diff -Nru wireshark-1.10.5/acinclude.m4 wireshark-1.10.6/acinclude.m4 --- wireshark-1.10.5/acinclude.m4 2013-07-17 22:26:25.000000000 +0000 +++ wireshark-1.10.6/acinclude.m4 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ dnl This file is part of the Autoconf packaging for Wireshark. dnl Copyright (C) 1998-2000 by Gerald Combs. dnl -dnl $Id: acinclude.m4 50710 2013-07-17 22:20:12Z gerald $ +dnl $Id$ dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by diff -Nru wireshark-1.10.5/aclocal-fallback/gtk-2.0.m4 wireshark-1.10.6/aclocal-fallback/gtk-2.0.m4 --- wireshark-1.10.5/aclocal-fallback/gtk-2.0.m4 2013-04-22 18:04:12.000000000 +0000 +++ wireshark-1.10.6/aclocal-fallback/gtk-2.0.m4 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ # Configure paths for GTK+ # Owen Taylor 1997-2001 -# $Id: gtk-2.0.m4 47538 2013-02-07 20:58:45Z morriss $ +# $Id$ dnl AM_PATH_GTK_2_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, diff -Nru wireshark-1.10.5/aclocal-fallback/gtk-3.0.m4 wireshark-1.10.6/aclocal-fallback/gtk-3.0.m4 --- wireshark-1.10.5/aclocal-fallback/gtk-3.0.m4 2013-04-22 18:04:12.000000000 +0000 +++ wireshark-1.10.6/aclocal-fallback/gtk-3.0.m4 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ # Configure paths for GTK+ # Owen Taylor 1997-2001 -# $Id: gtk-3.0.m4 47538 2013-02-07 20:58:45Z morriss $ +# $Id$ 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, diff -Nru wireshark-1.10.5/aclocal-fallback/qt.m4 wireshark-1.10.6/aclocal-fallback/qt.m4 --- wireshark-1.10.5/aclocal-fallback/qt.m4 2013-04-22 18:04:12.000000000 +0000 +++ wireshark-1.10.6/aclocal-fallback/qt.m4 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ # Based on gtk-2.0.m4. -# $Id: qt.m4 47553 2013-02-08 02:51:14Z morriss $ +# $Id$ dnl AM_PATH_QT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for Qt+ and define Qt_CFLAGS and Qt_LIBS. diff -Nru wireshark-1.10.5/aclocal-flags wireshark-1.10.6/aclocal-flags --- wireshark-1.10.5/aclocal-flags 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/aclocal-flags 2014-03-07 18:07:11.000000000 +0000 @@ -36,7 +36,7 @@ # and Glib are installed with the same prefix, we should only supply one # "-I" flag for both of them. # -# $Id: aclocal-flags 44922 2012-09-16 01:49:59Z guy $ +# $Id$ # # diff -Nru wireshark-1.10.5/adns_dll.dep wireshark-1.10.6/adns_dll.dep --- wireshark-1.10.5/adns_dll.dep 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/adns_dll.dep 2014-03-07 18:07:11.000000000 +0000 @@ -1,85 +1,85 @@ -# Microsoft Developer Studio Generated Dependency File, included by adns_dll.mak - -.\adns_dll.cpp : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - - -..\adns_unix_calls.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - - -..\..\src\check.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - "..\..\src\config.h"\ - "..\..\src\dlist.h"\ - "..\..\src\internal.h"\ - - -..\..\src\event.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - "..\..\src\config.h"\ - "..\..\src\dlist.h"\ - "..\..\src\internal.h"\ - "..\..\src\tvarith.h"\ - - -..\..\src\general.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - "..\..\src\config.h"\ - "..\..\src\dlist.h"\ - "..\..\src\internal.h"\ - - -..\..\src\parse.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - "..\..\src\config.h"\ - "..\..\src\dlist.h"\ - "..\..\src\internal.h"\ - - -..\..\src\query.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - "..\..\src\config.h"\ - "..\..\src\dlist.h"\ - "..\..\src\internal.h"\ - - -..\..\src\reply.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - "..\..\src\config.h"\ - "..\..\src\dlist.h"\ - "..\..\src\internal.h"\ - - -..\..\src\setup.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - "..\..\src\config.h"\ - "..\..\src\dlist.h"\ - "..\..\src\internal.h"\ - - -..\..\src\transmit.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - "..\..\src\config.h"\ - "..\..\src\dlist.h"\ - "..\..\src\internal.h"\ - "..\..\src\tvarith.h"\ - - -..\..\src\types.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - "..\..\src\config.h"\ - "..\..\src\dlist.h"\ - "..\..\src\internal.h"\ - +# Microsoft Developer Studio Generated Dependency File, included by adns_dll.mak + +.\adns_dll.cpp : \ + "..\..\src\adns.h"\ + "..\..\src\adns_win32.h"\ + + +..\adns_unix_calls.c : \ + "..\..\src\adns.h"\ + "..\..\src\adns_win32.h"\ + + +..\..\src\check.c : \ + "..\..\src\adns.h"\ + "..\..\src\adns_win32.h"\ + "..\..\src\config.h"\ + "..\..\src\dlist.h"\ + "..\..\src\internal.h"\ + + +..\..\src\event.c : \ + "..\..\src\adns.h"\ + "..\..\src\adns_win32.h"\ + "..\..\src\config.h"\ + "..\..\src\dlist.h"\ + "..\..\src\internal.h"\ + "..\..\src\tvarith.h"\ + + +..\..\src\general.c : \ + "..\..\src\adns.h"\ + "..\..\src\adns_win32.h"\ + "..\..\src\config.h"\ + "..\..\src\dlist.h"\ + "..\..\src\internal.h"\ + + +..\..\src\parse.c : \ + "..\..\src\adns.h"\ + "..\..\src\adns_win32.h"\ + "..\..\src\config.h"\ + "..\..\src\dlist.h"\ + "..\..\src\internal.h"\ + + +..\..\src\query.c : \ + "..\..\src\adns.h"\ + "..\..\src\adns_win32.h"\ + "..\..\src\config.h"\ + "..\..\src\dlist.h"\ + "..\..\src\internal.h"\ + + +..\..\src\reply.c : \ + "..\..\src\adns.h"\ + "..\..\src\adns_win32.h"\ + "..\..\src\config.h"\ + "..\..\src\dlist.h"\ + "..\..\src\internal.h"\ + + +..\..\src\setup.c : \ + "..\..\src\adns.h"\ + "..\..\src\adns_win32.h"\ + "..\..\src\config.h"\ + "..\..\src\dlist.h"\ + "..\..\src\internal.h"\ + + +..\..\src\transmit.c : \ + "..\..\src\adns.h"\ + "..\..\src\adns_win32.h"\ + "..\..\src\config.h"\ + "..\..\src\dlist.h"\ + "..\..\src\internal.h"\ + "..\..\src\tvarith.h"\ + + +..\..\src\types.c : \ + "..\..\src\adns.h"\ + "..\..\src\adns_win32.h"\ + "..\..\src\config.h"\ + "..\..\src\dlist.h"\ + "..\..\src\internal.h"\ + diff -Nru wireshark-1.10.5/adns_dll.rc wireshark-1.10.6/adns_dll.rc --- wireshark-1.10.5/adns_dll.rc 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/adns_dll.rc 2014-03-07 18:07:11.000000000 +0000 @@ -1,110 +1,110 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -// WIRESHARK: this makes problem on some machines -//#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Norwegian (Bokmal) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NOR) -//#ifdef _WIN32 -//LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL -//#pragma code_page(1252) -//#endif //_WIN32 - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,5 - PRODUCTVERSION 1,0,0,5 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000004b0" - BEGIN - VALUE "Comments", "Lisenced under GPL - see www.gnu.org\0" - VALUE "CompanyName", "Jgaa's Internet www.jgaa.com\0" - VALUE "FileDescription", "adns resolver library\0" - VALUE "FileVersion", "1, 0, 0, 5\0" - VALUE "InternalName", "adns-win32\0" - VALUE "LegalCopyright", "Copyright © 2000, 2001, 2002 , 2003 Ian Jackson, Jarle Aase\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "adns_dll.dll\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "GNU adns\0" - VALUE "ProductVersion", "1, 0, 0, 5\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0, 1200 - END -END - -#endif // !_MAC - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // Norwegian (Bokmal) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +// WIRESHARK: this makes problem on some machines +//#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Norwegian (Bokmal) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NOR) +//#ifdef _WIN32 +//LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +//#pragma code_page(1252) +//#endif //_WIN32 + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,0,5 + PRODUCTVERSION 1,0,0,5 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "Comments", "Lisenced under GPL - see www.gnu.org\0" + VALUE "CompanyName", "Jgaa's Internet www.jgaa.com\0" + VALUE "FileDescription", "adns resolver library\0" + VALUE "FileVersion", "1, 0, 0, 5\0" + VALUE "InternalName", "adns-win32\0" + VALUE "LegalCopyright", "Copyright © 2000, 2001, 2002 , 2003 Ian Jackson, Jarle Aase\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "adns_dll.dll\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "GNU adns\0" + VALUE "ProductVersion", "1, 0, 0, 5\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END + +#endif // !_MAC + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // Norwegian (Bokmal) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff -Nru wireshark-1.10.5/airpcap_loader.c wireshark-1.10.6/airpcap_loader.c --- wireshark-1.10.5/airpcap_loader.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/airpcap_loader.c 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ /* airpcap_loader.c * - * $Id: airpcap_loader.c 48960 2013-04-22 02:10:49Z mmann $ + * $Id$ * * Giorgio Tino * Copyright (c) CACE Technologies, LLC 2006 diff -Nru wireshark-1.10.5/airpcap_loader.h wireshark-1.10.6/airpcap_loader.h --- wireshark-1.10.5/airpcap_loader.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/airpcap_loader.h 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ /* airpcap_loader.h * Declarations of routines for the "About" dialog * - * $Id: airpcap_loader.h 47697 2013-02-17 03:16:57Z guy $ + * $Id$ * * Giorgio Tino * Copyright (c) CACE Technologies, LLC 2006 diff -Nru wireshark-1.10.5/asn1/acp133/Makefile.am wireshark-1.10.6/asn1/acp133/Makefile.am --- wireshark-1.10.5/asn1/acp133/Makefile.am 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/acp133/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/acp133/Makefile.common wireshark-1.10.6/asn1/acp133/Makefile.common --- wireshark-1.10.5/asn1/acp133/Makefile.common 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/acp133/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 46008 2012-11-12 13:45:24Z stig $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/acp133/Makefile.in wireshark-1.10.6/asn1/acp133/Makefile.in --- wireshark-1.10.5/asn1/acp133/Makefile.in 2013-12-19 19:13:36.000000000 +0000 +++ wireshark-1.10.6/asn1/acp133/Makefile.in 2014-03-07 18:07:26.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 46008 2012-11-12 13:45:24Z stig $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/acp133/Makefile.nmake wireshark-1.10.6/asn1/acp133/Makefile.nmake --- wireshark-1.10.5/asn1/acp133/Makefile.nmake 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/acp133/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/acp133/MHSDirectoryObjectsAndAttributes.asn wireshark-1.10.6/asn1/acp133/MHSDirectoryObjectsAndAttributes.asn --- wireshark-1.10.5/asn1/acp133/MHSDirectoryObjectsAndAttributes.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/acp133/MHSDirectoryObjectsAndAttributes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MHSDirectoryObjectsAndAttributes.asn 24197 2008-01-26 10:18:10Z gal $ +-- $Id$ -- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x402/1999/index.html -- Module MHSDirectoryObjectsAndAttributes (X.402:06/1999) MHSDirectoryObjectsAndAttributes {joint-iso-itu-t mhs(6) arch(5) modules(0) diff -Nru wireshark-1.10.5/asn1/acp133/packet-acp133-template.c wireshark-1.10.6/asn1/acp133/packet-acp133-template.c --- wireshark-1.10.5/asn1/acp133/packet-acp133-template.c 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/acp133/packet-acp133-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ACP133 specific syntaxes in X.500 packet dissection * Graeme Lunt 2005 * - * $Id: packet-acp133-template.c 48440 2013-03-20 06:50:56Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/acp133/packet-acp133-template.h wireshark-1.10.6/asn1/acp133/packet-acp133-template.h --- wireshark-1.10.5/asn1/acp133/packet-acp133-template.h 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/acp133/packet-acp133-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ACP133 specific syntaxes in X.500 packet dissection * Graeme Lunt 2005 * - * $Id: packet-acp133-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/acse/acse.cnf wireshark-1.10.6/asn1/acse/acse.cnf --- wireshark-1.10.5/asn1/acse/acse.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/acse/acse.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # asce.cnf # ACSE conformation file -# $Id: acse.cnf 34519 2010-10-15 08:39:48Z stig $ +# $Id$ #.IMPORT ../x509if/x509if-exp.cnf diff -Nru wireshark-1.10.5/asn1/acse/Makefile.am wireshark-1.10.6/asn1/acse/Makefile.am --- wireshark-1.10.5/asn1/acse/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/acse/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/acse/Makefile.common wireshark-1.10.6/asn1/acse/Makefile.common --- wireshark-1.10.5/asn1/acse/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/acse/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/acse/Makefile.in wireshark-1.10.6/asn1/acse/Makefile.in --- wireshark-1.10.5/asn1/acse/Makefile.in 2013-12-19 19:13:36.000000000 +0000 +++ wireshark-1.10.6/asn1/acse/Makefile.in 2014-03-07 18:07:26.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/acse/Makefile.nmake wireshark-1.10.6/asn1/acse/Makefile.nmake --- wireshark-1.10.5/asn1/acse/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/acse/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/acse/packet-acse-template.c wireshark-1.10.6/asn1/acse/packet-acse-template.c --- wireshark-1.10.5/asn1/acse/packet-acse-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/acse/packet-acse-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -13,7 +13,7 @@ * Yuriy Sidelnikov * * - * $Id: packet-acse-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/acse/packet-acse-template.h wireshark-1.10.6/asn1/acse/packet-acse-template.h --- wireshark-1.10.5/asn1/acse/packet-acse-template.h 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/acse/packet-acse-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ACSE packet dissection * Ronnie Sahlberg 2005 * - * $Id: packet-acse-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/ansi_map/ansi_map.asn wireshark-1.10.6/asn1/ansi_map/ansi_map.asn --- wireshark-1.10.5/asn1/ansi_map/ansi_map.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/ansi_map/ansi_map.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- Copyright 2005 - 2009 Anders Broman --- $Id: ansi_map.asn 38159 2011-07-21 22:46:07Z etxrab $ +-- $Id$ MAP-Protocol{ 0 identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-Protocol (4) version5 (5) } DEFINITIONS ::= diff -Nru wireshark-1.10.5/asn1/ansi_map/ansi_map.cnf wireshark-1.10.6/asn1/ansi_map/ansi_map.cnf --- wireshark-1.10.5/asn1/ansi_map/ansi_map.cnf 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/ansi_map/ansi_map.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # ansi_map.cnf # ansi_map conformation file # Copyright 2005-2007 Anders Broman -# $Id: ansi_map.cnf 41211 2012-02-27 16:50:27Z alagoutte $ +# $Id$ #.IMPORT ../gsm_map/gsm_map-exp.cnf #.EXPORTS diff -Nru wireshark-1.10.5/asn1/ansi_map/Makefile.am wireshark-1.10.6/asn1/ansi_map/Makefile.am --- wireshark-1.10.5/asn1/ansi_map/Makefile.am 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/ansi_map/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ansi_map/Makefile.common wireshark-1.10.6/asn1/ansi_map/Makefile.common --- wireshark-1.10.5/asn1/ansi_map/Makefile.common 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/ansi_map/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ansi_map/Makefile.in wireshark-1.10.6/asn1/ansi_map/Makefile.in --- wireshark-1.10.5/asn1/ansi_map/Makefile.in 2013-12-19 19:13:36.000000000 +0000 +++ wireshark-1.10.6/asn1/ansi_map/Makefile.in 2014-03-07 18:07:26.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ansi_map/Makefile.nmake wireshark-1.10.6/asn1/ansi_map/Makefile.nmake --- wireshark-1.10.5/asn1/ansi_map/Makefile.nmake 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/ansi_map/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ansi_map/packet-ansi_map-template.c wireshark-1.10.6/asn1/ansi_map/packet-ansi_map-template.c --- wireshark-1.10.5/asn1/ansi_map/packet-ansi_map-template.c 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/ansi_map/packet-ansi_map-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -7,7 +7,7 @@ * * Copyright 2005 - 2009, Anders Broman * - * $Id: packet-ansi_map-template.c 48439 2013-03-20 05:59:22Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/ansi_map/packet-ansi_map-template.h wireshark-1.10.6/asn1/ansi_map/packet-ansi_map-template.h --- wireshark-1.10.5/asn1/ansi_map/packet-ansi_map-template.h 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/ansi_map/packet-ansi_map-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ansi_map packet dissection * Copyright 2005, Anders Broman * - * $Id: packet-ansi_map-template.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/ansi_tcap/ansi_tcap.cnf wireshark-1.10.6/asn1/ansi_tcap/ansi_tcap.cnf --- wireshark-1.10.5/asn1/ansi_tcap/ansi_tcap.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ansi_tcap/ansi_tcap.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ # tcap.cnf -# $Id: ansi_tcap.cnf 39887 2011-11-16 19:52:00Z etxrab $ +# $Id$ # tcap conformation file #.OMIT_ASSIGNMENT diff -Nru wireshark-1.10.5/asn1/ansi_tcap/Makefile.am wireshark-1.10.6/asn1/ansi_tcap/Makefile.am --- wireshark-1.10.5/asn1/ansi_tcap/Makefile.am 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ansi_tcap/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ansi_tcap/Makefile.common wireshark-1.10.6/asn1/ansi_tcap/Makefile.common --- wireshark-1.10.5/asn1/ansi_tcap/Makefile.common 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ansi_tcap/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ansi_tcap/Makefile.in wireshark-1.10.6/asn1/ansi_tcap/Makefile.in --- wireshark-1.10.5/asn1/ansi_tcap/Makefile.in 2013-12-19 19:13:36.000000000 +0000 +++ wireshark-1.10.6/asn1/ansi_tcap/Makefile.in 2014-03-07 18:07:26.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ansi_tcap/Makefile.nmake wireshark-1.10.6/asn1/ansi_tcap/Makefile.nmake --- wireshark-1.10.5/asn1/ansi_tcap/Makefile.nmake 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ansi_tcap/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ansi_tcap/packet-ansi_tcap-template.c wireshark-1.10.6/asn1/ansi_tcap/packet-ansi_tcap-template.c --- wireshark-1.10.5/asn1/ansi_tcap/packet-ansi_tcap-template.c 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ansi_tcap/packet-ansi_tcap-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2007 Anders Broman * Built from the gsm-map dissector Copyright 2004 - 2005, Anders Broman * - * $Id: packet-ansi_tcap-template.c 48440 2013-03-20 06:50:56Z etxrab $ + * $Id$ * Wireshark - Network traffic analyzer * By Gerald Combs * Copyright 1998 Gerald Combs diff -Nru wireshark-1.10.5/asn1/ansi_tcap/packet-ansi_tcap-template.h wireshark-1.10.6/asn1/ansi_tcap/packet-ansi_tcap-template.h --- wireshark-1.10.5/asn1/ansi_tcap/packet-ansi_tcap-template.h 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ansi_tcap/packet-ansi_tcap-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ansi_tcap.h * - * $Id: packet-ansi_tcap-template.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Copyright 2007 Anders Broman * diff -Nru wireshark-1.10.5/asn1/c1222/c1222.cnf wireshark-1.10.6/asn1/c1222/c1222.cnf --- wireshark-1.10.5/asn1/c1222/c1222.cnf 2013-06-03 17:50:22.000000000 +0000 +++ wireshark-1.10.6/asn1/c1222/c1222.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ # C1222 conformation file # Copyright 2010, Edward J. Beroset, edward.j.beroset@us.elster.com -# $Id: c1222.cnf 49721 2013-06-03 17:44:22Z gerald $ +# $Id$ #.MODULE_IMPORT IMPORT ../acse/acse.inf diff -Nru wireshark-1.10.5/asn1/c1222/Makefile.am wireshark-1.10.6/asn1/c1222/Makefile.am --- wireshark-1.10.5/asn1/c1222/Makefile.am 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/c1222/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/c1222/Makefile.common wireshark-1.10.6/asn1/c1222/Makefile.common --- wireshark-1.10.5/asn1/c1222/Makefile.common 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/c1222/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/c1222/Makefile.in wireshark-1.10.6/asn1/c1222/Makefile.in --- wireshark-1.10.5/asn1/c1222/Makefile.in 2013-12-19 19:13:36.000000000 +0000 +++ wireshark-1.10.6/asn1/c1222/Makefile.in 2014-03-07 18:07:26.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/c1222/Makefile.nmake wireshark-1.10.6/asn1/c1222/Makefile.nmake --- wireshark-1.10.5/asn1/c1222/Makefile.nmake 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/c1222/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/c1222/packet-c1222-template.c wireshark-1.10.6/asn1/c1222/packet-c1222-template.c --- wireshark-1.10.5/asn1/c1222/packet-c1222-template.c 2013-05-20 21:52:18.000000000 +0000 +++ wireshark-1.10.6/asn1/c1222/packet-c1222-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ANSI C12.22 packet dissection * Copyright 2010, Edward J. Beroset, edward.j.beroset@us.elster.com * - * $Id: packet-c1222-template.c 49462 2013-05-20 21:46:36Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/c1222/packet-c1222-template.h wireshark-1.10.6/asn1/c1222/packet-c1222-template.h --- wireshark-1.10.5/asn1/c1222/packet-c1222-template.h 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/c1222/packet-c1222-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ANSI C12.22 packet dissection * Copyright 2010, Edward J. Beroset, edward.j.beroset@us.elster.com * - * $Id: packet-c1222-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/camel/camel.asn wireshark-1.10.6/asn1/camel/camel.asn --- wireshark-1.10.5/asn1/camel/camel.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/camel.asn 2014-03-07 18:07:11.000000000 +0000 @@ -8,7 +8,7 @@ -- --*********************************************** --- $Id: camel.asn 20835 2007-02-17 20:04:10Z etxrab $ +-- $Id$ --********************************************* -- Core-INAP-CS1-Operations DEFINITIONS diff -Nru wireshark-1.10.5/asn1/camel/camel.cnf wireshark-1.10.6/asn1/camel/camel.cnf --- wireshark-1.10.5/asn1/camel/camel.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/camel.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # camel.cnf # camel conformation file # Anders Broman 2007 -# $Id: camel.cnf 45194 2012-09-28 16:31:08Z pascal $ +# $Id$ #.IMPORT ../gsm_map/gsm_map-exp.cnf #.IMPORT ../inap/inap-exp.cnf diff -Nru wireshark-1.10.5/asn1/camel/CamelV2diff.asn wireshark-1.10.6/asn1/camel/CamelV2diff.asn --- wireshark-1.10.5/asn1/camel/CamelV2diff.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/CamelV2diff.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: CamelV2diff.asn 39715 2011-11-02 18:10:34Z etxrab $-- +-- $Id$-- -- -- Hand crafted ASN1 file for the differences between latest spec and V2 -- statments sufixed with V2 to be able to generate this with the latest ASN1 spec. diff -Nru wireshark-1.10.5/asn1/camel/CAP-classes.asn wireshark-1.10.6/asn1/camel/CAP-classes.asn --- wireshark-1.10.5/asn1/camel/CAP-classes.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/CAP-classes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: CAP-classes.asn 39386 2011-10-12 16:41:42Z etxrab $ +-- $Id$ -- 3GPP TS 29.078 11.0.0 (2011-09) -- 5.5 Classes CAP-classes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) diff -Nru wireshark-1.10.5/asn1/camel/CAP-datatypes.asn wireshark-1.10.6/asn1/camel/CAP-datatypes.asn --- wireshark-1.10.5/asn1/camel/CAP-datatypes.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/CAP-datatypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: CAP-datatypes.asn 39386 2011-10-12 16:41:42Z etxrab $ +-- $Id$ -- 3GPP TS 29.078 11.0.0 (2011-09) -- 5 Common CAP Types -- 5.1 Data types diff -Nru wireshark-1.10.5/asn1/camel/CAP-errorcodes.asn wireshark-1.10.6/asn1/camel/CAP-errorcodes.asn --- wireshark-1.10.5/asn1/camel/CAP-errorcodes.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/CAP-errorcodes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: CAP-errorcodes.asn 39386 2011-10-12 16:41:42Z etxrab $ +-- $Id$ -- 3GPP TS 29.078 11.0.0 (2011-09) -- 5.4 Error codes CAP-errorcodes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-errorcodes(57) version8(7)} diff -Nru wireshark-1.10.5/asn1/camel/CAP-errortypes.asn wireshark-1.10.6/asn1/camel/CAP-errortypes.asn --- wireshark-1.10.5/asn1/camel/CAP-errortypes.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/CAP-errortypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: CAP-errortypes.asn 39386 2011-10-12 16:41:42Z etxrab $ +-- $Id$ -- 3GPP TS 29.078 11.0.0 (2011-09) -- 5.2 Error types diff -Nru wireshark-1.10.5/asn1/camel/CAP-GPRS-ReferenceNumber.asn wireshark-1.10.6/asn1/camel/CAP-GPRS-ReferenceNumber.asn --- wireshark-1.10.5/asn1/camel/CAP-GPRS-ReferenceNumber.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/CAP-GPRS-ReferenceNumber.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: CAP-GPRS-ReferenceNumber.asn 39386 2011-10-12 16:41:42Z etxrab $ +-- $Id$ -- 3GPP TS 29.078 29.078 11.0.0 (2011-09) -- 8.1.1 GPRS Reference Number diff -Nru wireshark-1.10.5/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn wireshark-1.10.6/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn --- wireshark-1.10.5/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: CAP-gprsSSF-gsmSCF-ops-args.asn 39386 2011-10-12 16:41:42Z etxrab $ +-- $Id$ -- 3GPP TS 29.078 11.0.0 (2011-09) -- 8 GPRS Control -- 8.1 gsmSCF/gprsSSF operations and arguments diff -Nru wireshark-1.10.5/asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn wireshark-1.10.6/asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn --- wireshark-1.10.5/asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: CAP-gsmSCF-gsmSRF-ops-args.asn 39386 2011-10-12 16:41:42Z etxrab $ +-- $Id$ -- 3GPP TS 29.078 11.0.0 (2011-09) -- 6.2 gsmSCF/gsmSRF interface -- 6.2.1 gsmSCF/gsmSRF operations and arguments diff -Nru wireshark-1.10.5/asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn wireshark-1.10.6/asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn --- wireshark-1.10.5/asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: CAP-gsmSSF-gsmSCF-ops-args.asn 44612 2012-08-22 13:35:20Z etxrab $ +-- $Id$ -- 3GPP TS 29.078 11.0.0 (2011-09) -- 6 Circuit Switched Call Control -- 6.1 gsmSSF/CCF - gsmSCF Interface diff -Nru wireshark-1.10.5/asn1/camel/CAP-object-identifiers.asn wireshark-1.10.6/asn1/camel/CAP-object-identifiers.asn --- wireshark-1.10.5/asn1/camel/CAP-object-identifiers.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/CAP-object-identifiers.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: CAP-object-identifiers.asn 39386 2011-10-12 16:41:42Z etxrab $ +-- $Id$ -- 3GPP TS 29.078 11.0.0 (2011-09) -- 5.6 Object IDentifiers (IDs) CAP-object-identifiers {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) diff -Nru wireshark-1.10.5/asn1/camel/CAP-operationcodes.asn wireshark-1.10.6/asn1/camel/CAP-operationcodes.asn --- wireshark-1.10.5/asn1/camel/CAP-operationcodes.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/CAP-operationcodes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: CAP-operationcodes.asn 39386 2011-10-12 16:41:42Z etxrab $ +-- $Id$ -- 3GPP TS 29.078 11.0.0 (2011-09) -- 5.3 Operation codes CAP-operationcodes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-operationcodes(53) version8(7)} diff -Nru wireshark-1.10.5/asn1/camel/CAP-SMS-ops-args.asn wireshark-1.10.6/asn1/camel/CAP-SMS-ops-args.asn --- wireshark-1.10.5/asn1/camel/CAP-SMS-ops-args.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/CAP-SMS-ops-args.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: CAP-SMS-ops-args.asn 39386 2011-10-12 16:41:42Z etxrab $ +-- $Id$ -- 3GPP TS 29.078 11.0.0 (2011-09) -- 7 SMS Control -- 7.1 SMS operations and arguments diff -Nru wireshark-1.10.5/asn1/camel/CAP-U-ABORT-Data.asn wireshark-1.10.6/asn1/camel/CAP-U-ABORT-Data.asn --- wireshark-1.10.5/asn1/camel/CAP-U-ABORT-Data.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/CAP-U-ABORT-Data.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: CAP-U-ABORT-Data.asn 39386 2011-10-12 16:41:42Z etxrab $ +-- $Id$ -- 3GPP TS 29.078 11.0.0 (2011-09) -- 5.7 User Abort Data CAP-U-ABORT-Data {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-u-abort-data(110) version8(7)} diff -Nru wireshark-1.10.5/asn1/camel/Makefile.am wireshark-1.10.6/asn1/camel/Makefile.am --- wireshark-1.10.5/asn1/camel/Makefile.am 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/camel/Makefile.common wireshark-1.10.6/asn1/camel/Makefile.common --- wireshark-1.10.5/asn1/camel/Makefile.common 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/camel/Makefile.in wireshark-1.10.6/asn1/camel/Makefile.in --- wireshark-1.10.5/asn1/camel/Makefile.in 2013-12-19 19:13:36.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/Makefile.in 2014-03-07 18:07:26.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/camel/Makefile.nmake wireshark-1.10.6/asn1/camel/Makefile.nmake --- wireshark-1.10.5/asn1/camel/Makefile.nmake 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/camel/packet-camel-template.c wireshark-1.10.6/asn1/camel/packet-camel-template.c --- wireshark-1.10.5/asn1/camel/packet-camel-template.c 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/packet-camel-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -8,7 +8,7 @@ * Updated to 3GPP TS 29.078 version 7.3.0 Release 7 (2006-06) * Built from the gsm-map dissector Copyright 2004, Anders Broman * - * $Id: packet-camel-template.c 48429 2013-03-19 21:22:31Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/camel/packet-camel-template.h wireshark-1.10.6/asn1/camel/packet-camel-template.h --- wireshark-1.10.5/asn1/camel/packet-camel-template.h 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/camel/packet-camel-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2005, Olivier Jacques * Built from the gsm-map dissector Copyright 2004, Anders Broman * - * $Id: packet-camel-template.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/cdt/cdt.cnf wireshark-1.10.6/asn1/cdt/cdt.cnf --- wireshark-1.10.5/asn1/cdt/cdt.cnf 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/cdt/cdt.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # cdt.cnf # Compressed Data Type conformation file -# $Id: cdt.cnf 36013 2011-02-20 17:03:29Z stig $ +# $Id$ #.EXPORTS CompressedData diff -Nru wireshark-1.10.5/asn1/cdt/Makefile.am wireshark-1.10.6/asn1/cdt/Makefile.am --- wireshark-1.10.5/asn1/cdt/Makefile.am 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/cdt/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/cdt/Makefile.common wireshark-1.10.6/asn1/cdt/Makefile.common --- wireshark-1.10.5/asn1/cdt/Makefile.common 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/cdt/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/cdt/Makefile.in wireshark-1.10.6/asn1/cdt/Makefile.in --- wireshark-1.10.5/asn1/cdt/Makefile.in 2013-12-19 19:13:36.000000000 +0000 +++ wireshark-1.10.6/asn1/cdt/Makefile.in 2014-03-07 18:07:27.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/cdt/Makefile.nmake wireshark-1.10.6/asn1/cdt/Makefile.nmake --- wireshark-1.10.5/asn1/cdt/Makefile.nmake 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/cdt/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/cdt/packet-cdt-template.c wireshark-1.10.6/asn1/cdt/packet-cdt-template.c --- wireshark-1.10.5/asn1/cdt/packet-cdt-template.c 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/cdt/packet-cdt-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 2005, Stig Bjorlykke , Thales Norway AS * - * $Id: packet-cdt-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/cdt/packet-cdt-template.h wireshark-1.10.6/asn1/cdt/packet-cdt-template.h --- wireshark-1.10.5/asn1/cdt/packet-cdt-template.h 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/cdt/packet-cdt-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 2005, Stig Bjorlykke , Thales Norway AS * - * $Id: packet-cdt-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/charging_ase/charging_ase.cnf wireshark-1.10.6/asn1/charging_ase/charging_ase.cnf --- wireshark-1.10.5/asn1/charging_ase/charging_ase.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/charging_ase/charging_ase.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # charging ase.cnf # charging ase conformation file # Anders Broman 2009 -# $Id: charging_ase.cnf 27405 2009-02-09 20:46:59Z etxrab $ +# $Id$ #.EXPORTS ChargingMessageType diff -Nru wireshark-1.10.5/asn1/charging_ase/Makefile.am wireshark-1.10.6/asn1/charging_ase/Makefile.am --- wireshark-1.10.5/asn1/charging_ase/Makefile.am 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/charging_ase/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/charging_ase/Makefile.common wireshark-1.10.6/asn1/charging_ase/Makefile.common --- wireshark-1.10.5/asn1/charging_ase/Makefile.common 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/charging_ase/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/charging_ase/Makefile.in wireshark-1.10.6/asn1/charging_ase/Makefile.in --- wireshark-1.10.5/asn1/charging_ase/Makefile.in 2013-12-19 19:13:36.000000000 +0000 +++ wireshark-1.10.6/asn1/charging_ase/Makefile.in 2014-03-07 18:07:27.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/charging_ase/Makefile.nmake wireshark-1.10.6/asn1/charging_ase/Makefile.nmake --- wireshark-1.10.5/asn1/charging_ase/Makefile.nmake 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/charging_ase/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/charging_ase/packet-charging_ase-template.c wireshark-1.10.6/asn1/charging_ase/packet-charging_ase-template.c --- wireshark-1.10.5/asn1/charging_ase/packet-charging_ase-template.c 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/charging_ase/packet-charging_ase-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-charging_ase-template.c * Copyright 2009 , Anders Broman * - * $Id: packet-charging_ase-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/charging_ase/packet-charging_ase-template.h wireshark-1.10.6/asn1/charging_ase/packet-charging_ase-template.h --- wireshark-1.10.5/asn1/charging_ase/packet-charging_ase-template.h 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/charging_ase/packet-charging_ase-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-charging_ase-template.h * Copyright 2009, Anders Broman * - * $Id: packet-charging_ase-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/charging_ase/Tariffing-Data-Types.asn wireshark-1.10.6/asn1/charging_ase/Tariffing-Data-Types.asn --- wireshark-1.10.5/asn1/charging_ase/Tariffing-Data-Types.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/charging_ase/Tariffing-Data-Types.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- ETSI ES 201 296 V1.3.1 (2003-04) --- $Id: Tariffing-Data-Types.asn 27405 2009-02-09 20:46:59Z etxrab $ +-- $Id$ Tariffing-Data-Types {itu-t(0) identified-organization(4) etsi (0) 1296 version3(4)} DEFINITIONS IMPLICIT TAGS ::= BEGIN diff -Nru wireshark-1.10.5/asn1/cmip/cmip.cnf wireshark-1.10.6/asn1/cmip/cmip.cnf --- wireshark-1.10.5/asn1/cmip/cmip.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/cmip/cmip.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # cmip.cnf # CMIP conformation file -# $Id: cmip.cnf 35894 2011-02-10 10:11:38Z stig $ +# $Id$ #.IMPORT ../acse/acse-exp.cnf diff -Nru wireshark-1.10.5/asn1/cmip/Makefile.am wireshark-1.10.6/asn1/cmip/Makefile.am --- wireshark-1.10.5/asn1/cmip/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/cmip/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/cmip/Makefile.common wireshark-1.10.6/asn1/cmip/Makefile.common --- wireshark-1.10.5/asn1/cmip/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/cmip/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/cmip/Makefile.in wireshark-1.10.6/asn1/cmip/Makefile.in --- wireshark-1.10.5/asn1/cmip/Makefile.in 2013-12-19 19:13:36.000000000 +0000 +++ wireshark-1.10.6/asn1/cmip/Makefile.in 2014-03-07 18:07:27.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/cmip/Makefile.nmake wireshark-1.10.6/asn1/cmip/Makefile.nmake --- wireshark-1.10.5/asn1/cmip/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/cmip/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/cmip/packet-cmip-template.c wireshark-1.10.6/asn1/cmip/packet-cmip-template.c --- wireshark-1.10.5/asn1/cmip/packet-cmip-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/cmip/packet-cmip-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.711 CMIP packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-cmip-template.c 48440 2013-03-20 06:50:56Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/cmip/packet-cmip-template.h wireshark-1.10.6/asn1/cmip/packet-cmip-template.h --- wireshark-1.10.5/asn1/cmip/packet-cmip-template.h 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/cmip/packet-cmip-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.711 CMIP packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-cmip-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/cmp/cmp.cnf wireshark-1.10.6/asn1/cmp/cmp.cnf --- wireshark-1.10.5/asn1/cmp/cmp.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/cmp/cmp.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # CMP.cnf # CMP conformation file -# $Id: cmp.cnf 31544 2010-01-17 12:19:02Z etxrab $ +# $Id$ #.MODULE_IMPORT PKIX1Explicit88 pkix1explicit diff -Nru wireshark-1.10.5/asn1/cmp/Makefile.am wireshark-1.10.6/asn1/cmp/Makefile.am --- wireshark-1.10.5/asn1/cmp/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/cmp/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/cmp/Makefile.common wireshark-1.10.6/asn1/cmp/Makefile.common --- wireshark-1.10.5/asn1/cmp/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/cmp/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/cmp/Makefile.in wireshark-1.10.6/asn1/cmp/Makefile.in --- wireshark-1.10.5/asn1/cmp/Makefile.in 2013-12-19 19:13:36.000000000 +0000 +++ wireshark-1.10.6/asn1/cmp/Makefile.in 2014-03-07 18:07:27.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/cmp/Makefile.nmake wireshark-1.10.6/asn1/cmp/Makefile.nmake --- wireshark-1.10.5/asn1/cmp/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/cmp/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/cmp/packet-cmp-template.c wireshark-1.10.6/asn1/cmp/packet-cmp-template.c --- wireshark-1.10.5/asn1/cmp/packet-cmp-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/cmp/packet-cmp-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ * Updated to RFC4210 CMPv2 and associated "Transport Protocols for CMP" draft * Martin Peylo 2008 * - * $Id: packet-cmp-template.c 47899 2013-02-26 04:42:26Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/cmp/packet-cmp-template.h wireshark-1.10.6/asn1/cmp/packet-cmp-template.h --- wireshark-1.10.5/asn1/cmp/packet-cmp-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/cmp/packet-cmp-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for RFC2510 Certificate Management Protocol packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-cmp-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/cms/AttributeCertificateVersion1.asn wireshark-1.10.6/asn1/cms/AttributeCertificateVersion1.asn --- wireshark-1.10.5/asn1/cms/AttributeCertificateVersion1.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/cms/AttributeCertificateVersion1.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- Extracted from RFC5652 --- $Id: AttributeCertificateVersion1.asn 31501 2010-01-12 14:29:53Z stig $ +-- $Id$ AttributeCertificateVersion1 { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) modules(0) v1AttrCert(15) } diff -Nru wireshark-1.10.5/asn1/cms/cms.cnf wireshark-1.10.6/asn1/cms/cms.cnf --- wireshark-1.10.5/asn1/cms/cms.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/cms/cms.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # CMS.cnf # CMS conformation file -# $Id: cms.cnf 46013 2012-11-12 22:00:53Z stig $ +# $Id$ #.IMPORT ../x509af/x509af-exp.cnf #.IMPORT ../x509ce/x509ce-exp.cnf diff -Nru wireshark-1.10.5/asn1/cms/CryptographicMessageSyntax.asn wireshark-1.10.6/asn1/cms/CryptographicMessageSyntax.asn --- wireshark-1.10.5/asn1/cms/CryptographicMessageSyntax.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/cms/CryptographicMessageSyntax.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ -- Extracted from RFC5652 -- and massaged/modified so it passes through our asn2wrs compiler --- $Id: CryptographicMessageSyntax.asn 31501 2010-01-12 14:29:53Z stig $ +-- $Id$ CryptographicMessageSyntax { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) modules(0) cms-2004(24) } DEFINITIONS IMPLICIT TAGS ::= diff -Nru wireshark-1.10.5/asn1/cms/Makefile.am wireshark-1.10.6/asn1/cms/Makefile.am --- wireshark-1.10.5/asn1/cms/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/cms/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/cms/Makefile.common wireshark-1.10.6/asn1/cms/Makefile.common --- wireshark-1.10.5/asn1/cms/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/cms/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/cms/Makefile.in wireshark-1.10.6/asn1/cms/Makefile.in --- wireshark-1.10.5/asn1/cms/Makefile.in 2013-12-19 19:13:36.000000000 +0000 +++ wireshark-1.10.6/asn1/cms/Makefile.in 2014-03-07 18:07:27.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/cms/Makefile.nmake wireshark-1.10.6/asn1/cms/Makefile.nmake --- wireshark-1.10.5/asn1/cms/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/cms/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/cms/packet-cms-template.c wireshark-1.10.6/asn1/cms/packet-cms-template.c --- wireshark-1.10.5/asn1/cms/packet-cms-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/cms/packet-cms-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ * Ronnie Sahlberg 2004 * Stig Bjorlykke 2010 * - * $Id: packet-cms-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/cms/packet-cms-template.h wireshark-1.10.6/asn1/cms/packet-cms-template.h --- wireshark-1.10.5/asn1/cms/packet-cms-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/cms/packet-cms-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ * Ronnie Sahlberg 2004 * Stig Bjorlykke 2010 * - * $Id: packet-cms-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/credssp/CredSSP.asn wireshark-1.10.6/asn1/credssp/CredSSP.asn --- wireshark-1.10.5/asn1/credssp/CredSSP.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/credssp/CredSSP.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: CredSSP.asn 39196 2011-09-30 15:21:16Z gal $ +-- $Id$ -- -- Derived from http://download.microsoft.com/download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/%5BMS-CSSP%5D.pdf diff -Nru wireshark-1.10.5/asn1/credssp/credssp.cnf wireshark-1.10.6/asn1/credssp/credssp.cnf --- wireshark-1.10.5/asn1/credssp/credssp.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/credssp/credssp.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ # credssp.cnf # Credential Security Support Provider (CredSSP) conformance file -# $Id: credssp.cnf 44871 2012-09-11 08:26:48Z darkjames $ +# $Id$ #.PDU TSRequest diff -Nru wireshark-1.10.5/asn1/credssp/Makefile.am wireshark-1.10.6/asn1/credssp/Makefile.am --- wireshark-1.10.5/asn1/credssp/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/credssp/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/credssp/Makefile.common wireshark-1.10.6/asn1/credssp/Makefile.common --- wireshark-1.10.5/asn1/credssp/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/credssp/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/credssp/Makefile.in wireshark-1.10.6/asn1/credssp/Makefile.in --- wireshark-1.10.5/asn1/credssp/Makefile.in 2013-12-19 19:13:37.000000000 +0000 +++ wireshark-1.10.6/asn1/credssp/Makefile.in 2014-03-07 18:07:27.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/credssp/Makefile.nmake wireshark-1.10.6/asn1/credssp/Makefile.nmake --- wireshark-1.10.5/asn1/credssp/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/credssp/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/credssp/packet-credssp-template.c wireshark-1.10.6/asn1/credssp/packet-credssp-template.c --- wireshark-1.10.5/asn1/credssp/packet-credssp-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/credssp/packet-credssp-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for CredSSP (Credential Security Support Provider) packet dissection * Graeme Lunt 2011 * - * $Id: packet-credssp-template.c 48043 2013-03-03 21:22:25Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/credssp/packet-credssp-template.h wireshark-1.10.6/asn1/credssp/packet-credssp-template.h --- wireshark-1.10.5/asn1/credssp/packet-credssp-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/credssp/packet-credssp-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for CredSSP (Credential Security Support Provider) packet dissection * Graeme Lunt 2011 * - * $Id: packet-credssp-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/crmf/crmf.cnf wireshark-1.10.6/asn1/crmf/crmf.cnf --- wireshark-1.10.5/asn1/crmf/crmf.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/crmf/crmf.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # CRMF.cnf # CRMF conformation file -# $Id: crmf.cnf 34099 2010-09-10 21:22:29Z stig $ +# $Id$ #.MODULE_IMPORT PKIX1Explicit88 pkix1explicit diff -Nru wireshark-1.10.5/asn1/crmf/Makefile.am wireshark-1.10.6/asn1/crmf/Makefile.am --- wireshark-1.10.5/asn1/crmf/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/crmf/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/crmf/Makefile.common wireshark-1.10.6/asn1/crmf/Makefile.common --- wireshark-1.10.5/asn1/crmf/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/crmf/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/crmf/Makefile.in wireshark-1.10.6/asn1/crmf/Makefile.in --- wireshark-1.10.5/asn1/crmf/Makefile.in 2013-12-19 19:13:37.000000000 +0000 +++ wireshark-1.10.6/asn1/crmf/Makefile.in 2014-03-07 18:07:27.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/crmf/Makefile.nmake wireshark-1.10.6/asn1/crmf/Makefile.nmake --- wireshark-1.10.5/asn1/crmf/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/crmf/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/crmf/packet-crmf-template.c wireshark-1.10.6/asn1/crmf/packet-crmf-template.c --- wireshark-1.10.5/asn1/crmf/packet-crmf-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/crmf/packet-crmf-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for RFC2511 Certificate Request Message Format packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-crmf-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/crmf/packet-crmf-template.h wireshark-1.10.6/asn1/crmf/packet-crmf-template.h --- wireshark-1.10.5/asn1/crmf/packet-crmf-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/crmf/packet-crmf-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for RFC2511 Certificate Request Message Format packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-crmf-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/Custom.make wireshark-1.10.6/asn1/Custom.make --- wireshark-1.10.5/asn1/Custom.make 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/Custom.make 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ # Automake file for Wireshark # -# $Id: Custom.make 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/asn1/dap/dap.cnf wireshark-1.10.6/asn1/dap/dap.cnf --- wireshark-1.10.5/asn1/dap/dap.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/dap/dap.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: dap.cnf 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ #.TYPE_ATTR diff -Nru wireshark-1.10.5/asn1/dap/DirectoryAccessProtocol.asn wireshark-1.10.6/asn1/dap/DirectoryAccessProtocol.asn --- wireshark-1.10.5/asn1/dap/DirectoryAccessProtocol.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/dap/DirectoryAccessProtocol.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: DirectoryAccessProtocol.asn 24384 2008-02-18 23:58:45Z wmeier $ +-- $Id$ -- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x519/2001/index.html -- Module DirectoryAccessProtocol (X.519:02/2001) DirectoryAccessProtocol {joint-iso-itu-t ds(5) module(1) dap(11) 4} DEFINITIONS diff -Nru wireshark-1.10.5/asn1/dap/Makefile.am wireshark-1.10.6/asn1/dap/Makefile.am --- wireshark-1.10.5/asn1/dap/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/dap/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/dap/Makefile.common wireshark-1.10.6/asn1/dap/Makefile.common --- wireshark-1.10.5/asn1/dap/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/dap/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/dap/Makefile.in wireshark-1.10.6/asn1/dap/Makefile.in --- wireshark-1.10.5/asn1/dap/Makefile.in 2013-12-19 19:13:37.000000000 +0000 +++ wireshark-1.10.6/asn1/dap/Makefile.in 2014-03-07 18:07:27.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/dap/Makefile.nmake wireshark-1.10.6/asn1/dap/Makefile.nmake --- wireshark-1.10.5/asn1/dap/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/dap/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/dap/packet-dap-template.c wireshark-1.10.6/asn1/dap/packet-dap-template.c --- wireshark-1.10.5/asn1/dap/packet-dap-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/dap/packet-dap-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.511 (X.500 Directory Asbtract Service) and X.519 DAP packet dissection * Graeme Lunt 2005 * - * $Id: packet-dap-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/dap/packet-dap-template.h wireshark-1.10.6/asn1/dap/packet-dap-template.h --- wireshark-1.10.5/asn1/dap/packet-dap-template.h 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/dap/packet-dap-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.511 (X.500 Directory Access Protocol) packet dissection * Graeme Lunt 2005 * - * $Id: packet-dap-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/disp/Makefile.am wireshark-1.10.6/asn1/disp/Makefile.am --- wireshark-1.10.5/asn1/disp/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/disp/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/disp/Makefile.common wireshark-1.10.6/asn1/disp/Makefile.common --- wireshark-1.10.5/asn1/disp/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/disp/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/disp/Makefile.in wireshark-1.10.6/asn1/disp/Makefile.in --- wireshark-1.10.5/asn1/disp/Makefile.in 2013-12-19 19:13:37.000000000 +0000 +++ wireshark-1.10.6/asn1/disp/Makefile.in 2014-03-07 18:07:27.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/disp/Makefile.nmake wireshark-1.10.6/asn1/disp/Makefile.nmake --- wireshark-1.10.5/asn1/disp/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/disp/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/disp/packet-disp-template.c wireshark-1.10.6/asn1/disp/packet-disp-template.c --- wireshark-1.10.5/asn1/disp/packet-disp-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/disp/packet-disp-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.525 (X.500 Directory Shadow Asbtract Service) and X.519 DISP packet dissection * Graeme Lunt 2005 * - * $Id: packet-disp-template.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/disp/packet-disp-template.h wireshark-1.10.6/asn1/disp/packet-disp-template.h --- wireshark-1.10.5/asn1/disp/packet-disp-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/disp/packet-disp-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.525 (X.400 Message Transfer) packet dissection * Graeme Lunt 2005 * - * $Id: packet-disp-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/dop/Makefile.am wireshark-1.10.6/asn1/dop/Makefile.am --- wireshark-1.10.5/asn1/dop/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/dop/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/dop/Makefile.common wireshark-1.10.6/asn1/dop/Makefile.common --- wireshark-1.10.5/asn1/dop/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/dop/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/dop/Makefile.in wireshark-1.10.6/asn1/dop/Makefile.in --- wireshark-1.10.5/asn1/dop/Makefile.in 2013-12-19 19:13:37.000000000 +0000 +++ wireshark-1.10.6/asn1/dop/Makefile.in 2014-03-07 18:07:27.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/dop/Makefile.nmake wireshark-1.10.6/asn1/dop/Makefile.nmake --- wireshark-1.10.5/asn1/dop/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/dop/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/dop/packet-dop-template.c wireshark-1.10.6/asn1/dop/packet-dop-template.c --- wireshark-1.10.5/asn1/dop/packet-dop-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/dop/packet-dop-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.501 (DSA Operational Attributes) packet dissection * Graeme Lunt 2005 * - * $Id: packet-dop-template.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/dop/packet-dop-template.h wireshark-1.10.6/asn1/dop/packet-dop-template.h --- wireshark-1.10.5/asn1/dop/packet-dop-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/dop/packet-dop-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.501 (DSA Operational Attributes) packet dissection * Graeme Lunt 2005 * - * $Id: packet-dop-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/dsp/Makefile.am wireshark-1.10.6/asn1/dsp/Makefile.am --- wireshark-1.10.5/asn1/dsp/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/dsp/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/dsp/Makefile.common wireshark-1.10.6/asn1/dsp/Makefile.common --- wireshark-1.10.5/asn1/dsp/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/dsp/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/dsp/Makefile.in wireshark-1.10.6/asn1/dsp/Makefile.in --- wireshark-1.10.5/asn1/dsp/Makefile.in 2013-12-19 19:13:37.000000000 +0000 +++ wireshark-1.10.6/asn1/dsp/Makefile.in 2014-03-07 18:07:27.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/dsp/Makefile.nmake wireshark-1.10.6/asn1/dsp/Makefile.nmake --- wireshark-1.10.5/asn1/dsp/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/dsp/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/dsp/packet-dsp-template.c wireshark-1.10.6/asn1/dsp/packet-dsp-template.c --- wireshark-1.10.5/asn1/dsp/packet-dsp-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/dsp/packet-dsp-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.518 (X.500 Distributed Operations) packet dissection * Graeme Lunt 2005 * - * $Id: packet-dsp-template.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/dsp/packet-dsp-template.h wireshark-1.10.6/asn1/dsp/packet-dsp-template.h --- wireshark-1.10.5/asn1/dsp/packet-dsp-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/dsp/packet-dsp-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.511 (X.500 Directory Access Protocol) packet dissection * Graeme Lunt 2005 * - * $Id: packet-dsp-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/ess/ess.cnf wireshark-1.10.6/asn1/ess/ess.cnf --- wireshark-1.10.5/asn1/ess/ess.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/ess/ess.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # ess.cnf # ExtendedSecurityServices conformation file -# $Id: ess.cnf 39413 2011-10-14 07:44:20Z stig $ +# $Id$ #.IMPORT ../x509af/x509af-exp.cnf #.IMPORT ../x509ce/x509ce-exp.cnf diff -Nru wireshark-1.10.5/asn1/ess/Makefile.am wireshark-1.10.6/asn1/ess/Makefile.am --- wireshark-1.10.5/asn1/ess/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/ess/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ess/Makefile.common wireshark-1.10.6/asn1/ess/Makefile.common --- wireshark-1.10.5/asn1/ess/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/ess/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ess/Makefile.in wireshark-1.10.6/asn1/ess/Makefile.in --- wireshark-1.10.5/asn1/ess/Makefile.in 2013-12-19 19:13:37.000000000 +0000 +++ wireshark-1.10.6/asn1/ess/Makefile.in 2014-03-07 18:07:27.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ess/Makefile.nmake wireshark-1.10.6/asn1/ess/Makefile.nmake --- wireshark-1.10.5/asn1/ess/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/ess/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ess/packet-ess-template.c wireshark-1.10.6/asn1/ess/packet-ess-template.c --- wireshark-1.10.5/asn1/ess/packet-ess-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/ess/packet-ess-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -1,9 +1,10 @@ /* packet-ess.c - * Routines for RFC5035 Extended Security Services packet dissection + * Routines for RFC 2634 and RFC 5035 Extended Security Services packet + * dissection * Ronnie Sahlberg 2004 * Stig Bjorlykke 2010 * - * $Id: packet-ess-template.c 48286 2013-03-14 06:26:55Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -120,7 +121,7 @@ guint i; tree = proto_item_add_subtree (actx->created_item, ett_Category_attributes); - value = tvb_get_ephemeral_string (tvb, 0, tvb_length (tvb)); + value = (guint8 *)ep_tvb_memdup (tvb, 0, tvb_length (tvb)); for (i = 0; i < num_ess_category_attributes; i++) { ess_category_attributes_t *u = &(ess_category_attributes[i]); diff -Nru wireshark-1.10.5/asn1/ess/packet-ess-template.h wireshark-1.10.6/asn1/ess/packet-ess-template.h --- wireshark-1.10.5/asn1/ess/packet-ess-template.h 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/ess/packet-ess-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ * Ronnie Sahlberg 2004 * Stig Bjorlykke 2010 * - * $Id: packet-ess-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/ftam/ftam.cnf wireshark-1.10.6/asn1/ftam/ftam.cnf --- wireshark-1.10.5/asn1/ftam/ftam.cnf 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/ftam/ftam.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # FTAM.cnf # FTAM conformation file -# $Id: ftam.cnf 33047 2010-06-02 13:36:10Z gal $ +# $Id$ #.IMPORT ../acse/acse-exp.cnf diff -Nru wireshark-1.10.5/asn1/ftam/Makefile.am wireshark-1.10.6/asn1/ftam/Makefile.am --- wireshark-1.10.5/asn1/ftam/Makefile.am 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/ftam/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ftam/Makefile.common wireshark-1.10.6/asn1/ftam/Makefile.common --- wireshark-1.10.5/asn1/ftam/Makefile.common 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/ftam/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ftam/Makefile.in wireshark-1.10.6/asn1/ftam/Makefile.in --- wireshark-1.10.5/asn1/ftam/Makefile.in 2013-12-19 19:13:37.000000000 +0000 +++ wireshark-1.10.6/asn1/ftam/Makefile.in 2014-03-07 18:07:27.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ftam/Makefile.nmake wireshark-1.10.6/asn1/ftam/Makefile.nmake --- wireshark-1.10.5/asn1/ftam/Makefile.nmake 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/ftam/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ftam/packet-ftam-template.c wireshark-1.10.6/asn1/ftam/packet-ftam-template.c --- wireshark-1.10.5/asn1/ftam/packet-ftam-template.c 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/ftam/packet-ftam-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -7,7 +7,7 @@ * * Anders Broman and Ronnie Sahlberg 2005 - 2006 * - * $Id: packet-ftam-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/ftam/packet-ftam-template.h wireshark-1.10.6/asn1/ftam/packet-ftam-template.h --- wireshark-1.10.5/asn1/ftam/packet-ftam-template.h 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/ftam/packet-ftam-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -7,7 +7,7 @@ * * Anders Broman and Ronnie Sahlberg 2005 * - * $Id: packet-ftam-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/gnm/gnm.cnf wireshark-1.10.6/asn1/gnm/gnm.cnf --- wireshark-1.10.5/asn1/gnm/gnm.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/gnm/gnm.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ # gnm.cnf # gnm conformation file -# $Id: gnm.cnf 25848 2008-07-28 11:03:35Z etxrab $ +# $Id$ #.IMPORT ../cmip/cmip-exp.cnf #.EXPORTS diff -Nru wireshark-1.10.5/asn1/gnm/Makefile.am wireshark-1.10.6/asn1/gnm/Makefile.am --- wireshark-1.10.5/asn1/gnm/Makefile.am 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/gnm/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/gnm/Makefile.common wireshark-1.10.6/asn1/gnm/Makefile.common --- wireshark-1.10.5/asn1/gnm/Makefile.common 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/gnm/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/gnm/Makefile.in wireshark-1.10.6/asn1/gnm/Makefile.in --- wireshark-1.10.5/asn1/gnm/Makefile.in 2013-12-19 19:13:37.000000000 +0000 +++ wireshark-1.10.6/asn1/gnm/Makefile.in 2014-03-07 18:07:27.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/gnm/Makefile.nmake wireshark-1.10.6/asn1/gnm/Makefile.nmake --- wireshark-1.10.5/asn1/gnm/Makefile.nmake 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/gnm/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/gnm/packet-gnm-template.c wireshark-1.10.6/asn1/gnm/packet-gnm-template.c --- wireshark-1.10.5/asn1/gnm/packet-gnm-template.c 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/gnm/packet-gnm-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for GENERIC NETWORK INFORMATION MODEL Data dissection * * Copyright 2005 , Anders Broman - * $Id: packet-gnm-template.c 48609 2013-03-28 07:34:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/gnm/packet-gnm-template.h wireshark-1.10.6/asn1/gnm/packet-gnm-template.h --- wireshark-1.10.5/asn1/gnm/packet-gnm-template.h 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/gnm/packet-gnm-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for GENERIC NETWORK INFORMATION MODEL Data dissection * * Copyright 2005 , Anders Broman - * $Id: packet-gnm-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/goose/goose.asn wireshark-1.10.6/asn1/goose/goose.asn --- wireshark-1.10.5/asn1/goose/goose.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/goose/goose.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: goose.asn 40628 2012-01-21 12:21:29Z etxrab $ +-- $Id$ IEC61850 DEFINITIONS ::= BEGIN GOOSEpdu ::= CHOICE { diff -Nru wireshark-1.10.5/asn1/goose/goose.cnf wireshark-1.10.6/asn1/goose/goose.cnf --- wireshark-1.10.5/asn1/goose/goose.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/goose/goose.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # goose.cnf # goose conformation file -# $Id: goose.cnf 32913 2010-05-21 06:33:25Z guy $ +# $Id$ #.MODULE_IMPORT diff -Nru wireshark-1.10.5/asn1/goose/Makefile.am wireshark-1.10.6/asn1/goose/Makefile.am --- wireshark-1.10.5/asn1/goose/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/goose/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/goose/Makefile.common wireshark-1.10.6/asn1/goose/Makefile.common --- wireshark-1.10.5/asn1/goose/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/goose/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/goose/Makefile.in wireshark-1.10.6/asn1/goose/Makefile.in --- wireshark-1.10.5/asn1/goose/Makefile.in 2013-12-19 19:13:37.000000000 +0000 +++ wireshark-1.10.6/asn1/goose/Makefile.in 2014-03-07 18:07:27.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/goose/Makefile.nmake wireshark-1.10.6/asn1/goose/Makefile.nmake --- wireshark-1.10.5/asn1/goose/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/goose/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/goose/packet-goose-template.c wireshark-1.10.6/asn1/goose/packet-goose-template.c --- wireshark-1.10.5/asn1/goose/packet-goose-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/goose/packet-goose-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for IEC 61850 GOOSE packet dissection * Martin Lutz 2008 * - * $Id: packet-goose-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/gprscdr/GenericChargingDataTypesV8e0.asn wireshark-1.10.6/asn1/gprscdr/GenericChargingDataTypesV8e0.asn --- wireshark-1.10.5/asn1/gprscdr/GenericChargingDataTypesV8e0.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gprscdr/GenericChargingDataTypesV8e0.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: GenericChargingDataTypesV8e0.asn 43624 2012-07-09 14:09:59Z etxrab $ +-- $Id$ -- 3GPP TS 32.298 V8.14.0 (2006-06) GenericChargingDataTypes {itu-t (0) identified-organization (4) etsi(0) mobileDomain (0) charging (5) genericChargingDataTypes (0) asn1Module (0) version1 (0)} diff -Nru wireshark-1.10.5/asn1/gprscdr/gprscdr.cnf wireshark-1.10.6/asn1/gprscdr/gprscdr.cnf --- wireshark-1.10.5/asn1/gprscdr/gprscdr.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gprscdr/gprscdr.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ # gprscdr.cnf # Anders Broman 2011 -# $Id: gprscdr.cnf 43624 2012-07-09 14:09:59Z etxrab $ +# $Id$ #.IMPORT ../gsm_map/gsm_map-exp.cnf diff -Nru wireshark-1.10.5/asn1/gprscdr/GPRSChargingDataTypesV641.asn wireshark-1.10.6/asn1/gprscdr/GPRSChargingDataTypesV641.asn --- wireshark-1.10.5/asn1/gprscdr/GPRSChargingDataTypesV641.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gprscdr/GPRSChargingDataTypesV641.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: GPRSChargingDataTypesV641.asn 47250 2013-01-24 09:53:57Z etxrab $ +-- $Id$ -- 3GPP TS 32.298 V6.4.1 (2006-06) -- GPRSChargingDataTypes {itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) charging (5) gprsChargingDataTypes (2) asn1Module (0) version1 (0)} diff -Nru wireshark-1.10.5/asn1/gprscdr/GPRSChargingDataTypesV8e0.asn wireshark-1.10.6/asn1/gprscdr/GPRSChargingDataTypesV8e0.asn --- wireshark-1.10.5/asn1/gprscdr/GPRSChargingDataTypesV8e0.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gprscdr/GPRSChargingDataTypesV8e0.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: GPRSChargingDataTypesV8e0.asn 43624 2012-07-09 14:09:59Z etxrab $ +-- $Id$ -- 3GPP TS 32.298 V8.14.0 (2012-03) -- GPRSChargingDataTypesV8e0 {itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) charging (5) gprsChargingDataTypes (2) asn1Module (0) version1 (0)} diff -Nru wireshark-1.10.5/asn1/gprscdr/Makefile.am wireshark-1.10.6/asn1/gprscdr/Makefile.am --- wireshark-1.10.5/asn1/gprscdr/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gprscdr/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/gprscdr/Makefile.common wireshark-1.10.6/asn1/gprscdr/Makefile.common --- wireshark-1.10.5/asn1/gprscdr/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gprscdr/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43624 2012-07-09 14:09:59Z etxrab $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/gprscdr/Makefile.in wireshark-1.10.6/asn1/gprscdr/Makefile.in --- wireshark-1.10.5/asn1/gprscdr/Makefile.in 2013-12-19 19:13:37.000000000 +0000 +++ wireshark-1.10.6/asn1/gprscdr/Makefile.in 2014-03-07 18:07:27.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43624 2012-07-09 14:09:59Z etxrab $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/gprscdr/Makefile.nmake wireshark-1.10.6/asn1/gprscdr/Makefile.nmake --- wireshark-1.10.5/asn1/gprscdr/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gprscdr/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/gprscdr/packet-gprscdr-template.c wireshark-1.10.6/asn1/gprscdr/packet-gprscdr-template.c --- wireshark-1.10.5/asn1/gprscdr/packet-gprscdr-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gprscdr/packet-gprscdr-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-gprscdr-template.c * Copyright 2011 , Anders Broman * - * $Id: packet-gprscdr-template.c 48609 2013-03-28 07:34:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/gprscdr/packet-gprscdr-template.h wireshark-1.10.6/asn1/gprscdr/packet-gprscdr-template.h --- wireshark-1.10.5/asn1/gprscdr/packet-gprscdr-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gprscdr/packet-gprscdr-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for gprscdr packet dissection * Copyright 2011, Anders Broman * - * $Id: packet-gprscdr-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/gsm_map/Ericsson.asn wireshark-1.10.6/asn1/gsm_map/Ericsson.asn --- wireshark-1.10.5/asn1/gsm_map/Ericsson.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/Ericsson.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- Ericsson proprietary extensions --- $Id: Ericsson.asn 44605 2012-08-21 15:14:50Z pascal $ +-- $Id$ EricssonMAP{ 0 identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-Protocol (4) version13 (13) } diff -Nru wireshark-1.10.5/asn1/gsm_map/GSMMAP.asn wireshark-1.10.6/asn1/gsm_map/GSMMAP.asn --- wireshark-1.10.5/asn1/gsm_map/GSMMAP.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/GSMMAP.asn 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ --SIEMENS ASN.1 Compiler R5.70 (Production_5.70) -- Date: 2003-09-04 Time: 14:14:00 -- Updated to version 3GPP TS 29.002 V7.5.0 (2006-09) Release 7 --- $Id: GSMMAP.asn 39386 2011-10-12 16:41:42Z etxrab $ +-- $Id$ DummyMAP{ 0 identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-Protocol (4) version5 (5) } diff -Nru wireshark-1.10.5/asn1/gsm_map/Makefile.am wireshark-1.10.6/asn1/gsm_map/Makefile.am --- wireshark-1.10.5/asn1/gsm_map/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/gsm_map/Makefile.common wireshark-1.10.6/asn1/gsm_map/Makefile.common --- wireshark-1.10.5/asn1/gsm_map/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 44603 2012-08-21 09:32:04Z pascal $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/gsm_map/Makefile.in wireshark-1.10.6/asn1/gsm_map/Makefile.in --- wireshark-1.10.5/asn1/gsm_map/Makefile.in 2013-12-19 19:13:37.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/Makefile.in 2014-03-07 18:07:27.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 44603 2012-08-21 09:32:04Z pascal $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/gsm_map/Makefile.nmake wireshark-1.10.6/asn1/gsm_map/Makefile.nmake --- wireshark-1.10.5/asn1/gsm_map/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-ApplicationContexts.asn wireshark-1.10.6/asn1/gsm_map/MAP-ApplicationContexts.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-ApplicationContexts.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-ApplicationContexts.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-ApplicationContexts.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ --17.3.3 ASN.1 Module for application-context-names --The following ASN.1 module summarises the application-context-name assigned to MAP application-contexts. -- 3GPP TS 29.002 V11.5.0 (2012-12) diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-BS-Code.asn wireshark-1.10.6/asn1/gsm_map/MAP-BS-Code.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-BS-Code.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-BS-Code.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-BS-Code.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS 29.002 V11.5.0 (2012-12) -- 17.7.10 Bearer Service Codes diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-CallHandlingOperations.asn wireshark-1.10.6/asn1/gsm_map/MAP-CallHandlingOperations.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-CallHandlingOperations.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-CallHandlingOperations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-CallHandlingOperations.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS 29.002 V11.5.0 (2012-12) --17.6.3 Call Handling Operations MAP-CallHandlingOperations { diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-CH-DataTypes.asn wireshark-1.10.6/asn1/gsm_map/MAP-CH-DataTypes.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-CH-DataTypes.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-CH-DataTypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-CH-DataTypes.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS 29.002 V11.5.0 (2012-12) -- 17.7.3 Call handling data types diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-CommonDataTypes.asn wireshark-1.10.6/asn1/gsm_map/MAP-CommonDataTypes.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-CommonDataTypes.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-CommonDataTypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-CommonDataTypes.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS 29.002 V11.5.0 (2012-12) -- 17.7.8 Common data types diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-DialogueInformation.asn wireshark-1.10.6/asn1/gsm_map/MAP-DialogueInformation.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-DialogueInformation.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-DialogueInformation.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-DialogueInformation.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS 29.002 V11.5.0 (2012-12) -- 17.4 MAP Dialogue Information MAP-DialogueInformation { diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-ER-DataTypes.asn wireshark-1.10.6/asn1/gsm_map/MAP-ER-DataTypes.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-ER-DataTypes.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-ER-DataTypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-ER-DataTypes.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS V11.5.0 (2012-12) -- 17.7.7 Error data types diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-Errors.asn wireshark-1.10.6/asn1/gsm_map/MAP-Errors.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-Errors.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-Errors.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-Errors.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS 29.002 V11.5.0 (2012-12) -- 17.6.6 Errors diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-ExtensionDataTypes.asn wireshark-1.10.6/asn1/gsm_map/MAP-ExtensionDataTypes.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-ExtensionDataTypes.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-ExtensionDataTypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-ExtensionDataTypes.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- MAP-ExtensionDataTypes.asn -- -- Taken from 3GPP TS 29.002 V11.5.0 (2012-12) diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-GR-DataTypes.asn wireshark-1.10.6/asn1/gsm_map/MAP-GR-DataTypes.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-GR-DataTypes.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-GR-DataTypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-GR-DataTypes.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- -- Taken from 3GPP TS 29.002 V11.5.0 (2012-12) -- diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-Group-Call-Operations.asn wireshark-1.10.6/asn1/gsm_map/MAP-Group-Call-Operations.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-Group-Call-Operations.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-Group-Call-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-Group-Call-Operations.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS 29.002 V11.5.0 (2012-12) -- 17.6.7 Group Call operations diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-LCS-DataTypes.asn wireshark-1.10.6/asn1/gsm_map/MAP-LCS-DataTypes.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-LCS-DataTypes.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-LCS-DataTypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-LCS-DataTypes.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- MAP-LCS-DataTypes.asn -- -- Taken from 3GPP TS 29.002 V11.5.0 (2012-12) diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-LocationServiceOperations.asn wireshark-1.10.6/asn1/gsm_map/MAP-LocationServiceOperations.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-LocationServiceOperations.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-LocationServiceOperations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-LocationServiceOperations.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS 29.002 V11.5.0 (2012-12) -- 17.6.8 Location service operations diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-MobileServiceOperations.asn wireshark-1.10.6/asn1/gsm_map/MAP-MobileServiceOperations.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-MobileServiceOperations.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-MobileServiceOperations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-MobileServiceOperations.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS 29.002 V11.5.0 (2012-12) -- 17.6.1 Mobile Service Operations diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-MS-DataTypes.asn wireshark-1.10.6/asn1/gsm_map/MAP-MS-DataTypes.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-MS-DataTypes.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-MS-DataTypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-MS-DataTypes.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS 29.002 V11.5.0 (2012-12) -- 17.7.1 Mobile Service data types diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-OM-DataTypes.asn wireshark-1.10.6/asn1/gsm_map/MAP-OM-DataTypes.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-OM-DataTypes.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-OM-DataTypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-OM-DataTypes.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 17.7.2 Operation and maintenance data types -- 3GPP TS 29.002 V11.5.0 (2012-12) diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn wireshark-1.10.6/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-OperationAndMaintenanceOperations.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS 29.002 V11.5.0 (2012-12) --17.6.2 Operation and Maintenance Operations MAP-OperationAndMaintenanceOperations { diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-Protocol.asn wireshark-1.10.6/asn1/gsm_map/MAP-Protocol.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-Protocol.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-Protocol.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-Protocol.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS 29.002 V11.5.0 (2012-12) --17.5 MAP operation and error codes MAP-Protocol { diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn wireshark-1.10.6/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-ShortMessageServiceOperations.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS 29.002 V11.5.0 (2012-12) -- 17.6.5 Short message service operations diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-SM-DataTypes.asn wireshark-1.10.6/asn1/gsm_map/MAP-SM-DataTypes.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-SM-DataTypes.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-SM-DataTypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-SM-DataTypes.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS 29.002 V10.4.0 (2011-09) -- 17.7.6 Short message data types diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-SS-Code.asn wireshark-1.10.6/asn1/gsm_map/MAP-SS-Code.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-SS-Code.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-SS-Code.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-SS-Code.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS 29.002 V11.5.0 (2012-12) -- 17.7.5 Supplementary service codes diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-SS-DataTypes.asn wireshark-1.10.6/asn1/gsm_map/MAP-SS-DataTypes.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-SS-DataTypes.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-SS-DataTypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-SS-DataTypes.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS 29.002 V11.5.0 (2012-12) -- 17.7.4 Supplementary service data types diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn wireshark-1.10.6/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-SupplementaryServiceOperations.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS 29.002 V11.5.0 (2012-12) --17.6.4 Supplementary service operations diff -Nru wireshark-1.10.5/asn1/gsm_map/MAP-TS-Code.asn wireshark-1.10.6/asn1/gsm_map/MAP-TS-Code.asn --- wireshark-1.10.5/asn1/gsm_map/MAP-TS-Code.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MAP-TS-Code.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MAP-TS-Code.asn 48195 2013-03-08 17:55:53Z etxrab $ +-- $Id$ -- 3GPP TS 29.002 V11.5.0 (2012-12) -- 17.7.9 Teleservice Codes diff -Nru wireshark-1.10.5/asn1/gsm_map/MobileDomainDefinitions.asn wireshark-1.10.6/asn1/gsm_map/MobileDomainDefinitions.asn --- wireshark-1.10.5/asn1/gsm_map/MobileDomainDefinitions.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/MobileDomainDefinitions.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MobileDomainDefinitions.asn 22031 2007-06-03 19:58:59Z etxrab $ +-- $Id$ -- ETSI ETR 091 ed.1 http://www.etsi.org MobileDomainDefinitions {ccitt (0) identified-organization (4) etsi (0) diff -Nru wireshark-1.10.5/asn1/gsm_map/packet-gsm_map-template.c wireshark-1.10.6/asn1/gsm_map/packet-gsm_map-template.c --- wireshark-1.10.5/asn1/gsm_map/packet-gsm_map-template.c 2013-12-13 20:37:22.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/packet-gsm_map-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -17,7 +17,7 @@ * Felix Fei * and Michael Lum * - * $Id: packet-gsm_map-template.c 54059 2013-12-13 20:31:28Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/gsm_map/packet-gsm_map-template.h wireshark-1.10.6/asn1/gsm_map/packet-gsm_map-template.h --- wireshark-1.10.5/asn1/gsm_map/packet-gsm_map-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/packet-gsm_map-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for GSM MAP packet dissection * Copyright 2004 - 2006, Anders Broman * - * $Id: packet-gsm_map-template.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/gsm_map/SS-DataTypes.asn wireshark-1.10.6/asn1/gsm_map/SS-DataTypes.asn --- wireshark-1.10.5/asn1/gsm_map/SS-DataTypes.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/SS-DataTypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: SS-DataTypes.asn 32509 2010-04-19 05:58:01Z etxrab $ +-- $Id$ -- 3GPP TS 24.080 V9.1.0 (2010-03) -- 4.4.2 ASN.1 data types SS-DataTypes { diff -Nru wireshark-1.10.5/asn1/gsm_map/SS-Operations.asn wireshark-1.10.6/asn1/gsm_map/SS-Operations.asn --- wireshark-1.10.5/asn1/gsm_map/SS-Operations.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/gsm_map/SS-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: SS-Operations.asn 32509 2010-04-19 05:58:01Z etxrab $ +-- $Id$ -- 3GPP TS 24.080 V9.1.0 (2010-03) -- 4.2 Operation types SS-Operations { diff -Nru wireshark-1.10.5/asn1/h225/h225.cnf wireshark-1.10.6/asn1/h225/h225.cnf --- wireshark-1.10.5/asn1/h225/h225.cnf 2013-10-29 22:38:52.000000000 +0000 +++ wireshark-1.10.6/asn1/h225/h225.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # h225.cnf # H.225 conformation file # Copyright 2004 Anders Broman -# $Id: h225.cnf 52973 2013-10-29 22:19:18Z gerald $ +# $Id$ #.IMPORT ../h235/h235-exp.cnf diff -Nru wireshark-1.10.5/asn1/h225/H323-MESSAGES.asn wireshark-1.10.6/asn1/h225/H323-MESSAGES.asn --- wireshark-1.10.5/asn1/h225/H323-MESSAGES.asn 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/h225/H323-MESSAGES.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/formal-language/itu-t/h/h225-0/2009/H323-MESSAGES.asn -- --- $Id: H323-MESSAGES.asn 32672 2010-05-05 13:14:41Z kukosa $ +-- $Id$ -- -- Module H323-MESSAGES (H.225.0:12/2009) diff -Nru wireshark-1.10.5/asn1/h225/Makefile.am wireshark-1.10.6/asn1/h225/Makefile.am --- wireshark-1.10.5/asn1/h225/Makefile.am 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/h225/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h225/Makefile.common wireshark-1.10.6/asn1/h225/Makefile.common --- wireshark-1.10.5/asn1/h225/Makefile.common 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/h225/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h225/Makefile.in wireshark-1.10.6/asn1/h225/Makefile.in --- wireshark-1.10.5/asn1/h225/Makefile.in 2013-12-19 19:13:37.000000000 +0000 +++ wireshark-1.10.6/asn1/h225/Makefile.in 2014-03-07 18:07:27.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h225/Makefile.nmake wireshark-1.10.6/asn1/h225/Makefile.nmake --- wireshark-1.10.5/asn1/h225/Makefile.nmake 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/h225/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h225/packet-h225-template.c wireshark-1.10.6/asn1/h225/packet-h225-template.c --- wireshark-1.10.5/asn1/h225/packet-h225-template.c 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/h225/packet-h225-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for h225 packet dissection * Copyright 2005, Anders Broman * - * $Id: packet-h225-template.c 47899 2013-02-26 04:42:26Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h225/packet-h225-template.h wireshark-1.10.6/asn1/h225/packet-h225-template.h --- wireshark-1.10.5/asn1/h225/packet-h225-template.h 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/h225/packet-h225-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for h225 packet dissection * Copyright 2005, Anders Broman * - * $Id: packet-h225-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h235/h235.cnf wireshark-1.10.6/asn1/h235/h235.cnf --- wireshark-1.10.5/asn1/h235/h235.cnf 2013-07-17 01:50:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h235/h235.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ # H.235.x conformation file # 2004 Tomas Kukosa -# $Id: h235.cnf 50688 2013-07-17 01:34:46Z gerald $ +# $Id$ #.IMPORT ../h225/h225-exp.cnf diff -Nru wireshark-1.10.5/asn1/h235/H235-SECURITY-MESSAGES.asn wireshark-1.10.6/asn1/h235/H235-SECURITY-MESSAGES.asn --- wireshark-1.10.5/asn1/h235/H235-SECURITY-MESSAGES.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h235/H235-SECURITY-MESSAGES.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h235.0/2005/H235-SECURITY-MESSAGES.asn -- --- $Id: H235-SECURITY-MESSAGES.asn 18339 2006-06-05 06:52:50Z kukosa $ +-- $Id$ -- -- Module H235-SECURITY-MESSAGES (H.235.0:09/2005) diff -Nru wireshark-1.10.5/asn1/h235/H235-SRTP.asn wireshark-1.10.6/asn1/h235/H235-SRTP.asn --- wireshark-1.10.5/asn1/h235/H235-SRTP.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h235/H235-SRTP.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h235.8/2005/H235-SRTP.asn -- --- $Id: H235-SRTP.asn 18339 2006-06-05 06:52:50Z kukosa $ +-- $Id$ -- -- Module H235-SRTP (H.235.8:09/2005) diff -Nru wireshark-1.10.5/asn1/h235/Makefile.am wireshark-1.10.6/asn1/h235/Makefile.am --- wireshark-1.10.5/asn1/h235/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h235/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h235/Makefile.common wireshark-1.10.6/asn1/h235/Makefile.common --- wireshark-1.10.5/asn1/h235/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h235/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h235/Makefile.in wireshark-1.10.6/asn1/h235/Makefile.in --- wireshark-1.10.5/asn1/h235/Makefile.in 2013-12-19 19:13:37.000000000 +0000 +++ wireshark-1.10.6/asn1/h235/Makefile.in 2014-03-07 18:07:28.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h235/Makefile.nmake wireshark-1.10.6/asn1/h235/Makefile.nmake --- wireshark-1.10.5/asn1/h235/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h235/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h235/packet-h235-template.c wireshark-1.10.6/asn1/h235/packet-h235-template.c --- wireshark-1.10.5/asn1/h235/packet-h235-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h235/packet-h235-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for H.235 packet dissection * 2004 Tomas Kukosa * - * $Id: packet-h235-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h235/packet-h235-template.h wireshark-1.10.6/asn1/h235/packet-h235-template.h --- wireshark-1.10.5/asn1/h235/packet-h235-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h235/packet-h235-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for H.235 packet dissection * 2004 Tomas Kukosa * - * $Id: packet-h235-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h245/h245.cnf wireshark-1.10.6/asn1/h245/h245.cnf --- wireshark-1.10.5/asn1/h245/h245.cnf 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h245/h245.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ # H.245 conformation file # Copyright 2005 Anders Broman anders.broman[at]ericsson.com -# $Id: h245.cnf 48356 2013-03-17 17:52:26Z etxrab $ +# $Id$ #---------------------------------------------------------------------------------------- #.OPT diff -Nru wireshark-1.10.5/asn1/h245/Makefile.am wireshark-1.10.6/asn1/h245/Makefile.am --- wireshark-1.10.5/asn1/h245/Makefile.am 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h245/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h245/Makefile.common wireshark-1.10.6/asn1/h245/Makefile.common --- wireshark-1.10.5/asn1/h245/Makefile.common 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h245/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h245/Makefile.in wireshark-1.10.6/asn1/h245/Makefile.in --- wireshark-1.10.5/asn1/h245/Makefile.in 2013-12-19 19:13:38.000000000 +0000 +++ wireshark-1.10.6/asn1/h245/Makefile.in 2014-03-07 18:07:28.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h245/Makefile.nmake wireshark-1.10.6/asn1/h245/Makefile.nmake --- wireshark-1.10.5/asn1/h245/Makefile.nmake 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h245/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h245/MULTIMEDIA-SYSTEM-CONTROL.asn wireshark-1.10.6/asn1/h245/MULTIMEDIA-SYSTEM-CONTROL.asn --- wireshark-1.10.5/asn1/h245/MULTIMEDIA-SYSTEM-CONTROL.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h245/MULTIMEDIA-SYSTEM-CONTROL.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/formal-language/itu-t/h/h245/2009v15/MULTIMEDIA-SYSTEM-CONTROL.asn -- --- $Id: MULTIMEDIA-SYSTEM-CONTROL.asn 32671 2010-05-05 10:29:23Z kukosa $ +-- $Id$ -- -- Module MULTIMEDIA-SYSTEM-CONTROL (H.245:12/2009) diff -Nru wireshark-1.10.5/asn1/h245/packet-h245-template.c wireshark-1.10.6/asn1/h245/packet-h245-template.c --- wireshark-1.10.5/asn1/h245/packet-h245-template.c 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h245/packet-h245-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for h245 packet dissection * Copyright 2004, Anders Broman * - * $Id: packet-h245-template.c 48356 2013-03-17 17:52:26Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h245/packet-h245-template.h wireshark-1.10.6/asn1/h245/packet-h245-template.h --- wireshark-1.10.5/asn1/h245/packet-h245-template.h 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h245/packet-h245-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for h245 packet dissection * Copyright 2005, Anders Broman * - * $Id: packet-h245-template.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h248/h248.cnf wireshark-1.10.6/asn1/h248/h248.cnf --- wireshark-1.10.5/asn1/h248/h248.cnf 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h248/h248.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # h248.cnf # H.248 conformation file -# $Id: h248.cnf 48429 2013-03-19 21:22:31Z etxrab $ +# $Id$ #.MODULE_IMPORT diff -Nru wireshark-1.10.5/asn1/h248/h248v1support.asn wireshark-1.10.6/asn1/h248/h248v1support.asn --- wireshark-1.10.5/asn1/h248/h248v1support.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h248/h248v1support.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ -- Required for support for h248v1 -- --- $Id: h248v1support.asn 43107 2012-06-05 10:54:21Z etxrab $ +-- $Id$ -- -- This file represents the differences between h248v1 and the h248v3, the current version -- This file is included in the Makefile generate_dissectors and related tasks necessary diff -Nru wireshark-1.10.5/asn1/h248/h248v3.asn wireshark-1.10.6/asn1/h248/h248v3.asn --- wireshark-1.10.5/asn1/h248/h248v3.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h248/h248v3.asn 2014-03-07 18:07:11.000000000 +0000 @@ -4,7 +4,7 @@ -- Module MEDIA-GATEWAY-CONTROL (H.248.1:09/2005) -- See also ITU-T H.248.1 v3 (2005) Amend. 1 (05/2008) -- --- $Id: h248v3.asn 29787 2009-09-08 09:11:21Z etxrab $ +-- $Id$ --DEFINITIONS AUTOMATIC TAGS ::= --BEGIN -- Has been modified to pass through the ASN2ETH compiler diff -Nru wireshark-1.10.5/asn1/h248/Makefile.am wireshark-1.10.6/asn1/h248/Makefile.am --- wireshark-1.10.5/asn1/h248/Makefile.am 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h248/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h248/Makefile.common wireshark-1.10.6/asn1/h248/Makefile.common --- wireshark-1.10.5/asn1/h248/Makefile.common 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h248/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h248/Makefile.in wireshark-1.10.6/asn1/h248/Makefile.in --- wireshark-1.10.5/asn1/h248/Makefile.in 2013-12-19 19:13:38.000000000 +0000 +++ wireshark-1.10.6/asn1/h248/Makefile.in 2014-03-07 18:07:28.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h248/Makefile.nmake wireshark-1.10.6/asn1/h248/Makefile.nmake --- wireshark-1.10.5/asn1/h248/Makefile.nmake 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h248/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h248/packet-h248-template.c wireshark-1.10.6/asn1/h248/packet-h248-template.c --- wireshark-1.10.5/asn1/h248/packet-h248-template.c 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h248/packet-h248-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ * * Luis Ontanon 2005 - Context and Transaction Tracing * - * $Id: packet-h248-template.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h248/packet-h248-template.h wireshark-1.10.6/asn1/h248/packet-h248-template.h --- wireshark-1.10.5/asn1/h248/packet-h248-template.h 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h248/packet-h248-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -4,7 +4,7 @@ * Ronnie Sahlberg 2004 * Luis Ontanon 2005 * - * $Id: packet-h248-template.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h282/h282.cnf wireshark-1.10.6/asn1/h282/h282.cnf --- wireshark-1.10.5/asn1/h282/h282.cnf 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h282/h282.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ # H.282 conformation file # 2007 Tomas Kukosa -# $Id: h282.cnf 48741 2013-04-04 21:01:27Z pascal $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/h282/Makefile.am wireshark-1.10.6/asn1/h282/Makefile.am --- wireshark-1.10.5/asn1/h282/Makefile.am 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h282/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h282/Makefile.common wireshark-1.10.6/asn1/h282/Makefile.common --- wireshark-1.10.5/asn1/h282/Makefile.common 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h282/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h282/Makefile.in wireshark-1.10.6/asn1/h282/Makefile.in --- wireshark-1.10.5/asn1/h282/Makefile.in 2013-12-19 19:13:38.000000000 +0000 +++ wireshark-1.10.6/asn1/h282/Makefile.in 2014-03-07 18:07:28.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h282/Makefile.nmake wireshark-1.10.6/asn1/h282/Makefile.nmake --- wireshark-1.10.5/asn1/h282/Makefile.nmake 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h282/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h282/packet-h282-template.c wireshark-1.10.6/asn1/h282/packet-h282-template.c --- wireshark-1.10.5/asn1/h282/packet-h282-template.c 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h282/packet-h282-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for H.282 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-h282-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h283/h283.cnf wireshark-1.10.6/asn1/h283/h283.cnf --- wireshark-1.10.5/asn1/h283/h283.cnf 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h283/h283.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ # H.283 conformation file # 2007 Tomas Kukosa -# $Id: h283.cnf 48741 2013-04-04 21:01:27Z pascal $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/h283/Makefile.am wireshark-1.10.6/asn1/h283/Makefile.am --- wireshark-1.10.5/asn1/h283/Makefile.am 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h283/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h283/Makefile.common wireshark-1.10.6/asn1/h283/Makefile.common --- wireshark-1.10.5/asn1/h283/Makefile.common 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h283/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h283/Makefile.in wireshark-1.10.6/asn1/h283/Makefile.in --- wireshark-1.10.5/asn1/h283/Makefile.in 2013-12-19 19:13:38.000000000 +0000 +++ wireshark-1.10.6/asn1/h283/Makefile.in 2014-03-07 18:07:28.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h283/Makefile.nmake wireshark-1.10.6/asn1/h283/Makefile.nmake --- wireshark-1.10.5/asn1/h283/Makefile.nmake 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h283/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h283/packet-h283-template.c wireshark-1.10.6/asn1/h283/packet-h283-template.c --- wireshark-1.10.5/asn1/h283/packet-h283-template.c 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/h283/packet-h283-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for H.283 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-h283-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h323/h323.cnf wireshark-1.10.6/asn1/h323/h323.cnf --- wireshark-1.10.5/asn1/h323/h323.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/h323/h323.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ # H.323 conformation file # 2007 Tomas Kukosa -# $Id: h323.cnf 23309 2007-10-29 19:25:37Z kukosa $ +# $Id$ #.IMPORT ../h225/h225-exp.cnf diff -Nru wireshark-1.10.5/asn1/h323/Makefile.am wireshark-1.10.6/asn1/h323/Makefile.am --- wireshark-1.10.5/asn1/h323/Makefile.am 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/h323/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h323/Makefile.common wireshark-1.10.6/asn1/h323/Makefile.common --- wireshark-1.10.5/asn1/h323/Makefile.common 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/h323/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h323/Makefile.in wireshark-1.10.6/asn1/h323/Makefile.in --- wireshark-1.10.5/asn1/h323/Makefile.in 2013-12-19 19:13:38.000000000 +0000 +++ wireshark-1.10.6/asn1/h323/Makefile.in 2014-03-07 18:07:28.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h323/Makefile.nmake wireshark-1.10.6/asn1/h323/Makefile.nmake --- wireshark-1.10.5/asn1/h323/Makefile.nmake 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/h323/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h323/packet-h323-template.c wireshark-1.10.6/asn1/h323/packet-h323-template.c --- wireshark-1.10.5/asn1/h323/packet-h323-template.c 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/h323/packet-h323-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for H.323 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-h323-template.c 48429 2013-03-19 21:22:31Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h323/packet-h323-template.h wireshark-1.10.6/asn1/h323/packet-h323-template.h --- wireshark-1.10.5/asn1/h323/packet-h323-template.h 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/h323/packet-h323-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for H.235 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-h323-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h323/RAS-PROTOCOL-TUNNEL.asn wireshark-1.10.6/asn1/h323/RAS-PROTOCOL-TUNNEL.asn --- wireshark-1.10.5/asn1/h323/RAS-PROTOCOL-TUNNEL.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/h323/RAS-PROTOCOL-TUNNEL.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h323/2006/RAS-PROTOCOL-TUNNEL.asn -- --- $Id: RAS-PROTOCOL-TUNNEL.asn 23309 2007-10-29 19:25:37Z kukosa $ +-- $Id$ -- -- Module RAS-PROTOCOL-TUNNEL (H.323:06/2006) diff -Nru wireshark-1.10.5/asn1/h323/ROBUSTNESS-DATA.asn wireshark-1.10.6/asn1/h323/ROBUSTNESS-DATA.asn --- wireshark-1.10.5/asn1/h323/ROBUSTNESS-DATA.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/h323/ROBUSTNESS-DATA.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ -- ROBUSTNESS-DATA.asn -- --- $Id: ROBUSTNESS-DATA.asn 23309 2007-10-29 19:25:37Z kukosa $ +-- $Id$ -- -- ITU-T Rec. H.323 (06/2006) -- diff -Nru wireshark-1.10.5/asn1/h450/Addressing-Data-Elements.asn wireshark-1.10.6/asn1/h450/Addressing-Data-Elements.asn --- wireshark-1.10.5/asn1/h450/Addressing-Data-Elements.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/Addressing-Data-Elements.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h450.1/1998/Addressing-Data-Elements.asn -- --- $Id: Addressing-Data-Elements.asn 22417 2007-07-30 08:01:59Z kukosa $ +-- $Id$ -- -- Module Addressing-Data-Elements (H.450.1:02/1998) diff -Nru wireshark-1.10.5/asn1/h450/Call-Completion-Operations.asn wireshark-1.10.6/asn1/h450/Call-Completion-Operations.asn --- wireshark-1.10.5/asn1/h450/Call-Completion-Operations.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/Call-Completion-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h450.9/2000/Call-Completion-Operations.asn -- --- $Id: Call-Completion-Operations.asn 22417 2007-07-30 08:01:59Z kukosa $ +-- $Id$ -- -- Module Call-Completion-Operations (H.450.9:11/2000) diff -Nru wireshark-1.10.5/asn1/h450/Call-Diversion-Operations.asn wireshark-1.10.6/asn1/h450/Call-Diversion-Operations.asn --- wireshark-1.10.5/asn1/h450/Call-Diversion-Operations.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/Call-Diversion-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h450.3/1998/Call-Diversion-Operations.asn -- --- $Id: Call-Diversion-Operations.asn 22417 2007-07-30 08:01:59Z kukosa $ +-- $Id$ -- -- Module Call-Diversion-Operations (H.450.3:02/1998) diff -Nru wireshark-1.10.5/asn1/h450/Call-Hold-Operations.asn wireshark-1.10.6/asn1/h450/Call-Hold-Operations.asn --- wireshark-1.10.5/asn1/h450/Call-Hold-Operations.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/Call-Hold-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h450.4/1999/Call-Hold-Operations.asn -- --- $Id: Call-Hold-Operations.asn 22417 2007-07-30 08:01:59Z kukosa $ +-- $Id$ -- -- Module Call-Hold-Operations (H.450.4:05/1999) diff -Nru wireshark-1.10.5/asn1/h450/Call-Intrusion-Operations.asn wireshark-1.10.6/asn1/h450/Call-Intrusion-Operations.asn --- wireshark-1.10.5/asn1/h450/Call-Intrusion-Operations.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/Call-Intrusion-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h450.11/2001/Call-Intrusion-Operations.asn -- --- $Id: Call-Intrusion-Operations.asn 22417 2007-07-30 08:01:59Z kukosa $ +-- $Id$ -- -- Module Call-Intrusion-Operations (H.450.11:03/2001) diff -Nru wireshark-1.10.5/asn1/h450/Call-Offer-Operations.asn wireshark-1.10.6/asn1/h450/Call-Offer-Operations.asn --- wireshark-1.10.5/asn1/h450/Call-Offer-Operations.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/Call-Offer-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h450.10/2001/Call-Offer-Operations.asn -- --- $Id: Call-Offer-Operations.asn 22417 2007-07-30 08:01:59Z kukosa $ +-- $Id$ -- -- Module Call-Offer-Operations (H.450.10:03/2001) diff -Nru wireshark-1.10.5/asn1/h450/Call-Park-Pickup-Operations.asn wireshark-1.10.6/asn1/h450/Call-Park-Pickup-Operations.asn --- wireshark-1.10.5/asn1/h450/Call-Park-Pickup-Operations.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/Call-Park-Pickup-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h450.5/1999/Call-Park-Pickup-Operations.asn -- --- $Id: Call-Park-Pickup-Operations.asn 22417 2007-07-30 08:01:59Z kukosa $ +-- $Id$ -- -- Module Call-Park-Pickup-Operations (H.450.5:05/1999) diff -Nru wireshark-1.10.5/asn1/h450/Call-Transfer-Operations.asn wireshark-1.10.6/asn1/h450/Call-Transfer-Operations.asn --- wireshark-1.10.5/asn1/h450/Call-Transfer-Operations.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/Call-Transfer-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h450.2/1998/Call-Transfer-Operations.asn -- --- $Id: Call-Transfer-Operations.asn 22417 2007-07-30 08:01:59Z kukosa $ +-- $Id$ -- -- Module Call-Transfer-Operations (H.450.2:02/1998) diff -Nru wireshark-1.10.5/asn1/h450/Call-Waiting-Operations.asn wireshark-1.10.6/asn1/h450/Call-Waiting-Operations.asn --- wireshark-1.10.5/asn1/h450/Call-Waiting-Operations.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/Call-Waiting-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h450.6/1999/Call-Waiting-Operations.asn -- --- $Id: Call-Waiting-Operations.asn 22417 2007-07-30 08:01:59Z kukosa $ +-- $Id$ -- -- Module Call-Waiting-Operations (H.450.6:05/1999) diff -Nru wireshark-1.10.5/asn1/h450/Common-Information-Operations.asn wireshark-1.10.6/asn1/h450/Common-Information-Operations.asn --- wireshark-1.10.5/asn1/h450/Common-Information-Operations.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/Common-Information-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h450.12/2001/Common-Information-Operations.asn -- --- $Id: Common-Information-Operations.asn 22417 2007-07-30 08:01:59Z kukosa $ +-- $Id$ -- -- Module Common-Information-Operations (H.450.12:07/2001) diff -Nru wireshark-1.10.5/asn1/h450/H225-generic-parameters-definition.asn wireshark-1.10.6/asn1/h450/H225-generic-parameters-definition.asn --- wireshark-1.10.5/asn1/h450/H225-generic-parameters-definition.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/H225-generic-parameters-definition.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h450.1/1998/H225-generic-parameters-definition.asn -- --- $Id: H225-generic-parameters-definition.asn 22417 2007-07-30 08:01:59Z kukosa $ +-- $Id$ -- -- Module H225-generic-parameters-definition (H.450.1:02/1998) diff -Nru wireshark-1.10.5/asn1/h450/H4501-General-Error-List.asn wireshark-1.10.6/asn1/h450/H4501-General-Error-List.asn --- wireshark-1.10.5/asn1/h450/H4501-General-Error-List.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/H4501-General-Error-List.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h450.1/1998/H4501-General-Error-List.asn -- --- $Id: H4501-General-Error-List.asn 22417 2007-07-30 08:01:59Z kukosa $ +-- $Id$ -- -- Module H4501-General-Error-List (H.450.1:02/1998) diff -Nru wireshark-1.10.5/asn1/h450/H4501-Supplementary-ServiceAPDU-Structure.asn wireshark-1.10.6/asn1/h450/H4501-Supplementary-ServiceAPDU-Structure.asn --- wireshark-1.10.5/asn1/h450/H4501-Supplementary-ServiceAPDU-Structure.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/H4501-Supplementary-ServiceAPDU-Structure.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h450.1/1998/H4501-Supplementary-ServiceAPDU-Structure.asn -- --- $Id: H4501-Supplementary-ServiceAPDU-Structure.asn 22417 2007-07-30 08:01:59Z kukosa $ +-- $Id$ -- -- Module H4501-Supplementary-ServiceAPDU-Structure (H.450.1:02/1998) diff -Nru wireshark-1.10.5/asn1/h450/h450.cnf wireshark-1.10.6/asn1/h450/h450.cnf --- wireshark-1.10.5/asn1/h450/h450.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/h450.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # h450.cnf # H.450 conformation file # Copyright 2004 Anders Broman -# $Id: h450.cnf 42489 2012-05-07 22:52:33Z guy $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/h450/Makefile.am wireshark-1.10.6/asn1/h450/Makefile.am --- wireshark-1.10.5/asn1/h450/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h450/Makefile.common wireshark-1.10.6/asn1/h450/Makefile.common --- wireshark-1.10.5/asn1/h450/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h450/Makefile.in wireshark-1.10.6/asn1/h450/Makefile.in --- wireshark-1.10.5/asn1/h450/Makefile.in 2013-12-19 19:13:38.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/Makefile.in 2014-03-07 18:07:28.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h450/Makefile.nmake wireshark-1.10.6/asn1/h450/Makefile.nmake --- wireshark-1.10.5/asn1/h450/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h450/Manufacturer-specific-service-extension-definition.asn wireshark-1.10.6/asn1/h450/Manufacturer-specific-service-extension-definition.asn --- wireshark-1.10.5/asn1/h450/Manufacturer-specific-service-extension-definition.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/Manufacturer-specific-service-extension-definition.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h450.1/1998/Manufacturer-specific-service-extension-definition.asn -- --- $Id: Manufacturer-specific-service-extension-definition.asn 22417 2007-07-30 08:01:59Z kukosa $ +-- $Id$ -- -- Module Manufacturer-specific-service-extension-definition (H.450.1:02/1998) diff -Nru wireshark-1.10.5/asn1/h450/Message-Waiting-Indication-Operations.asn wireshark-1.10.6/asn1/h450/Message-Waiting-Indication-Operations.asn --- wireshark-1.10.5/asn1/h450/Message-Waiting-Indication-Operations.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/Message-Waiting-Indication-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h450.7/1999/Message-Waiting-Indication-Operations.asn -- --- $Id: Message-Waiting-Indication-Operations.asn 22417 2007-07-30 08:01:59Z kukosa $ +-- $Id$ -- -- Module Message-Waiting-Indication-Operations (H.450.7:05/1999) diff -Nru wireshark-1.10.5/asn1/h450/Name-Operations.asn wireshark-1.10.6/asn1/h450/Name-Operations.asn --- wireshark-1.10.5/asn1/h450/Name-Operations.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/Name-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h450.8/2000/Name-Operations.asn -- --- $Id: Name-Operations.asn 22417 2007-07-30 08:01:59Z kukosa $ +-- $Id$ -- -- Module Name-Operations (H.450.8:02/2000) diff -Nru wireshark-1.10.5/asn1/h450/packet-h450-template.c wireshark-1.10.6/asn1/h450/packet-h450-template.c --- wireshark-1.10.5/asn1/h450/packet-h450-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/h450/packet-h450-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -4,7 +4,7 @@ * 2003 Graeme Reid (graeme.reid@norwoodsystems.com) * Copyright 2005, Anders Broman * - * $Id: packet-h450-template.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h450-ros/Makefile.am wireshark-1.10.6/asn1/h450-ros/Makefile.am --- wireshark-1.10.5/asn1/h450-ros/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h450-ros/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h450-ros/Makefile.common wireshark-1.10.6/asn1/h450-ros/Makefile.common --- wireshark-1.10.5/asn1/h450-ros/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h450-ros/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h450-ros/Makefile.in wireshark-1.10.6/asn1/h450-ros/Makefile.in --- wireshark-1.10.5/asn1/h450-ros/Makefile.in 2013-12-19 19:13:38.000000000 +0000 +++ wireshark-1.10.6/asn1/h450-ros/Makefile.in 2014-03-07 18:07:28.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h450-ros/Makefile.nmake wireshark-1.10.6/asn1/h450-ros/Makefile.nmake --- wireshark-1.10.5/asn1/h450-ros/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h450-ros/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h450-ros/packet-h450-ros-template.c wireshark-1.10.6/asn1/h450-ros/packet-h450-ros-template.c --- wireshark-1.10.5/asn1/h450-ros/packet-h450-ros-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h450-ros/packet-h450-ros-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for H.450 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-h450-ros-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h450-ros/packet-h450-ros-template.h wireshark-1.10.6/asn1/h450-ros/packet-h450-ros-template.h --- wireshark-1.10.5/asn1/h450-ros/packet-h450-ros-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h450-ros/packet-h450-ros-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for H.450 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-h450-ros-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h450-ros/Remote-Operations-Apdus.asn wireshark-1.10.6/asn1/h450-ros/Remote-Operations-Apdus.asn --- wireshark-1.10.5/asn1/h450-ros/Remote-Operations-Apdus.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h450-ros/Remote-Operations-Apdus.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h450.1/1998/Remote-Operations-Apdus.asn -- --- $Id: Remote-Operations-Apdus.asn 23102 2007-10-08 23:52:21Z jmayer $ +-- $Id$ -- -- Module Remote-Operations-Apdus (H.450.1:02/1998) diff -Nru wireshark-1.10.5/asn1/h460/CALL-PARTY-CATEGORY.asn wireshark-1.10.6/asn1/h460/CALL-PARTY-CATEGORY.asn --- wireshark-1.10.5/asn1/h460/CALL-PARTY-CATEGORY.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h460/CALL-PARTY-CATEGORY.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h460.10/2004/CALL-PARTY-CATEGORY.asn -- --- $Id: CALL-PARTY-CATEGORY.asn 23274 2007-10-26 07:18:44Z kukosa $ +-- $Id$ -- -- Module CALL-PARTY-CATEGORY (H.460.10:03/2004) diff -Nru wireshark-1.10.5/asn1/h460/CALL-PRIORITY.asn wireshark-1.10.6/asn1/h460/CALL-PRIORITY.asn --- wireshark-1.10.5/asn1/h460/CALL-PRIORITY.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h460/CALL-PRIORITY.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h460.4/2007/CALL-PRIORITY.asn -- --- $Id: CALL-PRIORITY.asn 23274 2007-10-26 07:18:44Z kukosa $ +-- $Id$ -- -- Module CALL-PRIORITY (H.460.4:01/2007) diff -Nru wireshark-1.10.5/asn1/h460/CIRCUIT-STATUS-MAP.asn wireshark-1.10.6/asn1/h460/CIRCUIT-STATUS-MAP.asn --- wireshark-1.10.5/asn1/h460/CIRCUIT-STATUS-MAP.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h460/CIRCUIT-STATUS-MAP.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h460.3/2002/CIRCUIT-STATUS-MAP.asn -- --- $Id: CIRCUIT-STATUS-MAP.asn 23274 2007-10-26 07:18:44Z kukosa $ +-- $Id$ -- -- Module CIRCUIT-STATUS-MAP (H.460.3:11/2002) diff -Nru wireshark-1.10.5/asn1/h460/h460.cnf wireshark-1.10.6/asn1/h460/h460.cnf --- wireshark-1.10.5/asn1/h460/h460.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h460/h460.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ # H.460.x conformation file # 2007 Tomas Kukosa -# $Id: h460.cnf 25839 2008-07-26 15:28:04Z kukosa $ +# $Id$ #.INCLUDE ../h225/h225-exp.cnf #.INCLUDE ../h235/h235-exp.cnf diff -Nru wireshark-1.10.5/asn1/h460/Makefile.am wireshark-1.10.6/asn1/h460/Makefile.am --- wireshark-1.10.5/asn1/h460/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h460/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h460/Makefile.common wireshark-1.10.6/asn1/h460/Makefile.common --- wireshark-1.10.5/asn1/h460/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h460/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h460/Makefile.in wireshark-1.10.6/asn1/h460/Makefile.in --- wireshark-1.10.5/asn1/h460/Makefile.in 2013-12-19 19:13:38.000000000 +0000 +++ wireshark-1.10.6/asn1/h460/Makefile.in 2014-03-07 18:07:28.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h460/Makefile.nmake wireshark-1.10.6/asn1/h460/Makefile.nmake --- wireshark-1.10.5/asn1/h460/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h460/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h460/MEDIA-TRAVERSAL.asn wireshark-1.10.6/asn1/h460/MEDIA-TRAVERSAL.asn --- wireshark-1.10.5/asn1/h460/MEDIA-TRAVERSAL.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h460/MEDIA-TRAVERSAL.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h460.19/2005/MEDIA-TRAVERSAL.asn -- --- $Id: MEDIA-TRAVERSAL.asn 23274 2007-10-26 07:18:44Z kukosa $ +-- $Id$ -- -- Module MEDIA-TRAVERSAL (H.460.19:09/2005) diff -Nru wireshark-1.10.5/asn1/h460/MESSAGE-BROADCAST.asn wireshark-1.10.6/asn1/h460/MESSAGE-BROADCAST.asn --- wireshark-1.10.5/asn1/h460/MESSAGE-BROADCAST.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h460/MESSAGE-BROADCAST.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h460.21/2006/MESSAGE-BROADCAST.asn -- --- $Id: MESSAGE-BROADCAST.asn 23274 2007-10-26 07:18:44Z kukosa $ +-- $Id$ -- -- Module MESSAGE-BROADCAST (H.460.21:05/2006) diff -Nru wireshark-1.10.5/asn1/h460/MLPP.asn wireshark-1.10.6/asn1/h460/MLPP.asn --- wireshark-1.10.5/asn1/h460/MLPP.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h460/MLPP.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h460.14/2004/MLPP.asn -- --- $Id: MLPP.asn 23274 2007-10-26 07:18:44Z kukosa $ +-- $Id$ -- -- Module MLPP (H.460.14:03/2004) diff -Nru wireshark-1.10.5/asn1/h460/NUMBER-PORTABILITY.asn wireshark-1.10.6/asn1/h460/NUMBER-PORTABILITY.asn --- wireshark-1.10.5/asn1/h460/NUMBER-PORTABILITY.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h460/NUMBER-PORTABILITY.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h460.2/2001/NUMBER-PORTABILITY.asn -- --- $Id: NUMBER-PORTABILITY.asn 23274 2007-10-26 07:18:44Z kukosa $ +-- $Id$ -- -- Module NUMBER-PORTABILITY (H.460.2:07/2001) diff -Nru wireshark-1.10.5/asn1/h460/packet-h460-template.c wireshark-1.10.6/asn1/h460/packet-h460-template.c --- wireshark-1.10.5/asn1/h460/packet-h460-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h460/packet-h460-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for H.460.x packet dissection * 2007 Tomas Kukosa * - * $Id: packet-h460-template.c 47256 2013-01-24 11:54:18Z kukosa $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/h460/QOS-MONITORING-EXTENDED-VOIP-REPORT.asn wireshark-1.10.6/asn1/h460/QOS-MONITORING-EXTENDED-VOIP-REPORT.asn --- wireshark-1.10.5/asn1/h460/QOS-MONITORING-EXTENDED-VOIP-REPORT.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h460/QOS-MONITORING-EXTENDED-VOIP-REPORT.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h460.9/2002/QOS-MONITORING-EXTENDED-VOIP-REPORT.asn -- --- $Id: QOS-MONITORING-EXTENDED-VOIP-REPORT.asn 23274 2007-10-26 07:18:44Z kukosa $ +-- $Id$ -- -- Module QOS-MONITORING-EXTENDED-VOIP-REPORT (H.460.9:11/2002) diff -Nru wireshark-1.10.5/asn1/h460/QOS-MONITORING-REPORT.asn wireshark-1.10.6/asn1/h460/QOS-MONITORING-REPORT.asn --- wireshark-1.10.5/asn1/h460/QOS-MONITORING-REPORT.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h460/QOS-MONITORING-REPORT.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h460.9/2002/QOS-MONITORING-REPORT.asn -- --- $Id: QOS-MONITORING-REPORT.asn 23274 2007-10-26 07:18:44Z kukosa $ +-- $Id$ -- -- Module QOS-MONITORING-REPORT (H.460.9:11/2002) diff -Nru wireshark-1.10.5/asn1/h460/SIGNALLING-CHANNEL-SUSPEND-REDIRECT.asn wireshark-1.10.6/asn1/h460/SIGNALLING-CHANNEL-SUSPEND-REDIRECT.asn --- wireshark-1.10.5/asn1/h460/SIGNALLING-CHANNEL-SUSPEND-REDIRECT.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h460/SIGNALLING-CHANNEL-SUSPEND-REDIRECT.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h460.15/2004/SIGNALLING-CHANNEL-SUSPEND-REDIRECT.asn -- --- $Id: SIGNALLING-CHANNEL-SUSPEND-REDIRECT.asn 23260 2007-10-24 06:56:07Z guy $ +-- $Id$ -- -- Module SIGNALLING-CHANNEL-SUSPEND-REDIRECT (H.460.15:03/2004) diff -Nru wireshark-1.10.5/asn1/h460/SIGNALLING-TRAVERSAL.asn wireshark-1.10.6/asn1/h460/SIGNALLING-TRAVERSAL.asn --- wireshark-1.10.5/asn1/h460/SIGNALLING-TRAVERSAL.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/h460/SIGNALLING-TRAVERSAL.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h460.18/2005/SIGNALLING-TRAVERSAL.asn -- --- $Id: SIGNALLING-TRAVERSAL.asn 23260 2007-10-24 06:56:07Z guy $ +-- $Id$ -- -- Module SIGNALLING-TRAVERSAL (H.460.18:09/2005) diff -Nru wireshark-1.10.5/asn1/h501/h501.cnf wireshark-1.10.6/asn1/h501/h501.cnf --- wireshark-1.10.5/asn1/h501/h501.cnf 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/h501/h501.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ # H.501 conformation file # 2007 Tomas Kukosa -# $Id: h501.cnf 48741 2013-04-04 21:01:27Z pascal $ +# $Id$ #.INCLUDE ../h225/h225-exp.cnf #.INCLUDE ../h235/h235-exp.cnf diff -Nru wireshark-1.10.5/asn1/h501/H501-MESSAGES.asn wireshark-1.10.6/asn1/h501/H501-MESSAGES.asn --- wireshark-1.10.5/asn1/h501/H501-MESSAGES.asn 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/h501/H501-MESSAGES.asn 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h501/2002/H501-MESSAGES.asn -- --- $Id: H501-MESSAGES.asn 23275 2007-10-26 07:42:29Z kukosa $ +-- $Id$ -- -- Module H501-MESSAGES (H.501:03/2002) diff -Nru wireshark-1.10.5/asn1/h501/Makefile.am wireshark-1.10.6/asn1/h501/Makefile.am --- wireshark-1.10.5/asn1/h501/Makefile.am 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/h501/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h501/Makefile.common wireshark-1.10.6/asn1/h501/Makefile.common --- wireshark-1.10.5/asn1/h501/Makefile.common 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/h501/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h501/Makefile.in wireshark-1.10.6/asn1/h501/Makefile.in --- wireshark-1.10.5/asn1/h501/Makefile.in 2013-12-19 19:13:38.000000000 +0000 +++ wireshark-1.10.6/asn1/h501/Makefile.in 2014-03-07 18:07:28.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h501/Makefile.nmake wireshark-1.10.6/asn1/h501/Makefile.nmake --- wireshark-1.10.5/asn1/h501/Makefile.nmake 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/h501/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/h501/packet-h501-template.c wireshark-1.10.6/asn1/h501/packet-h501-template.c --- wireshark-1.10.5/asn1/h501/packet-h501-template.c 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/h501/packet-h501-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for H.501 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-h501-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/HI2Operations/HI2Operations.cnf wireshark-1.10.6/asn1/HI2Operations/HI2Operations.cnf --- wireshark-1.10.5/asn1/HI2Operations/HI2Operations.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/HI2Operations/HI2Operations.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # HI2Operations.cnf # HI2Operations conformation file -# $Id: HI2Operations.cnf 32062 2010-03-01 09:33:47Z etxrab $ +# $Id$ #.MODULE UmtsHI2Operations UmtsHI2 diff -Nru wireshark-1.10.5/asn1/HI2Operations/HI2Operations_ver11.asn wireshark-1.10.6/asn1/HI2Operations/HI2Operations_ver11.asn --- wireshark-1.10.5/asn1/HI2Operations/HI2Operations_ver11.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/HI2Operations/HI2Operations_ver11.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: HI2Operations_ver11.asn 32052 2010-02-28 20:49:06Z etxrab $ +-- $Id$ HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version11(11)} diff -Nru wireshark-1.10.5/asn1/HI2Operations/Makefile.am wireshark-1.10.6/asn1/HI2Operations/Makefile.am --- wireshark-1.10.5/asn1/HI2Operations/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/HI2Operations/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/HI2Operations/Makefile.common wireshark-1.10.6/asn1/HI2Operations/Makefile.common --- wireshark-1.10.5/asn1/HI2Operations/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/HI2Operations/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/HI2Operations/Makefile.in wireshark-1.10.6/asn1/HI2Operations/Makefile.in --- wireshark-1.10.5/asn1/HI2Operations/Makefile.in 2013-12-19 19:13:35.000000000 +0000 +++ wireshark-1.10.6/asn1/HI2Operations/Makefile.in 2014-03-07 18:07:26.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/HI2Operations/Makefile.nmake wireshark-1.10.6/asn1/HI2Operations/Makefile.nmake --- wireshark-1.10.5/asn1/HI2Operations/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/HI2Operations/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/HI2Operations/packet-HI2Operations-template.c wireshark-1.10.6/asn1/HI2Operations/packet-HI2Operations-template.c --- wireshark-1.10.5/asn1/HI2Operations/packet-HI2Operations-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/HI2Operations/packet-HI2Operations-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for HI2 (ETSI TS 101 671 V3.5.1 (2009-11)) * Erwin van Eijk 2010 * - * $Id: packet-HI2Operations-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/HI2Operations/TS101909201.asn wireshark-1.10.6/asn1/HI2Operations/TS101909201.asn --- wireshark-1.10.5/asn1/HI2Operations/TS101909201.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/HI2Operations/TS101909201.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: TS101909201.asn 32052 2010-02-28 20:49:06Z etxrab $ +-- $Id$ TS101909201 {itu-t (0) identified-organization (4) etsi (0) ts101909 (1909) part20 (20) subpart1(1) interceptVersion (0)} DEFINITIONS AUTOMATIC TAGS ::= diff -Nru wireshark-1.10.5/asn1/HI2Operations/UmtsHI2Operations.asn wireshark-1.10.6/asn1/HI2Operations/UmtsHI2Operations.asn --- wireshark-1.10.5/asn1/HI2Operations/UmtsHI2Operations.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/HI2Operations/UmtsHI2Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ -- WS Modified UmtsHI2Operations just containing the imported defines -- --- $Id: UmtsHI2Operations.asn 32052 2010-02-28 20:49:06Z etxrab $ +-- $Id$ UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r8(8) version-1(1)} DEFINITIONS IMPLICIT TAGS ::= diff -Nru wireshark-1.10.5/asn1/hnbap/hnbap.cnf wireshark-1.10.6/asn1/hnbap/hnbap.cnf --- wireshark-1.10.5/asn1/hnbap/hnbap.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/hnbap/hnbap.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # hnbap.cnf # hnbap conformation file # Copyright 2010 Neil Piercy, ip.access Limited -# $Id: hnbap.cnf 39789 2011-11-10 23:28:28Z guy $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/hnbap/HNBAP-CommonDataTypes.asn wireshark-1.10.6/asn1/hnbap/HNBAP-CommonDataTypes.asn --- wireshark-1.10.5/asn1/hnbap/HNBAP-CommonDataTypes.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/hnbap/HNBAP-CommonDataTypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.5 Common Definitions -- --- $Id: HNBAP-CommonDataTypes.asn 39786 2011-11-10 21:38:15Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/hnbap/HNBAP-Constants.asn wireshark-1.10.6/asn1/hnbap/HNBAP-Constants.asn --- wireshark-1.10.5/asn1/hnbap/HNBAP-Constants.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/hnbap/HNBAP-Constants.asn 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.6 Constant Definitions -- --- $Id: HNBAP-Constants.asn 39786 2011-11-10 21:38:15Z etxrab $ +-- $Id$ -- -- ************************************************************** -- diff -Nru wireshark-1.10.5/asn1/hnbap/HNBAP-Containers.asn wireshark-1.10.6/asn1/hnbap/HNBAP-Containers.asn --- wireshark-1.10.5/asn1/hnbap/HNBAP-Containers.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/hnbap/HNBAP-Containers.asn 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.7 Container Definitions -- --- $Id: HNBAP-Containers.asn 39786 2011-11-10 21:38:15Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/hnbap/HNBAP-IEs.asn wireshark-1.10.6/asn1/hnbap/HNBAP-IEs.asn --- wireshark-1.10.5/asn1/hnbap/HNBAP-IEs.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/hnbap/HNBAP-IEs.asn 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.4 Information Element Definitions -- --- $Id: HNBAP-IEs.asn 39786 2011-11-10 21:38:15Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/hnbap/HNBAP-PDU-Contents.asn wireshark-1.10.6/asn1/hnbap/HNBAP-PDU-Contents.asn --- wireshark-1.10.5/asn1/hnbap/HNBAP-PDU-Contents.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/hnbap/HNBAP-PDU-Contents.asn 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.3 PDU Definitions -- --- $Id: HNBAP-PDU-Contents.asn 39786 2011-11-10 21:38:15Z etxrab $ +-- $Id$ -- HNBAP-PDU-Contents { diff -Nru wireshark-1.10.5/asn1/hnbap/HNBAP-PDU-Descriptions.asn wireshark-1.10.6/asn1/hnbap/HNBAP-PDU-Descriptions.asn --- wireshark-1.10.5/asn1/hnbap/HNBAP-PDU-Descriptions.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/hnbap/HNBAP-PDU-Descriptions.asn 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.2 Elementary Procedure definitions -- --- $Id: HNBAP-PDU-Descriptions.asn 39786 2011-11-10 21:38:15Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/hnbap/Makefile.am wireshark-1.10.6/asn1/hnbap/Makefile.am --- wireshark-1.10.5/asn1/hnbap/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/hnbap/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/hnbap/Makefile.common wireshark-1.10.6/asn1/hnbap/Makefile.common --- wireshark-1.10.5/asn1/hnbap/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/hnbap/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/hnbap/Makefile.in wireshark-1.10.6/asn1/hnbap/Makefile.in --- wireshark-1.10.5/asn1/hnbap/Makefile.in 2013-12-19 19:13:38.000000000 +0000 +++ wireshark-1.10.6/asn1/hnbap/Makefile.in 2014-03-07 18:07:28.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/hnbap/Makefile.nmake wireshark-1.10.6/asn1/hnbap/Makefile.nmake --- wireshark-1.10.5/asn1/hnbap/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/hnbap/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/hnbap/packet-hnbap-template.c wireshark-1.10.6/asn1/hnbap/packet-hnbap-template.c --- wireshark-1.10.5/asn1/hnbap/packet-hnbap-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/hnbap/packet-hnbap-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for UMTS Node B Application Part(HNBAP) packet dissection * Copyright 2010 Neil Piercy, ip.access Limited * - * $Id: packet-hnbap-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/idmp/CommonProtocolSpecification.asn wireshark-1.10.6/asn1/idmp/CommonProtocolSpecification.asn --- wireshark-1.10.5/asn1/idmp/CommonProtocolSpecification.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/idmp/CommonProtocolSpecification.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: CommonProtocolSpecification.asn 33177 2010-06-09 14:17:51Z gal $ +-- $Id$ -- http://www.itu.int/ITU-T/formal-language/itu-t/x/x519/2005/CommonProtocolSpecification.asn -- Module CommonProtocolSpecification (X.519:08/2005) CommonProtocolSpecification {joint-iso-itu-t ds(5) module(1) diff -Nru wireshark-1.10.5/asn1/idmp/idmp.cnf wireshark-1.10.6/asn1/idmp/idmp.cnf --- wireshark-1.10.5/asn1/idmp/idmp.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/idmp/idmp.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: idmp.cnf 33177 2010-06-09 14:17:51Z gal $ +# $Id$ # #.IMPORT ../x509ce/x509ce-exp.cnf diff -Nru wireshark-1.10.5/asn1/idmp/IDMProtocolSpecification.asn wireshark-1.10.6/asn1/idmp/IDMProtocolSpecification.asn --- wireshark-1.10.5/asn1/idmp/IDMProtocolSpecification.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/idmp/IDMProtocolSpecification.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IDMProtocolSpecification.asn 33177 2010-06-09 14:17:51Z gal $ +-- $Id$ -- http://www.itu.int/ITU-T/formal-language/itu-t/x/x519/2005/IDMProtocolSpecification.asn -- Module IDMProtocolSpecification (X.519:08/2005) IDMProtocolSpecification {joint-iso-itu-t ds(5) module(1) diff -Nru wireshark-1.10.5/asn1/idmp/Makefile.am wireshark-1.10.6/asn1/idmp/Makefile.am --- wireshark-1.10.5/asn1/idmp/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/idmp/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/idmp/Makefile.common wireshark-1.10.6/asn1/idmp/Makefile.common --- wireshark-1.10.5/asn1/idmp/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/idmp/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/idmp/Makefile.in wireshark-1.10.6/asn1/idmp/Makefile.in --- wireshark-1.10.5/asn1/idmp/Makefile.in 2013-12-19 19:13:38.000000000 +0000 +++ wireshark-1.10.6/asn1/idmp/Makefile.in 2014-03-07 18:07:28.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/idmp/Makefile.nmake wireshark-1.10.6/asn1/idmp/Makefile.nmake --- wireshark-1.10.5/asn1/idmp/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/idmp/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/idmp/packet-idmp-template.c wireshark-1.10.6/asn1/idmp/packet-idmp-template.c --- wireshark-1.10.5/asn1/idmp/packet-idmp-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/idmp/packet-idmp-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.519 Internet Directly Mapped Procotol (IDMP) packet dissection * Graeme Lunt 2010 * - * $Id: packet-idmp-template.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/idmp/packet-idmp-template.h wireshark-1.10.6/asn1/idmp/packet-idmp-template.h --- wireshark-1.10.5/asn1/idmp/packet-idmp-template.h 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/idmp/packet-idmp-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.519 Internet Directly Mapped Protocol (IDMP) packet dissection * Graeme Lunt 2010 * - * $Id: packet-idmp-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/inap/inap.cnf wireshark-1.10.6/asn1/inap/inap.cnf --- wireshark-1.10.5/asn1/inap/inap.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/inap/inap.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ # inap.cnf # inap conformation file -# $Id: inap.cnf 44860 2012-09-10 21:40:21Z darkjames $ +# $Id$ #.IMPORT ../dap/dap-exp.cnf #.IMPORT ../dsp/dsp-exp.cnf diff -Nru wireshark-1.10.5/asn1/inap/IN-common-classes.asn wireshark-1.10.6/asn1/inap/IN-common-classes.asn --- wireshark-1.10.5/asn1/inap/IN-common-classes.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/inap/IN-common-classes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IN-common-classes.asn 22459 2007-08-06 12:16:20Z etxrab $ +-- $Id$ -- Module IN-common-classes (Q.1248.1:07/2001) IN-common-classes {itu-t recommendation q 1248 modules(1) in-common-classes(5) version1(0)} DEFINITIONS ::= diff -Nru wireshark-1.10.5/asn1/inap/IN-common-datatypes.asn wireshark-1.10.6/asn1/inap/IN-common-datatypes.asn --- wireshark-1.10.5/asn1/inap/IN-common-datatypes.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/inap/IN-common-datatypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IN-common-datatypes.asn 22459 2007-08-06 12:16:20Z etxrab $ +-- $Id$ -- Module IN-common-datatypes (Q.1248.1:07/2001) IN-common-datatypes {itu-t recommendation q 1248 modules(1) in-common-datatypes(1) version1(0)} DEFINITIONS IMPLICIT TAGS ::= diff -Nru wireshark-1.10.5/asn1/inap/IN-errorcodes.asn wireshark-1.10.6/asn1/inap/IN-errorcodes.asn --- wireshark-1.10.5/asn1/inap/IN-errorcodes.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/inap/IN-errorcodes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IN-errorcodes.asn 32060 2010-03-01 07:27:35Z etxrab $ +-- $Id$ -- Module IN-errorcodes (Q.1248.1:07/2001) IN-errorcodes {itu-t recommendation q 1248 modules(1) in-errorcodes(4) version1(0)} DEFINITIONS ::= diff -Nru wireshark-1.10.5/asn1/inap/IN-errortypes.asn wireshark-1.10.6/asn1/inap/IN-errortypes.asn --- wireshark-1.10.5/asn1/inap/IN-errortypes.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/inap/IN-errortypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IN-errortypes.asn 32061 2010-03-01 09:30:45Z etxrab $ +-- $Id$ -- Module IN-errortypes (Q.1248.1:07/2001) IN-errortypes {itu-t recommendation q 1248 modules(1) in-errortypes(2) version1(0)} DEFINITIONS IMPLICIT TAGS ::= diff -Nru wireshark-1.10.5/asn1/inap/IN-object-identifiers.asn wireshark-1.10.6/asn1/inap/IN-object-identifiers.asn --- wireshark-1.10.5/asn1/inap/IN-object-identifiers.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/inap/IN-object-identifiers.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IN-object-identifiers.asn 22459 2007-08-06 12:16:20Z etxrab $ +-- $Id$ -- Module IN-object-identifiers (Q.1248.1:07/2001) IN-object-identifiers {itu-t recommendation q 1248 modules(1) in-object-identifiers(0) version1(0)} DEFINITIONS ::= diff -Nru wireshark-1.10.5/asn1/inap/IN-operationcodes.asn wireshark-1.10.6/asn1/inap/IN-operationcodes.asn --- wireshark-1.10.5/asn1/inap/IN-operationcodes.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/inap/IN-operationcodes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IN-operationcodes.asn 22459 2007-08-06 12:16:20Z etxrab $ +-- $Id$ -- Module IN-operationcodes (Q.1248.1:07/2001) IN-operationcodes {itu-t recommendation q 1248 modules(1) in-operationcodes(3) version1(0)} DEFINITIONS ::= diff -Nru wireshark-1.10.5/asn1/inap/IN-SCF-SRF-Classes.asn wireshark-1.10.6/asn1/inap/IN-SCF-SRF-Classes.asn --- wireshark-1.10.5/asn1/inap/IN-SCF-SRF-Classes.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/inap/IN-SCF-SRF-Classes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IN-SCF-SRF-Classes.asn 22459 2007-08-06 12:16:20Z etxrab $ +-- $Id$ -- Module IN-SCF-SRF-Classes (Q.1248.3:07/2001) IN-SCF-SRF-Classes {itu-t recommendation q 1248 modules(1) in-scf-srf-classes(11) version1(0)} DEFINITIONS ::= diff -Nru wireshark-1.10.5/asn1/inap/IN-SCF-SRF-ops-args.asn wireshark-1.10.6/asn1/inap/IN-SCF-SRF-ops-args.asn --- wireshark-1.10.5/asn1/inap/IN-SCF-SRF-ops-args.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/inap/IN-SCF-SRF-ops-args.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IN-SCF-SRF-ops-args.asn 22459 2007-08-06 12:16:20Z etxrab $ +-- $Id$ -- Module IN-SCF-SRF-ops-args (Q.1248.3:07/2001) IN-SCF-SRF-ops-args {itu-t recommendation q 1248 modules(1) in-scf-srf-ops-args(12) version1(0)} DEFINITIONS IMPLICIT TAGS ::= diff -Nru wireshark-1.10.5/asn1/inap/IN-SSF-SCF-Classes.asn wireshark-1.10.6/asn1/inap/IN-SSF-SCF-Classes.asn --- wireshark-1.10.5/asn1/inap/IN-SSF-SCF-Classes.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/inap/IN-SSF-SCF-Classes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IN-SSF-SCF-Classes.asn 24380 2008-02-18 21:01:11Z wmeier $ +-- $Id$ -- Module IN-SSF-SCF-Classes (Q.1248.2:07/2001) IN-SSF-SCF-Classes {itu-t recommendation q 1248 modules(1) in-ssf-scf-classes(7) version1(0)} DEFINITIONS ::= diff -Nru wireshark-1.10.5/asn1/inap/IN-SSF-SCF-datatypes.asn wireshark-1.10.6/asn1/inap/IN-SSF-SCF-datatypes.asn --- wireshark-1.10.5/asn1/inap/IN-SSF-SCF-datatypes.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/inap/IN-SSF-SCF-datatypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IN-SSF-SCF-datatypes.asn 22459 2007-08-06 12:16:20Z etxrab $ +-- $Id$ -- Small modifications made to the original due to as2wrs shortfalls, to be corrected. -- Module IN-SSF-SCF-datatypes (Q.1248.2:07/2001) IN-SSF-SCF-datatypes {itu-t recommendation q 1248 modules(1) diff -Nru wireshark-1.10.5/asn1/inap/IN-SSF-SCF-ops-args.asn wireshark-1.10.6/asn1/inap/IN-SSF-SCF-ops-args.asn --- wireshark-1.10.5/asn1/inap/IN-SSF-SCF-ops-args.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/inap/IN-SSF-SCF-ops-args.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IN-SSF-SCF-ops-args.asn 24380 2008-02-18 21:01:11Z wmeier $ +-- $Id$ -- Small modifications made to the original due to as2wrs shortfalls, to be corrected. -- Module IN-SSF-SCF-ops-args (Q.1248.2:07/2001) IN-SSF-SCF-ops-args {itu-t recommendation q 1248 modules(1) diff -Nru wireshark-1.10.5/asn1/inap/Makefile.am wireshark-1.10.6/asn1/inap/Makefile.am --- wireshark-1.10.5/asn1/inap/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/inap/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/inap/Makefile.common wireshark-1.10.6/asn1/inap/Makefile.common --- wireshark-1.10.5/asn1/inap/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/inap/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/inap/Makefile.in wireshark-1.10.6/asn1/inap/Makefile.in --- wireshark-1.10.5/asn1/inap/Makefile.in 2013-12-19 19:13:38.000000000 +0000 +++ wireshark-1.10.6/asn1/inap/Makefile.in 2014-03-07 18:07:28.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/inap/Makefile.nmake wireshark-1.10.6/asn1/inap/Makefile.nmake --- wireshark-1.10.5/asn1/inap/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/inap/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/inap/packet-inap-template.c wireshark-1.10.6/asn1/inap/packet-inap-template.c --- wireshark-1.10.5/asn1/inap/packet-inap-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/inap/packet-inap-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2004, Tim Endean * Built from the gsm-map dissector Copyright 2004, Anders Broman * - * $Id: packet-inap-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * Wireshark - Network traffic analyzer * By Gerald Combs * Copyright 1998 Gerald Combs diff -Nru wireshark-1.10.5/asn1/inap/packet-inap-template.h wireshark-1.10.6/asn1/inap/packet-inap-template.h --- wireshark-1.10.5/asn1/inap/packet-inap-template.h 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/inap/packet-inap-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-inap.h * - * $Id: packet-inap-template.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Copyright 2004, Tim Endean * diff -Nru wireshark-1.10.5/asn1/isdn-sup/Addressing-Data-Elements.asn wireshark-1.10.6/asn1/isdn-sup/Addressing-Data-Elements.asn --- wireshark-1.10.5/asn1/isdn-sup/Addressing-Data-Elements.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/isdn-sup/Addressing-Data-Elements.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- --- $Id: Addressing-Data-Elements.asn 47709 2013-02-17 19:07:27Z guy $ +-- $Id$ -- -- EN 300 196-1 Ver. 1.3.2 -- diff -Nru wireshark-1.10.5/asn1/isdn-sup/Advice-of-Charge-Operations.asn wireshark-1.10.6/asn1/isdn-sup/Advice-of-Charge-Operations.asn --- wireshark-1.10.5/asn1/isdn-sup/Advice-of-Charge-Operations.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/isdn-sup/Advice-of-Charge-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- --- $Id: Advice-of-Charge-Operations.asn 47746 2013-02-19 18:44:06Z etxrab $ +-- $Id$ -- -- EN 300 182-1 Ver. 1.3.6 -- diff -Nru wireshark-1.10.5/asn1/isdn-sup/Basic-Service-Elements.asn wireshark-1.10.6/asn1/isdn-sup/Basic-Service-Elements.asn --- wireshark-1.10.5/asn1/isdn-sup/Basic-Service-Elements.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/isdn-sup/Basic-Service-Elements.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- --- $Id: Basic-Service-Elements.asn 47709 2013-02-17 19:07:27Z guy $ +-- $Id$ -- -- EN 300 196-1 Ver. 1.3.2 -- diff -Nru wireshark-1.10.5/asn1/isdn-sup/Closed-User-Group-Service-Operations.asn wireshark-1.10.6/asn1/isdn-sup/Closed-User-Group-Service-Operations.asn --- wireshark-1.10.5/asn1/isdn-sup/Closed-User-Group-Service-Operations.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/isdn-sup/Closed-User-Group-Service-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- --- $Id: Closed-User-Group-Service-Operations.asn 47738 2013-02-18 19:34:04Z etxrab $ +-- $Id$ -- -- EN 300 138-1 Ver. 1.3.4 -- diff -Nru wireshark-1.10.5/asn1/isdn-sup/Conference-Add-On-Operations.asn wireshark-1.10.6/asn1/isdn-sup/Conference-Add-On-Operations.asn --- wireshark-1.10.5/asn1/isdn-sup/Conference-Add-On-Operations.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/isdn-sup/Conference-Add-On-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- --- $Id: Conference-Add-On-Operations.asn 47746 2013-02-19 18:44:06Z etxrab $ +-- $Id$ -- -- EN 300 185-1 Ver. 1.2.4 -- diff -Nru wireshark-1.10.5/asn1/isdn-sup/Diversion-Operations.asn wireshark-1.10.6/asn1/isdn-sup/Diversion-Operations.asn --- wireshark-1.10.5/asn1/isdn-sup/Diversion-Operations.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/isdn-sup/Diversion-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- --- $Id: Diversion-Operations.asn 47738 2013-02-18 19:34:04Z etxrab $ +-- $Id$ -- -- ETSI EN 300 207-1 V3.1.1 (2001-06) -- diff -Nru wireshark-1.10.5/asn1/isdn-sup/Embedded-Q931-Types.asn wireshark-1.10.6/asn1/isdn-sup/Embedded-Q931-Types.asn --- wireshark-1.10.5/asn1/isdn-sup/Embedded-Q931-Types.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/isdn-sup/Embedded-Q931-Types.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- --- $Id: Embedded-Q931-Types.asn 47710 2013-02-17 19:08:12Z guy $ +-- $Id$ -- Embedded-Q931-Types {itu-t identified-organization etsi(0) 196 embedded-q931-types(7)} diff -Nru wireshark-1.10.5/asn1/isdn-sup/Freephone-Operations.asn wireshark-1.10.6/asn1/isdn-sup/Freephone-Operations.asn --- wireshark-1.10.5/asn1/isdn-sup/Freephone-Operations.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/isdn-sup/Freephone-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- --- $Id: Freephone-Operations.asn 48475 2013-03-22 06:43:49Z etxrab $ +-- $Id$ -- -- EN 300 210-1 Ver. 1.2.4 -- diff -Nru wireshark-1.10.5/asn1/isdn-sup/General-Errors.asn wireshark-1.10.6/asn1/isdn-sup/General-Errors.asn --- wireshark-1.10.5/asn1/isdn-sup/General-Errors.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/isdn-sup/General-Errors.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- --- $Id: General-Errors.asn 47738 2013-02-18 19:34:04Z etxrab $ +-- $Id$ -- -- EN 300 196-1 Ver. 1.3.2 -- diff -Nru wireshark-1.10.5/asn1/isdn-sup/isdn-sup.cnf wireshark-1.10.6/asn1/isdn-sup/isdn-sup.cnf --- wireshark-1.10.5/asn1/isdn-sup/isdn-sup.cnf 2013-09-09 19:11:59.000000000 +0000 +++ wireshark-1.10.6/asn1/isdn-sup/isdn-sup.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ # isdn_sup conformation file # 2013 Anders Broman -# $Id: isdn-sup.cnf 51875 2013-09-09 18:52:33Z gerald $ +# $Id$ #.OPT BER diff -Nru wireshark-1.10.5/asn1/isdn-sup/Makefile.am wireshark-1.10.6/asn1/isdn-sup/Makefile.am --- wireshark-1.10.5/asn1/isdn-sup/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/isdn-sup/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 47709 2013-02-17 19:07:27Z guy $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/isdn-sup/Makefile.common wireshark-1.10.6/asn1/isdn-sup/Makefile.common --- wireshark-1.10.5/asn1/isdn-sup/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/isdn-sup/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 48478 2013-03-22 17:19:46Z etxrab $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/isdn-sup/Makefile.in wireshark-1.10.6/asn1/isdn-sup/Makefile.in --- wireshark-1.10.5/asn1/isdn-sup/Makefile.in 2013-12-19 19:13:38.000000000 +0000 +++ wireshark-1.10.6/asn1/isdn-sup/Makefile.in 2014-03-07 18:07:28.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 47709 2013-02-17 19:07:27Z guy $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 48478 2013-03-22 17:19:46Z etxrab $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/isdn-sup/Makefile.nmake wireshark-1.10.6/asn1/isdn-sup/Makefile.nmake --- wireshark-1.10.5/asn1/isdn-sup/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/isdn-sup/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 47709 2013-02-17 19:07:27Z guy $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/isdn-sup/MCID-Operations.asn wireshark-1.10.6/asn1/isdn-sup/MCID-Operations.asn --- wireshark-1.10.5/asn1/isdn-sup/MCID-Operations.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/isdn-sup/MCID-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- --- $Id: MCID-Operations.asn 47730 2013-02-18 06:26:09Z etxrab $ +-- $Id$ -- -- EN 300 130-1 Ver. 1.2.4 -- diff -Nru wireshark-1.10.5/asn1/isdn-sup/packet-isdn-sup-template.c wireshark-1.10.6/asn1/isdn-sup/packet-isdn-sup-template.c --- wireshark-1.10.5/asn1/isdn-sup/packet-isdn-sup-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/isdn-sup/packet-isdn-sup-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ * supplementary services * Copyright 2013, Anders Broman * - * $Id: packet-isdn-sup-template.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/isdn-sup/User-To-User-Signalling-Operations.asn wireshark-1.10.6/asn1/isdn-sup/User-To-User-Signalling-Operations.asn --- wireshark-1.10.5/asn1/isdn-sup/User-To-User-Signalling-Operations.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/isdn-sup/User-To-User-Signalling-Operations.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- --- $Id: User-To-User-Signalling-Operations.asn 47746 2013-02-19 18:44:06Z etxrab $ +-- $Id$ -- -- EN 300 286-1 Ver. 1.2.4 -- diff -Nru wireshark-1.10.5/asn1/kerberos/k5.asn wireshark-1.10.6/asn1/kerberos/k5.asn --- wireshark-1.10.5/asn1/kerberos/k5.asn 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/kerberos/k5.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ -- Extracted from http://www.h5l.org/dist/src/heimdal-1.2.tar.gz -- Id: k5.asn1 22745 2008-03-24 12:07:54Z lha $ -- Commented out stuff already in KerberosV5Spec2.asn --- $Id: k5.asn 26486 2008-10-17 16:09:34Z etxrab $ +-- $Id$ KERBEROS5 DEFINITIONS ::= BEGIN diff -Nru wireshark-1.10.5/asn1/kerberos/kerberos.cnf wireshark-1.10.6/asn1/kerberos/kerberos.cnf --- wireshark-1.10.5/asn1/kerberos/kerberos.cnf 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/kerberos/kerberos.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # kerberos.cnf # kerberos conformation file # Copyright 2008 Anders Broman -# $Id: kerberos.cnf 42525 2012-05-09 22:08:00Z guy $ +# $Id$ #.EXPORTS Checksum diff -Nru wireshark-1.10.5/asn1/kerberos/Makefile.am wireshark-1.10.6/asn1/kerberos/Makefile.am --- wireshark-1.10.5/asn1/kerberos/Makefile.am 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/kerberos/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/kerberos/Makefile.common wireshark-1.10.6/asn1/kerberos/Makefile.common --- wireshark-1.10.5/asn1/kerberos/Makefile.common 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/kerberos/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/kerberos/Makefile.in wireshark-1.10.6/asn1/kerberos/Makefile.in --- wireshark-1.10.5/asn1/kerberos/Makefile.in 2013-12-19 19:13:39.000000000 +0000 +++ wireshark-1.10.6/asn1/kerberos/Makefile.in 2014-03-07 18:07:28.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/kerberos/packet-kerberos-template.c wireshark-1.10.6/asn1/kerberos/packet-kerberos-template.c --- wireshark-1.10.5/asn1/kerberos/packet-kerberos-template.c 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/kerberos/packet-kerberos-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -23,7 +23,7 @@ * * Some structures from RFC2630 * - * $Id: packet-kerberos-template.c 48429 2013-03-19 21:22:31Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/kerberos/packet-kerberos-template.h wireshark-1.10.6/asn1/kerberos/packet-kerberos-template.h --- wireshark-1.10.5/asn1/kerberos/packet-kerberos-template.h 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/kerberos/packet-kerberos-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for kerberos packet dissection * Copyright 2007, Anders Broman * - * $Id: packet-kerberos-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/lcsap/lcsap.cnf wireshark-1.10.6/asn1/lcsap/lcsap.cnf --- wireshark-1.10.5/asn1/lcsap/lcsap.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/lcsap/lcsap.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # lcsap.cnf # lcsap conformation file -# $Id: lcsap.cnf 45946 2012-11-06 09:22:29Z etxrab $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/lcsap/LCS-AP-CommonDataTypes.asn wireshark-1.10.6/asn1/lcsap/LCS-AP-CommonDataTypes.asn --- wireshark-1.10.5/asn1/lcsap/LCS-AP-CommonDataTypes.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/lcsap/LCS-AP-CommonDataTypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: LCS-AP-CommonDataTypes.asn 41904 2012-04-03 14:12:07Z etxrab $ +-- $Id$ -- ETSI TS 129 171 V11.1.0 (2012-03) -- 7.5.6 Common Definitions diff -Nru wireshark-1.10.5/asn1/lcsap/LCS-AP-Constants.asn wireshark-1.10.6/asn1/lcsap/LCS-AP-Constants.asn --- wireshark-1.10.5/asn1/lcsap/LCS-AP-Constants.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/lcsap/LCS-AP-Constants.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: LCS-AP-Constants.asn 41904 2012-04-03 14:12:07Z etxrab $ +-- $Id$ -- ETSI TS 129 171 V11.1.0 (2012-03) -- ************************************************************** -- diff -Nru wireshark-1.10.5/asn1/lcsap/LCS-AP-Containers.asn wireshark-1.10.6/asn1/lcsap/LCS-AP-Containers.asn --- wireshark-1.10.5/asn1/lcsap/LCS-AP-Containers.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/lcsap/LCS-AP-Containers.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: LCS-AP-Containers.asn 41904 2012-04-03 14:12:07Z etxrab $ +-- $Id$ -- ETSI TS 129 171 V9.2.0 (2010-10) -- -- 7.5.8 Container Definitions diff -Nru wireshark-1.10.5/asn1/lcsap/LCS-AP-IEs.asn wireshark-1.10.6/asn1/lcsap/LCS-AP-IEs.asn --- wireshark-1.10.5/asn1/lcsap/LCS-AP-IEs.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/lcsap/LCS-AP-IEs.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: LCS-AP-IEs.asn 41905 2012-04-03 14:46:02Z etxrab $ +-- $Id$ -- ETSI TS 129 171 V11.1.0 (2012-03) -- -- 7.5.5 Information element definitions diff -Nru wireshark-1.10.5/asn1/lcsap/LCS-AP-PDU-Contents.asn wireshark-1.10.6/asn1/lcsap/LCS-AP-PDU-Contents.asn --- wireshark-1.10.5/asn1/lcsap/LCS-AP-PDU-Contents.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/lcsap/LCS-AP-PDU-Contents.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: LCS-AP-PDU-Contents.asn 41904 2012-04-03 14:12:07Z etxrab $ +-- $Id$ -- ETSI TS 129 171 V11.1.0 (2012-03) -- -- 7.5.4 PDU definitions diff -Nru wireshark-1.10.5/asn1/lcsap/LCS-AP-PDU-Descriptions.asn wireshark-1.10.6/asn1/lcsap/LCS-AP-PDU-Descriptions.asn --- wireshark-1.10.5/asn1/lcsap/LCS-AP-PDU-Descriptions.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/lcsap/LCS-AP-PDU-Descriptions.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: LCS-AP-PDU-Descriptions.asn 41904 2012-04-03 14:12:07Z etxrab $ +-- $Id$ -- ETSI TS 129 171 V11.1.0 (2012-03) -- -- 7.5.3 Elementary procedure definitions diff -Nru wireshark-1.10.5/asn1/lcsap/Makefile.am wireshark-1.10.6/asn1/lcsap/Makefile.am --- wireshark-1.10.5/asn1/lcsap/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/lcsap/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lcsap/Makefile.common wireshark-1.10.6/asn1/lcsap/Makefile.common --- wireshark-1.10.5/asn1/lcsap/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/lcsap/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lcsap/Makefile.in wireshark-1.10.6/asn1/lcsap/Makefile.in --- wireshark-1.10.5/asn1/lcsap/Makefile.in 2013-12-19 19:13:39.000000000 +0000 +++ wireshark-1.10.6/asn1/lcsap/Makefile.in 2014-03-07 18:07:28.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lcsap/Makefile.nmake wireshark-1.10.6/asn1/lcsap/Makefile.nmake --- wireshark-1.10.5/asn1/lcsap/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/lcsap/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lcsap/packet-lcsap-template.c wireshark-1.10.6/asn1/lcsap/packet-lcsap-template.c --- wireshark-1.10.5/asn1/lcsap/packet-lcsap-template.c 2013-08-15 04:32:55.000000000 +0000 +++ wireshark-1.10.6/asn1/lcsap/packet-lcsap-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright (c) 2011 by Spenser Sheng * - * $Id: packet-lcsap-template.c 51374 2013-08-15 03:57:10Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/lcsap/packet-lcsap-template.h wireshark-1.10.6/asn1/lcsap/packet-lcsap-template.h --- wireshark-1.10.5/asn1/lcsap/packet-lcsap-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/lcsap/packet-lcsap-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright (c) 2011 by Spenser Sheng * - * $Id: packet-lcsap-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/ldap/ldap.cnf wireshark-1.10.6/asn1/ldap/ldap.cnf --- wireshark-1.10.5/asn1/ldap/ldap.cnf 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/ldap/ldap.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # ldap.cnf # LDAP conformation file # Copyright 2005 Anders Broman -# $Id: ldap.cnf 43057 2012-06-04 08:56:48Z etxrab $ +# $Id$ #.PDU diff -Nru wireshark-1.10.5/asn1/ldap/Lightweight-Directory-Access-Protocol-V3.asn wireshark-1.10.6/asn1/ldap/Lightweight-Directory-Access-Protocol-V3.asn --- wireshark-1.10.5/asn1/ldap/Lightweight-Directory-Access-Protocol-V3.asn 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/ldap/Lightweight-Directory-Access-Protocol-V3.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ -- Module Lightweight-Directory-Access-Protocol-V3 (RFC 2251:12/1997) Lightweight-Directory-Access-Protocol-V3 -- --- $Id: Lightweight-Directory-Access-Protocol-V3.asn 35474 2011-01-11 02:27:41Z sahlberg $ +-- $Id$ -- This is based on the ASN.1 definitions in RFC 2251, with changes made -- as necessary for Wireshark. -- Copyright (C) The Internet Society (1997). This version of diff -Nru wireshark-1.10.5/asn1/ldap/Makefile.am wireshark-1.10.6/asn1/ldap/Makefile.am --- wireshark-1.10.5/asn1/ldap/Makefile.am 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/ldap/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ldap/Makefile.common wireshark-1.10.6/asn1/ldap/Makefile.common --- wireshark-1.10.5/asn1/ldap/Makefile.common 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/ldap/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ldap/Makefile.in wireshark-1.10.6/asn1/ldap/Makefile.in --- wireshark-1.10.5/asn1/ldap/Makefile.in 2013-12-19 19:13:39.000000000 +0000 +++ wireshark-1.10.6/asn1/ldap/Makefile.in 2014-03-07 18:07:28.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ldap/Makefile.nmake wireshark-1.10.6/asn1/ldap/Makefile.nmake --- wireshark-1.10.5/asn1/ldap/Makefile.nmake 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/ldap/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ldap/packet-ldap-template.c wireshark-1.10.6/asn1/ldap/packet-ldap-template.c --- wireshark-1.10.5/asn1/ldap/packet-ldap-template.c 2013-09-01 12:42:29.000000000 +0000 +++ wireshark-1.10.6/asn1/ldap/packet-ldap-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ * * See RFC 1777 (LDAP v2), RFC 4511 (LDAP v3), and RFC 2222 (SASL). * - * $Id: packet-ldap-template.c 51623 2013-09-01 12:36:18Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/ldap/packet-ldap-template.h wireshark-1.10.6/asn1/ldap/packet-ldap-template.h --- wireshark-1.10.5/asn1/ldap/packet-ldap-template.h 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/ldap/packet-ldap-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ros packet dissection * Copyright 2005, Anders Broman * - * $Id: packet-ldap-template.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/logotypecertextn/logotypecertextn.cnf wireshark-1.10.6/asn1/logotypecertextn/logotypecertextn.cnf --- wireshark-1.10.5/asn1/logotypecertextn/logotypecertextn.cnf 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/logotypecertextn/logotypecertextn.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # logotypecertextn.cnf # LogotypeCertExtn conformation file -# $Id: logotypecertextn.cnf 30471 2009-10-10 12:43:47Z krj $ +# $Id$ #.IMPORT ../x509af/x509af-exp.cnf diff -Nru wireshark-1.10.5/asn1/logotypecertextn/Makefile.am wireshark-1.10.6/asn1/logotypecertextn/Makefile.am --- wireshark-1.10.5/asn1/logotypecertextn/Makefile.am 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/logotypecertextn/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/logotypecertextn/Makefile.common wireshark-1.10.6/asn1/logotypecertextn/Makefile.common --- wireshark-1.10.5/asn1/logotypecertextn/Makefile.common 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/logotypecertextn/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/logotypecertextn/Makefile.in wireshark-1.10.6/asn1/logotypecertextn/Makefile.in --- wireshark-1.10.5/asn1/logotypecertextn/Makefile.in 2013-12-19 19:13:39.000000000 +0000 +++ wireshark-1.10.6/asn1/logotypecertextn/Makefile.in 2014-03-07 18:07:28.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/logotypecertextn/Makefile.nmake wireshark-1.10.6/asn1/logotypecertextn/Makefile.nmake --- wireshark-1.10.5/asn1/logotypecertextn/Makefile.nmake 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/logotypecertextn/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/logotypecertextn/packet-logotypecertextn-template.c wireshark-1.10.6/asn1/logotypecertextn/packet-logotypecertextn-template.c --- wireshark-1.10.5/asn1/logotypecertextn/packet-logotypecertextn-template.c 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/logotypecertextn/packet-logotypecertextn-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for RFC3709 Logotype Certificate Extensions packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-logotypecertextn-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/logotypecertextn/packet-logotypecertextn-template.h wireshark-1.10.6/asn1/logotypecertextn/packet-logotypecertextn-template.h --- wireshark-1.10.5/asn1/logotypecertextn/packet-logotypecertextn-template.h 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/logotypecertextn/packet-logotypecertextn-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for RFC3907 Logotype Certificate Extensions packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-logotypecertextn-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/lpp/LPP.asn wireshark-1.10.6/asn1/lpp/LPP.asn --- wireshark-1.10.5/asn1/lpp/LPP.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/lpp/LPP.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- 3GPP TS 36.355 V11.2.0 (2013-03) --- $Id: LPP.asn 48443 2013-03-20 21:14:25Z pascal $ +-- $Id$ -- LPP-PDU-Definitions { diff -Nru wireshark-1.10.5/asn1/lpp/lpp.cnf wireshark-1.10.6/asn1/lpp/lpp.cnf --- wireshark-1.10.5/asn1/lpp/lpp.cnf 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/lpp/lpp.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # lpp.cnf # llp conformation file # Copyright 2011-2013 Pascal Quantin -# $Id: lpp.cnf 47034 2013-01-11 19:31:15Z pascal $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/lpp/Makefile.am wireshark-1.10.6/asn1/lpp/Makefile.am --- wireshark-1.10.5/asn1/lpp/Makefile.am 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/lpp/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lpp/Makefile.common wireshark-1.10.6/asn1/lpp/Makefile.common --- wireshark-1.10.5/asn1/lpp/Makefile.common 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/lpp/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43628 2012-07-09 20:55:09Z pascal $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lpp/Makefile.in wireshark-1.10.6/asn1/lpp/Makefile.in --- wireshark-1.10.5/asn1/lpp/Makefile.in 2013-12-19 19:13:39.000000000 +0000 +++ wireshark-1.10.6/asn1/lpp/Makefile.in 2014-03-07 18:07:29.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43628 2012-07-09 20:55:09Z pascal $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lpp/Makefile.nmake wireshark-1.10.6/asn1/lpp/Makefile.nmake --- wireshark-1.10.5/asn1/lpp/Makefile.nmake 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/lpp/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lpp/packet-lpp-template.c wireshark-1.10.6/asn1/lpp/packet-lpp-template.c --- wireshark-1.10.5/asn1/lpp/packet-lpp-template.c 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/lpp/packet-lpp-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for 3GPP LTE Positioning Protocol (LLP) packet dissection * Copyright 2011-2013 Pascal Quantin * - * $Id: packet-lpp-template.c 48443 2013-03-20 21:14:25Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/lppa/lppa.cnf wireshark-1.10.6/asn1/lppa/lppa.cnf --- wireshark-1.10.5/asn1/lppa/lppa.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lppa/lppa.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # lppa.cnf # llpa conformation file # Copyright 2011 Pascal Quantin -# $Id: lppa.cnf 39847 2011-11-15 15:02:01Z wmeier $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/lppa/LPPA-Common.asn wireshark-1.10.6/asn1/lppa/LPPA-Common.asn --- wireshark-1.10.5/asn1/lppa/LPPA-Common.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lppa/LPPA-Common.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- 3GPP TS 36.455 V9.4.1 (2011-03) --- $Id: LPPA-Common.asn 39847 2011-11-15 15:02:01Z wmeier $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/lppa/LPPA-Constant.asn wireshark-1.10.6/asn1/lppa/LPPA-Constant.asn --- wireshark-1.10.5/asn1/lppa/LPPA-Constant.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lppa/LPPA-Constant.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- 3GPP TS 36.455 V9.4.1 (2011-03) --- $Id: LPPA-Constant.asn 39847 2011-11-15 15:02:01Z wmeier $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/lppa/LPPA-Container.asn wireshark-1.10.6/asn1/lppa/LPPA-Container.asn --- wireshark-1.10.5/asn1/lppa/LPPA-Container.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lppa/LPPA-Container.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- 3GPP TS 36.455 V9.4.1 (2011-03) --- $Id: LPPA-Container.asn 39847 2011-11-15 15:02:01Z wmeier $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/lppa/LPPA-ElementaryProcedure.asn wireshark-1.10.6/asn1/lppa/LPPA-ElementaryProcedure.asn --- wireshark-1.10.5/asn1/lppa/LPPA-ElementaryProcedure.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lppa/LPPA-ElementaryProcedure.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- 3GPP TS 36.455 V9.4.1 (2011-03) --- $Id: LPPA-ElementaryProcedure.asn 39847 2011-11-15 15:02:01Z wmeier $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/lppa/LPPA-InformationElement.asn wireshark-1.10.6/asn1/lppa/LPPA-InformationElement.asn --- wireshark-1.10.5/asn1/lppa/LPPA-InformationElement.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lppa/LPPA-InformationElement.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- 3GPP TS 36.455 V9.4.1 (2011-03) --- $Id: LPPA-InformationElement.asn 39847 2011-11-15 15:02:01Z wmeier $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/lppa/LPPA-PDU.asn wireshark-1.10.6/asn1/lppa/LPPA-PDU.asn --- wireshark-1.10.5/asn1/lppa/LPPA-PDU.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lppa/LPPA-PDU.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- 3GPP TS 36.455 V9.4.1 (2011-03) --- $Id: LPPA-PDU.asn 39847 2011-11-15 15:02:01Z wmeier $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/lppa/Makefile.am wireshark-1.10.6/asn1/lppa/Makefile.am --- wireshark-1.10.5/asn1/lppa/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lppa/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lppa/Makefile.common wireshark-1.10.6/asn1/lppa/Makefile.common --- wireshark-1.10.5/asn1/lppa/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lppa/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lppa/Makefile.in wireshark-1.10.6/asn1/lppa/Makefile.in --- wireshark-1.10.5/asn1/lppa/Makefile.in 2013-12-19 19:13:39.000000000 +0000 +++ wireshark-1.10.6/asn1/lppa/Makefile.in 2014-03-07 18:07:29.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lppa/Makefile.nmake wireshark-1.10.6/asn1/lppa/Makefile.nmake --- wireshark-1.10.5/asn1/lppa/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lppa/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lppa/packet-lppa-template.c wireshark-1.10.6/asn1/lppa/packet-lppa-template.c --- wireshark-1.10.5/asn1/lppa/packet-lppa-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lppa/packet-lppa-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for 3GPP LTE Positioning Protocol A (LLPa) packet dissection * Copyright 2011, Pascal Quantin * - * $Id: packet-lppa-template.c 46300 2012-11-30 08:34:50Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/lppe/LPPe.asn wireshark-1.10.6/asn1/lppe/LPPe.asn --- wireshark-1.10.5/asn1/lppe/LPPe.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lppe/LPPe.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- Open Mobile Alliance OMA-TS-LPPe V1_0-20110929-C --- $Id: LPPe.asn 43628 2012-07-09 20:55:09Z pascal $ +-- $Id$ -- OMA-LPPE DEFINITIONS AUTOMATIC TAGS ::= diff -Nru wireshark-1.10.5/asn1/lppe/lppe.cnf wireshark-1.10.6/asn1/lppe/lppe.cnf --- wireshark-1.10.5/asn1/lppe/lppe.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lppe/lppe.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # lppe.cnf # llpe conformation file # Copyright 2012 Pascal Quantin -# $Id: lppe.cnf 43629 2012-07-09 21:04:50Z pascal $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/lppe/Makefile.am wireshark-1.10.6/asn1/lppe/Makefile.am --- wireshark-1.10.5/asn1/lppe/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lppe/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43628 2012-07-09 20:55:09Z pascal $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lppe/Makefile.common wireshark-1.10.6/asn1/lppe/Makefile.common --- wireshark-1.10.5/asn1/lppe/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lppe/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43628 2012-07-09 20:55:09Z pascal $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lppe/Makefile.in wireshark-1.10.6/asn1/lppe/Makefile.in --- wireshark-1.10.5/asn1/lppe/Makefile.in 2013-12-19 19:13:39.000000000 +0000 +++ wireshark-1.10.6/asn1/lppe/Makefile.in 2014-03-07 18:07:29.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43628 2012-07-09 20:55:09Z pascal $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43628 2012-07-09 20:55:09Z pascal $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lppe/Makefile.nmake wireshark-1.10.6/asn1/lppe/Makefile.nmake --- wireshark-1.10.5/asn1/lppe/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lppe/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43628 2012-07-09 20:55:09Z pascal $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lppe/packet-lppe-template.c wireshark-1.10.6/asn1/lppe/packet-lppe-template.c --- wireshark-1.10.5/asn1/lppe/packet-lppe-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lppe/packet-lppe-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for LPP Extensions (LLPe) packet dissection * Copyright 2012, Pascal Quantin * - * $Id: packet-lppe-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn wireshark-1.10.6/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn --- wireshark-1.10.5/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- 3GPP TS 36.331 V11.3.0 (2013-03) --- $Id: EUTRA-InterNodeDefinitions.asn 48463 2013-03-21 20:51:19Z pascal $ +-- $Id$ -- EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::= diff -Nru wireshark-1.10.5/asn1/lte-rrc/EUTRA-RRC-Definitions.asn wireshark-1.10.6/asn1/lte-rrc/EUTRA-RRC-Definitions.asn --- wireshark-1.10.5/asn1/lte-rrc/EUTRA-RRC-Definitions.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lte-rrc/EUTRA-RRC-Definitions.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- 3GPP TS 36.331 V11.3.0 (2013-03) --- $Id: EUTRA-RRC-Definitions.asn 48463 2013-03-21 20:51:19Z pascal $ +-- $Id$ -- EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::= diff -Nru wireshark-1.10.5/asn1/lte-rrc/EUTRA-UE-Variables.asn wireshark-1.10.6/asn1/lte-rrc/EUTRA-UE-Variables.asn --- wireshark-1.10.5/asn1/lte-rrc/EUTRA-UE-Variables.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lte-rrc/EUTRA-UE-Variables.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,5 +1,5 @@ -- 3GPP TS 36.331 V11.3.0 (2013-03) --- $Id: EUTRA-UE-Variables.asn 48463 2013-03-21 20:51:19Z pascal $ +-- $Id$ -- EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::= diff -Nru wireshark-1.10.5/asn1/lte-rrc/lte-rrc.cnf wireshark-1.10.6/asn1/lte-rrc/lte-rrc.cnf --- wireshark-1.10.5/asn1/lte-rrc/lte-rrc.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lte-rrc/lte-rrc.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # lte-rrc.cnf # lte-rrc conformation file # Copyright 2008 Vincent Helfre, 2009-2013 Pascal Quantin -# $Id: lte-rrc.cnf 48464 2013-03-21 21:12:26Z pascal $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/lte-rrc/Makefile.am wireshark-1.10.6/asn1/lte-rrc/Makefile.am --- wireshark-1.10.5/asn1/lte-rrc/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lte-rrc/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lte-rrc/Makefile.common wireshark-1.10.6/asn1/lte-rrc/Makefile.common --- wireshark-1.10.5/asn1/lte-rrc/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lte-rrc/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lte-rrc/Makefile.in wireshark-1.10.6/asn1/lte-rrc/Makefile.in --- wireshark-1.10.5/asn1/lte-rrc/Makefile.in 2013-12-19 19:13:39.000000000 +0000 +++ wireshark-1.10.6/asn1/lte-rrc/Makefile.in 2014-03-07 18:07:29.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lte-rrc/Makefile.nmake wireshark-1.10.6/asn1/lte-rrc/Makefile.nmake --- wireshark-1.10.5/asn1/lte-rrc/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lte-rrc/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/lte-rrc/packet-lte-rrc-template.c wireshark-1.10.6/asn1/lte-rrc/packet-lte-rrc-template.c --- wireshark-1.10.5/asn1/lte-rrc/packet-lte-rrc-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lte-rrc/packet-lte-rrc-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ * Copyright 2008, Vincent Helfre * Copyright 2009-2013, Pascal Quantin * - * $Id: packet-lte-rrc-template.c 48463 2013-03-21 20:51:19Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/lte-rrc/packet-lte-rrc-template.h wireshark-1.10.6/asn1/lte-rrc/packet-lte-rrc-template.h --- wireshark-1.10.5/asn1/lte-rrc/packet-lte-rrc-template.h 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/lte-rrc/packet-lte-rrc-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-llc-rrc-template.h * Copyright 2009, Anders Broman * - * $Id: packet-lte-rrc-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/m3ap/m3ap.cnf wireshark-1.10.6/asn1/m3ap/m3ap.cnf --- wireshark-1.10.5/asn1/m3ap/m3ap.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/m3ap/m3ap.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ # m3ap.cnf # m3ap conformation file -# $Id: m3ap.cnf 48450 2013-03-21 14:29:58Z wmeier $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/m3ap/M3AP-CommonDataTypes.asn wireshark-1.10.6/asn1/m3ap/M3AP-CommonDataTypes.asn --- wireshark-1.10.5/asn1/m3ap/M3AP-CommonDataTypes.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/m3ap/M3AP-CommonDataTypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.6 Common Definitions -- --- $Id: M3AP-CommonDataTypes.asn 42290 2012-04-27 11:08:37Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/m3ap/M3AP-Constants.asn wireshark-1.10.6/asn1/m3ap/M3AP-Constants.asn --- wireshark-1.10.5/asn1/m3ap/M3AP-Constants.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/m3ap/M3AP-Constants.asn 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.7 Constant Definitions -- --- $Id: M3AP-Constants.asn 42290 2012-04-27 11:08:37Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/m3ap/M3AP-Containers.asn wireshark-1.10.6/asn1/m3ap/M3AP-Containers.asn --- wireshark-1.10.5/asn1/m3ap/M3AP-Containers.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/m3ap/M3AP-Containers.asn 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.8 Container Definitions -- --- $Id: M3AP-Containers.asn 42290 2012-04-27 11:08:37Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/m3ap/M3AP-IEs.asn wireshark-1.10.6/asn1/m3ap/M3AP-IEs.asn --- wireshark-1.10.5/asn1/m3ap/M3AP-IEs.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/m3ap/M3AP-IEs.asn 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.5 Information Element Definitions -- --- $Id: M3AP-IEs.asn 43270 2012-06-15 11:23:40Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/m3ap/M3AP-PDU-Contents.asn wireshark-1.10.6/asn1/m3ap/M3AP-PDU-Contents.asn --- wireshark-1.10.5/asn1/m3ap/M3AP-PDU-Contents.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/m3ap/M3AP-PDU-Contents.asn 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.4 PDU Definitions -- --- $Id: M3AP-PDU-Contents.asn 42290 2012-04-27 11:08:37Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/m3ap/M3AP-PDU-Descriptions.asn wireshark-1.10.6/asn1/m3ap/M3AP-PDU-Descriptions.asn --- wireshark-1.10.5/asn1/m3ap/M3AP-PDU-Descriptions.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/m3ap/M3AP-PDU-Descriptions.asn 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.3 Elementary Procedure Definitions -- --- $Id: M3AP-PDU-Descriptions.asn 42290 2012-04-27 11:08:37Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/m3ap/Makefile.am wireshark-1.10.6/asn1/m3ap/Makefile.am --- wireshark-1.10.5/asn1/m3ap/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/m3ap/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/m3ap/Makefile.common wireshark-1.10.6/asn1/m3ap/Makefile.common --- wireshark-1.10.5/asn1/m3ap/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/m3ap/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/m3ap/Makefile.in wireshark-1.10.6/asn1/m3ap/Makefile.in --- wireshark-1.10.5/asn1/m3ap/Makefile.in 2013-12-19 19:13:39.000000000 +0000 +++ wireshark-1.10.6/asn1/m3ap/Makefile.in 2014-03-07 18:07:29.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/m3ap/Makefile.nmake wireshark-1.10.6/asn1/m3ap/Makefile.nmake --- wireshark-1.10.5/asn1/m3ap/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/m3ap/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/m3ap/packet-m3ap-template.c wireshark-1.10.6/asn1/m3ap/packet-m3ap-template.c --- wireshark-1.10.5/asn1/m3ap/packet-m3ap-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/m3ap/packet-m3ap-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-m3ap.c * Routines for M3 Application Protocol packet dissection * - * $Id: packet-m3ap-template.c 48609 2013-03-28 07:34:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/Makefile.am wireshark-1.10.6/asn1/Makefile.am --- wireshark-1.10.5/asn1/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Wireshark # -# $Id: Makefile.am 47994 2013-03-02 00:35:57Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/asn1/Makefile.in wireshark-1.10.6/asn1/Makefile.in --- wireshark-1.10.5/asn1/Makefile.in 2013-12-19 19:13:36.000000000 +0000 +++ wireshark-1.10.6/asn1/Makefile.in 2014-03-07 18:07:26.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for Wireshark # -# $Id: Makefile.am 47994 2013-03-02 00:35:57Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -385,7 +385,7 @@ # Automake file for Wireshark # -# $Id: Custom.make 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/asn1/Makefile.inc wireshark-1.10.6/asn1/Makefile.inc --- wireshark-1.10.5/asn1/Makefile.inc 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/Makefile.inc 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/Makefile.inc.nmake wireshark-1.10.6/asn1/Makefile.inc.nmake --- wireshark-1.10.5/asn1/Makefile.inc.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/Makefile.inc.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ # To be included into the asn1 Makefiles for Windows builds # -# $Id: Makefile.inc.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/Makefile.nmake wireshark-1.10.6/asn1/Makefile.nmake --- wireshark-1.10.5/asn1/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake ## (See 'Logic' below for additional details) # -# $Id: Makefile.nmake 47707 2013-02-17 18:32:35Z etxrab $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/Makefile.preinc wireshark-1.10.6/asn1/Makefile.preinc --- wireshark-1.10.5/asn1/Makefile.preinc 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/Makefile.preinc 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/Makefile.preinc.nmake wireshark-1.10.6/asn1/Makefile.preinc.nmake --- wireshark-1.10.5/asn1/Makefile.preinc.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/Makefile.preinc.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ # To be included into the asn1 Makefiles for Windows builds # -# $Id: Makefile.preinc.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/mms/Makefile.am wireshark-1.10.6/asn1/mms/Makefile.am --- wireshark-1.10.5/asn1/mms/Makefile.am 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/mms/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/mms/Makefile.common wireshark-1.10.6/asn1/mms/Makefile.common --- wireshark-1.10.5/asn1/mms/Makefile.common 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/mms/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/mms/Makefile.in wireshark-1.10.6/asn1/mms/Makefile.in --- wireshark-1.10.5/asn1/mms/Makefile.in 2013-12-19 19:13:39.000000000 +0000 +++ wireshark-1.10.6/asn1/mms/Makefile.in 2014-03-07 18:07:29.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/mms/Makefile.nmake wireshark-1.10.6/asn1/mms/Makefile.nmake --- wireshark-1.10.5/asn1/mms/Makefile.nmake 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/mms/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/mms/mms.cnf wireshark-1.10.6/asn1/mms/mms.cnf --- wireshark-1.10.5/asn1/mms/mms.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/mms/mms.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # mms.cnf # mms conformation file -# $Id: mms.cnf 46748 2012-12-26 05:57:06Z guy $ +# $Id$ #.MODULE_IMPORT ISO-8650-ACSE-1 acse diff -Nru wireshark-1.10.5/asn1/mms/packet-mms-template.c wireshark-1.10.6/asn1/mms/packet-mms-template.c --- wireshark-1.10.5/asn1/mms/packet-mms-template.c 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/mms/packet-mms-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * * Ronnie Sahlberg 2005 * - * $Id: packet-mms-template.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/mms/packet-mms-template.h wireshark-1.10.6/asn1/mms/packet-mms-template.h --- wireshark-1.10.5/asn1/mms/packet-mms-template.h 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/mms/packet-mms-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for MMS packet dissection * Ronnie Sahlberg 2005 * - * $Id: packet-mms-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/mpeg-audio/Makefile.am wireshark-1.10.6/asn1/mpeg-audio/Makefile.am --- wireshark-1.10.5/asn1/mpeg-audio/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/mpeg-audio/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/mpeg-audio/Makefile.common wireshark-1.10.6/asn1/mpeg-audio/Makefile.common --- wireshark-1.10.5/asn1/mpeg-audio/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/mpeg-audio/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/mpeg-audio/Makefile.in wireshark-1.10.6/asn1/mpeg-audio/Makefile.in --- wireshark-1.10.5/asn1/mpeg-audio/Makefile.in 2013-12-19 19:13:39.000000000 +0000 +++ wireshark-1.10.6/asn1/mpeg-audio/Makefile.in 2014-03-07 18:07:29.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/mpeg-audio/Makefile.nmake wireshark-1.10.6/asn1/mpeg-audio/Makefile.nmake --- wireshark-1.10.5/asn1/mpeg-audio/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/mpeg-audio/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/mpeg-audio/mpeg-audio.cnf wireshark-1.10.6/asn1/mpeg-audio/mpeg-audio.cnf --- wireshark-1.10.5/asn1/mpeg-audio/mpeg-audio.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/mpeg-audio/mpeg-audio.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # mpeg-audio.cnf # mpeg-audio conformation file # -# $Id: mpeg-audio.cnf 21114 2007-03-22 11:43:07Z sahlberg $ +# $Id$ #.TYPE_ATTR ID3v1/tag TYPE=FT_STRING diff -Nru wireshark-1.10.5/asn1/mpeg-audio/packet-mpeg-audio-template.c wireshark-1.10.6/asn1/mpeg-audio/packet-mpeg-audio-template.c --- wireshark-1.10.5/asn1/mpeg-audio/packet-mpeg-audio-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/mpeg-audio/packet-mpeg-audio-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Written by Shaun Jackman . * Copyright 2007 Shaun Jackman * - * $Id: packet-mpeg-audio-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/mpeg-pes/Makefile.am wireshark-1.10.6/asn1/mpeg-pes/Makefile.am --- wireshark-1.10.5/asn1/mpeg-pes/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/mpeg-pes/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/mpeg-pes/Makefile.common wireshark-1.10.6/asn1/mpeg-pes/Makefile.common --- wireshark-1.10.5/asn1/mpeg-pes/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/mpeg-pes/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/mpeg-pes/Makefile.in wireshark-1.10.6/asn1/mpeg-pes/Makefile.in --- wireshark-1.10.5/asn1/mpeg-pes/Makefile.in 2013-12-19 19:13:39.000000000 +0000 +++ wireshark-1.10.6/asn1/mpeg-pes/Makefile.in 2014-03-07 18:07:29.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/mpeg-pes/Makefile.nmake wireshark-1.10.6/asn1/mpeg-pes/Makefile.nmake --- wireshark-1.10.5/asn1/mpeg-pes/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/mpeg-pes/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/mpeg-pes/mpeg-pes.cnf wireshark-1.10.6/asn1/mpeg-pes/mpeg-pes.cnf --- wireshark-1.10.5/asn1/mpeg-pes/mpeg-pes.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/mpeg-pes/mpeg-pes.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # mpeg-pes.cnf # mpeg-pes conformation file # -# $Id: mpeg-pes.cnf 23113 2007-10-09 17:58:29Z jmayer $ +# $Id$ #.TYPE_ATTR PES/stream TYPE=FT_UINT8 DISPLAY=BASE_HEX diff -Nru wireshark-1.10.5/asn1/mpeg-pes/packet-mpeg-pes-template.c wireshark-1.10.6/asn1/mpeg-pes/packet-mpeg-pes-template.c --- wireshark-1.10.5/asn1/mpeg-pes/packet-mpeg-pes-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/mpeg-pes/packet-mpeg-pes-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Written by Shaun Jackman . * Copyright 2007 Shaun Jackman * - * $Id: packet-mpeg-pes-template.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/nbap/Makefile.am wireshark-1.10.6/asn1/nbap/Makefile.am --- wireshark-1.10.5/asn1/nbap/Makefile.am 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/nbap/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/nbap/Makefile.common wireshark-1.10.6/asn1/nbap/Makefile.common --- wireshark-1.10.5/asn1/nbap/Makefile.common 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/nbap/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43749 2012-07-16 13:11:20Z etxrab $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/nbap/Makefile.in wireshark-1.10.6/asn1/nbap/Makefile.in --- wireshark-1.10.5/asn1/nbap/Makefile.in 2013-12-19 19:13:39.000000000 +0000 +++ wireshark-1.10.6/asn1/nbap/Makefile.in 2014-03-07 18:07:29.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43749 2012-07-16 13:11:20Z etxrab $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/nbap/Makefile.nmake wireshark-1.10.6/asn1/nbap/Makefile.nmake --- wireshark-1.10.5/asn1/nbap/Makefile.nmake 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/nbap/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/nbap/nbap.cnf wireshark-1.10.6/asn1/nbap/nbap.cnf --- wireshark-1.10.5/asn1/nbap/nbap.cnf 2013-10-29 18:55:35.000000000 +0000 +++ wireshark-1.10.6/asn1/nbap/nbap.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ # Copyright 2005 - 2012 Anders Broman # Modified 2012 by Jacob Nordgren and # Rishie Sharma -# $Id: nbap.cnf 52957 2013-10-29 18:46:43Z gerald $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/nbap/NBAP-CommonDataTypes.asn wireshark-1.10.6/asn1/nbap/NBAP-CommonDataTypes.asn --- wireshark-1.10.5/asn1/nbap/NBAP-CommonDataTypes.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/nbap/NBAP-CommonDataTypes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ -- Taken from 3GPP TS 25.433 V9.4.0 (2010-09) -- http://www.3gpp.org/ftp/Specs/archive/25_series/25.433/ --- $Id: NBAP-CommonDataTypes.asn 34908 2010-11-16 17:31:29Z etxrab $ +-- $Id$ -- 9.3.5 Common Definitions diff -Nru wireshark-1.10.5/asn1/nbap/NBAP-Constants.asn wireshark-1.10.6/asn1/nbap/NBAP-Constants.asn --- wireshark-1.10.5/asn1/nbap/NBAP-Constants.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/nbap/NBAP-Constants.asn 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ --- -- 9.3.6 Constant Definitions -- --- $Id: NBAP-Constants.asn 34908 2010-11-16 17:31:29Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/nbap/NBAP-Containers.asn wireshark-1.10.6/asn1/nbap/NBAP-Containers.asn --- wireshark-1.10.5/asn1/nbap/NBAP-Containers.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/nbap/NBAP-Containers.asn 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.7 Container Definitions -- --- $Id: NBAP-Containers.asn 34908 2010-11-16 17:31:29Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/nbap/NBAP-IEs.asn wireshark-1.10.6/asn1/nbap/NBAP-IEs.asn --- wireshark-1.10.5/asn1/nbap/NBAP-IEs.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/nbap/NBAP-IEs.asn 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.4 Information Elements Definitions -- --- $Id: NBAP-IEs.asn 32819 2010-05-15 10:27:45Z etxrab $ +-- $Id$ -- --****************************************************************************** diff -Nru wireshark-1.10.5/asn1/nbap/NBAP-PDU-Contents.asn wireshark-1.10.6/asn1/nbap/NBAP-PDU-Contents.asn --- wireshark-1.10.5/asn1/nbap/NBAP-PDU-Contents.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/nbap/NBAP-PDU-Contents.asn 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.3 PDU Definitions -- --- $Id: NBAP-PDU-Contents.asn 32819 2010-05-15 10:27:45Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/nbap/NBAP-PDU-Descriptions.asn wireshark-1.10.6/asn1/nbap/NBAP-PDU-Descriptions.asn --- wireshark-1.10.5/asn1/nbap/NBAP-PDU-Descriptions.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/nbap/NBAP-PDU-Descriptions.asn 2014-03-07 18:07:11.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.2 Elementary Procedure Definitions -- --- $Id: NBAP-PDU-Descriptions.asn 32819 2010-05-15 10:27:45Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/nbap/packet-nbap-template.c wireshark-1.10.6/asn1/nbap/packet-nbap-template.c --- wireshark-1.10.5/asn1/nbap/packet-nbap-template.c 2013-10-29 18:55:35.000000000 +0000 +++ wireshark-1.10.6/asn1/nbap/packet-nbap-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for UMTS Node B Application Part(NBAP) packet dissection * Copyright 2005, 2009 Anders Broman * - * $Id: packet-nbap-template.c 52957 2013-10-29 18:46:43Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/nbap/packet-nbap-template.h wireshark-1.10.6/asn1/nbap/packet-nbap-template.h --- wireshark-1.10.5/asn1/nbap/packet-nbap-template.h 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/nbap/packet-nbap-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-nbap-template.h * - * $Id: packet-nbap-template.h 44154 2012-07-31 08:40:22Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/ns_cert_exts/Makefile.am wireshark-1.10.6/asn1/ns_cert_exts/Makefile.am --- wireshark-1.10.5/asn1/ns_cert_exts/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/ns_cert_exts/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ns_cert_exts/Makefile.common wireshark-1.10.6/asn1/ns_cert_exts/Makefile.common --- wireshark-1.10.5/asn1/ns_cert_exts/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/ns_cert_exts/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ns_cert_exts/Makefile.in wireshark-1.10.6/asn1/ns_cert_exts/Makefile.in --- wireshark-1.10.5/asn1/ns_cert_exts/Makefile.in 2013-12-19 19:13:39.000000000 +0000 +++ wireshark-1.10.6/asn1/ns_cert_exts/Makefile.in 2014-03-07 18:07:29.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ns_cert_exts/Makefile.nmake wireshark-1.10.6/asn1/ns_cert_exts/Makefile.nmake --- wireshark-1.10.5/asn1/ns_cert_exts/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/ns_cert_exts/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ns_cert_exts/NETSCAPE-CERT-EXTS.asn wireshark-1.10.6/asn1/ns_cert_exts/NETSCAPE-CERT-EXTS.asn --- wireshark-1.10.5/asn1/ns_cert_exts/NETSCAPE-CERT-EXTS.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/ns_cert_exts/NETSCAPE-CERT-EXTS.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ -- NetScape Certificate Extensions -- based on information from http://wp.netscape.com/eng/security/cert-exts.html --- $Id: NETSCAPE-CERT-EXTS.asn 33084 2010-06-04 15:07:17Z gal $ +-- $Id$ NS-CERT-EXTS { 2 16 840 1 113730 1 } DEFINITIONS EXPLICIT TAGS ::= BEGIN diff -Nru wireshark-1.10.5/asn1/ns_cert_exts/ns_cert_exts.cnf wireshark-1.10.6/asn1/ns_cert_exts/ns_cert_exts.cnf --- wireshark-1.10.5/asn1/ns_cert_exts/ns_cert_exts.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/ns_cert_exts/ns_cert_exts.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # NS-CERT-EXT.cnf # NetScape Certificate Extensions conformation file -# $Id: ns_cert_exts.cnf 30478 2009-10-10 14:20:33Z krj $ +# $Id$ #.MODULE_IMPORT diff -Nru wireshark-1.10.5/asn1/ns_cert_exts/packet-ns_cert_exts-template.c wireshark-1.10.6/asn1/ns_cert_exts/packet-ns_cert_exts-template.c --- wireshark-1.10.5/asn1/ns_cert_exts/packet-ns_cert_exts-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/ns_cert_exts/packet-ns_cert_exts-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for NetScape Certificate Extensions packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-ns_cert_exts-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/ocsp/Makefile.am wireshark-1.10.6/asn1/ocsp/Makefile.am --- wireshark-1.10.5/asn1/ocsp/Makefile.am 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ocsp/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ocsp/Makefile.common wireshark-1.10.6/asn1/ocsp/Makefile.common --- wireshark-1.10.5/asn1/ocsp/Makefile.common 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ocsp/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ocsp/Makefile.in wireshark-1.10.6/asn1/ocsp/Makefile.in --- wireshark-1.10.5/asn1/ocsp/Makefile.in 2013-12-19 19:13:40.000000000 +0000 +++ wireshark-1.10.6/asn1/ocsp/Makefile.in 2014-03-07 18:07:29.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ocsp/Makefile.nmake wireshark-1.10.6/asn1/ocsp/Makefile.nmake --- wireshark-1.10.5/asn1/ocsp/Makefile.nmake 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ocsp/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ocsp/ocsp.cnf wireshark-1.10.6/asn1/ocsp/ocsp.cnf --- wireshark-1.10.5/asn1/ocsp/ocsp.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ocsp/ocsp.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # ocsp.cnf # OCSP conformation file -# $Id: ocsp.cnf 48429 2013-03-19 21:22:31Z etxrab $ +# $Id$ #.MODULE_IMPORT PKIX1Implicit88 pkix1implicit diff -Nru wireshark-1.10.5/asn1/ocsp/packet-ocsp-template.c wireshark-1.10.6/asn1/ocsp/packet-ocsp-template.c --- wireshark-1.10.5/asn1/ocsp/packet-ocsp-template.c 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ocsp/packet-ocsp-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Online Certificate Status Protocol (RFC2560) packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-ocsp-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/ocsp/packet-ocsp-template.h wireshark-1.10.6/asn1/ocsp/packet-ocsp-template.h --- wireshark-1.10.5/asn1/ocsp/packet-ocsp-template.h 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ocsp/packet-ocsp-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Online Certificate Status Protocol (RFC2560) packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-ocsp-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/p1/Makefile.am wireshark-1.10.6/asn1/p1/Makefile.am --- wireshark-1.10.5/asn1/p1/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p1/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/p1/Makefile.common wireshark-1.10.6/asn1/p1/Makefile.common --- wireshark-1.10.5/asn1/p1/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p1/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/p1/Makefile.in wireshark-1.10.6/asn1/p1/Makefile.in --- wireshark-1.10.5/asn1/p1/Makefile.in 2013-12-19 19:13:40.000000000 +0000 +++ wireshark-1.10.6/asn1/p1/Makefile.in 2014-03-07 18:07:29.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/p1/Makefile.nmake wireshark-1.10.6/asn1/p1/Makefile.nmake --- wireshark-1.10.5/asn1/p1/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p1/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/p1/MHSProtocolObjectIdentifiers.asn wireshark-1.10.6/asn1/p1/MHSProtocolObjectIdentifiers.asn --- wireshark-1.10.5/asn1/p1/MHSProtocolObjectIdentifiers.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p1/MHSProtocolObjectIdentifiers.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MHSProtocolObjectIdentifiers.asn 31324 2009-12-19 15:39:16Z stig $ +-- $Id$ -- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x419/1999/index.html -- Module MHSProtocolObjectIdentifiers (X.419:06/1999) MHSProtocolObjectIdentifiers {joint-iso-itu-t mhs(6) protocols(0) modules(0) diff -Nru wireshark-1.10.5/asn1/p1/MTAAbstractService.asn wireshark-1.10.6/asn1/p1/MTAAbstractService.asn --- wireshark-1.10.5/asn1/p1/MTAAbstractService.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p1/MTAAbstractService.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MTAAbstractService.asn 32028 2010-02-27 11:39:18Z stig $ +-- $Id$ -- Module MTAAbstractService (X.411:06/1999) MTAAbstractService {joint-iso-itu-t mhs(6) mts(3) modules(0) mta-abstract-service(2) version-1999(1)} DEFINITIONS IMPLICIT TAGS ::= diff -Nru wireshark-1.10.5/asn1/p1/MTSAbstractService.asn wireshark-1.10.6/asn1/p1/MTSAbstractService.asn --- wireshark-1.10.5/asn1/p1/MTSAbstractService.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p1/MTSAbstractService.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MTSAbstractService.asn 30409 2009-10-08 17:26:57Z krj $ +-- $Id$ -- Module MTSAbstractService (X.411:06/1999) MTSAbstractService {joint-iso-itu-t mhs(6) mts(3) modules(0) mts-abstract-service(1) version-1999(1)} DEFINITIONS IMPLICIT TAGS ::= diff -Nru wireshark-1.10.5/asn1/p1/MTSAccessProtocol.asn wireshark-1.10.6/asn1/p1/MTSAccessProtocol.asn --- wireshark-1.10.5/asn1/p1/MTSAccessProtocol.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p1/MTSAccessProtocol.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MTSAccessProtocol.asn 30409 2009-10-08 17:26:57Z krj $ +-- $Id$ -- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x411/1999/index.html -- Module MTSAccessProtocol (X.419:06/1999) MTSAccessProtocol {joint-iso-itu-t mhs(6) protocols(0) modules(0) diff -Nru wireshark-1.10.5/asn1/p1/MTSUpperBounds.asn wireshark-1.10.6/asn1/p1/MTSUpperBounds.asn --- wireshark-1.10.5/asn1/p1/MTSUpperBounds.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p1/MTSUpperBounds.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MTSUpperBounds.asn 31310 2009-12-18 15:21:08Z stig $ +-- $Id$ -- Module MTSUpperBounds (X.411:06/1999) -- See also ITU-T X.411 (06/1999) -- See also the index of all ASN.1 assignments needed in this document diff -Nru wireshark-1.10.5/asn1/p1/p1.cnf wireshark-1.10.6/asn1/p1/p1.cnf --- wireshark-1.10.5/asn1/p1/p1.cnf 2013-06-30 13:52:24.000000000 +0000 +++ wireshark-1.10.6/asn1/p1/p1.cnf 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ # p1.cnf # X.411 (MTA Access and Transfer) conformance file -# $Id: p1.cnf 50253 2013-06-30 13:46:31Z morriss $ +# $Id$ #.TYPE_ATTR CountryName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(p1_CountryName_U_vals) BITMASK = 0 diff -Nru wireshark-1.10.5/asn1/p1/packet-p1-template.c wireshark-1.10.6/asn1/p1/packet-p1-template.c --- wireshark-1.10.5/asn1/p1/packet-p1-template.c 2013-06-30 13:52:24.000000000 +0000 +++ wireshark-1.10.6/asn1/p1/packet-p1-template.c 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.411 (X.400 Message Transfer) packet dissection * Graeme Lunt 2005 * - * $Id: packet-p1-template.c 50253 2013-06-30 13:46:31Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/p1/packet-p1-template.h wireshark-1.10.6/asn1/p1/packet-p1-template.h --- wireshark-1.10.5/asn1/p1/packet-p1-template.h 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p1/packet-p1-template.h 2014-03-07 18:07:11.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.411 (X.400 Message Transfer) packet dissection * Graeme Lunt 2005 * - * $Id: packet-p1-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/p22/IPMSExtendedBodyPartTypes2.asn wireshark-1.10.6/asn1/p22/IPMSExtendedBodyPartTypes2.asn --- wireshark-1.10.5/asn1/p22/IPMSExtendedBodyPartTypes2.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/p22/IPMSExtendedBodyPartTypes2.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IPMSExtendedBodyPartTypes2.asn 23981 2008-01-02 09:34:34Z gal $ +-- $Id$ -- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x420/1999/index.html -- Module IPMSExtendedBodyPartTypes2 (X.420:06/1999) IPMSExtendedBodyPartTypes2 {iso standard mhs(10021) ipms(7) modules(0) diff -Nru wireshark-1.10.5/asn1/p22/IPMSExtendedVoiceBodyPartType.asn wireshark-1.10.6/asn1/p22/IPMSExtendedVoiceBodyPartType.asn --- wireshark-1.10.5/asn1/p22/IPMSExtendedVoiceBodyPartType.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/p22/IPMSExtendedVoiceBodyPartType.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IPMSExtendedVoiceBodyPartType.asn 23981 2008-01-02 09:34:34Z gal $ +-- $Id$ -- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x420/1999/index.html -- Module IPMSExtendedVoiceBodyPartType (X.420:06/1999) IPMSExtendedVoiceBodyPartType {joint-iso-itu-t mhs(6) ipms(1) modules(0) diff -Nru wireshark-1.10.5/asn1/p22/IPMSFileTransferBodyPartType.asn wireshark-1.10.6/asn1/p22/IPMSFileTransferBodyPartType.asn --- wireshark-1.10.5/asn1/p22/IPMSFileTransferBodyPartType.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/p22/IPMSFileTransferBodyPartType.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IPMSFileTransferBodyPartType.asn 35965 2011-02-16 11:04:28Z stig $ +-- $Id$ -- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x420/1999/index.html -- Module IPMSFileTransferBodyPartType (X.420:06/1999) IPMSFileTransferBodyPartType {joint-iso-itu-t mhs(6) ipms(1) modules(0) diff -Nru wireshark-1.10.5/asn1/p22/IPMSForwardedContentBodyPartType.asn wireshark-1.10.6/asn1/p22/IPMSForwardedContentBodyPartType.asn --- wireshark-1.10.5/asn1/p22/IPMSForwardedContentBodyPartType.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/p22/IPMSForwardedContentBodyPartType.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IPMSForwardedContentBodyPartType.asn 23981 2008-01-02 09:34:34Z gal $ +-- $Id$ -- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x420/1999/index.html -- Module IPMSForwardedContentBodyPartType (X.420:06/1999) IPMSForwardedContentBodyPartType {joint-iso-itu-t mhs(6) ipms(1) modules(0) diff -Nru wireshark-1.10.5/asn1/p22/IPMSHeadingExtensions.asn wireshark-1.10.6/asn1/p22/IPMSHeadingExtensions.asn --- wireshark-1.10.5/asn1/p22/IPMSHeadingExtensions.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/p22/IPMSHeadingExtensions.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IPMSHeadingExtensions.asn 23981 2008-01-02 09:34:34Z gal $ +-- $Id$ -- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x420/1999/index.html -- Module IPMSHeadingExtensions (X.420:06/1999) IPMSHeadingExtensions {joint-iso-itu-t mhs(6) ipms(1) modules(0) diff -Nru wireshark-1.10.5/asn1/p22/IPMSInformationObjects.asn wireshark-1.10.6/asn1/p22/IPMSInformationObjects.asn --- wireshark-1.10.5/asn1/p22/IPMSInformationObjects.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/p22/IPMSInformationObjects.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IPMSInformationObjects.asn 23981 2008-01-02 09:34:34Z gal $ +-- $Id$ -- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x420/1999/index.html -- Module IPMSInformationObjects (X.420:06/1999) IPMSInformationObjects {joint-iso-itu-t mhs(6) ipms(1) modules(0) diff -Nru wireshark-1.10.5/asn1/p22/IPMSMessageStoreAttributes.asn wireshark-1.10.6/asn1/p22/IPMSMessageStoreAttributes.asn --- wireshark-1.10.5/asn1/p22/IPMSMessageStoreAttributes.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/p22/IPMSMessageStoreAttributes.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IPMSMessageStoreAttributes.asn 23981 2008-01-02 09:34:34Z gal $ +-- $Id$ -- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x420/1999/index.html -- Module IPMSMessageStoreAttributes (X.420:06/1999) IPMSMessageStoreAttributes {joint-iso-itu-t mhs(6) ipms(1) modules(0) diff -Nru wireshark-1.10.5/asn1/p22/IPMSObjectIdentifiers.asn wireshark-1.10.6/asn1/p22/IPMSObjectIdentifiers.asn --- wireshark-1.10.5/asn1/p22/IPMSObjectIdentifiers.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/p22/IPMSObjectIdentifiers.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IPMSObjectIdentifiers.asn 23981 2008-01-02 09:34:34Z gal $ +-- $Id$ -- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x420/1999/index.html -- Module IPMSObjectIdentifiers (X.420:06/1999) IPMSObjectIdentifiers {joint-iso-itu-t mhs(6) ipms(1) modules(0) diff -Nru wireshark-1.10.5/asn1/p22/IPMSSecurityExtensions.asn wireshark-1.10.6/asn1/p22/IPMSSecurityExtensions.asn --- wireshark-1.10.5/asn1/p22/IPMSSecurityExtensions.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/p22/IPMSSecurityExtensions.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IPMSSecurityExtensions.asn 23981 2008-01-02 09:34:34Z gal $ +-- $Id$ -- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x420/1999/index.html -- Module IPMSSecurityExtensions (X.420:06/1999) IPMSSecurityExtensions {joint-iso-itu-t mhs(6) ipms(1) modules(0) diff -Nru wireshark-1.10.5/asn1/p22/IPMSUpperBounds.asn wireshark-1.10.6/asn1/p22/IPMSUpperBounds.asn --- wireshark-1.10.5/asn1/p22/IPMSUpperBounds.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/p22/IPMSUpperBounds.asn 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IPMSUpperBounds.asn 31311 2009-12-18 15:22:45Z stig $ +-- $Id$ -- Module IPMSUpperBounds (X.420:06/1999) -- See also ITU-T X.420 (06/1999) -- See also the index of all ASN.1 assignments needed in this document diff -Nru wireshark-1.10.5/asn1/p22/Makefile.am wireshark-1.10.6/asn1/p22/Makefile.am --- wireshark-1.10.5/asn1/p22/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/p22/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/p22/Makefile.common wireshark-1.10.6/asn1/p22/Makefile.common --- wireshark-1.10.5/asn1/p22/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/p22/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/p22/Makefile.in wireshark-1.10.6/asn1/p22/Makefile.in --- wireshark-1.10.5/asn1/p22/Makefile.in 2013-12-19 19:13:40.000000000 +0000 +++ wireshark-1.10.6/asn1/p22/Makefile.in 2014-03-07 18:07:29.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/p22/Makefile.nmake wireshark-1.10.6/asn1/p22/Makefile.nmake --- wireshark-1.10.5/asn1/p22/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/p22/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/p22/p22.cnf wireshark-1.10.6/asn1/p22/p22.cnf --- wireshark-1.10.5/asn1/p22/p22.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/p22/p22.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ # p22.cnf # X.420 (InterPersonal Messaging) conformance file -# $Id: p22.cnf 36013 2011-02-20 17:03:29Z stig $ +# $Id$ #.TYPE_ATTR Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0 diff -Nru wireshark-1.10.5/asn1/p22/packet-p22-template.c wireshark-1.10.6/asn1/p22/packet-p22-template.c --- wireshark-1.10.5/asn1/p22/packet-p22-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/p22/packet-p22-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.420 (X.400 Message Transfer) packet dissection * Graeme Lunt 2005 * - * $Id: packet-p22-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/p22/packet-p22-template.h wireshark-1.10.6/asn1/p22/packet-p22-template.h --- wireshark-1.10.5/asn1/p22/packet-p22-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/p22/packet-p22-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.420 (X.400 Message Transfer) packet dissection * Graeme Lunt 2005 * - * $Id: packet-p22-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/p7/Makefile.am wireshark-1.10.6/asn1/p7/Makefile.am --- wireshark-1.10.5/asn1/p7/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p7/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/p7/Makefile.common wireshark-1.10.6/asn1/p7/Makefile.common --- wireshark-1.10.5/asn1/p7/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p7/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/p7/Makefile.in wireshark-1.10.6/asn1/p7/Makefile.in --- wireshark-1.10.5/asn1/p7/Makefile.in 2013-12-19 19:13:40.000000000 +0000 +++ wireshark-1.10.6/asn1/p7/Makefile.in 2014-03-07 18:07:29.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/p7/Makefile.nmake wireshark-1.10.6/asn1/p7/Makefile.nmake --- wireshark-1.10.5/asn1/p7/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p7/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/p7/MSAbstractService.asn wireshark-1.10.6/asn1/p7/MSAbstractService.asn --- wireshark-1.10.5/asn1/p7/MSAbstractService.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p7/MSAbstractService.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MSAbstractService.asn 31321 2009-12-19 14:26:26Z stig $ +-- $Id$ -- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x413/1999/index.html -- Module MSAbstractService (X.413:06/1999) MSAbstractService {joint-iso-itu-t mhs(6) ms(4) modules(0) abstract-service(1) diff -Nru wireshark-1.10.5/asn1/p7/MSAccessProtocol.asn wireshark-1.10.6/asn1/p7/MSAccessProtocol.asn --- wireshark-1.10.5/asn1/p7/MSAccessProtocol.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p7/MSAccessProtocol.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MSAccessProtocol.asn 31321 2009-12-19 14:26:26Z stig $ +-- $Id$ -- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x419/1999/index.html -- Module MSAccessProtocol (X.419:06/1999) MSAccessProtocol {joint-iso-itu-t mhs(6) protocols(0) modules(0) diff -Nru wireshark-1.10.5/asn1/p7/MSGeneralAttributeTypes.asn wireshark-1.10.6/asn1/p7/MSGeneralAttributeTypes.asn --- wireshark-1.10.5/asn1/p7/MSGeneralAttributeTypes.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p7/MSGeneralAttributeTypes.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ -- --- $Id: MSGeneralAttributeTypes.asn 23586 2007-11-25 17:46:42Z gal $ +-- $Id$ -- -- Module MSGeneralAttributeTypes (X.413:06/1999) diff -Nru wireshark-1.10.5/asn1/p7/MSUpperBounds.asn wireshark-1.10.6/asn1/p7/MSUpperBounds.asn --- wireshark-1.10.5/asn1/p7/MSUpperBounds.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p7/MSUpperBounds.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MSUpperBounds.asn 31321 2009-12-19 14:26:26Z stig $ +-- $Id$ -- Module MSUpperBounds (X.413:06/1999) -- See also ITU-T X.413 (06/1999) -- See also the index of all ASN.1 assignments needed in this document diff -Nru wireshark-1.10.5/asn1/p7/p7.cnf wireshark-1.10.6/asn1/p7/p7.cnf --- wireshark-1.10.5/asn1/p7/p7.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p7/p7.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: p7.cnf 36025 2011-02-22 10:23:44Z stig $ +# $Id$ # #.IMPORT ../p1/p1-exp.cnf diff -Nru wireshark-1.10.5/asn1/p7/packet-p7-template.c wireshark-1.10.6/asn1/p7/packet-p7-template.c --- wireshark-1.10.5/asn1/p7/packet-p7-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p7/packet-p7-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.413 (P7) packet dissection * Graeme Lunt 2007 * - * $Id: packet-p7-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/p7/packet-p7-template.h wireshark-1.10.6/asn1/p7/packet-p7-template.h --- wireshark-1.10.5/asn1/p7/packet-p7-template.h 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p7/packet-p7-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.413 (P7) packet dissection * Graeme Lunt 2007 * - * $Id: packet-p7-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/p772/Makefile.am wireshark-1.10.6/asn1/p772/Makefile.am --- wireshark-1.10.5/asn1/p772/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p772/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/p772/Makefile.common wireshark-1.10.6/asn1/p772/Makefile.common --- wireshark-1.10.5/asn1/p772/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p772/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/p772/Makefile.in wireshark-1.10.6/asn1/p772/Makefile.in --- wireshark-1.10.5/asn1/p772/Makefile.in 2013-12-19 19:13:40.000000000 +0000 +++ wireshark-1.10.6/asn1/p772/Makefile.in 2014-03-07 18:07:29.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/p772/Makefile.nmake wireshark-1.10.6/asn1/p772/Makefile.nmake --- wireshark-1.10.5/asn1/p772/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p772/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/p772/MMSAbstractService.asn wireshark-1.10.6/asn1/p772/MMSAbstractService.asn --- wireshark-1.10.5/asn1/p772/MMSAbstractService.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p772/MMSAbstractService.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MMSAbstractService.asn 31474 2010-01-09 20:52:47Z stig $ +-- $Id$ MMSAbstractService {iso(1) identified-organization(3) nato(26) stanags(0) mmhs(4406) object-identifiers(0) module(0) abstract-service(3)} DEFINITIONS IMPLICIT TAGS ::= diff -Nru wireshark-1.10.5/asn1/p772/MMSExtendedBodyPartTypes.asn wireshark-1.10.6/asn1/p772/MMSExtendedBodyPartTypes.asn --- wireshark-1.10.5/asn1/p772/MMSExtendedBodyPartTypes.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p772/MMSExtendedBodyPartTypes.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MMSExtendedBodyPartTypes.asn 31474 2010-01-09 20:52:47Z stig $ +-- $Id$ MMSExtendedBodyPartTypes {iso(1) identified-organization(3) nato(26) stanags(0) mmhs(4406) object-identifiers(0) module(0) extended-body-part-types(7)} DEFINITIONS IMPLICIT TAGS ::= diff -Nru wireshark-1.10.5/asn1/p772/MMSHeadingExtensions.asn wireshark-1.10.6/asn1/p772/MMSHeadingExtensions.asn --- wireshark-1.10.5/asn1/p772/MMSHeadingExtensions.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p772/MMSHeadingExtensions.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MMSHeadingExtensions.asn 31963 2010-02-23 08:04:48Z stig $ +-- $Id$ MMSHeadingExtensions {iso(1) identified-organization(3) nato(26) stanags(0) mmhs(4406) object-identifiers(0) module(0) heading-extensions(6)} DEFINITIONS IMPLICIT TAGS ::= diff -Nru wireshark-1.10.5/asn1/p772/MMSInformationObjects.asn wireshark-1.10.6/asn1/p772/MMSInformationObjects.asn --- wireshark-1.10.5/asn1/p772/MMSInformationObjects.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p772/MMSInformationObjects.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MMSInformationObjects.asn 31474 2010-01-09 20:52:47Z stig $ +-- $Id$ MMSInformationObjects {iso(1) identified-organization(3) nato(26) stanags(0) mmhs(4406) object-identifiers(0) module(0) mms(1)} DEFINITIONS IMPLICIT TAGS ::= diff -Nru wireshark-1.10.5/asn1/p772/MMSObjectIdentifiers.asn wireshark-1.10.6/asn1/p772/MMSObjectIdentifiers.asn --- wireshark-1.10.5/asn1/p772/MMSObjectIdentifiers.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p772/MMSObjectIdentifiers.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MMSObjectIdentifiers.asn 31474 2010-01-09 20:52:47Z stig $ +-- $Id$ MMSObjectIdentifiers {iso(1) identified-organization(3) nato(26) stanags(0) mmhs(4406) object-identifiers(0)} DEFINITIONS IMPLICIT TAGS ::= BEGIN diff -Nru wireshark-1.10.5/asn1/p772/MMSOtherNotificationTypeExtensions.asn wireshark-1.10.6/asn1/p772/MMSOtherNotificationTypeExtensions.asn --- wireshark-1.10.5/asn1/p772/MMSOtherNotificationTypeExtensions.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p772/MMSOtherNotificationTypeExtensions.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MMSOtherNotificationTypeExtensions.asn 31474 2010-01-09 20:52:47Z stig $ +-- $Id$ MMSOtherNotificationTypeExtensions {iso(1) identified-organization(3) nato(26) stanags(0) mmhs(4406) object-identifiers(0) module(0) other-notification-type-extensions(12)} DEFINITIONS IMPLICIT TAGS ::= diff -Nru wireshark-1.10.5/asn1/p772/MMSPerRecipientSpecifierExtensions.asn wireshark-1.10.6/asn1/p772/MMSPerRecipientSpecifierExtensions.asn --- wireshark-1.10.5/asn1/p772/MMSPerRecipientSpecifierExtensions.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p772/MMSPerRecipientSpecifierExtensions.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MMSPerRecipientSpecifierExtensions.asn 31474 2010-01-09 20:52:47Z stig $ +-- $Id$ MMSPerRecipientSpecifierExtensions {iso(1) identified-organization(3) nato(26) stanags(0) mmhs(4406) object-identifiers(0) module(0) per-recipient-specifier-extensions(11)} DEFINITIONS IMPLICIT TAGS ::= diff -Nru wireshark-1.10.5/asn1/p772/MMSUpperBounds.asn wireshark-1.10.6/asn1/p772/MMSUpperBounds.asn --- wireshark-1.10.5/asn1/p772/MMSUpperBounds.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p772/MMSUpperBounds.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: MMSUpperBounds.asn 31312 2009-12-18 15:24:18Z stig $ +-- $Id$ MMSUpperBounds {iso(1) identified-organization(3) nato(26) stanags(0) mmhs(4406) object-identifiers(0) module(0) upper-bounds(0)} DEFINITIONS IMPLICIT TAGS ::= diff -Nru wireshark-1.10.5/asn1/p772/p772.cnf wireshark-1.10.6/asn1/p772/p772.cnf --- wireshark-1.10.5/asn1/p772/p772.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p772/p772.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # p772.cnf # p772 conformation file -# $Id: p772.cnf 36013 2011-02-20 17:03:29Z stig $ +# $Id$ #.IMPORT ../p1/p1-exp.cnf #.IMPORT ../p22/p22-exp.cnf diff -Nru wireshark-1.10.5/asn1/p772/packet-p772-template.c wireshark-1.10.6/asn1/p772/packet-p772-template.c --- wireshark-1.10.5/asn1/p772/packet-p772-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p772/packet-p772-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for STANAG 4406 (X.400 Military Message Extensions) packet dissection * Graeme Lunt 2005 * - * $Id: packet-p772-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/p772/packet-p772-template.h wireshark-1.10.6/asn1/p772/packet-p772-template.h --- wireshark-1.10.5/asn1/p772/packet-p772-template.h 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/p772/packet-p772-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for STANAG 4406 (X.400 Military Message Extensions) packet dissection * Graeme Lunt 2005 * - * $Id: packet-p772-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pcap/Makefile.am wireshark-1.10.6/asn1/pcap/Makefile.am --- wireshark-1.10.5/asn1/pcap/Makefile.am 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pcap/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pcap/Makefile.common wireshark-1.10.6/asn1/pcap/Makefile.common --- wireshark-1.10.5/asn1/pcap/Makefile.common 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pcap/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pcap/Makefile.in wireshark-1.10.6/asn1/pcap/Makefile.in --- wireshark-1.10.5/asn1/pcap/Makefile.in 2013-12-19 19:13:40.000000000 +0000 +++ wireshark-1.10.6/asn1/pcap/Makefile.in 2014-03-07 18:07:29.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pcap/Makefile.nmake wireshark-1.10.6/asn1/pcap/Makefile.nmake --- wireshark-1.10.5/asn1/pcap/Makefile.nmake 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pcap/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pcap/packet-pcap-template.c wireshark-1.10.6/asn1/pcap/packet-pcap-template.c --- wireshark-1.10.5/asn1/pcap/packet-pcap-template.c 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pcap/packet-pcap-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2008, Anders Broman * - * $Id: packet-pcap-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pcap/pcap.cnf wireshark-1.10.6/asn1/pcap/pcap.cnf --- wireshark-1.10.5/asn1/pcap/pcap.cnf 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pcap/pcap.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # pcap.cnf # pcap conformation file -# $Id: pcap.cnf 44513 2012-08-15 13:42:46Z pascal $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/pcap/PCAP-CommonDataTypes.asn wireshark-1.10.6/asn1/pcap/PCAP-CommonDataTypes.asn --- wireshark-1.10.5/asn1/pcap/PCAP-CommonDataTypes.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pcap/PCAP-CommonDataTypes.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: PCAP-CommonDataTypes.asn 34929 2010-11-17 16:23:10Z etxrab $ +-- $Id$ -- -- 3GPP TS 25.453 V9.2.0 (2010-09) -- diff -Nru wireshark-1.10.5/asn1/pcap/PCAP-Constants.asn wireshark-1.10.6/asn1/pcap/PCAP-Constants.asn --- wireshark-1.10.5/asn1/pcap/PCAP-Constants.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pcap/PCAP-Constants.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: PCAP-Constants.asn 34929 2010-11-17 16:23:10Z etxrab $ +-- $Id$ -- -- 3GPP TS 25.453 V9.1.0 (2010-03) -- diff -Nru wireshark-1.10.5/asn1/pcap/PCAP-Containers.asn wireshark-1.10.6/asn1/pcap/PCAP-Containers.asn --- wireshark-1.10.5/asn1/pcap/PCAP-Containers.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pcap/PCAP-Containers.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: PCAP-Containers.asn 32818 2010-05-15 09:04:28Z etxrab $ +-- $Id$ -- -- 3GPP TS 25.453 V9.1.0 (2010-03) -- diff -Nru wireshark-1.10.5/asn1/pcap/PCAP-IEs.asn wireshark-1.10.6/asn1/pcap/PCAP-IEs.asn --- wireshark-1.10.5/asn1/pcap/PCAP-IEs.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pcap/PCAP-IEs.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: PCAP-IEs.asn 34929 2010-11-17 16:23:10Z etxrab $ +-- $Id$ -- -- 3GPP TS 25.453 V9.2.0 (2010-09) -- diff -Nru wireshark-1.10.5/asn1/pcap/PCAP-PDU-Contents.asn wireshark-1.10.6/asn1/pcap/PCAP-PDU-Contents.asn --- wireshark-1.10.5/asn1/pcap/PCAP-PDU-Contents.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pcap/PCAP-PDU-Contents.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: PCAP-PDU-Contents.asn 34929 2010-11-17 16:23:10Z etxrab $ +-- $Id$ -- -- 3GPP TS 25.453 V9.2.0 (2010-09) -- diff -Nru wireshark-1.10.5/asn1/pcap/PCAP-PDU-Descriptions.asn wireshark-1.10.6/asn1/pcap/PCAP-PDU-Descriptions.asn --- wireshark-1.10.5/asn1/pcap/PCAP-PDU-Descriptions.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pcap/PCAP-PDU-Descriptions.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: PCAP-PDU-Descriptions.asn 34929 2010-11-17 16:23:10Z etxrab $ +-- $Id$ -- -- 3GPP TS 25.453 V9.2.0 (2010-09) -- diff -Nru wireshark-1.10.5/asn1/pkcs1/Makefile.am wireshark-1.10.6/asn1/pkcs1/Makefile.am --- wireshark-1.10.5/asn1/pkcs1/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkcs1/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkcs1/Makefile.common wireshark-1.10.6/asn1/pkcs1/Makefile.common --- wireshark-1.10.5/asn1/pkcs1/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkcs1/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkcs1/Makefile.in wireshark-1.10.6/asn1/pkcs1/Makefile.in --- wireshark-1.10.5/asn1/pkcs1/Makefile.in 2013-12-19 19:13:40.000000000 +0000 +++ wireshark-1.10.6/asn1/pkcs1/Makefile.in 2014-03-07 18:07:30.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkcs1/Makefile.nmake wireshark-1.10.6/asn1/pkcs1/Makefile.nmake --- wireshark-1.10.5/asn1/pkcs1/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkcs1/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkcs1/packet-pkcs1-template.c wireshark-1.10.6/asn1/pkcs1/packet-pkcs1-template.c --- wireshark-1.10.5/asn1/pkcs1/packet-pkcs1-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkcs1/packet-pkcs1-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for PKCS#1/RFC2313 packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkcs1-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pkcs1/packet-pkcs1-template.h wireshark-1.10.6/asn1/pkcs1/packet-pkcs1-template.h --- wireshark-1.10.5/asn1/pkcs1/packet-pkcs1-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkcs1/packet-pkcs1-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for PKCS#1/RFC2313 packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkcs1-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pkcs1/pkcs1.cnf wireshark-1.10.6/asn1/pkcs1/pkcs1.cnf --- wireshark-1.10.5/asn1/pkcs1/pkcs1.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkcs1/pkcs1.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # pkcs1.cnf # PKCS#1 conformation file -# $Id: pkcs1.cnf 39785 2011-11-10 20:52:44Z etxrab $ +# $Id$ #.IMPORT ../x509af/x509af-exp.cnf diff -Nru wireshark-1.10.5/asn1/pkcs1/PKIXAlgs-2009.asn wireshark-1.10.6/asn1/pkcs1/PKIXAlgs-2009.asn --- wireshark-1.10.5/asn1/pkcs1/PKIXAlgs-2009.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkcs1/PKIXAlgs-2009.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ -- --- $Id: PKIXAlgs-2009.asn 43469 2012-06-24 23:52:24Z etxrab $ +-- $Id$ -- Transcribed from RFC 5912 -- diff -Nru wireshark-1.10.5/asn1/pkcs12/Makefile.am wireshark-1.10.6/asn1/pkcs12/Makefile.am --- wireshark-1.10.5/asn1/pkcs12/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkcs12/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkcs12/Makefile.common wireshark-1.10.6/asn1/pkcs12/Makefile.common --- wireshark-1.10.5/asn1/pkcs12/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkcs12/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkcs12/Makefile.in wireshark-1.10.6/asn1/pkcs12/Makefile.in --- wireshark-1.10.5/asn1/pkcs12/Makefile.in 2013-12-19 19:13:40.000000000 +0000 +++ wireshark-1.10.6/asn1/pkcs12/Makefile.in 2014-03-07 18:07:30.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkcs12/Makefile.nmake wireshark-1.10.6/asn1/pkcs12/Makefile.nmake --- wireshark-1.10.5/asn1/pkcs12/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkcs12/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkcs12/packet-pkcs12-template.c wireshark-1.10.6/asn1/pkcs12/packet-pkcs12-template.c --- wireshark-1.10.5/asn1/pkcs12/packet-pkcs12-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkcs12/packet-pkcs12-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for PKCS#12: Personal Information Exchange packet dissection * Graeme Lunt 2006 * - * $Id: packet-pkcs12-template.c 48609 2013-03-28 07:34:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pkcs12/packet-pkcs12-template.h wireshark-1.10.6/asn1/pkcs12/packet-pkcs12-template.h --- wireshark-1.10.5/asn1/pkcs12/packet-pkcs12-template.h 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkcs12/packet-pkcs12-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for PKCS#12 Personal Information Exchange packet dissection * Graeme Lunt 2006 * - * $Id: packet-pkcs12-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pkcs12/pkcs12.asn wireshark-1.10.6/asn1/pkcs12/pkcs12.asn --- wireshark-1.10.5/asn1/pkcs12/pkcs12.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkcs12/pkcs12.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ PKCS-12 {iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-12(12) modules(0) pkcs-12(1)} --- $Id: pkcs12.asn 25803 2008-07-23 12:45:24Z etxrab $ +-- $Id$ DEFINITIONS IMPLICIT TAGS ::= diff -Nru wireshark-1.10.5/asn1/pkcs12/pkcs12.cnf wireshark-1.10.6/asn1/pkcs12/pkcs12.cnf --- wireshark-1.10.5/asn1/pkcs12/pkcs12.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkcs12/pkcs12.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # pkcs12.cnf # PKCS12 conformation file -# $Id: pkcs12.cnf 31961 2010-02-23 04:35:23Z guy $ +# $Id$ #.MODULE_IMPORT PKCS-7 cms diff -Nru wireshark-1.10.5/asn1/pkinit/Makefile.am wireshark-1.10.6/asn1/pkinit/Makefile.am --- wireshark-1.10.5/asn1/pkinit/Makefile.am 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pkinit/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkinit/Makefile.common wireshark-1.10.6/asn1/pkinit/Makefile.common --- wireshark-1.10.5/asn1/pkinit/Makefile.common 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pkinit/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkinit/Makefile.in wireshark-1.10.6/asn1/pkinit/Makefile.in --- wireshark-1.10.5/asn1/pkinit/Makefile.in 2013-12-19 19:13:40.000000000 +0000 +++ wireshark-1.10.6/asn1/pkinit/Makefile.in 2014-03-07 18:07:30.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkinit/Makefile.nmake wireshark-1.10.6/asn1/pkinit/Makefile.nmake --- wireshark-1.10.5/asn1/pkinit/Makefile.nmake 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pkinit/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkinit/packet-pkinit-template.c wireshark-1.10.6/asn1/pkinit/packet-pkinit-template.c --- wireshark-1.10.5/asn1/pkinit/packet-pkinit-template.c 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pkinit/packet-pkinit-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for PKINIT packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkinit-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pkinit/packet-pkinit-template.h wireshark-1.10.6/asn1/pkinit/packet-pkinit-template.h --- wireshark-1.10.5/asn1/pkinit/packet-pkinit-template.h 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pkinit/packet-pkinit-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for PKINIT packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkinit-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pkinit/pkinit.cnf wireshark-1.10.6/asn1/pkinit/pkinit.cnf --- wireshark-1.10.5/asn1/pkinit/pkinit.cnf 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pkinit/pkinit.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # pkinit.cnf # pkinit conformation file -# $Id: pkinit.cnf 43771 2012-07-17 19:43:17Z pascal $ +# $Id$ #.MODULE_IMPORT PKIX1Explicit88 pkix1explicit diff -Nru wireshark-1.10.5/asn1/pkix1explicit/IPAddrAndASCertExtn.asn wireshark-1.10.6/asn1/pkix1explicit/IPAddrAndASCertExtn.asn --- wireshark-1.10.5/asn1/pkix1explicit/IPAddrAndASCertExtn.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pkix1explicit/IPAddrAndASCertExtn.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: IPAddrAndASCertExtn.asn 24473 2008-02-26 18:05:24Z etxrab $ +-- $Id$ -- RFC 3779 X.509 Extensions for IP Addr and AS ID June 2004 -- IPAddrAndASCertExtn { iso(1) identified-organization(3) dod(6) diff -Nru wireshark-1.10.5/asn1/pkix1explicit/Makefile.am wireshark-1.10.6/asn1/pkix1explicit/Makefile.am --- wireshark-1.10.5/asn1/pkix1explicit/Makefile.am 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pkix1explicit/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkix1explicit/Makefile.common wireshark-1.10.6/asn1/pkix1explicit/Makefile.common --- wireshark-1.10.5/asn1/pkix1explicit/Makefile.common 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pkix1explicit/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkix1explicit/Makefile.in wireshark-1.10.6/asn1/pkix1explicit/Makefile.in --- wireshark-1.10.5/asn1/pkix1explicit/Makefile.in 2013-12-19 19:13:40.000000000 +0000 +++ wireshark-1.10.6/asn1/pkix1explicit/Makefile.in 2014-03-07 18:07:30.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkix1explicit/Makefile.nmake wireshark-1.10.6/asn1/pkix1explicit/Makefile.nmake --- wireshark-1.10.5/asn1/pkix1explicit/Makefile.nmake 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pkix1explicit/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkix1explicit/packet-pkix1explicit-template.c wireshark-1.10.6/asn1/pkix1explicit/packet-pkix1explicit-template.c --- wireshark-1.10.5/asn1/pkix1explicit/packet-pkix1explicit-template.c 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pkix1explicit/packet-pkix1explicit-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ /* packet-pkix1explicit.c * Routines for PKIX1Explitic packet dissection * - * $Id: packet-pkix1explicit-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pkix1explicit/packet-pkix1explicit-template.h wireshark-1.10.6/asn1/pkix1explicit/packet-pkix1explicit-template.h --- wireshark-1.10.5/asn1/pkix1explicit/packet-pkix1explicit-template.h 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pkix1explicit/packet-pkix1explicit-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-pkix1explicit.h * Routines for PKIX1Explicit packet dissection * - * $Id: packet-pkix1explicit-template.h 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pkix1explicit/pkix1explicit.cnf wireshark-1.10.6/asn1/pkix1explicit/pkix1explicit.cnf --- wireshark-1.10.5/asn1/pkix1explicit/pkix1explicit.cnf 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/pkix1explicit/pkix1explicit.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # pkix1explicit.cnf # pkix1explicit conformation file -# $Id: pkix1explicit.cnf 48429 2013-03-19 21:22:31Z etxrab $ +# $Id$ #.MODULE_IMPORT diff -Nru wireshark-1.10.5/asn1/pkix1implicit/Makefile.am wireshark-1.10.6/asn1/pkix1implicit/Makefile.am --- wireshark-1.10.5/asn1/pkix1implicit/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkix1implicit/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkix1implicit/Makefile.common wireshark-1.10.6/asn1/pkix1implicit/Makefile.common --- wireshark-1.10.5/asn1/pkix1implicit/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkix1implicit/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkix1implicit/Makefile.in wireshark-1.10.6/asn1/pkix1implicit/Makefile.in --- wireshark-1.10.5/asn1/pkix1implicit/Makefile.in 2013-12-19 19:13:40.000000000 +0000 +++ wireshark-1.10.6/asn1/pkix1implicit/Makefile.in 2014-03-07 18:07:30.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkix1implicit/Makefile.nmake wireshark-1.10.6/asn1/pkix1implicit/Makefile.nmake --- wireshark-1.10.5/asn1/pkix1implicit/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkix1implicit/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkix1implicit/packet-pkix1implicit-template.c wireshark-1.10.6/asn1/pkix1implicit/packet-pkix1implicit-template.c --- wireshark-1.10.5/asn1/pkix1implicit/packet-pkix1implicit-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkix1implicit/packet-pkix1implicit-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-pkix1implicit.c * Routines for PKIX1Implitic packet dissection * - * $Id: packet-pkix1implicit-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pkix1implicit/packet-pkix1implicit-template.h wireshark-1.10.6/asn1/pkix1implicit/packet-pkix1implicit-template.h --- wireshark-1.10.5/asn1/pkix1implicit/packet-pkix1implicit-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkix1implicit/packet-pkix1implicit-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-pkix1implicit.h * Routines for PKIX1Implicit packet dissection * - * $Id: packet-pkix1implicit-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pkix1implicit/pkix1implicit.cnf wireshark-1.10.6/asn1/pkix1implicit/pkix1implicit.cnf --- wireshark-1.10.5/asn1/pkix1implicit/pkix1implicit.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkix1implicit/pkix1implicit.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # pkix1implicit.cnf # pkix1implicit conformation file -# $Id: pkix1implicit.cnf 28586 2009-06-02 09:17:16Z gal $ +# $Id$ #.MODULE_IMPORT PKIX1Explicit93 pkix1explicit diff -Nru wireshark-1.10.5/asn1/pkixac/Makefile.am wireshark-1.10.6/asn1/pkixac/Makefile.am --- wireshark-1.10.5/asn1/pkixac/Makefile.am 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixac/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkixac/Makefile.common wireshark-1.10.6/asn1/pkixac/Makefile.common --- wireshark-1.10.5/asn1/pkixac/Makefile.common 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixac/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkixac/Makefile.in wireshark-1.10.6/asn1/pkixac/Makefile.in --- wireshark-1.10.5/asn1/pkixac/Makefile.in 2013-12-19 19:13:40.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixac/Makefile.in 2014-03-07 18:07:30.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkixac/Makefile.nmake wireshark-1.10.6/asn1/pkixac/Makefile.nmake --- wireshark-1.10.5/asn1/pkixac/Makefile.nmake 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixac/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkixac/packet-pkixac-template.c wireshark-1.10.6/asn1/pkixac/packet-pkixac-template.c --- wireshark-1.10.5/asn1/pkixac/packet-pkixac-template.c 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixac/packet-pkixac-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 2010, Stig Bjorlykke * - * $Id: packet-pkixac-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pkixac/packet-pkixac-template.h wireshark-1.10.6/asn1/pkixac/packet-pkixac-template.h --- wireshark-1.10.5/asn1/pkixac/packet-pkixac-template.h 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixac/packet-pkixac-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 2010, Stig Bjorlykke * - * $Id: packet-pkixac-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pkixac/pkixac.cnf wireshark-1.10.6/asn1/pkixac/pkixac.cnf --- wireshark-1.10.5/asn1/pkixac/pkixac.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixac/pkixac.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # pkixac.cnf # An Internet Attribute Certificate (RFC3281) conformation file -# $Id: pkixac.cnf 38014 2011-07-14 08:47:05Z gal $ +# $Id$ #.MODULE_IMPORT PKIX1Explicit88 pkix1explicit diff -Nru wireshark-1.10.5/asn1/pkixproxy/Makefile.am wireshark-1.10.6/asn1/pkixproxy/Makefile.am --- wireshark-1.10.5/asn1/pkixproxy/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixproxy/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkixproxy/Makefile.common wireshark-1.10.6/asn1/pkixproxy/Makefile.common --- wireshark-1.10.5/asn1/pkixproxy/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixproxy/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkixproxy/Makefile.in wireshark-1.10.6/asn1/pkixproxy/Makefile.in --- wireshark-1.10.5/asn1/pkixproxy/Makefile.in 2013-12-19 19:13:40.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixproxy/Makefile.in 2014-03-07 18:07:30.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkixproxy/Makefile.nmake wireshark-1.10.6/asn1/pkixproxy/Makefile.nmake --- wireshark-1.10.5/asn1/pkixproxy/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixproxy/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkixproxy/packet-pkixproxy-template.c wireshark-1.10.6/asn1/pkixproxy/packet-pkixproxy-template.c --- wireshark-1.10.5/asn1/pkixproxy/packet-pkixproxy-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixproxy/packet-pkixproxy-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for RFC3820 PKIXProxy packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkixproxy-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pkixproxy/packet-pkixproxy-template.h wireshark-1.10.6/asn1/pkixproxy/packet-pkixproxy-template.h --- wireshark-1.10.5/asn1/pkixproxy/packet-pkixproxy-template.h 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixproxy/packet-pkixproxy-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for RFC3820 PKIXProxy packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkixproxy-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pkixproxy/pkixproxy.cnf wireshark-1.10.6/asn1/pkixproxy/pkixproxy.cnf --- wireshark-1.10.5/asn1/pkixproxy/pkixproxy.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixproxy/pkixproxy.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # pkixproxy.cnf # PKIXProxy conformation file -# $Id: pkixproxy.cnf 15178 2005-08-02 05:21:19Z jmayer $ +# $Id$ #.MODULE_IMPORT diff -Nru wireshark-1.10.5/asn1/pkixqualified/Makefile.am wireshark-1.10.6/asn1/pkixqualified/Makefile.am --- wireshark-1.10.5/asn1/pkixqualified/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixqualified/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkixqualified/Makefile.common wireshark-1.10.6/asn1/pkixqualified/Makefile.common --- wireshark-1.10.5/asn1/pkixqualified/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixqualified/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkixqualified/Makefile.in wireshark-1.10.6/asn1/pkixqualified/Makefile.in --- wireshark-1.10.5/asn1/pkixqualified/Makefile.in 2013-12-19 19:13:41.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixqualified/Makefile.in 2014-03-07 18:07:30.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkixqualified/Makefile.nmake wireshark-1.10.6/asn1/pkixqualified/Makefile.nmake --- wireshark-1.10.5/asn1/pkixqualified/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixqualified/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkixqualified/packet-pkixqualified-template.c wireshark-1.10.6/asn1/pkixqualified/packet-pkixqualified-template.c --- wireshark-1.10.5/asn1/pkixqualified/packet-pkixqualified-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixqualified/packet-pkixqualified-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for RFC3739 PKIXqualified packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkixqualified-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pkixqualified/packet-pkixqualified-template.h wireshark-1.10.6/asn1/pkixqualified/packet-pkixqualified-template.h --- wireshark-1.10.5/asn1/pkixqualified/packet-pkixqualified-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixqualified/packet-pkixqualified-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for RFC3739 PKIXqualified packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkixqualified-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pkixqualified/pkixqualified.cnf wireshark-1.10.6/asn1/pkixqualified/pkixqualified.cnf --- wireshark-1.10.5/asn1/pkixqualified/pkixqualified.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixqualified/pkixqualified.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # PKIXqualified.cnf # PKIXqualified conformation file -# $Id: pkixqualified.cnf 26104 2008-08-31 12:55:45Z etxrab $ +# $Id$ #.IMPORT ../x509ce/x509ce-exp.cnf #.IMPORT ../x509af/x509af-exp.cnf diff -Nru wireshark-1.10.5/asn1/pkixtsp/Makefile.am wireshark-1.10.6/asn1/pkixtsp/Makefile.am --- wireshark-1.10.5/asn1/pkixtsp/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixtsp/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkixtsp/Makefile.common wireshark-1.10.6/asn1/pkixtsp/Makefile.common --- wireshark-1.10.5/asn1/pkixtsp/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixtsp/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkixtsp/Makefile.in wireshark-1.10.6/asn1/pkixtsp/Makefile.in --- wireshark-1.10.5/asn1/pkixtsp/Makefile.in 2013-12-19 19:13:41.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixtsp/Makefile.in 2014-03-07 18:07:30.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkixtsp/Makefile.nmake wireshark-1.10.6/asn1/pkixtsp/Makefile.nmake --- wireshark-1.10.5/asn1/pkixtsp/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixtsp/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pkixtsp/packet-pkixtsp-template.c wireshark-1.10.6/asn1/pkixtsp/packet-pkixtsp-template.c --- wireshark-1.10.5/asn1/pkixtsp/packet-pkixtsp-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixtsp/packet-pkixtsp-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for RFC2634 Extended Security Services packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkixtsp-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pkixtsp/packet-pkixtsp-template.h wireshark-1.10.6/asn1/pkixtsp/packet-pkixtsp-template.h --- wireshark-1.10.5/asn1/pkixtsp/packet-pkixtsp-template.h 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixtsp/packet-pkixtsp-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for RFC3161 Time-Stamp Protocol packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkixtsp-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pkixtsp/pkixtsp.cnf wireshark-1.10.6/asn1/pkixtsp/pkixtsp.cnf --- wireshark-1.10.5/asn1/pkixtsp/pkixtsp.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/pkixtsp/pkixtsp.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # pkixtsp.cnf # Time-Stamp Protocol (RFC3161) conformation file -# $Id: pkixtsp.cnf 25803 2008-07-23 12:45:24Z etxrab $ +# $Id$ #.MODULE_IMPORT PKIX1Explicit88 pkix1explicit diff -Nru wireshark-1.10.5/asn1/pres/ISO8823-PRESENTATION.asn wireshark-1.10.6/asn1/pres/ISO8823-PRESENTATION.asn --- wireshark-1.10.5/asn1/pres/ISO8823-PRESENTATION.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pres/ISO8823-PRESENTATION.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: ISO8823-PRESENTATION.asn 33375 2010-06-29 18:09:03Z gal $ +-- $Id$ -- Module ISO8823-PRESENTATION (X.226:07/1994) ISO8823-PRESENTATION DEFINITIONS ::= BEGIN diff -Nru wireshark-1.10.5/asn1/pres/ISO9576-PRESENTATION.asn wireshark-1.10.6/asn1/pres/ISO9576-PRESENTATION.asn --- wireshark-1.10.5/asn1/pres/ISO9576-PRESENTATION.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pres/ISO9576-PRESENTATION.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: ISO9576-PRESENTATION.asn 31445 2010-01-05 08:50:15Z stig $ +-- $Id$ -- Module ISO9576-PRESENTATION (X.236) ISO9576-CONNECTIONLESS-PRESENTATION DEFINITIONS ::= BEGIN diff -Nru wireshark-1.10.5/asn1/pres/Makefile.am wireshark-1.10.6/asn1/pres/Makefile.am --- wireshark-1.10.5/asn1/pres/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pres/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pres/Makefile.common wireshark-1.10.6/asn1/pres/Makefile.common --- wireshark-1.10.5/asn1/pres/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pres/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pres/Makefile.in wireshark-1.10.6/asn1/pres/Makefile.in --- wireshark-1.10.5/asn1/pres/Makefile.in 2013-12-19 19:13:41.000000000 +0000 +++ wireshark-1.10.6/asn1/pres/Makefile.in 2014-03-07 18:07:30.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pres/Makefile.nmake wireshark-1.10.6/asn1/pres/Makefile.nmake --- wireshark-1.10.5/asn1/pres/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pres/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/pres/packet-pres-template.c wireshark-1.10.6/asn1/pres/packet-pres-template.c --- wireshark-1.10.5/asn1/pres/packet-pres-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pres/packet-pres-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Based on the dissector by * Yuriy Sidelnikov * - * $Id: packet-pres-template.c 48429 2013-03-19 21:22:31Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pres/packet-pres-template.h wireshark-1.10.6/asn1/pres/packet-pres-template.h --- wireshark-1.10.5/asn1/pres/packet-pres-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pres/packet-pres-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-pres.h * Routines for pres packet dissection * - * $Id: packet-pres-template.h 46520 2012-12-12 15:17:36Z stig $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/pres/pres.cnf wireshark-1.10.6/asn1/pres/pres.cnf --- wireshark-1.10.5/asn1/pres/pres.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/pres/pres.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # pres.cnf # pres conformation file -# $Id: pres.cnf 46662 2012-12-21 10:52:29Z guy $ +# $Id$ #.IMPORT ../rtse/rtse-exp.cnf diff -Nru wireshark-1.10.5/asn1/q932/Addressing-Data-Elements.asn wireshark-1.10.6/asn1/q932/Addressing-Data-Elements.asn --- wireshark-1.10.5/asn1/q932/Addressing-Data-Elements.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/q932/Addressing-Data-Elements.asn 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/q/q932/1998-Amd1/Addressing-Data-Elements.asn -- --- $Id: Addressing-Data-Elements.asn 21602 2007-04-27 08:10:18Z kukosa $ +-- $Id$ -- -- Module Addressing-Data-Elements (Q.932:05/1998) diff -Nru wireshark-1.10.5/asn1/q932/Interpretation-component.asn wireshark-1.10.6/asn1/q932/Interpretation-component.asn --- wireshark-1.10.5/asn1/q932/Interpretation-component.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/q932/Interpretation-component.asn 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/q/q932/1998-Amd1/Interpretation-component.asn -- --- $Id: Interpretation-component.asn 21602 2007-04-27 08:10:18Z kukosa $ +-- $Id$ -- -- Module Interpretation-component (Q.932:05/1998) diff -Nru wireshark-1.10.5/asn1/q932/Makefile.am wireshark-1.10.6/asn1/q932/Makefile.am --- wireshark-1.10.5/asn1/q932/Makefile.am 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/q932/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/q932/Makefile.common wireshark-1.10.6/asn1/q932/Makefile.common --- wireshark-1.10.5/asn1/q932/Makefile.common 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/q932/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/q932/Makefile.in wireshark-1.10.6/asn1/q932/Makefile.in --- wireshark-1.10.5/asn1/q932/Makefile.in 2013-12-19 19:13:41.000000000 +0000 +++ wireshark-1.10.6/asn1/q932/Makefile.in 2014-03-07 18:07:30.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/q932/Makefile.nmake wireshark-1.10.6/asn1/q932/Makefile.nmake --- wireshark-1.10.5/asn1/q932/Makefile.nmake 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/q932/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/q932/Network-Facility-Extension.asn wireshark-1.10.6/asn1/q932/Network-Facility-Extension.asn --- wireshark-1.10.5/asn1/q932/Network-Facility-Extension.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/q932/Network-Facility-Extension.asn 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/q/q932/1998-Amd1/Network-Facility-Extension.asn -- --- $Id: Network-Facility-Extension.asn 21602 2007-04-27 08:10:18Z kukosa $ +-- $Id$ -- -- Module Network-Facility-Extension (Q.932:05/1998) diff -Nru wireshark-1.10.5/asn1/q932/Network-Protocol-Profile-component.asn wireshark-1.10.6/asn1/q932/Network-Protocol-Profile-component.asn --- wireshark-1.10.5/asn1/q932/Network-Protocol-Profile-component.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/q932/Network-Protocol-Profile-component.asn 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/q/q932/1998-Amd1/Network-Protocol-Profile-component.asn -- --- $Id: Network-Protocol-Profile-component.asn 21602 2007-04-27 08:10:18Z kukosa $ +-- $Id$ -- -- Module Network-Protocol-Profile-component (Q.932:05/1998) diff -Nru wireshark-1.10.5/asn1/q932/packet-q932-template.c wireshark-1.10.6/asn1/q932/packet-q932-template.c --- wireshark-1.10.5/asn1/q932/packet-q932-template.c 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/q932/packet-q932-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Q.932 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-q932-template.c 48429 2013-03-19 21:22:31Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/q932/packet-q932-template.h wireshark-1.10.6/asn1/q932/packet-q932-template.h --- wireshark-1.10.5/asn1/q932/packet-q932-template.h 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/q932/packet-q932-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Q.932 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-q932-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/q932/q932.cnf wireshark-1.10.6/asn1/q932/q932.cnf --- wireshark-1.10.5/asn1/q932/q932.cnf 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/q932/q932.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ # Q.932 conformation file # 2007 Tomas Kukosa -# $Id: q932.cnf 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ #.PDU diff -Nru wireshark-1.10.5/asn1/q932-ros/Facility-Information-Element-Components.asn wireshark-1.10.6/asn1/q932-ros/Facility-Information-Element-Components.asn --- wireshark-1.10.5/asn1/q932-ros/Facility-Information-Element-Components.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/q932-ros/Facility-Information-Element-Components.asn 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/q/q932/1998-Amd1/Facility-Information-Element-Components.asn -- --- $Id: Facility-Information-Element-Components.asn 23127 2007-10-10 08:09:19Z jmayer $ +-- $Id$ -- -- Module Facility-Information-Element-Components (Q.932:05/1998) diff -Nru wireshark-1.10.5/asn1/q932-ros/Makefile.am wireshark-1.10.6/asn1/q932-ros/Makefile.am --- wireshark-1.10.5/asn1/q932-ros/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/q932-ros/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/q932-ros/Makefile.common wireshark-1.10.6/asn1/q932-ros/Makefile.common --- wireshark-1.10.5/asn1/q932-ros/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/q932-ros/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/q932-ros/Makefile.in wireshark-1.10.6/asn1/q932-ros/Makefile.in --- wireshark-1.10.5/asn1/q932-ros/Makefile.in 2013-12-19 19:13:41.000000000 +0000 +++ wireshark-1.10.6/asn1/q932-ros/Makefile.in 2014-03-07 18:07:30.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/q932-ros/Makefile.nmake wireshark-1.10.6/asn1/q932-ros/Makefile.nmake --- wireshark-1.10.5/asn1/q932-ros/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/q932-ros/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/q932-ros/packet-q932-ros-template.c wireshark-1.10.6/asn1/q932-ros/packet-q932-ros-template.c --- wireshark-1.10.5/asn1/q932-ros/packet-q932-ros-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/q932-ros/packet-q932-ros-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Q.932 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-q932-ros-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/qsig/General-Error-List.asn wireshark-1.10.6/asn1/qsig/General-Error-List.asn --- wireshark-1.10.5/asn1/qsig/General-Error-List.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/General-Error-List.asn 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ -- See also ITU-T Q.950 (06/2000) -- See also the index of all ASN.1 assignments needed in this document -- --- $Id: General-Error-List.asn 37005 2011-05-06 01:47:16Z morriss $ +-- $Id$ -- General-Error-List {itu-t recommendation q 950 general-error-list(1)} diff -Nru wireshark-1.10.5/asn1/qsig/Makefile.am wireshark-1.10.6/asn1/qsig/Makefile.am --- wireshark-1.10.5/asn1/qsig/Makefile.am 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/qsig/Makefile.common wireshark-1.10.6/asn1/qsig/Makefile.common --- wireshark-1.10.5/asn1/qsig/Makefile.common 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/qsig/Makefile.in wireshark-1.10.6/asn1/qsig/Makefile.in --- wireshark-1.10.5/asn1/qsig/Makefile.in 2013-12-19 19:13:41.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/Makefile.in 2014-03-07 18:07:30.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/qsig/Makefile.nmake wireshark-1.10.6/asn1/qsig/Makefile.nmake --- wireshark-1.10.5/asn1/qsig/Makefile.nmake 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/qsig/packet-qsig-template.c wireshark-1.10.6/asn1/qsig/packet-qsig-template.c --- wireshark-1.10.5/asn1/qsig/packet-qsig-template.c 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/packet-qsig-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for QSIG packet dissection * 2007 Tomas Kukosa * - * $Id: packet-qsig-template.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/qsig/packet-qsig-template.h wireshark-1.10.6/asn1/qsig/packet-qsig-template.h --- wireshark-1.10.5/asn1/qsig/packet-qsig-template.h 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/packet-qsig-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for QSIG packet dissection * 2007 Tomas Kukosa * - * $Id: packet-qsig-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-AOC.asn wireshark-1.10.6/asn1/qsig/QSIG-AOC.asn --- wireshark-1.10.5/asn1/qsig/QSIG-AOC.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-AOC.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-212, 3rd edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-212.htm -- --- $Id: QSIG-AOC.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- SS-AOC-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-CC.asn wireshark-1.10.6/asn1/qsig/QSIG-CC.asn --- wireshark-1.10.5/asn1/qsig/QSIG-CC.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-CC.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-186, 4th edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-186.htm -- --- $Id: QSIG-CC.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- SS-CC-Operations-asn1-97 { iso (1) standard (0) pss1-call-completion (13870) operations-asn1-97 (1)} diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-CF.asn wireshark-1.10.6/asn1/qsig/QSIG-CF.asn --- wireshark-1.10.5/asn1/qsig/QSIG-CF.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-CF.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-174, 3rd edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-174.htm -- --- $Id: QSIG-CF.asn 22394 2007-07-24 07:37:10Z kukosa $ +-- $Id$ -- Call-Diversion-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-CI.asn wireshark-1.10.6/asn1/qsig/QSIG-CI.asn --- wireshark-1.10.5/asn1/qsig/QSIG-CI.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-CI.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-203, 4th edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-203.htm -- --- $Id: QSIG-CI.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- Call-Intrusion-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-CIDL.asn wireshark-1.10.6/asn1/qsig/QSIG-CIDL.asn --- wireshark-1.10.5/asn1/qsig/QSIG-CIDL.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-CIDL.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-314, 2nd edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-314.htm -- --- $Id: QSIG-CIDL.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- Call-Identification-and-Call-Linkage-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-CINT.asn wireshark-1.10.6/asn1/qsig/QSIG-CINT.asn --- wireshark-1.10.5/asn1/qsig/QSIG-CINT.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-CINT.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-221, 3rd edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-221.htm -- --- $Id: QSIG-CINT.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- Call-Interception-Operations-asn1-97 {iso (1) standard (0) pss1-cint (15054) cint-operations-asn1-97 (1) } diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-CMN.asn wireshark-1.10.6/asn1/qsig/QSIG-CMN.asn --- wireshark-1.10.5/asn1/qsig/QSIG-CMN.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-CMN.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-251, 3rd edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-251.htm -- --- $Id: QSIG-CMN.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- Common-Information-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/qsig.cnf wireshark-1.10.6/asn1/qsig/qsig.cnf --- wireshark-1.10.5/asn1/qsig/qsig.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/qsig.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ # QSIG conformation file # 2007 Tomas Kukosa -# $Id: qsig.cnf 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ #.OPT BER diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-CO.asn wireshark-1.10.6/asn1/qsig/QSIG-CO.asn --- wireshark-1.10.5/asn1/qsig/QSIG-CO.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-CO.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-192, 4th edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-192.htm -- --- $Id: QSIG-CO.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- Call-Offer-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-CPI.asn wireshark-1.10.6/asn1/qsig/QSIG-CPI.asn --- wireshark-1.10.5/asn1/qsig/QSIG-CPI.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-CPI.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-264, 3rd edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-264.htm -- --- $Id: QSIG-CPI.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- Call-Interruption-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-CT.asn wireshark-1.10.6/asn1/qsig/QSIG-CT.asn --- wireshark-1.10.5/asn1/qsig/QSIG-CT.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-CT.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-178, 3rd edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-178.htm -- --- $Id: QSIG-CT.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- Call-Transfer-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-DND.asn wireshark-1.10.6/asn1/qsig/QSIG-DND.asn --- wireshark-1.10.5/asn1/qsig/QSIG-DND.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-DND.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-194, 4th edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-194.htm -- --- $Id: QSIG-DND.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- Do-Not-Disturb-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/qsig-gf-ade.asn wireshark-1.10.6/asn1/qsig/qsig-gf-ade.asn --- wireshark-1.10.5/asn1/qsig/qsig-gf-ade.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/qsig-gf-ade.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- B.1 Addressing information -- --- $Id: qsig-gf-ade.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- Addressing-Data-Elements-asn1-97 {iso(1) standard(0) diff -Nru wireshark-1.10.5/asn1/qsig/qsig-gf-ext.asn wireshark-1.10.6/asn1/qsig/qsig-gf-ext.asn --- wireshark-1.10.5/asn1/qsig/qsig-gf-ext.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/qsig-gf-ext.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.2 Manufacturer specific additions to standardised operations -- --- $Id: qsig-gf-ext.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- Manufacturer-specific-service-extension-class-asn1-97 {iso(1) standard(0) diff -Nru wireshark-1.10.5/asn1/qsig/qsig-gf-gp.asn wireshark-1.10.6/asn1/qsig/qsig-gf-gp.asn --- wireshark-1.10.5/asn1/qsig/qsig-gf-gp.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/qsig-gf-gp.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- B.3 PSS1InformationElement -- --- $Id: qsig-gf-gp.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- PSS1-generic-parameters-definition-asn1-97 { iso( 1) standard( 0) diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-MCM.asn wireshark-1.10.6/asn1/qsig/QSIG-MCM.asn --- wireshark-1.10.5/asn1/qsig/QSIG-MCM.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-MCM.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-347, (June 2003) -- http://www.ecma-international.org/publications/standards/Ecma-347.htm -- --- $Id: QSIG-MCM.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- SS-MCM-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-MCR.asn wireshark-1.10.6/asn1/qsig/QSIG-MCR.asn --- wireshark-1.10.5/asn1/qsig/QSIG-MCR.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-MCR.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-344, (June 2003) -- http://www.ecma-international.org/publications/standards/Ecma-344.htm -- --- $Id: QSIG-MCR.asn 37005 2011-05-06 01:47:16Z morriss $ +-- $Id$ -- SS-MCR-Operations-asn97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-MID.asn wireshark-1.10.6/asn1/qsig/QSIG-MID.asn --- wireshark-1.10.5/asn1/qsig/QSIG-MID.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-MID.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-347, (June 2003) -- http://www.ecma-international.org/publications/standards/Ecma-347.htm -- --- $Id: QSIG-MID.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- SS-MID-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-NA.asn wireshark-1.10.6/asn1/qsig/QSIG-NA.asn --- wireshark-1.10.5/asn1/qsig/QSIG-NA.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-NA.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-164, 4th edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-164.htm -- --- $Id: QSIG-NA.asn 22394 2007-07-24 07:37:10Z kukosa $ +-- $Id$ -- Name-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-PR.asn wireshark-1.10.6/asn1/qsig/QSIG-PR.asn --- wireshark-1.10.5/asn1/qsig/QSIG-PR.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-PR.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-176, 4th edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-176.htm -- --- $Id: QSIG-PR.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- Path-Replacement-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-PUMCH.asn wireshark-1.10.6/asn1/qsig/QSIG-PUMCH.asn --- wireshark-1.10.5/asn1/qsig/QSIG-PUMCH.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-PUMCH.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-284, 3rd edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-284.htm -- --- $Id: QSIG-PUMCH.asn 37005 2011-05-06 01:47:16Z morriss $ +-- $Id$ -- Private-User-Mobility-Call-Handling-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-PUMR.asn wireshark-1.10.6/asn1/qsig/QSIG-PUMR.asn --- wireshark-1.10.5/asn1/qsig/QSIG-PUMR.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-PUMR.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-282, 3rd edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-282.htm -- --- $Id: QSIG-PUMR.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- PUM-Registration-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-RE.asn wireshark-1.10.6/asn1/qsig/QSIG-RE.asn --- wireshark-1.10.5/asn1/qsig/QSIG-RE.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-RE.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-214, 3rd edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-214.htm -- --- $Id: QSIG-RE.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- Recall-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-SD.asn wireshark-1.10.6/asn1/qsig/QSIG-SD.asn --- wireshark-1.10.5/asn1/qsig/QSIG-SD.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-SD.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-311, 2nd edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-311.htm -- --- $Id: QSIG-SD.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- SS-SD-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-SMS.asn wireshark-1.10.6/asn1/qsig/QSIG-SMS.asn --- wireshark-1.10.5/asn1/qsig/QSIG-SMS.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-SMS.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-325, (June 2001) -- http://www.ecma-international.org/publications/standards/Ecma-325.htm -- --- $Id: QSIG-SMS.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- Short-Message-Service-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-SSCT.asn wireshark-1.10.6/asn1/qsig/QSIG-SSCT.asn --- wireshark-1.10.5/asn1/qsig/QSIG-SSCT.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-SSCT.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-300, 2nd edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-300.htm -- --- $Id: QSIG-SSCT.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- Single-Step-Call-Transfer-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-WTMAU.asn wireshark-1.10.6/asn1/qsig/QSIG-WTMAU.asn --- wireshark-1.10.5/asn1/qsig/QSIG-WTMAU.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-WTMAU.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-306, 2nd edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-306.htm -- --- $Id: QSIG-WTMAU.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- WTM-Authentication-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-WTMCH.asn wireshark-1.10.6/asn1/qsig/QSIG-WTMCH.asn --- wireshark-1.10.5/asn1/qsig/QSIG-WTMCH.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-WTMCH.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-304, 2nd edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-304.htm -- --- $Id: QSIG-WTMCH.asn 22361 2007-07-20 09:54:47Z kukosa $ +-- $Id$ -- Wireless-Terminal-Call-Handling-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/QSIG-WTMLR.asn wireshark-1.10.6/asn1/qsig/QSIG-WTMLR.asn --- wireshark-1.10.5/asn1/qsig/QSIG-WTMLR.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/QSIG-WTMLR.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-302, 2nd edition (December 2001) -- http://www.ecma-international.org/publications/standards/Ecma-302.htm -- --- $Id: QSIG-WTMLR.asn 37005 2011-05-06 01:47:16Z morriss $ +-- $Id$ -- WTM-Location-Registration-Operations-asn1-97 diff -Nru wireshark-1.10.5/asn1/qsig/SYNC-SIG.asn wireshark-1.10.6/asn1/qsig/SYNC-SIG.asn --- wireshark-1.10.5/asn1/qsig/SYNC-SIG.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/qsig/SYNC-SIG.asn 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ -- Standard ECMA-245, 2nd Edition - September 1997 -- http://www.ecma-international.org/publications/standards/Ecma-245.htm -- --- $Id: SYNC-SIG.asn 37005 2011-05-06 01:47:16Z morriss $ +-- $Id$ -- -- updated from macro notation to information object notation -- diff -Nru wireshark-1.10.5/asn1/ranap/Makefile.am wireshark-1.10.6/asn1/ranap/Makefile.am --- wireshark-1.10.5/asn1/ranap/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ranap/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ranap/Makefile.common wireshark-1.10.6/asn1/ranap/Makefile.common --- wireshark-1.10.5/asn1/ranap/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ranap/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ranap/Makefile.in wireshark-1.10.6/asn1/ranap/Makefile.in --- wireshark-1.10.5/asn1/ranap/Makefile.in 2013-12-19 19:13:41.000000000 +0000 +++ wireshark-1.10.6/asn1/ranap/Makefile.in 2014-03-07 18:07:30.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ranap/Makefile.nmake wireshark-1.10.6/asn1/ranap/Makefile.nmake --- wireshark-1.10.5/asn1/ranap/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ranap/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ranap/packet-ranap-template.c wireshark-1.10.6/asn1/ranap/packet-ranap-template.c --- wireshark-1.10.5/asn1/ranap/packet-ranap-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ranap/packet-ranap-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for UMTS Node B Application Part(RANAP) packet dissection * Copyright 2005 - 2010, Anders Broman * - * $Id: packet-ranap-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/ranap/packet-ranap-template.h wireshark-1.10.6/asn1/ranap/packet-ranap-template.h --- wireshark-1.10.5/asn1/ranap/packet-ranap-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ranap/packet-ranap-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ranap-template.h * Routines for GSM Supplementary Services dissection * Copyright 2005, Anders Broman - * $Id: packet-ranap-template.h 43536 2012-06-28 22:56:06Z darkjames $ * + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs * Copyright 1998 Gerald Combs diff -Nru wireshark-1.10.5/asn1/ranap/ranap.cnf wireshark-1.10.6/asn1/ranap/ranap.cnf --- wireshark-1.10.5/asn1/ranap/ranap.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ranap/ranap.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # ranap.cnf # ranap conformation file -# $Id: ranap.cnf 48429 2013-03-19 21:22:31Z etxrab $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/ranap/RANAP-CommonDataTypes.asn wireshark-1.10.6/asn1/ranap/RANAP-CommonDataTypes.asn --- wireshark-1.10.5/asn1/ranap/RANAP-CommonDataTypes.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ranap/RANAP-CommonDataTypes.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.5 Common Definitions -- --- $Id: RANAP-CommonDataTypes.asn 41104 2012-02-21 09:25:41Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/ranap/RANAP-Constants.asn wireshark-1.10.6/asn1/ranap/RANAP-Constants.asn --- wireshark-1.10.5/asn1/ranap/RANAP-Constants.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ranap/RANAP-Constants.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.6 Constant Definitions -- --- $Id: RANAP-Constants.asn 44156 2012-07-31 13:49:39Z etxrab $ +-- $Id$ -- -- ************************************************************** -- diff -Nru wireshark-1.10.5/asn1/ranap/RANAP-Containers.asn wireshark-1.10.6/asn1/ranap/RANAP-Containers.asn --- wireshark-1.10.5/asn1/ranap/RANAP-Containers.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ranap/RANAP-Containers.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.7 Container Definitions -- --- $Id: RANAP-Containers.asn 41104 2012-02-21 09:25:41Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/ranap/RANAP-IEs.asn wireshark-1.10.6/asn1/ranap/RANAP-IEs.asn --- wireshark-1.10.5/asn1/ranap/RANAP-IEs.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ranap/RANAP-IEs.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.4 Information Element Definitions -- --- $Id: RANAP-IEs.asn 41104 2012-02-21 09:25:41Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/ranap/RANAP-PDU-Contents.asn wireshark-1.10.6/asn1/ranap/RANAP-PDU-Contents.asn --- wireshark-1.10.5/asn1/ranap/RANAP-PDU-Contents.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ranap/RANAP-PDU-Contents.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.3 PDU Definitions -- --- $Id: RANAP-PDU-Contents.asn 41104 2012-02-21 09:25:41Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/ranap/RANAP-PDU-Descriptions.asn wireshark-1.10.6/asn1/ranap/RANAP-PDU-Descriptions.asn --- wireshark-1.10.5/asn1/ranap/RANAP-PDU-Descriptions.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ranap/RANAP-PDU-Descriptions.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.2 Elementary Procedure Definitions -- --- $Id: RANAP-PDU-Descriptions.asn 41104 2012-02-21 09:25:41Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/rnsap/Makefile.am wireshark-1.10.6/asn1/rnsap/Makefile.am --- wireshark-1.10.5/asn1/rnsap/Makefile.am 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/rnsap/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rnsap/Makefile.common wireshark-1.10.6/asn1/rnsap/Makefile.common --- wireshark-1.10.5/asn1/rnsap/Makefile.common 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/rnsap/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rnsap/Makefile.in wireshark-1.10.6/asn1/rnsap/Makefile.in --- wireshark-1.10.5/asn1/rnsap/Makefile.in 2013-12-19 19:13:41.000000000 +0000 +++ wireshark-1.10.6/asn1/rnsap/Makefile.in 2014-03-07 18:07:30.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rnsap/Makefile.nmake wireshark-1.10.6/asn1/rnsap/Makefile.nmake --- wireshark-1.10.5/asn1/rnsap/Makefile.nmake 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/rnsap/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rnsap/packet-rnsap-template.c wireshark-1.10.6/asn1/rnsap/packet-rnsap-template.c --- wireshark-1.10.5/asn1/rnsap/packet-rnsap-template.c 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/rnsap/packet-rnsap-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * (3GPP TS 25.423 version 6.7.0 Release 6) packet dissection * Copyright 2005 - 2006, Anders Broman * - * $Id: packet-rnsap-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/rnsap/rnsap.cnf wireshark-1.10.6/asn1/rnsap/rnsap.cnf --- wireshark-1.10.5/asn1/rnsap/rnsap.cnf 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/rnsap/rnsap.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # rnsap.cnf # rnsap conformation file # Copyright 2005 Anders Broman -# $Id: rnsap.cnf 42570 2012-05-11 08:42:23Z etxrab $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/rnsap/RNSAP-CommonDataTypes.asn wireshark-1.10.6/asn1/rnsap/RNSAP-CommonDataTypes.asn --- wireshark-1.10.5/asn1/rnsap/RNSAP-CommonDataTypes.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/rnsap/RNSAP-CommonDataTypes.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.5 Common Definitions -- --- $Id: RNSAP-CommonDataTypes.asn 34928 2010-11-17 15:36:53Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/rnsap/RNSAP-Constants.asn wireshark-1.10.6/asn1/rnsap/RNSAP-Constants.asn --- wireshark-1.10.5/asn1/rnsap/RNSAP-Constants.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/rnsap/RNSAP-Constants.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.6 Constant Definitions -- --- $Id: RNSAP-Constants.asn 34928 2010-11-17 15:36:53Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/rnsap/RNSAP-Containers.asn wireshark-1.10.6/asn1/rnsap/RNSAP-Containers.asn --- wireshark-1.10.5/asn1/rnsap/RNSAP-Containers.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/rnsap/RNSAP-Containers.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.7 Container Definitions -- --- $Id: RNSAP-Containers.asn 34928 2010-11-17 15:36:53Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/rnsap/RNSAP-IEs.asn wireshark-1.10.6/asn1/rnsap/RNSAP-IEs.asn --- wireshark-1.10.5/asn1/rnsap/RNSAP-IEs.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/rnsap/RNSAP-IEs.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.4 Information Element Definitions -- --- $Id: RNSAP-IEs.asn 34928 2010-11-17 15:36:53Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/rnsap/RNSAP-PDU-Contents.asn wireshark-1.10.6/asn1/rnsap/RNSAP-PDU-Contents.asn --- wireshark-1.10.5/asn1/rnsap/RNSAP-PDU-Contents.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/rnsap/RNSAP-PDU-Contents.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.3 PDU Definitions -- --- $Id: RNSAP-PDU-Contents.asn 34928 2010-11-17 15:36:53Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/rnsap/RNSAP-PDU-Descriptions.asn wireshark-1.10.6/asn1/rnsap/RNSAP-PDU-Descriptions.asn --- wireshark-1.10.5/asn1/rnsap/RNSAP-PDU-Descriptions.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/rnsap/RNSAP-PDU-Descriptions.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.2 Elementary Procedure Definitions -- --- $Id: RNSAP-PDU-Descriptions.asn 34928 2010-11-17 15:36:53Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/ros/Makefile.am wireshark-1.10.6/asn1/ros/Makefile.am --- wireshark-1.10.5/asn1/ros/Makefile.am 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ros/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ros/Makefile.common wireshark-1.10.6/asn1/ros/Makefile.common --- wireshark-1.10.5/asn1/ros/Makefile.common 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ros/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ros/Makefile.in wireshark-1.10.6/asn1/ros/Makefile.in --- wireshark-1.10.5/asn1/ros/Makefile.in 2013-12-19 19:13:41.000000000 +0000 +++ wireshark-1.10.6/asn1/ros/Makefile.in 2014-03-07 18:07:30.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ros/Makefile.nmake wireshark-1.10.6/asn1/ros/Makefile.nmake --- wireshark-1.10.5/asn1/ros/Makefile.nmake 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ros/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ros/packet-ros-template.c wireshark-1.10.6/asn1/ros/packet-ros-template.c --- wireshark-1.10.5/asn1/ros/packet-ros-template.c 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ros/packet-ros-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ROS packet dissection * Graeme Lunt 2005 * - * $Id: packet-ros-template.c 48609 2013-03-28 07:34:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/ros/packet-ros-template.h wireshark-1.10.6/asn1/ros/packet-ros-template.h --- wireshark-1.10.5/asn1/ros/packet-ros-template.h 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ros/packet-ros-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ROS packet dissection * Graeme Lunt 2005 * - * $Id: packet-ros-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/ros/ros-err.cnf wireshark-1.10.6/asn1/ros/ros-err.cnf --- wireshark-1.10.5/asn1/ros/ros-err.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ros/ros-err.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # ros-err.cnf # ROS ReturnError common code # Copyright 2007 Tomas Kukosa -# $Id: ros-err.cnf 35224 2010-12-20 05:35:29Z guy $ +# $Id$ #.FN_HDR ReturnError dissector_handle_t err_handle = NULL; diff -Nru wireshark-1.10.5/asn1/ros/ros-inv.cnf wireshark-1.10.6/asn1/ros/ros-inv.cnf --- wireshark-1.10.5/asn1/ros/ros-inv.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ros/ros-inv.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # ros-inv.cnf # ROS Invoke common code # Copyright 2007 Tomas Kukosa -# $Id: ros-inv.cnf 35224 2010-12-20 05:35:29Z guy $ +# $Id$ #.FN_HDR Invoke diff -Nru wireshark-1.10.5/asn1/ros/ros-rej.cnf wireshark-1.10.6/asn1/ros/ros-rej.cnf --- wireshark-1.10.5/asn1/ros/ros-rej.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ros/ros-rej.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # ros-rej.cnf # ROS Reject common code # Copyright 2007 Tomas Kukosa -# $Id: ros-rej.cnf 22936 2007-09-24 11:01:53Z kukosa $ +# $Id$ #.FN_HDR Reject const gchar *descr = ""; diff -Nru wireshark-1.10.5/asn1/ros/ros-res.cnf wireshark-1.10.6/asn1/ros/ros-res.cnf --- wireshark-1.10.5/asn1/ros/ros-res.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/ros/ros-res.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # ros-res.cnf # ROS ReturnResult common code # Copyright 2007 Tomas Kukosa -# $Id: ros-res.cnf 35224 2010-12-20 05:35:29Z guy $ +# $Id$ #.FN_HDR ReturnResult dissector_handle_t res_handle = NULL; diff -Nru wireshark-1.10.5/asn1/rrc/Class-definitions.asn wireshark-1.10.6/asn1/rrc/Class-definitions.asn --- wireshark-1.10.5/asn1/rrc/Class-definitions.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/rrc/Class-definitions.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ -- 3GPP TS 25.331 V11.5.0 (2013-03) --- $Id: Class-definitions.asn 48444 2013-03-20 21:15:19Z pascal $ +-- $Id$ -- Class-definitions DEFINITIONS AUTOMATIC TAGS ::= diff -Nru wireshark-1.10.5/asn1/rrc/Constant-definitions.asn wireshark-1.10.6/asn1/rrc/Constant-definitions.asn --- wireshark-1.10.5/asn1/rrc/Constant-definitions.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/rrc/Constant-definitions.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ -- 3GPP TS 25.331 V11.5.0 (2013-03) --- $Id: Constant-definitions.asn 48444 2013-03-20 21:15:19Z pascal $ +-- $Id$ -- Constant-definitions DEFINITIONS AUTOMATIC TAGS ::= diff -Nru wireshark-1.10.5/asn1/rrc/InformationElements.asn wireshark-1.10.6/asn1/rrc/InformationElements.asn --- wireshark-1.10.5/asn1/rrc/InformationElements.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/rrc/InformationElements.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ -- 3GPP TS 25.331 V11.5.0 (2013-03) --- $Id: InformationElements.asn 48444 2013-03-20 21:15:19Z pascal $ +-- $Id$ -- InformationElements DEFINITIONS AUTOMATIC TAGS ::= diff -Nru wireshark-1.10.5/asn1/rrc/Internode-definitions.asn wireshark-1.10.6/asn1/rrc/Internode-definitions.asn --- wireshark-1.10.5/asn1/rrc/Internode-definitions.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/rrc/Internode-definitions.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ -- 3GPP TS 25.331 V11.5.0 (2013-03) --- $Id: Internode-definitions.asn 48444 2013-03-20 21:15:19Z pascal $ +-- $Id$ -- Internode-definitions DEFINITIONS AUTOMATIC TAGS ::= diff -Nru wireshark-1.10.5/asn1/rrc/Makefile.am wireshark-1.10.6/asn1/rrc/Makefile.am --- wireshark-1.10.5/asn1/rrc/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/rrc/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rrc/Makefile.common wireshark-1.10.6/asn1/rrc/Makefile.common --- wireshark-1.10.5/asn1/rrc/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/rrc/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rrc/Makefile.in wireshark-1.10.6/asn1/rrc/Makefile.in --- wireshark-1.10.5/asn1/rrc/Makefile.in 2013-12-19 19:13:41.000000000 +0000 +++ wireshark-1.10.6/asn1/rrc/Makefile.in 2014-03-07 18:07:30.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rrc/Makefile.nmake wireshark-1.10.6/asn1/rrc/Makefile.nmake --- wireshark-1.10.5/asn1/rrc/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/rrc/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rrc/packet-rrc-template.c wireshark-1.10.6/asn1/rrc/packet-rrc-template.c --- wireshark-1.10.5/asn1/rrc/packet-rrc-template.c 2013-06-03 17:50:22.000000000 +0000 +++ wireshark-1.10.6/asn1/rrc/packet-rrc-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * (3GPP TS 25.331 packet dissection * Copyright 2006-2010, Anders Broman * - * $Id: packet-rrc-template.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/rrc/packet-rrc-template.h wireshark-1.10.6/asn1/rrc/packet-rrc-template.h --- wireshark-1.10.5/asn1/rrc/packet-rrc-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/rrc/packet-rrc-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-rrc-template.h * Copyright 2009, Anders Broman * - * $Id: packet-rrc-template.h 46012 2012-11-12 21:39:14Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/rrc/PDU-definitions.asn wireshark-1.10.6/asn1/rrc/PDU-definitions.asn --- wireshark-1.10.5/asn1/rrc/PDU-definitions.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/rrc/PDU-definitions.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ -- 3GPP TS 25.331 V11.5.0 (2013-03) --- $Id: PDU-definitions.asn 48444 2013-03-20 21:15:19Z pascal $ +-- $Id$ -- PDU-definitions DEFINITIONS AUTOMATIC TAGS ::= diff -Nru wireshark-1.10.5/asn1/rrc/rrc.cnf wireshark-1.10.6/asn1/rrc/rrc.cnf --- wireshark-1.10.5/asn1/rrc/rrc.cnf 2013-06-03 17:50:22.000000000 +0000 +++ wireshark-1.10.6/asn1/rrc/rrc.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # rrc.cnf # rrc conformation file # Copyright 2006 Anders Broman -# $Id: rrc.cnf 49721 2013-06-03 17:44:22Z gerald $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/rrlp/Makefile.am wireshark-1.10.6/asn1/rrlp/Makefile.am --- wireshark-1.10.5/asn1/rrlp/Makefile.am 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/rrlp/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rrlp/Makefile.common wireshark-1.10.6/asn1/rrlp/Makefile.common --- wireshark-1.10.5/asn1/rrlp/Makefile.common 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/rrlp/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rrlp/Makefile.in wireshark-1.10.6/asn1/rrlp/Makefile.in --- wireshark-1.10.5/asn1/rrlp/Makefile.in 2013-12-19 19:13:41.000000000 +0000 +++ wireshark-1.10.6/asn1/rrlp/Makefile.in 2014-03-07 18:07:31.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rrlp/Makefile.nmake wireshark-1.10.6/asn1/rrlp/Makefile.nmake --- wireshark-1.10.5/asn1/rrlp/Makefile.nmake 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/rrlp/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rrlp/packet-rrlp-template.c wireshark-1.10.6/asn1/rrlp/packet-rrlp-template.c --- wireshark-1.10.5/asn1/rrlp/packet-rrlp-template.c 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/rrlp/packet-rrlp-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for 3GPP Radio Resource LCS Protocol (RRLP) packet dissection * Copyright 2006, Anders Broman * - * $Id: packet-rrlp-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/rrlp/rrlp.cnf wireshark-1.10.6/asn1/rrlp/rrlp.cnf --- wireshark-1.10.5/asn1/rrlp/rrlp.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/rrlp/rrlp.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # rrlp.cnf # rrlp conformation file # Copyright 2006 Anders Broman -# $Id: rrlp.cnf 44533 2012-08-15 20:43:00Z pascal $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/rrlp/RRLP-Components.asn wireshark-1.10.6/asn1/rrlp/RRLP-Components.asn --- wireshark-1.10.5/asn1/rrlp/RRLP-Components.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/rrlp/RRLP-Components.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ -- RRLP-Components.asn --- $Id: RRLP-Components.asn 44534 2012-08-15 20:50:26Z pascal $ +-- $Id$ -- Taken from 3GPP TS 44.031 V9.2.0 (2010-03) -- http://www.3gpp.org/ftp/Specs/archive/44_series/44.031/44031-920.zip/44031-920.doc -- diff -Nru wireshark-1.10.5/asn1/rrlp/RRLP-Messages.asn wireshark-1.10.6/asn1/rrlp/RRLP-Messages.asn --- wireshark-1.10.5/asn1/rrlp/RRLP-Messages.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/rrlp/RRLP-Messages.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ -- RRLP-Messages.asn --- $Id: RRLP-Messages.asn 42351 2012-04-30 16:45:03Z pascal $ +-- $Id$ -- Taken from 3GPP TS 44.031 V9.2.0 (2010-03) -- http://www.3gpp.org/ftp/Specs/archive/44_series/44.031/44031-920.zip/44031-920.doc -- diff -Nru wireshark-1.10.5/asn1/rtse/Makefile.am wireshark-1.10.6/asn1/rtse/Makefile.am --- wireshark-1.10.5/asn1/rtse/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/rtse/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rtse/Makefile.common wireshark-1.10.6/asn1/rtse/Makefile.common --- wireshark-1.10.5/asn1/rtse/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/rtse/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rtse/Makefile.in wireshark-1.10.6/asn1/rtse/Makefile.in --- wireshark-1.10.5/asn1/rtse/Makefile.in 2013-12-19 19:13:41.000000000 +0000 +++ wireshark-1.10.6/asn1/rtse/Makefile.in 2014-03-07 18:07:31.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rtse/Makefile.nmake wireshark-1.10.6/asn1/rtse/Makefile.nmake --- wireshark-1.10.5/asn1/rtse/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/rtse/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rtse/packet-rtse-template.c wireshark-1.10.6/asn1/rtse/packet-rtse-template.c --- wireshark-1.10.5/asn1/rtse/packet-rtse-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/rtse/packet-rtse-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for RTSE packet dissection * Graeme Lunt 2005 * - * $Id: packet-rtse-template.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/rtse/packet-rtse-template.h wireshark-1.10.6/asn1/rtse/packet-rtse-template.h --- wireshark-1.10.5/asn1/rtse/packet-rtse-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/rtse/packet-rtse-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for RTSE packet dissection * Graeme Lunt 2005 * - * $Id: packet-rtse-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/rtse/rtse.asn wireshark-1.10.6/asn1/rtse/rtse.asn --- wireshark-1.10.5/asn1/rtse/rtse.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/rtse/rtse.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: rtse.asn 33907 2010-08-24 07:44:36Z etxrab $ +-- $Id$ -- RTSE definition from -- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x228/1988/Reliable-Transfer-APDU.html -- and modified to pass through asn2wrs diff -Nru wireshark-1.10.5/asn1/rtse/rtse.cnf wireshark-1.10.6/asn1/rtse/rtse.cnf --- wireshark-1.10.5/asn1/rtse/rtse.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/rtse/rtse.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: rtse.cnf 46748 2012-12-26 05:57:06Z guy $ +# $Id$ #.EXPORTS RTORQapdu RTOACapdu diff -Nru wireshark-1.10.5/asn1/rua/Makefile.am wireshark-1.10.6/asn1/rua/Makefile.am --- wireshark-1.10.5/asn1/rua/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/rua/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rua/Makefile.common wireshark-1.10.6/asn1/rua/Makefile.common --- wireshark-1.10.5/asn1/rua/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/rua/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rua/Makefile.in wireshark-1.10.6/asn1/rua/Makefile.in --- wireshark-1.10.5/asn1/rua/Makefile.in 2013-12-19 19:13:41.000000000 +0000 +++ wireshark-1.10.6/asn1/rua/Makefile.in 2014-03-07 18:07:31.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rua/Makefile.nmake wireshark-1.10.6/asn1/rua/Makefile.nmake --- wireshark-1.10.5/asn1/rua/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/rua/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/rua/packet-rua-template.c wireshark-1.10.6/asn1/rua/packet-rua-template.c --- wireshark-1.10.5/asn1/rua/packet-rua-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/rua/packet-rua-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for UMTS Home Node B RANAP User Adaptation (RUA) packet dissection * Copyright 2010 Neil Piercy, ip.access Limited * - * $Id: packet-rua-template.c 48609 2013-03-28 07:34:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/rua/rua.cnf wireshark-1.10.6/asn1/rua/rua.cnf --- wireshark-1.10.5/asn1/rua/rua.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/rua/rua.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # rua.cnf # rua conformation file # Copyright 2010 Neil Piercy, ip.access Limited -# $Id: rua.cnf 32175 2010-03-12 19:34:07Z etxrab $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/rua/RUA-CommonDataTypes.asn wireshark-1.10.6/asn1/rua/RUA-CommonDataTypes.asn --- wireshark-1.10.5/asn1/rua/RUA-CommonDataTypes.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/rua/RUA-CommonDataTypes.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.5 Common definitions -- --- $Id: RUA-CommonDataTypes.asn 32779 2010-05-13 07:41:35Z etxrab $ +-- $Id$ -- -- ************************************************************** -- diff -Nru wireshark-1.10.5/asn1/rua/RUA-Constants.asn wireshark-1.10.6/asn1/rua/RUA-Constants.asn --- wireshark-1.10.5/asn1/rua/RUA-Constants.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/rua/RUA-Constants.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.6 Constant definitions -- --- $Id: RUA-Constants.asn 32779 2010-05-13 07:41:35Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/rua/RUA-Containers.asn wireshark-1.10.6/asn1/rua/RUA-Containers.asn --- wireshark-1.10.5/asn1/rua/RUA-Containers.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/rua/RUA-Containers.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.7 Container definitions -- --- $Id: RUA-Containers.asn 32779 2010-05-13 07:41:35Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/rua/RUA-IEs.asn wireshark-1.10.6/asn1/rua/RUA-IEs.asn --- wireshark-1.10.5/asn1/rua/RUA-IEs.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/rua/RUA-IEs.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.4 Information Element definitions -- --- $Id: RUA-IEs.asn 32779 2010-05-13 07:41:35Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/rua/RUA-PDU-Contents.asn wireshark-1.10.6/asn1/rua/RUA-PDU-Contents.asn --- wireshark-1.10.5/asn1/rua/RUA-PDU-Contents.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/rua/RUA-PDU-Contents.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.3 PDU definitions -- --- $Id: RUA-PDU-Contents.asn 32779 2010-05-13 07:41:35Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/rua/RUA-PDU-Descriptions.asn wireshark-1.10.6/asn1/rua/RUA-PDU-Descriptions.asn --- wireshark-1.10.5/asn1/rua/RUA-PDU-Descriptions.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/rua/RUA-PDU-Descriptions.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.2 Elementary Procedure definitions -- --- $Id: RUA-PDU-Descriptions.asn 32779 2010-05-13 07:41:35Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/s1ap/Makefile.am wireshark-1.10.6/asn1/s1ap/Makefile.am --- wireshark-1.10.5/asn1/s1ap/Makefile.am 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/s1ap/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/s1ap/Makefile.common wireshark-1.10.6/asn1/s1ap/Makefile.common --- wireshark-1.10.5/asn1/s1ap/Makefile.common 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/s1ap/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/s1ap/Makefile.in wireshark-1.10.6/asn1/s1ap/Makefile.in --- wireshark-1.10.5/asn1/s1ap/Makefile.in 2013-12-19 19:13:41.000000000 +0000 +++ wireshark-1.10.6/asn1/s1ap/Makefile.in 2014-03-07 18:07:31.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/s1ap/Makefile.nmake wireshark-1.10.6/asn1/s1ap/Makefile.nmake --- wireshark-1.10.5/asn1/s1ap/Makefile.nmake 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/s1ap/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/s1ap/packet-s1ap-template.c wireshark-1.10.6/asn1/s1ap/packet-s1ap-template.c --- wireshark-1.10.5/asn1/s1ap/packet-s1ap-template.c 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/s1ap/packet-s1ap-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for E-UTRAN S1 Application Protocol (S1AP) packet dissection * Copyright 2007-2010, Anders Broman * - * $Id: packet-s1ap-template.c 48609 2013-03-28 07:34:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/s1ap/packet-s1ap-template.h wireshark-1.10.6/asn1/s1ap/packet-s1ap-template.h --- wireshark-1.10.5/asn1/s1ap/packet-s1ap-template.h 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/s1ap/packet-s1ap-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-s1ap.h * Routines for E-UTRAN S1 Application Protocol (S1AP) packet dissection * - * $Id: packet-s1ap-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/s1ap/s1ap.cnf wireshark-1.10.6/asn1/s1ap/s1ap.cnf --- wireshark-1.10.5/asn1/s1ap/s1ap.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/s1ap/s1ap.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # s1ap.cnf # s1ap conformation file -# $Id: s1ap.cnf 48429 2013-03-19 21:22:31Z etxrab $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/s1ap/S1AP-CommonDataTypes.asn wireshark-1.10.6/asn1/s1ap/S1AP-CommonDataTypes.asn --- wireshark-1.10.5/asn1/s1ap/S1AP-CommonDataTypes.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/s1ap/S1AP-CommonDataTypes.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: S1AP-CommonDataTypes.asn 40134 2011-12-09 18:55:45Z etxrab $ +-- $Id$ -- 3GPP TS 36.413 V10.3.0 (2011-09) -- 9.3.5 Common Definitions -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/s1ap/S1AP-Constants.asn wireshark-1.10.6/asn1/s1ap/S1AP-Constants.asn --- wireshark-1.10.5/asn1/s1ap/S1AP-Constants.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/s1ap/S1AP-Constants.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: S1AP-Constants.asn 40134 2011-12-09 18:55:45Z etxrab $ +-- $Id$ -- 3GPP TS 36.413 V10.3.0 (2011-09) -- 9.3.6 Constant Definitions -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/s1ap/S1AP-Containers.asn wireshark-1.10.6/asn1/s1ap/S1AP-Containers.asn --- wireshark-1.10.5/asn1/s1ap/S1AP-Containers.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/s1ap/S1AP-Containers.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: S1AP-Containers.asn 40134 2011-12-09 18:55:45Z etxrab $ +-- $Id$ -- 3GPP TS 36.413 V10.3.0 (2011-09) -- 9.3.7 Container Definitions -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/s1ap/S1AP-IEs.asn wireshark-1.10.6/asn1/s1ap/S1AP-IEs.asn --- wireshark-1.10.5/asn1/s1ap/S1AP-IEs.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/s1ap/S1AP-IEs.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: S1AP-IEs.asn 40134 2011-12-09 18:55:45Z etxrab $ +-- $Id$ -- 3GPP TS 36.413 V10.3.0 (2011-09) -- 9.3.4 Information Element Definitions -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/s1ap/S1AP-PDU-Contents.asn wireshark-1.10.6/asn1/s1ap/S1AP-PDU-Contents.asn --- wireshark-1.10.5/asn1/s1ap/S1AP-PDU-Contents.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/s1ap/S1AP-PDU-Contents.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: S1AP-PDU-Contents.asn 40134 2011-12-09 18:55:45Z etxrab $ +-- $Id$ -- 3GPP TS 36.413 V10.3.0 (2011-09) -- 9.3.3 PDU Definitions -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/s1ap/S1AP-PDU-Descriptions.asn wireshark-1.10.6/asn1/s1ap/S1AP-PDU-Descriptions.asn --- wireshark-1.10.5/asn1/s1ap/S1AP-PDU-Descriptions.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/s1ap/S1AP-PDU-Descriptions.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: S1AP-PDU-Descriptions.asn 40134 2011-12-09 18:55:45Z etxrab $ +-- $Id$ -- 3GPP TS 36.413 V10.3.0 (2011-09) -- 9.3.2 Elementary Procedure Definitions -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/s1ap/S1AP-SonTransfer-IEs.asn wireshark-1.10.6/asn1/s1ap/S1AP-SonTransfer-IEs.asn --- wireshark-1.10.5/asn1/s1ap/S1AP-SonTransfer-IEs.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/s1ap/S1AP-SonTransfer-IEs.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: S1AP-SonTransfer-IEs.asn 40134 2011-12-09 18:55:45Z etxrab $ +-- $Id$ -- 3GPP TS 36.413 V10.3.0 (2011-09) -- B.2 ASN.1 definition -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/sabp/Makefile.am wireshark-1.10.6/asn1/sabp/Makefile.am --- wireshark-1.10.5/asn1/sabp/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/sabp/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/sabp/Makefile.common wireshark-1.10.6/asn1/sabp/Makefile.common --- wireshark-1.10.5/asn1/sabp/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/sabp/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/sabp/Makefile.in wireshark-1.10.6/asn1/sabp/Makefile.in --- wireshark-1.10.5/asn1/sabp/Makefile.in 2013-12-19 19:13:42.000000000 +0000 +++ wireshark-1.10.6/asn1/sabp/Makefile.in 2014-03-07 18:07:31.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/sabp/Makefile.nmake wireshark-1.10.6/asn1/sabp/Makefile.nmake --- wireshark-1.10.5/asn1/sabp/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/sabp/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/sabp/packet-sabp-template.c wireshark-1.10.6/asn1/sabp/packet-sabp-template.c --- wireshark-1.10.5/asn1/sabp/packet-sabp-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/sabp/packet-sabp-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for UTRAN Iu-BC Interface: Service Area Broadcast Protocol (SBAP) packet dissection * Copyright 2007, Tomas Kukosa * - * $Id: packet-sabp-template.c 48609 2013-03-28 07:34:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/sabp/sabp.cnf wireshark-1.10.6/asn1/sabp/sabp.cnf --- wireshark-1.10.5/asn1/sabp/sabp.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/sabp/sabp.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # sabp.cnf # sabp conformation file # Copyright 2007 Tomas Kukosa -# $Id: sabp.cnf 47273 2013-01-25 16:50:05Z pascal $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/sabp/SABP-CommonDataTypes.asn wireshark-1.10.6/asn1/sabp/SABP-CommonDataTypes.asn --- wireshark-1.10.5/asn1/sabp/SABP-CommonDataTypes.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/sabp/SABP-CommonDataTypes.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.5 Common Definitions -- --- $Id: SABP-CommonDataTypes.asn 47192 2013-01-21 07:09:13Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/sabp/SABP-Constants.asn wireshark-1.10.6/asn1/sabp/SABP-Constants.asn --- wireshark-1.10.5/asn1/sabp/SABP-Constants.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/sabp/SABP-Constants.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.6 Constant Definitions -- --- $Id: SABP-Constants.asn 47192 2013-01-21 07:09:13Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/sabp/SABP-Containers.asn wireshark-1.10.6/asn1/sabp/SABP-Containers.asn --- wireshark-1.10.5/asn1/sabp/SABP-Containers.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/sabp/SABP-Containers.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.7 Container Definitions -- --- $Id: SABP-Containers.asn 47192 2013-01-21 07:09:13Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/sabp/SABP-IEs.asn wireshark-1.10.6/asn1/sabp/SABP-IEs.asn --- wireshark-1.10.5/asn1/sabp/SABP-IEs.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/sabp/SABP-IEs.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.4 Information Element Definitions -- --- $Id: SABP-IEs.asn 47192 2013-01-21 07:09:13Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/sabp/SABP-PDU-Contents.asn wireshark-1.10.6/asn1/sabp/SABP-PDU-Contents.asn --- wireshark-1.10.5/asn1/sabp/SABP-PDU-Contents.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/sabp/SABP-PDU-Contents.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.3 PDU Definitions -- --- $Id: SABP-PDU-Contents.asn 47192 2013-01-21 07:09:13Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/sabp/SABP-PDU-Descriptions.asn wireshark-1.10.6/asn1/sabp/SABP-PDU-Descriptions.asn --- wireshark-1.10.5/asn1/sabp/SABP-PDU-Descriptions.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/sabp/SABP-PDU-Descriptions.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 9.3.2 Elementary Procedure Definitions -- --- $Id: SABP-PDU-Descriptions.asn 47192 2013-01-21 07:09:13Z etxrab $ +-- $Id$ -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/sbc-ap/Makefile.am wireshark-1.10.6/asn1/sbc-ap/Makefile.am --- wireshark-1.10.5/asn1/sbc-ap/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/sbc-ap/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/sbc-ap/Makefile.common wireshark-1.10.6/asn1/sbc-ap/Makefile.common --- wireshark-1.10.5/asn1/sbc-ap/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/sbc-ap/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/sbc-ap/Makefile.in wireshark-1.10.6/asn1/sbc-ap/Makefile.in --- wireshark-1.10.5/asn1/sbc-ap/Makefile.in 2013-12-19 19:13:42.000000000 +0000 +++ wireshark-1.10.6/asn1/sbc-ap/Makefile.in 2014-03-07 18:07:31.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/sbc-ap/Makefile.nmake wireshark-1.10.6/asn1/sbc-ap/Makefile.nmake --- wireshark-1.10.5/asn1/sbc-ap/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/sbc-ap/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/sbc-ap/packet-sbc-ap-template.c wireshark-1.10.6/asn1/sbc-ap/packet-sbc-ap-template.c --- wireshark-1.10.5/asn1/sbc-ap/packet-sbc-ap-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/sbc-ap/packet-sbc-ap-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-sbc-ap.c * Routines for SBc Application Part (SBc-AP) packet dissection * - * $Id: packet-sbc-ap-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/sbc-ap/sbc-ap.cnf wireshark-1.10.6/asn1/sbc-ap/sbc-ap.cnf --- wireshark-1.10.5/asn1/sbc-ap/sbc-ap.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/sbc-ap/sbc-ap.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # sbc-ap.cnf # sbc-ap conformation file -# $Id: sbc-ap.cnf 39766 2011-11-08 19:30:51Z etxrab $?? +# $Id$?? #.OPT PER diff -Nru wireshark-1.10.5/asn1/sbc-ap/SBC-AP-CommonDataTypes.asn wireshark-1.10.6/asn1/sbc-ap/SBC-AP-CommonDataTypes.asn --- wireshark-1.10.5/asn1/sbc-ap/SBC-AP-CommonDataTypes.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/sbc-ap/SBC-AP-CommonDataTypes.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 4.4.6 Common Definitions -- --- $Id: SBC-AP-CommonDataTypes.asn 39756 2011-11-08 17:17:05Z etxrab $?? +-- $Id$?? -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/sbc-ap/SBC-AP-Constants.asn wireshark-1.10.6/asn1/sbc-ap/SBC-AP-Constants.asn --- wireshark-1.10.5/asn1/sbc-ap/SBC-AP-Constants.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/sbc-ap/SBC-AP-Constants.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 4.4.7 Constant Definitions -- --- $Id: SBC-AP-Constants.asn 39756 2011-11-08 17:17:05Z etxrab $?? +-- $Id$?? -- -- ************************************************************** -- diff -Nru wireshark-1.10.5/asn1/sbc-ap/SBC-AP-Containers.asn wireshark-1.10.6/asn1/sbc-ap/SBC-AP-Containers.asn --- wireshark-1.10.5/asn1/sbc-ap/SBC-AP-Containers.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/sbc-ap/SBC-AP-Containers.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 4.4.8 Container Definitions -- --- $Id: SBC-AP-Containers.asn 39756 2011-11-08 17:17:05Z etxrab $?? +-- $Id$?? -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/sbc-ap/SBC-AP-IEs.asn wireshark-1.10.6/asn1/sbc-ap/SBC-AP-IEs.asn --- wireshark-1.10.5/asn1/sbc-ap/SBC-AP-IEs.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/sbc-ap/SBC-AP-IEs.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 4.4.5 Information Element Definitions -- --- $Id: SBC-AP-IEs.asn 39756 2011-11-08 17:17:05Z etxrab $?? +-- $Id$?? -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/sbc-ap/SBC-AP-PDU-Contents.asn wireshark-1.10.6/asn1/sbc-ap/SBC-AP-PDU-Contents.asn --- wireshark-1.10.5/asn1/sbc-ap/SBC-AP-PDU-Contents.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/sbc-ap/SBC-AP-PDU-Contents.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 4.4.4 PDU Definitions -- --- $Id: SBC-AP-PDU-Contents.asn 39781 2011-11-10 06:14:03Z etxrab $?? +-- $Id$?? -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/sbc-ap/SBC-AP-PDU-Descriptions.asn wireshark-1.10.6/asn1/sbc-ap/SBC-AP-PDU-Descriptions.asn --- wireshark-1.10.5/asn1/sbc-ap/SBC-AP-PDU-Descriptions.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/sbc-ap/SBC-AP-PDU-Descriptions.asn 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ -- -- 4.4.3 Elementary Procedure Definitions -- --- $Id: SBC-AP-PDU-Descriptions.asn 39756 2011-11-08 17:17:05Z etxrab $?? +-- $Id$?? -- -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/smrse/Makefile.am wireshark-1.10.6/asn1/smrse/Makefile.am --- wireshark-1.10.5/asn1/smrse/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/smrse/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/smrse/Makefile.common wireshark-1.10.6/asn1/smrse/Makefile.common --- wireshark-1.10.5/asn1/smrse/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/smrse/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/smrse/Makefile.in wireshark-1.10.6/asn1/smrse/Makefile.in --- wireshark-1.10.5/asn1/smrse/Makefile.in 2013-12-19 19:13:42.000000000 +0000 +++ wireshark-1.10.6/asn1/smrse/Makefile.in 2014-03-07 18:07:31.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/smrse/Makefile.nmake wireshark-1.10.6/asn1/smrse/Makefile.nmake --- wireshark-1.10.5/asn1/smrse/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/smrse/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/smrse/packet-smrse-template.c wireshark-1.10.6/asn1/smrse/packet-smrse-template.c --- wireshark-1.10.5/asn1/smrse/packet-smrse-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/smrse/packet-smrse-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for SMRSE Short Message Relay Service packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-smrse-template.c 48609 2013-03-28 07:34:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/smrse/packet-smrse-template.h wireshark-1.10.6/asn1/smrse/packet-smrse-template.h --- wireshark-1.10.5/asn1/smrse/packet-smrse-template.h 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/smrse/packet-smrse-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for SMRSE Short Message Relay Service packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-smrse-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/smrse/smrse.cnf wireshark-1.10.6/asn1/smrse/smrse.cnf --- wireshark-1.10.5/asn1/smrse/smrse.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/smrse/smrse.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # smrse.cnf # SMRSE conformation file -# $Id: smrse.cnf 48045 2013-03-04 06:48:36Z etxrab $ +# $Id$ #.MODULE_IMPORT diff -Nru wireshark-1.10.5/asn1/snmp/Makefile.am wireshark-1.10.6/asn1/snmp/Makefile.am --- wireshark-1.10.5/asn1/snmp/Makefile.am 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/snmp/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/snmp/Makefile.common wireshark-1.10.6/asn1/snmp/Makefile.common --- wireshark-1.10.5/asn1/snmp/Makefile.common 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/snmp/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/snmp/Makefile.in wireshark-1.10.6/asn1/snmp/Makefile.in --- wireshark-1.10.5/asn1/snmp/Makefile.in 2013-12-19 19:13:42.000000000 +0000 +++ wireshark-1.10.6/asn1/snmp/Makefile.in 2014-03-07 18:07:31.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/snmp/Makefile.nmake wireshark-1.10.6/asn1/snmp/Makefile.nmake --- wireshark-1.10.5/asn1/snmp/Makefile.nmake 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/snmp/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/snmp/packet-snmp-template.c wireshark-1.10.6/asn1/snmp/packet-snmp-template.c --- wireshark-1.10.5/asn1/snmp/packet-snmp-template.c 2013-08-19 11:31:14.000000000 +0000 +++ wireshark-1.10.6/asn1/snmp/packet-snmp-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -17,7 +17,7 @@ * See RFC 2578 for Structure of Management Information Version 2 (SMIv2) * Copyright (C) 2007 Luis E. Garcia Ontanon * - * $Id: packet-snmp-template.c 51425 2013-08-19 11:25:35Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/snmp/packet-snmp-template.h wireshark-1.10.6/asn1/snmp/packet-snmp-template.h --- wireshark-1.10.5/asn1/snmp/packet-snmp-template.h 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/snmp/packet-snmp-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-snmp.h * Routines for snmp packet dissection * - * $Id: packet-snmp-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/snmp/snmp.asn wireshark-1.10.6/asn1/snmp/snmp.asn --- wireshark-1.10.5/asn1/snmp/snmp.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/snmp/snmp.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: snmp.asn 39114 2011-09-23 22:44:28Z gerald $ +-- $Id$ RFC1157-SNMP DEFINITIONS ::= BEGIN -- IMPORTS diff -Nru wireshark-1.10.5/asn1/snmp/snmp.cnf wireshark-1.10.6/asn1/snmp/snmp.cnf --- wireshark-1.10.5/asn1/snmp/snmp.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/snmp/snmp.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # snmp.cnf # snmp conformation file -# $Id: snmp.cnf 46769 2012-12-26 10:54:03Z guy $ +# $Id$ #.PDU diff -Nru wireshark-1.10.5/asn1/spnego/Makefile.am wireshark-1.10.6/asn1/spnego/Makefile.am --- wireshark-1.10.5/asn1/spnego/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/spnego/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/spnego/Makefile.common wireshark-1.10.6/asn1/spnego/Makefile.common --- wireshark-1.10.5/asn1/spnego/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/spnego/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/spnego/Makefile.in wireshark-1.10.6/asn1/spnego/Makefile.in --- wireshark-1.10.5/asn1/spnego/Makefile.in 2013-12-19 19:13:42.000000000 +0000 +++ wireshark-1.10.6/asn1/spnego/Makefile.in 2014-03-07 18:07:31.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/spnego/Makefile.nmake wireshark-1.10.6/asn1/spnego/Makefile.nmake --- wireshark-1.10.5/asn1/spnego/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/spnego/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/spnego/packet-spnego-template.c wireshark-1.10.6/asn1/spnego/packet-spnego-template.c --- wireshark-1.10.5/asn1/spnego/packet-spnego-template.c 2013-06-03 17:50:22.000000000 +0000 +++ wireshark-1.10.6/asn1/spnego/packet-spnego-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ * Copyright 2005, Ronnie Sahlberg (krb decryption) * Copyright 2005, Anders Broman (converted to asn2wrs generated dissector) * - * $Id: packet-spnego-template.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/spnego/spnego.cnf wireshark-1.10.6/asn1/spnego/spnego.cnf --- wireshark-1.10.5/asn1/spnego/spnego.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/spnego/spnego.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # spnego.cnf # spnego conformation file -# $Id: spnego.cnf 48045 2013-03-04 06:48:36Z etxrab $ +# $Id$ #.EXPORTS diff -Nru wireshark-1.10.5/asn1/sv/Makefile.am wireshark-1.10.6/asn1/sv/Makefile.am --- wireshark-1.10.5/asn1/sv/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/sv/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/sv/Makefile.common wireshark-1.10.6/asn1/sv/Makefile.common --- wireshark-1.10.5/asn1/sv/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/sv/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/sv/Makefile.in wireshark-1.10.6/asn1/sv/Makefile.in --- wireshark-1.10.5/asn1/sv/Makefile.in 2013-12-19 19:13:42.000000000 +0000 +++ wireshark-1.10.6/asn1/sv/Makefile.in 2014-03-07 18:07:31.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/sv/Makefile.nmake wireshark-1.10.6/asn1/sv/Makefile.nmake --- wireshark-1.10.5/asn1/sv/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/sv/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/sv/packet-sv-template.c wireshark-1.10.6/asn1/sv/packet-sv-template.c --- wireshark-1.10.5/asn1/sv/packet-sv-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/sv/packet-sv-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for IEC 61850 Sampled Vales packet dissection * Michael Bernhard 2008 * - * $Id: packet-sv-template.c 48609 2013-03-28 07:34:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/sv/packet-sv-template.h wireshark-1.10.6/asn1/sv/packet-sv-template.h --- wireshark-1.10.5/asn1/sv/packet-sv-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/sv/packet-sv-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for IEC 61850 Sampled Vales packet dissection * Michael Bernhard 2008 * - * $Id: packet-sv-template.h 47016 2013-01-10 12:13:16Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/sv/sv.asn wireshark-1.10.6/asn1/sv/sv.asn --- wireshark-1.10.5/asn1/sv/sv.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/sv/sv.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: sv.asn 47016 2013-01-10 12:13:16Z etxrab $ +-- $Id$ IEC61850 DEFINITIONS ::= BEGIN SampledValues ::= CHOICE { diff -Nru wireshark-1.10.5/asn1/sv/sv.cnf wireshark-1.10.6/asn1/sv/sv.cnf --- wireshark-1.10.5/asn1/sv/sv.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/sv/sv.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # sv.cnf # SampledValue conformation file -# $Id: sv.cnf 47016 2013-01-10 12:13:16Z etxrab $ +# $Id$ #.MODULE_IMPORT diff -Nru wireshark-1.10.5/asn1/t124/GCC-PROTOCOL.asn wireshark-1.10.6/asn1/t124/GCC-PROTOCOL.asn --- wireshark-1.10.5/asn1/t124/GCC-PROTOCOL.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/t124/GCC-PROTOCOL.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: GCC-PROTOCOL.asn 39066 2011-09-21 07:35:51Z gal $ +-- $Id$ -- Module GCC-PROTOCOL (T.124:01/2007) -- See also ITU-T T.124 (01/2007) -- See also the index of all ASN.1 assignments needed in this document diff -Nru wireshark-1.10.5/asn1/t124/Makefile.am wireshark-1.10.6/asn1/t124/Makefile.am --- wireshark-1.10.5/asn1/t124/Makefile.am 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/t124/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/t124/Makefile.common wireshark-1.10.6/asn1/t124/Makefile.common --- wireshark-1.10.5/asn1/t124/Makefile.common 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/t124/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/t124/Makefile.in wireshark-1.10.6/asn1/t124/Makefile.in --- wireshark-1.10.5/asn1/t124/Makefile.in 2013-12-19 19:13:42.000000000 +0000 +++ wireshark-1.10.6/asn1/t124/Makefile.in 2014-03-07 18:07:31.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/t124/Makefile.nmake wireshark-1.10.6/asn1/t124/Makefile.nmake --- wireshark-1.10.5/asn1/t124/Makefile.nmake 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/t124/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/t124/packet-t124-template.c wireshark-1.10.6/asn1/t124/packet-t124-template.c --- wireshark-1.10.5/asn1/t124/packet-t124-template.c 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/t124/packet-t124-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for t124 packet dissection * Copyright 2010, Graeme Lunt * - * $Id: packet-t124-template.c 48609 2013-03-28 07:34:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -163,9 +163,11 @@ * to have a version of dissect_per_sequence() that checks all * references to the tvbuff before making them and returning "no" * if they would fail. + * + * We (ab)use hf_t124_connectGCCPDU here just to give a valid entry... */ TRY { - (void) dissect_per_sequence(tvb, 0, &asn1_ctx, NULL, -1, -1, t124Heur_sequence); + (void) dissect_per_sequence(tvb, 0, &asn1_ctx, NULL, hf_t124_connectGCCPDU, -1, t124Heur_sequence); } CATCH_BOUNDS_ERRORS { failed = TRUE; } ENDTRY; diff -Nru wireshark-1.10.5/asn1/t124/packet-t124-template.h wireshark-1.10.6/asn1/t124/packet-t124-template.h --- wireshark-1.10.5/asn1/t124/packet-t124-template.h 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/t124/packet-t124-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for t124 packet dissection * Copyright 2010, Graeme Lunt * - * $Id: packet-t124-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/t124/t124.cnf wireshark-1.10.6/asn1/t124/t124.cnf --- wireshark-1.10.5/asn1/t124/t124.cnf 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/t124/t124.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ # T.124/GCC-PROTOCOL.cnf # Copyright 2011 Graeme Lunt -# $Id: t124.cnf 39690 2011-10-31 17:04:58Z etxrab $ +# $Id$ #---------------------------------------------------------------------------------------- #.EXPORTS #---------------------------------------------------------------------------------------- diff -Nru wireshark-1.10.5/asn1/t125/Makefile.am wireshark-1.10.6/asn1/t125/Makefile.am --- wireshark-1.10.5/asn1/t125/Makefile.am 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/t125/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/t125/Makefile.common wireshark-1.10.6/asn1/t125/Makefile.common --- wireshark-1.10.5/asn1/t125/Makefile.common 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/t125/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/t125/Makefile.in wireshark-1.10.6/asn1/t125/Makefile.in --- wireshark-1.10.5/asn1/t125/Makefile.in 2013-12-19 19:13:42.000000000 +0000 +++ wireshark-1.10.6/asn1/t125/Makefile.in 2014-03-07 18:07:31.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/t125/Makefile.nmake wireshark-1.10.6/asn1/t125/Makefile.nmake --- wireshark-1.10.5/asn1/t125/Makefile.nmake 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/t125/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/t125/packet-t125-template.c wireshark-1.10.6/asn1/t125/packet-t125-template.c --- wireshark-1.10.5/asn1/t125/packet-t125-template.c 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/t125/packet-t125-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for t125 packet dissection * Copyright 2007, Ronnie Sahlberg * - * $Id: packet-t125-template.c 48609 2013-03-28 07:34:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/t125/packet-t125-template.h wireshark-1.10.6/asn1/t125/packet-t125-template.h --- wireshark-1.10.5/asn1/t125/packet-t125-template.h 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/t125/packet-t125-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for t125 packet dissection * Copyright 2007, Ronnie Sahlberg * - * $Id: packet-t125-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/t125/t125.cnf wireshark-1.10.6/asn1/t125/t125.cnf --- wireshark-1.10.5/asn1/t125/t125.cnf 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/t125/t125.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ # T.125/MCS-PROTOCOL.cnf # Copyright 2007 Ronnie Sahlberg -# $Id: t125.cnf 44871 2012-09-11 08:26:48Z darkjames $ +# $Id$ #---------------------------------------------------------------------------------------- #.EXPORTS #---------------------------------------------------------------------------------------- diff -Nru wireshark-1.10.5/asn1/t38/Makefile.am wireshark-1.10.6/asn1/t38/Makefile.am --- wireshark-1.10.5/asn1/t38/Makefile.am 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/t38/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/t38/Makefile.common wireshark-1.10.6/asn1/t38/Makefile.common --- wireshark-1.10.5/asn1/t38/Makefile.common 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/t38/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/t38/Makefile.in wireshark-1.10.6/asn1/t38/Makefile.in --- wireshark-1.10.5/asn1/t38/Makefile.in 2013-12-19 19:13:42.000000000 +0000 +++ wireshark-1.10.6/asn1/t38/Makefile.in 2014-03-07 18:07:31.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/t38/Makefile.nmake wireshark-1.10.6/asn1/t38/Makefile.nmake --- wireshark-1.10.5/asn1/t38/Makefile.nmake 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/t38/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/t38/packet-t38-template.c wireshark-1.10.6/asn1/t38/packet-t38-template.c --- wireshark-1.10.5/asn1/t38/packet-t38-template.c 2013-06-03 17:50:21.000000000 +0000 +++ wireshark-1.10.6/asn1/t38/packet-t38-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * 2004 Alejandro Vaquero, add support Conversations for SDP * 2006 Alejandro Vaquero, add T30 reassemble and dissection * - * $Id: packet-t38-template.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/t38/packet-t38-template.h wireshark-1.10.6/asn1/t38/packet-t38-template.h --- wireshark-1.10.5/asn1/t38/packet-t38-template.h 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/t38/packet-t38-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * 2003 Hans Viens * 2004 Alejandro Vaquero, add support to conversation * - * $Id: packet-t38-template.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/t38/T38_2002.asn wireshark-1.10.6/asn1/t38/T38_2002.asn --- wireshark-1.10.5/asn1/t38/T38_2002.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/t38/T38_2002.asn 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ -- Taken from ITU ASN.1 database -- http://www.itu.int/ITU-T/asn1/database/itu-t/t/t38/2005/T38(2002).asn -- --- $Id: T38_2002.asn 23127 2007-10-10 08:09:19Z jmayer $ +-- $Id$ -- -- Module T38(2002) (T.38:09/2005) diff -Nru wireshark-1.10.5/asn1/t38/t38.cnf wireshark-1.10.6/asn1/t38/t38.cnf --- wireshark-1.10.5/asn1/t38/t38.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/t38/t38.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ # T.38 conformation file # 2007 Tomas Kukosa -# $Id: t38.cnf 48491 2013-03-22 23:59:54Z guy $ +# $Id$ #.EXPORTS ONLY_VALS WS_DLL Type-of-msg/t30-indicator diff -Nru wireshark-1.10.5/asn1/tcap/DialoguePDUs.asn wireshark-1.10.6/asn1/tcap/DialoguePDUs.asn --- wireshark-1.10.5/asn1/tcap/DialoguePDUs.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/tcap/DialoguePDUs.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: DialoguePDUs.asn 26186 2008-09-13 11:44:33Z etxrab $ +-- $Id$ -- Generated by Asnp, the pretty-printer of France Telecom R&D (http://asn1.elibel.tm.fr/asnp/) DialoguePDUs {itu-t recommendation q 773 modules(2) dialoguePDUs(2) version1(1) } DEFINITIONS ::= diff -Nru wireshark-1.10.5/asn1/tcap/Makefile.am wireshark-1.10.6/asn1/tcap/Makefile.am --- wireshark-1.10.5/asn1/tcap/Makefile.am 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/tcap/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/tcap/Makefile.common wireshark-1.10.6/asn1/tcap/Makefile.common --- wireshark-1.10.5/asn1/tcap/Makefile.common 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/tcap/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/tcap/Makefile.in wireshark-1.10.6/asn1/tcap/Makefile.in --- wireshark-1.10.5/asn1/tcap/Makefile.in 2013-12-19 19:13:42.000000000 +0000 +++ wireshark-1.10.6/asn1/tcap/Makefile.in 2014-03-07 18:07:31.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/tcap/Makefile.nmake wireshark-1.10.6/asn1/tcap/Makefile.nmake --- wireshark-1.10.5/asn1/tcap/Makefile.nmake 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/tcap/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/tcap/packet-tcap-template.c wireshark-1.10.6/asn1/tcap/packet-tcap-template.c --- wireshark-1.10.5/asn1/tcap/packet-tcap-template.c 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/tcap/packet-tcap-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2004 - 2005, Tim Endean * Built from the gsm-map dissector Copyright 2004 - 2005, Anders Broman * - * $Id: packet-tcap-template.c 47924 2013-02-27 22:43:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/tcap/packet-tcap-template.h wireshark-1.10.6/asn1/tcap/packet-tcap-template.h --- wireshark-1.10.5/asn1/tcap/packet-tcap-template.h 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/tcap/packet-tcap-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-tcap.h * - * $Id: packet-tcap-template.h 48558 2013-03-26 05:20:55Z etxrab $ + * $Id$ * * Copyright 2004, Tim Endean * diff -Nru wireshark-1.10.5/asn1/tcap/tcap.asn wireshark-1.10.6/asn1/tcap/tcap.asn --- wireshark-1.10.5/asn1/tcap/tcap.asn 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/tcap/tcap.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: tcap.asn 26192 2008-09-14 14:42:39Z etxrab $ +-- $Id$ TCAPMessages {itu-t recommendation q 773 modules(2) messages(1) version3(3)} DEFINITIONS ::= diff -Nru wireshark-1.10.5/asn1/tcap/tcap.cnf wireshark-1.10.6/asn1/tcap/tcap.cnf --- wireshark-1.10.5/asn1/tcap/tcap.cnf 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/tcap/tcap.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # tcap.cnf -# $Id: tcap.cnf 47924 2013-02-27 22:43:54Z guy $ +# $Id$ # tcap conformation file #.OMIT_ASSIGNMENT diff -Nru wireshark-1.10.5/asn1/tetra/Makefile.am wireshark-1.10.6/asn1/tetra/Makefile.am --- wireshark-1.10.5/asn1/tetra/Makefile.am 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/tetra/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/tetra/Makefile.common wireshark-1.10.6/asn1/tetra/Makefile.common --- wireshark-1.10.5/asn1/tetra/Makefile.common 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/tetra/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/tetra/Makefile.in wireshark-1.10.6/asn1/tetra/Makefile.in --- wireshark-1.10.5/asn1/tetra/Makefile.in 2013-12-19 19:13:42.000000000 +0000 +++ wireshark-1.10.6/asn1/tetra/Makefile.in 2014-03-07 18:07:31.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/tetra/Makefile.nmake wireshark-1.10.6/asn1/tetra/Makefile.nmake --- wireshark-1.10.5/asn1/tetra/Makefile.nmake 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/tetra/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/tetra/packet-tetra-template.c wireshark-1.10.6/asn1/tetra/packet-tetra-template.c --- wireshark-1.10.5/asn1/tetra/packet-tetra-template.c 2013-07-17 01:50:17.000000000 +0000 +++ wireshark-1.10.6/asn1/tetra/packet-tetra-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-tetra.c * Routines for TETRA packet dissection * - *$Id: packet-tetra-template.c 50688 2013-07-17 01:34:46Z gerald $ + *$Id$ * * Copyright (c) 2007 - 2011 Professional Mobile Communication Research Group, * Beijing Institute of Technology, China diff -Nru wireshark-1.10.5/asn1/tetra/packet-tetra-template.h wireshark-1.10.6/asn1/tetra/packet-tetra-template.h --- wireshark-1.10.5/asn1/tetra/packet-tetra-template.h 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/tetra/packet-tetra-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright (c) 2007 - 2011 Professional Mobile Communication Research Group, * Beijing Institute of Technology, China * - * $Id: packet-tetra-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/tetra/tetra.cnf wireshark-1.10.6/asn1/tetra/tetra.cnf --- wireshark-1.10.5/asn1/tetra/tetra.cnf 2013-07-17 01:50:17.000000000 +0000 +++ wireshark-1.10.6/asn1/tetra/tetra.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ #.OPT -u -# $Id: tetra.cnf 50688 2013-07-17 01:34:46Z gerald $ +# $Id$ #.MODULE_IMPORT diff -Nru wireshark-1.10.5/asn1/ulp/Makefile.am wireshark-1.10.6/asn1/ulp/Makefile.am --- wireshark-1.10.5/asn1/ulp/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ulp/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ulp/Makefile.common wireshark-1.10.6/asn1/ulp/Makefile.common --- wireshark-1.10.5/asn1/ulp/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ulp/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ulp/Makefile.in wireshark-1.10.6/asn1/ulp/Makefile.in --- wireshark-1.10.5/asn1/ulp/Makefile.in 2013-12-19 19:13:42.000000000 +0000 +++ wireshark-1.10.6/asn1/ulp/Makefile.in 2014-03-07 18:07:31.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ulp/Makefile.nmake wireshark-1.10.6/asn1/ulp/Makefile.nmake --- wireshark-1.10.5/asn1/ulp/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ulp/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/ulp/packet-ulp-template.c wireshark-1.10.6/asn1/ulp/packet-ulp-template.c --- wireshark-1.10.5/asn1/ulp/packet-ulp-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ulp/packet-ulp-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for OMA UserPlane Location Protocol packet dissection * Copyright 2006, Anders Broman * - * $Id: packet-ulp-template.c 48609 2013-03-28 07:34:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/ulp/SUPL.asn wireshark-1.10.6/asn1/ulp/SUPL.asn --- wireshark-1.10.5/asn1/ulp/SUPL.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ulp/SUPL.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ -- SUPL.asn --- $Id: SUPL.asn 35577 2011-01-19 06:27:50Z etxrab $ +-- $Id$ -- From OMA UserPlane Location Protocol Candidate Version 2.0 06 Aug 2010 -- OMA-TS-ULP-V2_0-20100806-D -- diff -Nru wireshark-1.10.5/asn1/ulp/ulp.cnf wireshark-1.10.6/asn1/ulp/ulp.cnf --- wireshark-1.10.5/asn1/ulp/ulp.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ulp/ulp.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # upl.cnf # upl conformation file # Copyright 2006-2010 Anders Broman -# $Id: ulp.cnf 42562 2012-05-11 07:34:47Z guy $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/ulp/ULP-Components.asn wireshark-1.10.6/asn1/ulp/ULP-Components.asn --- wireshark-1.10.5/asn1/ulp/ULP-Components.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/ulp/ULP-Components.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ -- ULP-Components.asn --- $Id: ULP-Components.asn 35577 2011-01-19 06:27:50Z etxrab $ +-- $Id$ -- From OMA UserPlane Location Protocol Candidate Version 2.0 06 Aug 2010 -- OMA-TS-ULP-V2_0-20100806-D -- diff -Nru wireshark-1.10.5/asn1/wlancertextn/Makefile.am wireshark-1.10.6/asn1/wlancertextn/Makefile.am --- wireshark-1.10.5/asn1/wlancertextn/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/wlancertextn/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/wlancertextn/Makefile.common wireshark-1.10.6/asn1/wlancertextn/Makefile.common --- wireshark-1.10.5/asn1/wlancertextn/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/wlancertextn/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/wlancertextn/Makefile.in wireshark-1.10.6/asn1/wlancertextn/Makefile.in --- wireshark-1.10.5/asn1/wlancertextn/Makefile.in 2013-12-19 19:13:42.000000000 +0000 +++ wireshark-1.10.6/asn1/wlancertextn/Makefile.in 2014-03-07 18:07:31.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/wlancertextn/Makefile.nmake wireshark-1.10.6/asn1/wlancertextn/Makefile.nmake --- wireshark-1.10.5/asn1/wlancertextn/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/wlancertextn/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/wlancertextn/packet-wlancertextn-template.c wireshark-1.10.6/asn1/wlancertextn/packet-wlancertextn-template.c --- wireshark-1.10.5/asn1/wlancertextn/packet-wlancertextn-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/wlancertextn/packet-wlancertextn-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Wireless Certificate Extension (RFC3770) * Ronnie Sahlberg 2005 * - * $Id: packet-wlancertextn-template.c 48609 2013-03-28 07:34:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/wlancertextn/packet-wlancertextn-template.h wireshark-1.10.6/asn1/wlancertextn/packet-wlancertextn-template.h --- wireshark-1.10.5/asn1/wlancertextn/packet-wlancertextn-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/wlancertextn/packet-wlancertextn-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Wireless Certificate Extensions (RFC3770) packet dissection * Ronnie Sahlberg 2005 * - * $Id: packet-wlancertextn-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/wlancertextn/wlancertextn.cnf wireshark-1.10.6/asn1/wlancertextn/wlancertextn.cnf --- wireshark-1.10.5/asn1/wlancertextn/wlancertextn.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/wlancertextn/wlancertextn.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # WlanCertExtn.cnf # WlanCertExtn conformation file -# $Id: wlancertextn.cnf 15178 2005-08-02 05:21:19Z jmayer $ +# $Id$ #.MODULE_IMPORT diff -Nru wireshark-1.10.5/asn1/x2ap/Makefile.am wireshark-1.10.6/asn1/x2ap/Makefile.am --- wireshark-1.10.5/asn1/x2ap/Makefile.am 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/x2ap/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x2ap/Makefile.common wireshark-1.10.6/asn1/x2ap/Makefile.common --- wireshark-1.10.5/asn1/x2ap/Makefile.common 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/x2ap/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x2ap/Makefile.in wireshark-1.10.6/asn1/x2ap/Makefile.in --- wireshark-1.10.5/asn1/x2ap/Makefile.in 2013-12-19 19:13:42.000000000 +0000 +++ wireshark-1.10.6/asn1/x2ap/Makefile.in 2014-03-07 18:07:31.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x2ap/Makefile.nmake wireshark-1.10.6/asn1/x2ap/Makefile.nmake --- wireshark-1.10.5/asn1/x2ap/Makefile.nmake 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/x2ap/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x2ap/packet-x2ap-template.c wireshark-1.10.6/asn1/x2ap/packet-x2ap-template.c --- wireshark-1.10.5/asn1/x2ap/packet-x2ap-template.c 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/x2ap/packet-x2ap-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * 3GPP TS 36.423 packet dissection * Copyright 2007-2010, Anders Broman * - * $Id: packet-x2ap-template.c 48609 2013-03-28 07:34:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/x2ap/x2ap.cnf wireshark-1.10.6/asn1/x2ap/x2ap.cnf --- wireshark-1.10.5/asn1/x2ap/x2ap.cnf 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/x2ap/x2ap.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # x2ap.cnf # x2ap conformation file # Copyright 2007 Anders Broman -# $Id: x2ap.cnf 44860 2012-09-10 21:40:21Z darkjames $ +# $Id$ #.OPT PER diff -Nru wireshark-1.10.5/asn1/x2ap/X2AP-CommonDataTypes.asn wireshark-1.10.6/asn1/x2ap/X2AP-CommonDataTypes.asn --- wireshark-1.10.5/asn1/x2ap/X2AP-CommonDataTypes.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/x2ap/X2AP-CommonDataTypes.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: X2AP-CommonDataTypes.asn 40368 2012-01-04 07:20:15Z etxrab $ +-- $Id$ -- 3GPP TS 36.423 V10.3.0 (2011-09) -- 9.3.6 Common definitions diff -Nru wireshark-1.10.5/asn1/x2ap/X2AP-Constants.asn wireshark-1.10.6/asn1/x2ap/X2AP-Constants.asn --- wireshark-1.10.5/asn1/x2ap/X2AP-Constants.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/x2ap/X2AP-Constants.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: X2AP-Constants.asn 40368 2012-01-04 07:20:15Z etxrab $ +-- $Id$ -- 3GPP TS 36.423 V10.3.0 (2011-09) -- 9.3.7 Constant Definitions -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/x2ap/X2AP-Containers.asn wireshark-1.10.6/asn1/x2ap/X2AP-Containers.asn --- wireshark-1.10.5/asn1/x2ap/X2AP-Containers.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/x2ap/X2AP-Containers.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: X2AP-Containers.asn 40368 2012-01-04 07:20:15Z etxrab $ +-- $Id$ -- 3GPP TS 36.423 V10.3.0 (2011-09) -- 9.3.8 Container Definitions -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/x2ap/X2AP-IEs.asn wireshark-1.10.6/asn1/x2ap/X2AP-IEs.asn --- wireshark-1.10.5/asn1/x2ap/X2AP-IEs.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/x2ap/X2AP-IEs.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: X2AP-IEs.asn 40368 2012-01-04 07:20:15Z etxrab $ +-- $Id$ -- 3GPP TS 36.423 V10.3.0 (2011-09) -- 9.3.5 Information Element Definitions -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/x2ap/X2AP-PDU-Contents.asn wireshark-1.10.6/asn1/x2ap/X2AP-PDU-Contents.asn --- wireshark-1.10.5/asn1/x2ap/X2AP-PDU-Contents.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/x2ap/X2AP-PDU-Contents.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: X2AP-PDU-Contents.asn 40368 2012-01-04 07:20:15Z etxrab $ +-- $Id$ -- 3GPP TS 36.423 V10.3.0 (2011-09) -- 9.3.4 PDU Definitions -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/x2ap/X2AP-PDU-Descriptions.asn wireshark-1.10.6/asn1/x2ap/X2AP-PDU-Descriptions.asn --- wireshark-1.10.5/asn1/x2ap/X2AP-PDU-Descriptions.asn 2013-04-22 18:04:20.000000000 +0000 +++ wireshark-1.10.6/asn1/x2ap/X2AP-PDU-Descriptions.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: X2AP-PDU-Descriptions.asn 40368 2012-01-04 07:20:15Z etxrab $ +-- $Id$ -- 3GPP TS 36.423 V10.3.0 (2011-09) -- 9.3.3 Elementary Procedure Definitions -- ************************************************************** diff -Nru wireshark-1.10.5/asn1/x509af/Makefile.am wireshark-1.10.6/asn1/x509af/Makefile.am --- wireshark-1.10.5/asn1/x509af/Makefile.am 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/x509af/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x509af/Makefile.common wireshark-1.10.6/asn1/x509af/Makefile.common --- wireshark-1.10.5/asn1/x509af/Makefile.common 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/x509af/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x509af/Makefile.in wireshark-1.10.6/asn1/x509af/Makefile.in --- wireshark-1.10.5/asn1/x509af/Makefile.in 2013-12-19 19:13:43.000000000 +0000 +++ wireshark-1.10.6/asn1/x509af/Makefile.in 2014-03-07 18:07:32.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x509af/Makefile.nmake wireshark-1.10.6/asn1/x509af/Makefile.nmake --- wireshark-1.10.5/asn1/x509af/Makefile.nmake 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/x509af/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x509af/packet-x509af-template.c wireshark-1.10.6/asn1/x509af/packet-x509af-template.c --- wireshark-1.10.5/asn1/x509af/packet-x509af-template.c 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/x509af/packet-x509af-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.509 Authentication Framework packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509af-template.c 48609 2013-03-28 07:34:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/x509af/packet-x509af-template.h wireshark-1.10.6/asn1/x509af/packet-x509af-template.h --- wireshark-1.10.5/asn1/x509af/packet-x509af-template.h 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/x509af/packet-x509af-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.509 Authentication Framework packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509af-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/x509af/x509af.cnf wireshark-1.10.6/asn1/x509af/x509af.cnf --- wireshark-1.10.5/asn1/x509af/x509af.cnf 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/asn1/x509af/x509af.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # x509.cnf # X509 conformation file -# $Id: x509af.cnf 48008 2013-03-02 14:51:04Z etxrab $ +# $Id$ #.IMPORT ../x509ce/x509ce-exp.cnf #.IMPORT ../x509if/x509if-exp.cnf diff -Nru wireshark-1.10.5/asn1/x509ce/CertificateExtensions.asn wireshark-1.10.6/asn1/x509ce/CertificateExtensions.asn --- wireshark-1.10.5/asn1/x509ce/CertificateExtensions.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/x509ce/CertificateExtensions.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: CertificateExtensions.asn 28590 2009-06-02 09:46:03Z gal $ +-- $Id$ -- Module CertificateExtensions (X.509:08/2005) CertificateExtensions {joint-iso-itu-t ds(5) module(1) certificateExtensions(26) 5} DEFINITIONS IMPLICIT TAGS ::= diff -Nru wireshark-1.10.5/asn1/x509ce/CertificateExtensionsCiplus.asn wireshark-1.10.6/asn1/x509ce/CertificateExtensionsCiplus.asn --- wireshark-1.10.5/asn1/x509ce/CertificateExtensionsCiplus.asn 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/x509ce/CertificateExtensionsCiplus.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: CertificateExtensionsCiplus.asn 43485 2012-06-25 21:16:43Z etxrab $ +-- $Id$ -- Module CertificateExtensionsCiplus -- X.509 certificate extensions defined by CI+ (www.ci-plus.com) CertificateExtensionsCiplus DEFINITIONS IMPLICIT TAGS ::= diff -Nru wireshark-1.10.5/asn1/x509ce/Makefile.am wireshark-1.10.6/asn1/x509ce/Makefile.am --- wireshark-1.10.5/asn1/x509ce/Makefile.am 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/x509ce/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x509ce/Makefile.common wireshark-1.10.6/asn1/x509ce/Makefile.common --- wireshark-1.10.5/asn1/x509ce/Makefile.common 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/x509ce/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x509ce/Makefile.in wireshark-1.10.6/asn1/x509ce/Makefile.in --- wireshark-1.10.5/asn1/x509ce/Makefile.in 2013-12-19 19:13:43.000000000 +0000 +++ wireshark-1.10.6/asn1/x509ce/Makefile.in 2014-03-07 18:07:32.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x509ce/Makefile.nmake wireshark-1.10.6/asn1/x509ce/Makefile.nmake --- wireshark-1.10.5/asn1/x509ce/Makefile.nmake 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/x509ce/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x509ce/packet-x509ce-template.c wireshark-1.10.6/asn1/x509ce/packet-x509ce-template.c --- wireshark-1.10.5/asn1/x509ce/packet-x509ce-template.c 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/x509ce/packet-x509ce-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.509 Certificate Extensions packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509ce-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/x509ce/packet-x509ce-template.h wireshark-1.10.6/asn1/x509ce/packet-x509ce-template.h --- wireshark-1.10.5/asn1/x509ce/packet-x509ce-template.h 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/x509ce/packet-x509ce-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.509 Certificate Extensions packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509ce-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/x509ce/x509ce.cnf wireshark-1.10.6/asn1/x509ce/x509ce.cnf --- wireshark-1.10.5/asn1/x509ce/x509ce.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/x509ce/x509ce.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # x509ce.cnf # X509CE conformation file -# $Id: x509ce.cnf 43485 2012-06-25 21:16:43Z etxrab $ +# $Id$ #.IMPORT ../x509if/x509if-exp.cnf #.IMPORT ../x509af/x509af-exp.cnf diff -Nru wireshark-1.10.5/asn1/x509if/InformationFramework.asn wireshark-1.10.6/asn1/x509if/InformationFramework.asn --- wireshark-1.10.5/asn1/x509if/InformationFramework.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/x509if/InformationFramework.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: InformationFramework.asn 30409 2009-10-08 17:26:57Z krj $ +-- $Id$ -- Module InformationFramework (X.501:08/2005) InformationFramework {joint-iso-itu-t ds(5) module(1) informationFramework(1) 5} DEFINITIONS ::= diff -Nru wireshark-1.10.5/asn1/x509if/Makefile.am wireshark-1.10.6/asn1/x509if/Makefile.am --- wireshark-1.10.5/asn1/x509if/Makefile.am 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/x509if/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x509if/Makefile.common wireshark-1.10.6/asn1/x509if/Makefile.common --- wireshark-1.10.5/asn1/x509if/Makefile.common 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/x509if/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x509if/Makefile.in wireshark-1.10.6/asn1/x509if/Makefile.in --- wireshark-1.10.5/asn1/x509if/Makefile.in 2013-12-19 19:13:43.000000000 +0000 +++ wireshark-1.10.6/asn1/x509if/Makefile.in 2014-03-07 18:07:32.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x509if/Makefile.nmake wireshark-1.10.6/asn1/x509if/Makefile.nmake --- wireshark-1.10.5/asn1/x509if/Makefile.nmake 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/x509if/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x509if/packet-x509if-template.c wireshark-1.10.6/asn1/x509if/packet-x509if-template.c --- wireshark-1.10.5/asn1/x509if/packet-x509if-template.c 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/x509if/packet-x509if-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.509 Information Framework packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509if-template.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/x509if/packet-x509if-template.h wireshark-1.10.6/asn1/x509if/packet-x509if-template.h --- wireshark-1.10.5/asn1/x509if/packet-x509if-template.h 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/x509if/packet-x509if-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.509 Information Framework packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509if-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/x509if/ServiceAdministration.asn wireshark-1.10.6/asn1/x509if/ServiceAdministration.asn --- wireshark-1.10.5/asn1/x509if/ServiceAdministration.asn 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/x509if/ServiceAdministration.asn 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ --- $Id: ServiceAdministration.asn 30409 2009-10-08 17:26:57Z krj $ +-- $Id$ -- Module ServiceAdministration (X.501:08/2005) ServiceAdministration {joint-iso-itu-t ds(5) module(1) serviceAdministration(33) 5} DEFINITIONS ::= diff -Nru wireshark-1.10.5/asn1/x509if/x509if.cnf wireshark-1.10.6/asn1/x509if/x509if.cnf --- wireshark-1.10.5/asn1/x509if/x509if.cnf 2013-04-22 18:04:17.000000000 +0000 +++ wireshark-1.10.6/asn1/x509if/x509if.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # x509if.cnf # X509IF conformation file -# $Id: x509if.cnf 48008 2013-03-02 14:51:04Z etxrab $ +# $Id$ #.IMPORT ../x509sat/x509sat-exp.cnf diff -Nru wireshark-1.10.5/asn1/x509sat/Makefile.am wireshark-1.10.6/asn1/x509sat/Makefile.am --- wireshark-1.10.5/asn1/x509sat/Makefile.am 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/x509sat/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x509sat/Makefile.common wireshark-1.10.6/asn1/x509sat/Makefile.common --- wireshark-1.10.5/asn1/x509sat/Makefile.common 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/x509sat/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x509sat/Makefile.in wireshark-1.10.6/asn1/x509sat/Makefile.in --- wireshark-1.10.5/asn1/x509sat/Makefile.in 2013-12-19 19:13:43.000000000 +0000 +++ wireshark-1.10.6/asn1/x509sat/Makefile.in 2014-03-07 18:07:32.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -82,7 +82,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x509sat/Makefile.nmake wireshark-1.10.6/asn1/x509sat/Makefile.nmake --- wireshark-1.10.5/asn1/x509sat/Makefile.nmake 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/x509sat/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x509sat/packet-x509sat-template.c wireshark-1.10.6/asn1/x509sat/packet-x509sat-template.c --- wireshark-1.10.5/asn1/x509sat/packet-x509sat-template.c 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/x509sat/packet-x509sat-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.509 Selected Attribute Types packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509sat-template.c 46013 2012-11-12 22:00:53Z stig $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/x509sat/packet-x509sat-template.h wireshark-1.10.6/asn1/x509sat/packet-x509sat-template.h --- wireshark-1.10.5/asn1/x509sat/packet-x509sat-template.h 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/x509sat/packet-x509sat-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.509 Selected Attribute Types packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509sat-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/asn1/x509sat/x509sat.cnf wireshark-1.10.6/asn1/x509sat/x509sat.cnf --- wireshark-1.10.5/asn1/x509sat/x509sat.cnf 2013-04-22 18:04:18.000000000 +0000 +++ wireshark-1.10.6/asn1/x509sat/x509sat.cnf 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # x509sat.cnf # X509SAT conformation file -# $Id: x509sat.cnf 48008 2013-03-02 14:51:04Z etxrab $ +# $Id$ #.TYPE_ATTR GUID TYPE = FT_GUID DISPLAY = BASE_NONE STRING = NULL BITMASK = 0 diff -Nru wireshark-1.10.5/asn1/x721/Makefile.am wireshark-1.10.6/asn1/x721/Makefile.am --- wireshark-1.10.5/asn1/x721/Makefile.am 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/x721/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x721/Makefile.common wireshark-1.10.6/asn1/x721/Makefile.common --- wireshark-1.10.5/asn1/x721/Makefile.common 2013-04-22 18:04:19.000000000 +0000 +++ wireshark-1.10.6/asn1/x721/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/asn1/x721/Makefile.in wireshark-1.10.6/asn1/x721/Makefile.in --- wireshark-1.10.5/asn1/x721/Makefile.in 2013-12-19 19:13:43.000000000 +0000 +++ wireshark-1.10.6/asn1/x721/Makefile.in 2014-03-07 18:07:32.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -38,7 +38,7 @@ # To be included into the asn1 Makefiles # -# $Id: Makefile.preinc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -59,7 +59,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/autogen.sh wireshark-1.10.6/autogen.sh --- wireshark-1.10.5/autogen.sh 2013-07-07 21:17:20.000000000 +0000 +++ wireshark-1.10.6/autogen.sh 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ # # Run this to generate all the initial makefiles. # -# $Id: autogen.sh 50436 2013-07-07 21:11:57Z guy $ +# $Id$ DIE=true PROJECT="Wireshark" diff -Nru wireshark-1.10.5/capinfos.c wireshark-1.10.6/capinfos.c --- wireshark-1.10.5/capinfos.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/capinfos.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2004 Ian Schorr * - * $Id: capinfos.c 48841 2013-04-13 18:15:46Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -109,7 +109,7 @@ #include #endif /* _WIN32 */ -#include "svnversion.h" +#include "version.h" /* * By default capinfos now continues processing @@ -1019,8 +1019,8 @@ } fprintf(output, "Capinfos %s" -#ifdef SVNVERSION - " (" SVNVERSION " from " SVNPATH ")" +#ifdef GITVERSION + " (" GITVERSION " from " GITBRANCH ")" #endif "\n", VERSION); fprintf(output, "Prints various information (infos) about capture files.\n"); diff -Nru wireshark-1.10.5/capture.c wireshark-1.10.6/capture.c --- wireshark-1.10.5/capture.c 2013-06-04 07:45:22.000000000 +0000 +++ wireshark-1.10.6/capture.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture.c * Routines for packet capture * - * $Id: capture.c 49758 2013-06-04 07:33:53Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture.h wireshark-1.10.6/capture.h --- wireshark-1.10.5/capture.h 2013-06-04 18:51:25.000000000 +0000 +++ wireshark-1.10.6/capture.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture.h * Definitions for packet capture windows * - * $Id: capture.h 49768 2013-06-04 18:44:42Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture_ifinfo.c wireshark-1.10.6/capture_ifinfo.c --- wireshark-1.10.5/capture_ifinfo.c 2013-06-04 18:51:25.000000000 +0000 +++ wireshark-1.10.6/capture_ifinfo.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_ifinfo.c * Routines for getting interface information from dumpcap * - * $Id: capture_ifinfo.c 49768 2013-06-04 18:44:42Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture_ifinfo.h wireshark-1.10.6/capture_ifinfo.h --- wireshark-1.10.5/capture_ifinfo.h 2013-06-04 05:33:18.000000000 +0000 +++ wireshark-1.10.6/capture_ifinfo.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_ifinfo.h * Definitions for routines to get information about capture interfaces * - * $Id: capture_ifinfo.h 49753 2013-06-04 05:27:06Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture_info.c wireshark-1.10.6/capture_info.c --- wireshark-1.10.5/capture_info.c 2013-06-04 07:45:22.000000000 +0000 +++ wireshark-1.10.6/capture_info.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_info.c * capture info functions * - * $Id: capture_info.c 49758 2013-06-04 07:33:53Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture_info.h wireshark-1.10.6/capture_info.h --- wireshark-1.10.5/capture_info.h 2013-06-04 07:45:22.000000000 +0000 +++ wireshark-1.10.6/capture_info.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_info.h * capture info functions * - * $Id: capture_info.h 49758 2013-06-04 07:33:53Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture_opts.c wireshark-1.10.6/capture_opts.c --- wireshark-1.10.5/capture_opts.c 2013-12-13 23:12:45.000000000 +0000 +++ wireshark-1.10.6/capture_opts.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_opts.c * Routines for capture options setting * - * $Id: capture_opts.c 54076 2013-12-13 22:49:30Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture_opts.h wireshark-1.10.6/capture_opts.h --- wireshark-1.10.5/capture_opts.h 2013-09-09 18:34:32.000000000 +0000 +++ wireshark-1.10.6/capture_opts.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_opts.h * Capture options (all parameters needed to do the actual capture) * - * $Id: capture_opts.h 51874 2013-09-09 18:28:56Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture-pcap-util.c wireshark-1.10.6/capture-pcap-util.c --- wireshark-1.10.5/capture-pcap-util.c 2013-06-04 06:06:23.000000000 +0000 +++ wireshark-1.10.6/capture-pcap-util.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture-pcap-util.c * Utility routines for packet capture * - * $Id: capture-pcap-util.c 49755 2013-06-04 06:00:15Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture-pcap-util.h wireshark-1.10.6/capture-pcap-util.h --- wireshark-1.10.5/capture-pcap-util.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/capture-pcap-util.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture-pcap-util.h * Utility definitions for packet capture * - * $Id: capture-pcap-util.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture-pcap-util-int.h wireshark-1.10.6/capture-pcap-util-int.h --- wireshark-1.10.5/capture-pcap-util-int.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/capture-pcap-util-int.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture-pcap-util-int.h * Definitions of routines internal to the libpcap/WinPcap utilities * - * $Id: capture-pcap-util-int.h 46159 2012-11-23 22:28:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture-pcap-util-unix.c wireshark-1.10.6/capture-pcap-util-unix.c --- wireshark-1.10.5/capture-pcap-util-unix.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/capture-pcap-util-unix.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture-pcap-util-unix.c * UN*X-specific utility routines for packet capture * - * $Id: capture-pcap-util-unix.c 46159 2012-11-23 22:28:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture_session.h wireshark-1.10.6/capture_session.h --- wireshark-1.10.5/capture_session.h 2013-06-04 07:45:22.000000000 +0000 +++ wireshark-1.10.6/capture_session.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_session.h * State of a capture session * - * $Id: capture_session.h 49757 2013-06-04 07:32:39Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture_stop_conditions.c wireshark-1.10.6/capture_stop_conditions.c --- wireshark-1.10.5/capture_stop_conditions.c 2013-09-09 18:34:32.000000000 +0000 +++ wireshark-1.10.6/capture_stop_conditions.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_stop_conditions.c * Implementation for 'stop condition handler'. * - * $Id: capture_stop_conditions.c 51874 2013-09-09 18:28:56Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture_stop_conditions.h wireshark-1.10.6/capture_stop_conditions.h --- wireshark-1.10.5/capture_stop_conditions.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/capture_stop_conditions.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_stop_conditions.h * Implementation for 'stop condition handler'. * - * $Id: capture_stop_conditions.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture_sync.c wireshark-1.10.6/capture_sync.c --- wireshark-1.10.5/capture_sync.c 2013-09-09 18:34:32.000000000 +0000 +++ wireshark-1.10.6/capture_sync.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_sync.c * Synchronisation between Wireshark capture parent and child instances * - * $Id: capture_sync.c 51874 2013-09-09 18:28:56Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture_sync.h wireshark-1.10.6/capture_sync.h --- wireshark-1.10.5/capture_sync.h 2013-06-04 07:45:22.000000000 +0000 +++ wireshark-1.10.6/capture_sync.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_sync.h * Synchronisation between Wireshark capture parent and child instances * - * $Id: capture_sync.h 49758 2013-06-04 07:33:53Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture_ui_utils.c wireshark-1.10.6/capture_ui_utils.c --- wireshark-1.10.5/capture_ui_utils.c 2013-06-04 06:06:23.000000000 +0000 +++ wireshark-1.10.6/capture_ui_utils.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_ui_utils.c * Utilities for capture user interfaces * - * $Id: capture_ui_utils.c 49754 2013-06-04 05:55:24Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture_ui_utils.h wireshark-1.10.6/capture_ui_utils.h --- wireshark-1.10.5/capture_ui_utils.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/capture_ui_utils.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_ui_utils.c * Declarations of utilities for capture user interfaces * - * $Id: capture_ui_utils.h 48275 2013-03-13 12:38:08Z ruengeler $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture_win_ifnames.c wireshark-1.10.6/capture_win_ifnames.c --- wireshark-1.10.5/capture_win_ifnames.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/capture_win_ifnames.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines supporting the use of Windows friendly interface names within Wireshark * Copyright 2011-2012, Mike Garratt * -* $Id: capture_win_ifnames.c 46170 2012-11-24 18:55:06Z guy $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture_win_ifnames.h wireshark-1.10.6/capture_win_ifnames.h --- wireshark-1.10.5/capture_win_ifnames.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/capture_win_ifnames.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines supporting the use of Windows friendly interface names within Wireshark * Copyright 2011-2012, Mike Garratt * - * $Id: capture_win_ifnames.h 48869 2013-04-16 00:00:09Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture-wpcap.c wireshark-1.10.6/capture-wpcap.c --- wireshark-1.10.5/capture-wpcap.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/capture-wpcap.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * time, so that we only need one Wireshark binary and one TShark binary * for Windows, regardless of whether WinPcap is installed or not. * - * $Id: capture-wpcap.c 46159 2012-11-23 22:28:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture-wpcap.h wireshark-1.10.6/capture-wpcap.h --- wireshark-1.10.5/capture-wpcap.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/capture-wpcap.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* capture-wpcap.h * - * $Id: capture-wpcap.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture_wpcap_packet.c wireshark-1.10.6/capture_wpcap_packet.c --- wireshark-1.10.5/capture_wpcap_packet.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/capture_wpcap_packet.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * time, so that we only need one Wireshark binary and one TShark binary * for Windows, regardless of whether WinPcap is installed or not. * - * $Id: capture_wpcap_packet.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/capture_wpcap_packet.h wireshark-1.10.6/capture_wpcap_packet.h --- wireshark-1.10.5/capture_wpcap_packet.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/capture_wpcap_packet.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* capture_wpcap_packet.h * - * $Id: capture_wpcap_packet.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/cfile.c wireshark-1.10.6/cfile.c --- wireshark-1.10.5/cfile.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/cfile.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * capture_file GUI-independent manipulation * Vassilii Khachaturov * - * $Id: cfile.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/cfile.h wireshark-1.10.6/cfile.h --- wireshark-1.10.5/cfile.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/cfile.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* cfile.h * capture_file definition & GUI-independent manipulation * - * $Id: cfile.h 48654 2013-03-30 15:38:03Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/cfutils.c wireshark-1.10.6/cfutils.c --- wireshark-1.10.5/cfutils.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/cfutils.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * lack of a routine to convert a CFString to a C string of arbitrary * size. * - * $Id: cfutils.c 48534 2013-03-24 18:22:07Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/cfutils.h wireshark-1.10.6/cfutils.h --- wireshark-1.10.5/cfutils.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/cfutils.h 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * such as the lack of a routine to convert a CFString to a C string of * arbitrary size. * - * $Id: cfutils.h 46131 2012-11-22 06:02:49Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ChangeLog wireshark-1.10.6/ChangeLog --- wireshark-1.10.5/ChangeLog 2013-12-19 19:13:26.000000000 +0000 +++ wireshark-1.10.6/ChangeLog 2014-03-07 18:07:11.000000000 +0000 @@ -1,135 +1,1101 @@ ------------------------------------------------------------------------- -r54192 | gerald | 2013-12-17 12:03:59 -0800 (Tue, 17 Dec 2013) | 2 lines -Changed paths: - M /trunk-1.10/ChangeLog - M /trunk-1.10/config.nmake - M /trunk-1.10/configure.ac - M /trunk-1.10/debian/changelog - M /trunk-1.10/docbook/asciidoc.conf - M /trunk-1.10/docbook/release-notes.asciidoc - M /trunk-1.10/epan/Makefile.am - M /trunk-1.10/make-version.pl - M /trunk-1.10/version.conf - M /trunk-1.10/wiretap/Makefile.am - -1.10.4 → 1.10.5. - ------------------------------------------------------------------------- -r54196 | wmeier | 2013-12-17 13:18:15 -0800 (Tue, 17 Dec 2013) | 13 lines -Changed paths: - M /trunk-1.10/dumpcap.c - -Copy over from Trunk - - ------------------------------------------------------------------------ - r54181 | wmeier | 2013-12-17 10:02:47 -0500 (Tue, 17 Dec 2013) | 8 lines - - From "bd": Fix " Wireshark stops showing new packets but dumpcap keeps writing them to the temp file" - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9571 - - From me: Fixed in a slightly different manner than sugested in the patch attached to the bug. - ------------------------------------------------------------------------ - - ------------------------------------------------------------------------- -r54217 | mmann | 2013-12-18 05:15:13 -0800 (Wed, 18 Dec 2013) | 3 lines -Changed paths: - M /trunk-1.10/epan/dissectors/packet-bitcoin.c - -Bugfix port number endianness. Bug 9530 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9530) - -Taken from part of r52609 enhancement. ------------------------------------------------------------------------- -r54225 | cmaynard | 2013-12-18 08:31:29 -0800 (Wed, 18 Dec 2013) | 2 lines -Changed paths: - M /trunk-1.10/ui/gtk/capture_dlg.c - -Something went wrong with the backport of r53608 + r53611. Fix it. - ------------------------------------------------------------------------- -r54252 | gerald | 2013-12-19 09:31:09 -0800 (Thu, 19 Dec 2013) | 30 lines -Changed paths: - M /trunk-1.10 - M /trunk-1.10/docbook/release-notes.asciidoc - M /trunk-1.10/epan/dissectors/packet-gsm_a_bssmap.c - M /trunk-1.10/epan/dissectors/packet-gsm_bssmap_le.c - M /trunk-1.10/epan/dissectors/packet-gsm_sms.c - M /trunk-1.10/epan/dissectors/packet-homeplug.c - M /trunk-1.10/epan/dissectors/packet-nas_eps.c - M /trunk-1.10/epan/dissectors/packet-sgsap.c - -Copy over r54227 from the trunk: - - ------------------------------------------------------------------------ - r54227 | cmaynard | 2013-12-18 10:27:07 -0800 (Wed, 18 Dec 2013) | 4 lines - Changed paths: - M /trunk/epan/dissectors/packet-homeplug.c - - Call ptvcursor_new() to initialize cursor whether tree is NULL or not. - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9578 - #BACKPORT(1.10, 1.8) - ------------------------------------------------------------------------ - - -Copy over the non-BSSGP portions of r49145 with manual intervention: - ------------------------------------------------------------------------ - r49145 | mmann | 2013-05-03 07:54:39 -0700 (Fri, 03 May 2013) | 1 line - Changed paths: - M /trunk/epan/dissectors/packet-bssgp.c - M /trunk/epan/dissectors/packet-gsm_a_bssmap.c - M /trunk/epan/dissectors/packet-gsm_bssmap_le.c - M /trunk/epan/dissectors/packet-gsm_sms.c - M /trunk/epan/dissectors/packet-nas_eps.c - M /trunk/epan/dissectors/packet-sgsap.c - - Remove static packet_info *gpinfo and just use the packet_info provided by the function. - ------------------------------------------------------------------------ - - -Update the release notes. - ------------------------------------------------------------------------- -r54253 | gerald | 2013-12-19 09:40:32 -0800 (Thu, 19 Dec 2013) | 2 lines -Changed paths: - M /trunk-1.10/docbook/release-notes.asciidoc - -Remove duplicate entry. - ------------------------------------------------------------------------- -r54258 | cmaynard | 2013-12-19 09:59:14 -0800 (Thu, 19 Dec 2013) | 13 lines -Changed paths: - M /trunk-1.10/epan/dissectors/packet-omapi.c - M /trunk-1.10/epan/dissectors/packet-pgm.c - -Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r54255 | cmaynard | 2013-12-19 12:48:11 -0500 (Thu, 19 Dec 2013) | 2 lines - Changed paths: - M /trunk/epan/dissectors/packet-omapi.c - M /trunk/epan/dissectors/packet-pgm.c - - Fix leaks where ptvcursor_free() wasn't being called. - - ------------------------------------------------------------------------ - - ------------------------------------------------------------------------- -r54259 | cmaynard | 2013-12-19 10:02:03 -0800 (Thu, 19 Dec 2013) | 12 lines -Changed paths: - M /trunk-1.10/epan/dissectors/packet-roofnet.c - -Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r54257 | cmaynard | 2013-12-19 12:48:58 -0500 (Thu, 19 Dec 2013) | 2 lines - Changed paths: - M /trunk/epan/dissectors/packet-roofnet.c - - Need to call ptvcursor_current_offset() BEFORE ptvcursor_free(). - - ------------------------------------------------------------------------ - - ------------------------------------------------------------------------- +commit 94d9b3d0e52d8b2234a0c3c73c8132d3055a4d7b +Author: Gerald Combs +Date: Thu Mar 6 13:49:51 2014 -0800 + + Add a CVE ID and attribution. + + Change-Id: If3359fb1c73446747c6be4ab1f8b05f2697dba6f + Reviewed-on: https://code.wireshark.org/review/541 + Reviewed-by: Gerald Combs + +commit 9e4f943e12405079b7edcddd52ee5ccd580948d1 +Author: Gerald Combs +Date: Thu Mar 6 12:34:27 2014 -0800 + + Add wnpa-sec-2014-04. + + Change-Id: I3ca3843bf7f25aeafb35c4352367e36ba3f9c41a + Reviewed-on: https://code.wireshark.org/review/540 + Reviewed-by: Gerald Combs + +commit 34144b8d4da141e8aa9b99221855edc9f4c73ad8 +Author: Gerald Combs +Date: Thu Mar 6 11:27:45 2014 -0800 + + Add a check for an oversized record. + + For now we declare the file corrupt and give up. We may want to handle + this more gracefully. Fixes a vulnerability discovered by Wesley Neelen + (bug 9843). + + Remove the RCS ID and add modelines. + + Change-Id: I418938d7d6485b27cc51cf1dde50bc42dabf8c85 + Reviewed-on: https://code.wireshark.org/review/533 + Reviewed-by: Gerald Combs + +commit 69bf1a988a6629497ccf5feaf358413885d89a2d +Author: Gerald Combs +Date: Wed Mar 5 17:08:39 2014 -0800 + + Add CVE IDs. + + Change-Id: Iff81dd013812e79d4c70018cae48b3c16495a3af + Reviewed-on: https://code.wireshark.org/review/523 + Reviewed-by: Gerald Combs + +commit 116c8da958fcc8ecc3b629350572bad40a1746c8 +Author: Bill Meier +Date: Wed Mar 5 00:33:52 2014 -0500 + + Fix another case of a missing BASE_EXT_STRING (which may cause a crash). + + Change-Id: Ibe690826747b47d8b9a5e93f1ad3e96f2f18e7ef + Reviewed-on: https://code.wireshark.org/review/514 + Reviewed-by: Bill Meier + Tested-by: Bill Meier + +commit 983f5f9366e0b6f015de80cd1596b3367be1ab6a +Author: Guy Harris +Date: Tue Mar 4 20:58:01 2014 -0800 + + Fix some cases of value_string_ext without BASE_EXT_STRING. + + This fixes bug 9834. + + Change-Id: Ida6034fd4149b647545ed314eb10819e71553f85 + Reviewed-on: https://code.wireshark.org/review/512 + Reviewed-by: Guy Harris + +commit 4fc99f885a3df4abf84279308064a059f64e02fa +Author: Bill Meier +Date: Tue Mar 4 19:41:27 2014 -0500 + + Fix 2 instances of "Warning: Extended value string ... forced to fall back to linear search". + + Note: This issue was fixed in dev Wireshark as part of a much more extensive set + of changes. + + Change-Id: Iadca7e7813f42029e62c922ed183b6535a9c2a77 + Reviewed-on: https://code.wireshark.org/review/510 + Reviewed-by: Bill Meier + Tested-by: Bill Meier + +commit 5abc15ffcf967968ba4afacfb3f0a65f51e93697 +Author: Bill Meier +Date: Tue Mar 4 16:43:54 2014 -0500 + + Backport 2336eb9 (python3 compatibility) from git/master to git/master-1.10 + + Another Fix for part 2 of Bug #9834 + + https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9834 + + ============ + commit 2336eb9919e20de306b29ab34d1ca12550930f4a + Author: Gerald Combs + Date: Fri Aug 2 00:22:51 2013 +0000 + + Make sure we're compatible with Python 2 + 3. Tested with Pythons 2.5, + 2.7, and 3.3. + + svn path=/trunk/; revision=51106 + /tools/make-tap-reg.py + + Change-Id: I2a7aca979c596b4d06e91490aaf42126bb9da211 + Reviewed-on: https://code.wireshark.org/review/509 + Reviewed-by: Bill Meier + Tested-by: Bill Meier + +commit c7c59771e6a217ac68546374e676fa2d33708d6d +Author: Bill Meier +Date: Tue Mar 4 14:31:44 2014 -0500 + + Backport g97c9a9b from git/master to git/master-1.10 + + Fix for part 2 of Bug #9834 + + https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9834 + + ======== + commit 97c9a9b9ba3c29f394c306d6ba9bd1916d06c430 + Author: Gerald Combs + Date: Fri Aug 2 16:34:31 2013 +0000 + + Make sure we're compatible with Python 2 + 3. Tested with Pythons 2.5, + 2.7, and 3.3. The contents of packet-ncp2222.c are different after the + changes (e.g. some array contents are in a different order) but the + output of running 'tshark -nVxr' on the NCP files in the menagerie are + identical. + + svn path=/trunk/; revision=51123 + + Change-Id: Ib500bade79d65b97a57eeb4dd497228a6eb85c19 + Reviewed-on: https://code.wireshark.org/review/508 + Reviewed-by: Bill Meier + Tested-by: Bill Meier + +commit d58a92fc6fd936083196c044b91ab2607a9fe2f4 +Author: Gerald Combs +Date: Tue Mar 4 11:16:44 2014 -0800 + + Update the release notes. + + Change-Id: Iec747ea0f92142a81a88b6ff92d9dd3ec1818e7e + Reviewed-on: https://code.wireshark.org/review/506 + Reviewed-by: Gerald Combs + +commit 447c45a341124f091543cbe7ad6d6872a041f6ba +Author: Gerald Combs +Date: Thu Feb 27 15:31:10 2014 -0800 + + Disable IPv4 checksum verfification to match TCP and UDP. + + Offloading seems to be very common nowadays and having this option + enabled by default generates a lot of false positives. Suggested by + Laura Chappell. + + Change-Id: I285f218efb3c9f164d8ad7a6d6de8270e442ffff + Reviewed-on: https://code.wireshark.org/review/426 + Reviewed-by: Evan Huus + Reviewed-by: Alexis La Goutte + (cherry picked from commit 104a6edd1fb703c5c2319c893720df86f8c9a9e7) + Reviewed-on: https://code.wireshark.org/review/470 + Reviewed-by: Gerald Combs + +commit 31187b1c5d863e2338f0050ff897512b92ebf774 +Author: Gerald Combs +Date: Mon Mar 3 15:03:41 2014 -0800 + + Switch to "rc" instead of "pre" to match our tags. + + Change-Id: I539b7287cd9d91bc88549d56283beb3f1ab1ff8e + Reviewed-on: https://code.wireshark.org/review/489 + Reviewed-by: Gerald Combs + +commit 65f3fea66842838faf49f322de66e84be78e1f0b +Author: Gerald Combs +Date: Mon Mar 3 14:49:00 2014 -0800 + + More version stamp fixes. + + Change-Id: I80601db962734364575c989ecd64983ef5a493a2 + Reviewed-on: https://code.wireshark.org/review/487 + Reviewed-by: Gerald Combs + +commit 75bc4fd32ce2c3856f5f369b609c29743097690d +Author: Gerald Combs +Date: Mon Mar 3 14:26:15 2014 -0800 + + Don't append "-dirty" to the version string. + + Change-Id: I755a6229537745eca07f2fc467b9db9e6130b301 + Reviewed-on: https://code.wireshark.org/review/485 + Reviewed-by: Gerald Combs + (cherry picked from commit 7bb4ec81a7912a785758cd63570dab1d00da2647) + Reviewed-on: https://code.wireshark.org/review/486 + +commit 59c96b89eb214546093c7acd925eedcbadb920a3 +Author: Gerald Combs +Date: Mon Mar 3 13:52:57 2014 -0800 + + Strip out carriage returns when reading version.conf. + + The input record separator ($/) under Cygwin's Perl appears to be "\n" + which means that chomp() won't strip out carriage returns. Make sure + we do that when reading version.conf, otherwise we can end up with + unexpected behavior. + + Check pkg_enable using an integer comparison as an extra level of + protection. + + (We need to handle CRs better in general but for now we need to get + version stamping working for the next release.) + + Change-Id: I19974467d1a7386728b69dca77f74e678d66ca6b + Reviewed-on: https://code.wireshark.org/review/483 + Reviewed-by: Gerald Combs + (cherry picked from commit d70016fdd64f05093863c7fe66fe4c5f7343d8c0) + Reviewed-on: https://code.wireshark.org/review/484 + +commit b8c1cc09466cf436104de9d0eb52f563eca5c0cd +Author: Alexis La Goutte +Date: Sat Jun 29 21:58:46 2013 +0000 + + Update .gitignore to add some Windows specific build stuff to ignore list. + + svn path=/trunk/; revision=50231 + (cherry picked from commit e66457472d52fc96a1b5d3c30beed4b07f14fe8b) + + Change-Id: I41fd7ba5ce96055928d65fb5de4252750692078e + Reviewed-on: https://code.wireshark.org/review/481 + Reviewed-by: Evan Huus + Reviewed-by: Gerald Combs + +commit f58c4cdef2e4aa3f5107601d4968568ab1112f8c +Author: Gerald Combs +Date: Sun Mar 2 08:08:42 2014 -0800 + + [Automatic manuf, services and enterprise-numbers update for 2014-03-02] + + Change-Id: Ifd0cc536cc7b532f61aaae3aa9e9642f1299405b + Reviewed-on: https://code.wireshark.org/review/445 + Reviewed-by: Evan Huus + +commit e635d3f0f2bc1f1909553294a6488b6bd947f82d +Author: Gerald Combs +Date: Fri Feb 28 16:34:19 2014 -0800 + + Have git-compare-abis build in a sub-sub-subdirectory. + + We have a lot of relative includes which apparently weren't updated + correctly when we moved the gtk directory to ui/gtk. For example, + ui/gtk/about_dlg.c has + + The Autotools Makefile adds "-I../.." to the include path, which means + we end up including the current, top-level version_info.h instead of the + one in the compare-abis build directory. + + Change-Id: I9df83857fc9f7d87a3b79d5b4da08d5e41625e4c + Reviewed-on: https://code.wireshark.org/review/436 + Reviewed-by: Gerald Combs + +commit d8075e79f7dc435d68b942695d3d1604f3e166b7 +Author: Evan Huus +Date: Wed Feb 26 12:47:35 2014 -0500 + + Don't mix emem and glib memory and init routines. + + The seasonal memory is freed before the init routine is called, leading to a + whole bunch of use-after-free errors. + + Fixes bug #9802 (and duplicates). + + This introduces a few minor leaks but I can't find an easy way to add additional + free calls that doesn't lead to double-free errors. + + Change-Id: Idda79cb643d46d29253165cdeefeed189db6b078 + Reviewed-on: https://code.wireshark.org/review/406 + Reviewed-by: Evan Huus + +commit 9201ee0d484227722a9a5c325e12129336b9d283 +Author: Gerald Combs +Date: Tue Feb 25 09:18:41 2014 -0800 + + Release note updates for 1.10.6. + + Change-Id: I1a921df33d317a87ca1de6257c3783f0bfd3505f + Reviewed-on: https://code.wireshark.org/review/374 + Reviewed-by: Gerald Combs + +commit bfd4ba95c8365e1e92774e0398215e6b8cca7f66 +Author: Evan Huus +Date: Wed Jan 15 02:09:11 2014 +0000 + + Reject pcap files that claim on-the-wire packet sizes > 64MB. This fixes many + heuristic cases broken in r49999 when we permitted packets > 64KB, since that + relaxed so severely the definition of a valid packet header. + + 64MB is an arbitrary and perhaps suboptimal number, but it seems to do the right + thing in all the examples I have handy. + + Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9634 + + svn path=/trunk/; revision=54812 + (cherry picked from commit dae86605b61bbbabd54749e6bde7c0c10b031ca8 with + release note updates) + + Change-Id: Id3a9b413113148c8072bdd6c221246a56d0df2cb + Reviewed-on: https://code.wireshark.org/review/349 + Reviewed-by: Gerald Combs + +commit 246ef6a981714cfd97adf3884b6888be81fd9cf6 +Author: Bill Meier +Date: Sat Dec 21 18:16:07 2013 +0000 + + If Gtk >= 3.10, allow use of deprecated Gtk features (and prevent 'deprecated' warnings); + + Given that Wireshark is moving to QT, the Wireshark changes required to + fix the features deprecated in Gtk 3.10 will not be done. + + svn path=/trunk/; revision=54337 + (cherry picked from commit 6ec4ba58a18298d443d87de2cd8bd64dc97464e1 with + release note updates) + + Change-Id: Ic6e8f44e201a1e487ed969bbdcfaa3f40c00e682 + Reviewed-on: https://code.wireshark.org/review/347 + Reviewed-by: Gerald Combs + +commit 76c8bfa9a3b3fb672549fbb313be21db4c08f873 +Author: Martin Kaiser +Date: Sun Dec 29 18:45:09 2013 +0000 + + From stcook + clear the temporary buffer after each DXM channel data line + + https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9598 + + svn path=/trunk/; revision=54488 + (cherry picked from commit 745c8660be2707df41d7cea3cd2725d18b9d6ff0) + + Change-Id: I420ca616a6c19489214100d86446450905c4234d + Reviewed-on: https://code.wireshark.org/review/346 + Reviewed-by: Gerald Combs + +commit ff3c3a37991536980ec7bdf0b5549f95d12fd743 +Author: Michael Mann +Date: Thu Dec 26 14:10:26 2013 +0000 + + "Better" fix for OpenSafety heuristics with Modbus/TCP. Bug 9572 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9572) + + From Roland Knall + + This fix is on top of/in conjunction with r54193 and both need to be backported. + + svn path=/trunk/; revision=54463 + (cherry picked from commit 6697a94ba55934a132154439dc44b378cbf991e3 with + release note updates) + + Change-Id: I0fa9fbf6f7429fb6d8ad53731d7760f62edb1b02 + Reviewed-on: https://code.wireshark.org/review/345 + Reviewed-by: Gerald Combs + +commit d7d110415cdeb84a726c11cd47fd3269ff6144f7 +Author: Michael Mann +Date: Tue Dec 17 20:06:03 2013 +0000 + + Bugfix OpenSafety "heuristics" to only consider a packet "handled" if a subdissector is called. Fixes bug 9572 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9572) + + Also removed tree check in Modbus dissector because dissector_try_string() is being called under it. + + svn path=/trunk/; revision=54193 + cherry-picked from 6db9eb0b73b4bb02864ab389c74f5a17a9da50e2. Added + release note entry. + + Change-Id: I9bad5846d08cbf8b9c40c6a17a7f88712451794e + Reviewed-on: https://code.wireshark.org/review/344 + Reviewed-by: Gerald Combs + +commit 551423110b94730ed25a4193df5e30fbb5998b95 +Author: Jeff Morriss +Date: Fri May 31 02:27:40 2013 +0000 + + Don't intentionally use -1 as an hfindex: while only naughty before, with the + changes from r49644 you'll get complaints about the hf being unregistered... + + Note that this code also intentionally passes -1 as an ett_index. It doesn't + currently complain so I'm leaving it alone for now... + + svn path=/trunk/; revision=49648 + (cherry picked from commit 813dcf79a15d6527cce8a6a7bac4234de6ab577f) + Change-Id: I2bca70df606397264df54e88ce6fa85815aaf1b9 + Reviewed-on: https://code.wireshark.org/review/338 + Reviewed-by: Gerald Combs + +commit e45b0954fd182c6ac07a7c9ab1557ec9d23f2aaa +Author: Pascal Quantin +Date: Sun Feb 23 23:36:11 2014 +0100 + + NAS EPS: fix dissection of CS service notification message + + Fixes bug 9789 + + Change-Id: I26ed1e9d8bb5b662af97d19f64b5f4b39374a5ee + Reviewed-on: https://code.wireshark.org/review/330 + Reviewed-by: Pascal Quantin + + (cherry picked from commit dd4e5fcbdd1c54afd9da2764b00f8fef2febb682) + + Change-Id: Ia2d3cbdeda7935cec07fbfbb2c0d6b7cb2841288 + Reviewed-on: https://code.wireshark.org/review/333 + Reviewed-by: Pascal Quantin + +commit d1eaa9325a8e943310168e79f45849a89d8d3596 +Author: Gerald Combs +Date: Sun Feb 23 08:08:19 2014 -0800 + + [Automatic manuf, services and enterprise-numbers update for 2014-02-23] + + Change-Id: Ida5492e584bea365c0c9ec1b3a449c253b251122 + Reviewed-on: https://code.wireshark.org/review/317 + Reviewed-by: Alexis La Goutte + Tested-by: Alexis La Goutte + +commit 1fe82ae65685c75c01b89bacdfe5b1659bef7573 +Author: Guy Harris +Date: Fri Feb 21 16:47:55 2014 -0800 + + Add bug 9492. + + Change-Id: I412d5c56848f2a19c8bf2c2e50f1ad1db86ce793 + Reviewed-on: https://code.wireshark.org/review/306 + Reviewed-by: Guy Harris + Reviewed-on: https://code.wireshark.org/review/308 + +commit 953684ce31e8d302921c23ab662331ce9814d11e +Author: Michael Mann +Date: Sun Dec 1 13:47:11 2013 +0000 + + Add MPLS dissector to "ppp.protocol" table. Bug 9492 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492) + + From Peter Paluch + + svn path=/trunk/; revision=53694 + + Change-Id: Iee6b51807491170967a2822db8ccbab9b1e36204 + Reviewed-on: https://code.wireshark.org/review/304 + Reviewed-by: Guy Harris + +commit a4382fc3acbfd90eb69febdafcc77a638d868eea +Author: Alexis La Goutte +Date: Tue Feb 18 14:21:25 2014 +0100 + + Fix typo in name of Radio Type 802.11b (in IEEE802.11 WTP Radio Information) + + Found by Massimo Vellucci + + Change-Id: Ibbe2d0a4d1e421e647028262baf0398d05905c8d + Reviewed-on: https://code.wireshark.org/review/246 + Reviewed-by: Alexis La Goutte + Tested-by: Alexis La Goutte + (cherry picked from commit 8a1cead94713f0c7c6e2f5cc58aa1d0f6c8f2a60) + Reviewed-on: https://code.wireshark.org/review/289 + +commit c49165098a47dbd9610cd21d77a2edc69e492cf9 +Author: Alexis La Goutte +Date: Wed Feb 12 08:32:27 2014 +0100 + + Add message type from RFC5416 : Section 3 : IEEE 802.11 Specific CAPWAP Control Messages + + Issue found by Massimo Vellucci (SmartCAPWAP) + + Partial-Bug: 9752 + + Change-Id: I6f61a3c8706572e9ea7935e8f00818e6aa9fef7a + Reviewed-on: https://code.wireshark.org/review/193 + Reviewed-by: Alexis La Goutte + Tested-by: Alexis La Goutte + (cherry picked from commit a9dc8016e9d37663c3d09f1563f993182a979554) + Reviewed-on: https://code.wireshark.org/review/290 + +commit 2ba9a20dd132b92b2b567948be2fc5389f40fe93 +Author: Andreas Schultz +Date: Thu Oct 17 02:13:23 2013 +0000 + + Properly decode CAPWAP Data Keep-Alive's. Bug 9165 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9165) + + From Andreas Schultz + + From me: Use expert API instead of throwing exception for a bad length. + + svn path=/trunk/; revision=52657 + + Manual Backport to 1.10 (Use old expert API) + + Change-Id: Iab31aeb9521630d3ad69bb8b7fe5f10d4d95cee7 + Reviewed-on: https://code.wireshark.org/review/288 + Reviewed-by: Alexis La Goutte + Tested-by: Alexis La Goutte + +commit 63b3a9dfd3d2d12be127e9358a05a4eced9f6c4b +Author: Guy Harris +Date: Thu Feb 20 17:50:52 2014 -0800 + + Force "printing" if -T is specified, even if -w is also specified. + + Just as "tshark ... -P -w xxx" writes raw packets to xxx *and* writes + text packet summaries to the standard output, and just as "tshark ... + -V -w xxx" writes raw packets to xxx *and* writes text packet details to + the standard output, so should "tshark ... -T fff -w xxx" write raw + packets to xxx *and* write whatever "-T fff" (and any "-e" options) + specifies to the standard output. + + Change-Id: I28ab3a4d48531f297533ec4dfb3742031eb69885 + Reviewed-on: https://code.wireshark.org/review/278 + Reviewed-by: Guy Harris + Reviewed-on: https://code.wireshark.org/review/279 + +commit 78dae7c43f6512cd411dcfb4f20bc3363fc6ddf6 +Author: Gerald Combs +Date: Wed Feb 19 17:09:05 2014 -0800 + + More SVN → Git conversion. + + Change-Id: Iddb56a54befd187f87f7a250f1fb38c4d2cc59b2 + Reviewed-on: https://code.wireshark.org/review/265 + Reviewed-by: Gerald Combs + +commit 83640307e7538fd9586076c9e708b252c410977e +Author: Gerald Combs +Date: Fri Aug 23 22:18:49 2013 +0000 + + Add NSIS path discovery to config.nmake. + + Chocolatey wants to install NSIS in "c:\Program Files" no matter what. Try + to locate makensis automatically, similar to the way we locate Python. + + svn path=/trunk/; revision=51497 + (cherry picked from commit dc87fa2d68a5dbc7693b5cc93e044a62af5ce39c) + + Change-Id: I42d6084e3699275d8212c6e37f8f776f12b343f3 + Reviewed-on: https://code.wireshark.org/review/262 + Reviewed-by: Gerald Combs + +commit 5086c0e21d734612e12173acbee6a98b1a5df2ed +Author: Gerald Combs +Date: Wed Feb 19 15:16:44 2014 -0800 + + Replace "svn" with "git" all over the place. + + Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. + Rename "svnversion.h" to "version.h" as Evan suggested. Update some + URLs. In make-version.pl, make sure we don't set an improper upstream + branch name. Use the number of commits + short hash from `git describe` + for package names by default. + + Cherry-picked from gf966980 with a lot of manual intervention. + + Change-Id: Ib4b3e52e10557e803d603aa2b1ea5d826845a102 + Reviewed-on: https://code.wireshark.org/review/261 + Reviewed-by: Gerald Combs + +commit 84e3498349e202262857985a29549ac93b1beff8 +Author: Gerald Combs +Date: Sun Feb 16 08:08:09 2014 -0800 + + [Automatic manuf, services and enterprise-numbers update for 2014-02-16] + + Change-Id: Id8a7fe6a64184a121c945c8cd281863b96dd233e + Reviewed-on: https://code.wireshark.org/review/230 + Reviewed-by: Alexis La Goutte + Tested-by: Alexis La Goutte + +commit 8e4e30f615293b42d14a687ae0db986458942d10 +Author: Hadriel Kaplan +Date: Fri Feb 14 02:06:03 2014 -0500 + + Fix Bug 9728 'Lua: ProtoField.bool() VALUESTRING argument is not optional but was supposed to be' + + Similar to bug 9725 and ProtoField.new(), the way the VALUESTRING argument is being checked + in the code for ProtoField.bool() ends up making it non-optional. This patch fixes that, + along with some minor API documentation fixes (text). + + This is a backport for change-id Iadb9a8ace9c5514fc623d882301fe16b637fe4ce + + Change-Id: Ic60375f3e0ad7c7a8887dce7ffbd946f0a9d80b5 + Reviewed-on: https://code.wireshark.org/review/209 + Reviewed-by: Alexis La Goutte + Tested-by: Alexis La Goutte + +commit b826cb9da886d135fdb07439e31dc1ea496911ab +Author: Hadriel Kaplan +Date: Wed Feb 5 01:23:25 2014 -0500 + + Fix Bug 9725 'Lua: ProtoField.new() is buggy' + + Using ProtoField.new() is dicey. Many of the optional arguments don't properly check the lua stack - they call lua_isnil() for their index number, instead of lua_gettop() to see the stack size. lua_isnil() may return false in such cases. + + Change-Id: I83ca1e5fc34e71ec35899adbedabcee69571b9fe + Reviewed-on: https://code.wireshark.org/review/118 + Reviewed-by: Stig Bjørlykke + Tested-by: Stig Bjørlykke + Reviewed-on: https://code.wireshark.org/review/207 + Reviewed-by: Alexis La Goutte + Tested-by: Alexis La Goutte + +commit 00caebf4170f88ed02f7712c8c133d9efc364a76 +Author: Gerald Combs +Date: Tue Feb 11 08:56:15 2014 -0800 + + Fix the host entry. + + Change-Id: Ia76b5585c38eebdec6c275c6e1aadabb3862cf2b + Reviewed-on: https://code.wireshark.org/review/172 + Reviewed-by: Gerald Combs + (cherry picked from commit bed30b8a94b645361a00d70ee2db0ec184cae103) + Reviewed-on: https://code.wireshark.org/review/174 + Reviewed-by: Alexis La Goutte + Tested-by: Alexis La Goutte + +commit 0522f62f34214099247aa50bf28c74e75625a80f +Author: Gerald Combs +Date: Sun Feb 9 08:07:53 2014 -0800 + + [Automatic manuf, services and enterprise-numbers update for 2014-02-09] + + Change-Id: Ia3c3a4e113028e601e074c7ae9005fb532089ecb + Reviewed-on: https://code.wireshark.org/review/152 + Reviewed-by: Gerald Combs + +commit b62a8961c7adecc8405ad838bd659b6da8ae8d0d +Author: Hadriel Kaplan +Date: Tue Feb 4 00:45:45 2014 -0500 + + Fix bug 9720 'Lua: bitop library is missing in Lua 5.2' + + In Lua 5.2 the bitop library is missing - it's not getting loaded into + the lua global table as "bit", or anything else for that matter. Lua + 5.2 has its own bit-operations library ("bit32") which is there, but + that one's not as good as bitop and would break back/forward + compatibility for lua scripts anyway. + + Change-Id: I94b7d45bbeb2f637d1c76b0b5c9d8472eebfcaea + Reviewed-on: https://code.wireshark.org/review/100 + Reviewed-by: Evan Huus + Tested-by: Evan Huus + Reviewed-by: Stig Bjørlykke + Reviewed-on: https://code.wireshark.org/review/141 + +commit b921379e087e4fa5a4e9894ee21ae15af6305bb9 +Author: Guy Harris +Date: Thu Feb 6 16:49:40 2014 -0800 + + Pass the caplen from the struct wtap_pkthdr to pcap_read_post_process(). + + That makes it clearer what the argument should be and, in the case of an + SPB, passes the correct length (the length *after* any pseudo-header we + convert to a union wtap_pseudo_header and remove from the raw packet + data we hand to our caller). + + Change-Id: Ia360cd7c971ae1e1635bdef8f7e17a8d9e2495f8 + Reviewed-on: https://code.wireshark.org/review/134 + Reviewed-by: Guy Harris + +commit 6ed5bab8d5e4d59eaaf01c3d4122ee6610a99d4f +Author: Pascal Quantin +Date: Tue Feb 4 22:27:07 2014 +0100 + + Introduce end-of-line normalization + + Change-Id: I543039935aec3715cf9887708ca74966fa106571 + Reviewed-on: https://code.wireshark.org/review/115 + Reviewed-by: Pascal Quantin + Tested-by: Pascal Quantin + +commit 1de44d769cd205a49446ac1fd09ddd196fedb6a8 +Author: Evan Huus +Date: Tue Feb 4 10:28:06 2014 -0500 + + Fix dissection of GTP MM Context RAND field. + + As suggested by LükÅ‘ Bálint to fix bug #9722. + + Change-Id: Ie6b801a9660716c2c6efa6fd09b50a2481f5acd7 + Reviewed-on: https://code.wireshark.org/review/110 + Reviewed-by: Evan Huus + Tested-by: Evan Huus + +commit 037db78dbdf5ce3a4b2b66f769db8dbc01fbe9c7 +Author: Martin Kaiser +Date: Fri Jan 10 08:48:38 2014 +0000 + + correct a typo in a filter string + + svn path=/trunk/; revision=54687 + + Change-Id: Ie9ca9fbffdfe83b74f38ab314ba4403d2f17ee8e + Reviewed-on: https://code.wireshark.org/review/104 + Reviewed-by: Martin Kaiser + Tested-by: Martin Kaiser + +commit 194dafbc0c707fea6f451e06e0848c3d31c63550 +Author: Anders Broman +Date: Tue Sep 10 06:06:55 2013 +0000 + + Freom Dennis: + + As I looked into the implementation in epan/dissectors/packet-ieee802a.c, there's a bug in the dissect_ieee802a(). After OUI and PID is parsed, it looks for the customized sub-dissector_table by + oui_info = (oui_info_t *)g_hash_table_lookup(oui_info_table, GUINT_TO_POINTER(oui)) + The problem is that the oui is defined as an array (guint8 oui[3]), whose value contains the 3-byte customized OUI. However, here GUINT_TO_POINTER(oui) converts the local array oui's address to the hash table key, instead of the value. That cause the search in the hash table to fail, because the ieee802_add_oui() use the OUI value as the key. + + https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9122 + + svn path=/trunk/; revision=51918 + + Conflicts: + epan/dissectors/packet-ieee802a.c + + Change-Id: I659b8eee2bff74d8741d67546a1d7959fc40a113 + Reviewed-on: https://code.wireshark.org/review/101 + Reviewed-by: Pascal Quantin + Tested-by: Pascal Quantin + +commit 6c4d8cbf7d5850a1c731558b6db47f96f93b7528 +Author: Gerald Combs +Date: Sun Feb 2 08:08:14 2014 -0800 + + [Automatic manuf, services and enterprise-numbers update for 2014-02-02] + + Change-Id: I9e016b004a305d86521ebe6065fd7f6cc9805a89 + Reviewed-on: https://code.wireshark.org/review/76 + Reviewed-by: Evan Huus + Tested-by: Evan Huus + +commit fba07cd7503a45065fe19bb3717c7472f56fb809 +Author: Evan Huus +Date: Fri Jan 31 18:51:39 2014 -0500 + + Add gitreview file for master-1.10 + + Change-Id: I951f5ad9c121b63d1f075710b0f5e566516c5cca + Reviewed-on: https://code.wireshark.org/review/67 + Reviewed-by: Evan Huus + Tested-by: Evan Huus + +commit 0b6bb297545c4da1cee747464834cd7242799a70 +Author: Stig Bjørlykke +Date: Fri Dec 20 13:33:48 2013 +0000 + + Rewrote ProtoField_new to: + - Allow both string and integer for type and base (improve usability). + - Check valid base and mask for different types (avoid crashes). + - Remove ftypes.PROTOCOL from valid types. + + This should fix bug #9549. + + svn path=/trunk/; revision=54292 + + Conflicts: + epan/wslua/wslua_proto.c + + Change-Id: I6e925933b178deb9784340e03d72a4252b498b9c + +commit d3bd3965e8df79d63ae6a4ae0f7529db49fd906e +Author: Evan Huus +Date: Sat Aug 31 02:50:32 2013 +0000 + + Convert m3ua to wmem and use the pinfo pool for a variable that might be used + for an address. Fixes the recent valgrind fuzz failure. + + Fixes bug #9699 + + svn path=/trunk/; revision=51608 + + Change-Id: Ibbe8018509f8c74c0c70d6f64397fc0c8084d44c + +commit 69c740352a1bf2fec5bf501dad2ee2729f4666d2 +Merge: 892eb72 63d4c99 +Author: Pascal Quantin +Date: Wed Jan 29 11:17:54 2014 +0000 + + Merge "Fix bug 9633: Do not try to add a new NAL unit when the previous one was not decoded" into master-1.10 + +commit 892eb72ef92c9d56c4f1b1846da20028c7cbdd0b +Merge: aa977c7 312f7e1 +Author: Evan Huus +Date: Wed Jan 29 02:13:46 2014 +0000 + + Merge "Harden nfs_name_snoop_add_name against various malformed inputs. Thanks to Moshe Kaplan for the report." into master-1.10 + +commit aa977c77b3ef902fe9fa9ceebc84afcc86093871 +Merge: 4d16e9b 3eb9b1c +Author: Gerald Combs +Date: Wed Jan 29 00:17:14 2014 +0000 + + Merge "Fix bug 9649: SMPP: source_telematics_id value length is 1 byte" into master-1.10 + +commit 4d16e9b9f0c0b05d495354d5a0b61d535f1bf23c +Merge: 7bb25ec 2efc732 +Author: Evan Huus +Date: Tue Jan 28 22:44:06 2014 +0000 + + Merge "Add missing gitignore entries" into master-1.10 + +commit 7bb25ecfe4c95dee6186b8c81463c76fbbd78de0 +Merge: e7d6aee 7c8d960 +Author: Stig Bjørlykke +Date: Tue Jan 28 20:26:28 2014 +0000 + + Merge "Renamed new_TvbRange to push_TvbRange and use this when creating a new TvbRange from a FieldInfo." into master-1.10 + +commit e7d6aee85ca723d65d72a219ec93c51f5d5a7b37 +Author: Gerald Combs +Date: Sun Jan 26 09:08:42 2014 -0800 + + [Automatic manuf, services and enterprise-numbers update for 2014-01-26] + + Change-Id: I1dbd8bdeed0afb95951f9d10363b4ac1f8713f77 + +commit 2efc732f7fd26ba4d3fa2eb907e8e33a77249ee3 +Author: Evan Huus +Date: Sun Jan 26 09:11:53 2014 -0500 + + Add missing gitignore entries + + Change-Id: I6bc9bbe885d6d68d2545d1d0f7010cd939af4407 + +commit 9e61436165177098c7d526e8f1d9b59204cd7e3a +Author: Evan Huus +Date: Sun Jan 26 14:05:30 2014 +0000 + + Backport r54295 and part of r54296 - g_memmove is deprecated, so just use + memmove instead to permit building with recent glib versions. + + svn path=/trunk-1.10/; revision=54966 + +commit f37b929a48571217e6063ff299cff80bdf53c800 +Author: Guy Harris +Date: Fri Jan 24 07:56:15 2014 +0000 + + Copy over r54938 from trunk: + + ------------------------------------------------------------------------ + r54938 | guy | 2014-01-23 23:55:03 -0800 (Thu, 23 Jan 2014) | 5 lines + + Check for a zero offset in the "get status" reply *before* adding the + offset in the tvbuff of the beginning of the packet to it. Otherwise, + it will never be zero, and the tests will always think the field pointed + to by the offset is present. + + svn path=/trunk-1.10/; revision=54939 + +commit 7c8d9609fb8539b97bacfcd05d8909d2ed0ab7fe +Author: Stig Bjørlykke +Date: Thu Dec 19 15:26:31 2013 +0000 + + Renamed new_TvbRange to push_TvbRange and use this when creating a new + TvbRange from a FieldInfo. + + This should fix the crash in bug #9483. + + svn path=/trunk/; revision=54247 + + Change-Id: I0eaa87a5c95f486e2fb259f437e1ed9727d560d8 + +commit cadc31c42a21d2edfb77de8357d4aca337ca5e5c +Author: Guy Harris +Date: Wed Jan 22 02:17:04 2014 +0000 + + Copy over r54884 from trunk, with manual intervention: + + ------------------------------------------------------------------------ + r54884 | guy | 2014-01-21 17:22:01 -0800 (Tue, 21 Jan 2014) | 4 lines + + It's not a string, it's a byte array (bit array, really). + + Also, RFC 5035 isn't a complete ESS spec, it's an update to RFC 2634. + + As part of the manual intervention, use ep allocation, so we don't leak + memory. (In the trunk, we used wmem packet scope when allocating even + before the fix.) + + svn path=/trunk-1.10/; revision=54887 + +commit 312f7e18098177b6098878de33d555aae39ab815 +Author: Evan Huus +Date: Tue Jan 21 18:48:01 2014 +0000 + + Harden nfs_name_snoop_add_name against various malformed inputs. Thanks to Moshe + Kaplan for the report. + + Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9672 and some + other cases in the same vein. + + svn path=/trunk/; revision=54875 + + Conflicts: + epan/dissectors/packet-nfs.c + + Change-Id: I73714f5c0df608785b0bd96666e0dcf7a9d7ca3a + +commit 63d4c995d0b207c101611ec1168616e99e11b4ff +Author: Pascal Quantin +Date: Sun Jan 12 20:52:19 2014 +0000 + + Fix bug 9633: Do not try to add a new NAL unit when the previous one was not decoded + + svn path=/trunk/; revision=54707 + + Conflicts: + epan/dissectors/packet-h264.c + + (cherry picked from commit 527071fb0dba0b8cae5ed8baa58b19ebf1996b89) + + Change-Id: I572506ad6be63c7243d7b8181c6c79a75d1af04c + +commit 3eb9b1c839910823a4779a6eaf92cf2e9665a749 +Author: Pascal Quantin +Date: Fri Jan 17 22:18:50 2014 +0000 + + Fix bug 9649: SMPP: source_telematics_id value length is 1 byte + + svn path=/trunk/; revision=54837 + + (cherry picked from commit 642949701501d313059c3e7de888af266e00d0d1) + + Change-Id: Ib389f8f9b898492b69240cbf0674fe74bc0e1ca4 + +commit bc178a12738f03bb5e64edb0e91d14de9960f39d +Author: Gerald Combs +Date: Sun Jan 19 15:19:29 2014 +0000 + + [Automatic manuf, services and enterprise-numbers update for 2014-01-19] + + svn path=/trunk-1.10/; revision=54845 + +commit e57d7a63a05aa7e69c9a3e61f92c1eabf55f48c0 +Author: Gerald Combs +Date: Wed Jan 15 00:39:25 2014 +0000 + + Copy over recent changes from trunk-1.8 along with some local + modifications. + + ------------------------------------------------------------------------ + r54807 | gerald | 2014-01-14 16:35:34 -0800 (Tue, 14 Jan 2014) | 2 lines + + Start using the output of 'git describe'. + ------------------------------------------------------------------------ + r54805 | gerald | 2014-01-14 15:38:16 -0800 (Tue, 14 Jan 2014) | 2 lines + + Start adding support for plain git. + ------------------------------------------------------------------------ + + + svn path=/trunk-1.10/; revision=54808 + +commit f3b6ddbc2729b26e91672942c633056af707e1fb +Author: Guy Harris +Date: Mon Jan 13 19:56:48 2014 +0000 + + Copy over r54714 from trunk: + + ------------------------------------------------------------------------ + r54714 | guy | 2014-01-13 11:49:12 -0800 (Mon, 13 Jan 2014) | 17 lines + + In a source file that defines external functions, the header file that + declares the functions must be included, in order to make sure the + declarations match the function signature. Make it so. + + They *didn't* match; fix that. + + Do *not* use 16-bit tvbuff offsets; there is no advantage to that (and, + in fact, 32-bit arithmetic may be easier on some platforms), and it has + the disadvantage that you're more likely to have the offset overflow. + + dissect_cbs_serial_number() returns the new offset, not the length of + the item it dissected; don't add its return value to the offset, set the + offset to its return value. + + Make dissect_cbs_message_identifier() return the new offset as well, for + consistency, and don't add *its* return value to the offset. + + svn path=/trunk-1.10/; revision=54715 + +commit 80489e7c688904319f8fa143fec0ea69bb85f2cb +Author: Gerald Combs +Date: Sun Jan 12 15:19:31 2014 +0000 + + [Automatic manuf, services and enterprise-numbers update for 2014-01-12] + + svn path=/trunk-1.10/; revision=54703 + +commit 11ef00df3e94a5499d3863ff9ac2370be6d37530 +Author: Guy Harris +Date: Tue Jan 7 21:24:22 2014 +0000 + + Copy over r54630 from trunk: + + ------------------------------------------------------------------------ + r54630 | guy | 2014-01-07 13:21:20 -0800 (Tue, 07 Jan 2014) | 6 lines + + The capabilities for dumpcap don't need to be inheritable. + + See + + https://bugzilla.redhat.com/show_bug.cgi?id=1022377 + + svn path=/trunk-1.10/; revision=54631 + +commit 65a9164e08c0e152c7ce2a2586f0b417b1c263a4 +Author: Gerald Combs +Date: Sun Jan 5 15:19:24 2014 +0000 + + [Automatic manuf, services and enterprise-numbers update for 2014-01-05] + + svn path=/trunk-1.10/; revision=54602 + +commit 7fdea48ff9d44de1117a7d52555eb17adb000beb +Author: Pascal Quantin +Date: Thu Jan 2 09:41:50 2014 +0000 + + Copy over revisions from the trunk: + + ------------------------------------------------------------------------ + r54529 | stig | 2014-01-01 13:20:27 +0100 (mer. 01 janv. 2014) | 2 lignes + Chemins modifiés : + M /trunk/packaging/macosx/Info.plist.in + M /trunk/version_info.c + + Happy new year! + + ------------------------------------------------------------------------ + + svn path=/trunk-1.10/; revision=54550 + +commit 96d5a4760395b7a6c5a64f243de728fe2b3f0a92 +Author: Guy Harris +Date: Wed Jan 1 23:24:27 2014 +0000 + + Copy over r54544 from trunk: + + ------------------------------------------------------------------------ + r54544 | guy | 2014-01-01 15:22:53 -0800 (Wed, 01 Jan 2014) | 11 lines + + If the uncompression buffers are empty, they have no data; set the count + of bytes in them to 0, as there's no data in them, and set the offset in + that buffer of the stream's current position, to 0, as we're currently + at the beginning of the file in both streams. + + This fixes some tricky-to-reproduce errors (which show up only if the + ngsniffer_t structure is allocated from data that's been allocated, + written to in those variables, and freed). + + svn path=/trunk-1.10/; revision=54545 + +commit cddbba2b1bc2ec846d7fa70130686ac286dcb2c6 +Author: Gerald Combs +Date: Sun Dec 29 17:30:27 2013 +0000 + + Manually copy over r54485: + + ------------------------------------------------------------------------ + r54485 | gerald | 2013-12-29 09:28:12 -0800 (Sun, 29 Dec 2013) | 9 lines + Changed paths: + M /trunk/manuf + M /trunk/tools/make-manuf + + The IEEE OUI, IAB, and OUI-36 lists currently redirect to + http://standards.ieee.org/regauthmaint.html, which says + + IEEE Registration Authority Services will be unavailable from Friday, December 27th through Monday, December 30th + + As a result the manuf file got clobbered. Revert the manuf file to + its non-clobbered state and add sanity checks to make-manuf. Add a + note about the impending addition of OUI-28. + ------------------------------------------------------------------------ + + svn path=/trunk-1.10/; revision=54486 + +commit fb147728833becb86736162f4a3b6d56db820677 +Author: Gerald Combs +Date: Sun Dec 29 15:19:23 2013 +0000 + + [Automatic manuf, services and enterprise-numbers update for 2013-12-29] + + svn path=/trunk-1.10/; revision=54481 + +commit 6e69a1798c5c4de2877b13f5b32e8db86ecc47b7 +Author: Jeff Morriss +Date: Thu Dec 26 23:01:13 2013 +0000 + + Remove a (presumably debug) fprintf of the default filter value. + + svn path=/trunk-1.10/; revision=54471 + +commit 5d329247198b60502bbd295013660936d175d822 +Author: Gerald Combs +Date: Sun Dec 22 15:19:28 2013 +0000 + + [Automatic manuf, services and enterprise-numbers update for 2013-12-22] + + svn path=/trunk-1.10/; revision=54360 diff -Nru wireshark-1.10.5/clopts_common.c wireshark-1.10.6/clopts_common.c --- wireshark-1.10.5/clopts_common.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/clopts_common.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* clopts_common.c * Handle command-line arguments common to Wireshark and TShark * - * $Id: clopts_common.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/clopts_common.h wireshark-1.10.6/clopts_common.h --- wireshark-1.10.5/clopts_common.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/clopts_common.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* clopts_common.h * Handle command-line arguments common to Wireshark and TShark * - * $Id: clopts_common.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/cmake/modules/CMakeInstallDirs.cmake wireshark-1.10.6/cmake/modules/CMakeInstallDirs.cmake --- wireshark-1.10.5/cmake/modules/CMakeInstallDirs.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/CMakeInstallDirs.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: CMakeInstallDirs.cmake 30934 2009-11-11 16:20:37Z jmayer $ +# $Id$ # ################################################################### # diff -Nru wireshark-1.10.5/cmake/modules/COPYING-CMAKE-SCRIPTS wireshark-1.10.6/cmake/modules/COPYING-CMAKE-SCRIPTS --- wireshark-1.10.5/cmake/modules/COPYING-CMAKE-SCRIPTS 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/COPYING-CMAKE-SCRIPTS 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ Copyright notice for the files copied from http://www.opensync.org/browser/branches/3rd-party-cmake-modules/modules -$Id: COPYING-CMAKE-SCRIPTS 34248 2010-09-25 15:38:12Z jmayer $ +$Id$ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff -Nru wireshark-1.10.5/cmake/modules/FindADNS.cmake wireshark-1.10.6/cmake/modules/FindADNS.cmake --- wireshark-1.10.5/cmake/modules/FindADNS.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindADNS.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindADNS.cmake 30104 2009-09-23 19:40:25Z jmayer $ +# $Id$ # # - Find adns # Find the native ADNS includes and library diff -Nru wireshark-1.10.5/cmake/modules/FindCAP.cmake wireshark-1.10.6/cmake/modules/FindCAP.cmake --- wireshark-1.10.5/cmake/modules/FindCAP.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindCAP.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindCAP.cmake 30104 2009-09-23 19:40:25Z jmayer $ +# $Id$ # # - Find capabilities # Find the native CAP includes and library diff -Nru wireshark-1.10.5/cmake/modules/FindCARES.cmake wireshark-1.10.6/cmake/modules/FindCARES.cmake --- wireshark-1.10.5/cmake/modules/FindCARES.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindCARES.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindCARES.cmake 30104 2009-09-23 19:40:25Z jmayer $ +# $Id$ # # - Find cares # Find the native CARES includes and library diff -Nru wireshark-1.10.5/cmake/modules/FindFOP.cmake wireshark-1.10.6/cmake/modules/FindFOP.cmake --- wireshark-1.10.5/cmake/modules/FindFOP.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindFOP.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindFOP.cmake 32004 2010-02-25 12:30:44Z jmayer $ +# $Id$ # # - Find unix commands from cygwin # This module looks for some usual Unix commands. diff -Nru wireshark-1.10.5/cmake/modules/FindGCRYPT.cmake wireshark-1.10.6/cmake/modules/FindGCRYPT.cmake --- wireshark-1.10.5/cmake/modules/FindGCRYPT.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindGCRYPT.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindGCRYPT.cmake 30104 2009-09-23 19:40:25Z jmayer $ +# $Id$ # # - Find gcrypt # Find the native GCRYPT includes and library diff -Nru wireshark-1.10.5/cmake/modules/FindGEOIP.cmake wireshark-1.10.6/cmake/modules/FindGEOIP.cmake --- wireshark-1.10.5/cmake/modules/FindGEOIP.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindGEOIP.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindGEOIP.cmake 39307 2011-10-08 06:09:38Z jmayer $ +# $Id$ # # - Find GeoIP # Find the native GEOIP includes and library diff -Nru wireshark-1.10.5/cmake/modules/FindGLIB2.cmake wireshark-1.10.6/cmake/modules/FindGLIB2.cmake --- wireshark-1.10.5/cmake/modules/FindGLIB2.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindGLIB2.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindGLIB2.cmake 38361 2011-08-05 12:25:54Z jmayer $ +# $Id$ # # - Try to find GLib2 # Once done this will define diff -Nru wireshark-1.10.5/cmake/modules/FindGMODULE2.cmake wireshark-1.10.6/cmake/modules/FindGMODULE2.cmake --- wireshark-1.10.5/cmake/modules/FindGMODULE2.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindGMODULE2.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindGMODULE2.cmake 34248 2010-09-25 15:38:12Z jmayer $ +# $Id$ # # - Try to find GModule2 # Find GModule headers, libraries and the answer to all questions. diff -Nru wireshark-1.10.5/cmake/modules/FindGNUTLS.cmake wireshark-1.10.6/cmake/modules/FindGNUTLS.cmake --- wireshark-1.10.5/cmake/modules/FindGNUTLS.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindGNUTLS.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindGNUTLS.cmake 30104 2009-09-23 19:40:25Z jmayer $ +# $Id$ # # - Find gnutls # Find the native GNUTLS includes and library diff -Nru wireshark-1.10.5/cmake/modules/FindGTHREAD2.cmake wireshark-1.10.6/cmake/modules/FindGTHREAD2.cmake --- wireshark-1.10.5/cmake/modules/FindGTHREAD2.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindGTHREAD2.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ # - Try to find GThread2 # -# $Id: FindGTHREAD2.cmake 37103 2011-05-12 21:13:00Z jmayer $ +# $Id$ # # Find GThread headers, libraries and the answer to all questions. # diff -Nru wireshark-1.10.5/cmake/modules/FindGTK3.cmake wireshark-1.10.6/cmake/modules/FindGTK3.cmake --- wireshark-1.10.5/cmake/modules/FindGTK3.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindGTK3.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ # - Try to find GTK3 # -# $Id: FindGTK3.cmake 39970 2011-11-21 15:39:25Z jmayer $ +# $Id$ # # Once done this will define # diff -Nru wireshark-1.10.5/cmake/modules/FindHtmlViewer.cmake wireshark-1.10.6/cmake/modules/FindHtmlViewer.cmake --- wireshark-1.10.5/cmake/modules/FindHtmlViewer.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindHtmlViewer.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindHtmlViewer.cmake 34200 2010-09-23 06:59:41Z jmayer $ +# $Id$ # # - Find an html viewer program # diff -Nru wireshark-1.10.5/cmake/modules/FindKERBEROS.cmake wireshark-1.10.6/cmake/modules/FindKERBEROS.cmake --- wireshark-1.10.5/cmake/modules/FindKERBEROS.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindKERBEROS.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindKERBEROS.cmake 30104 2009-09-23 19:40:25Z jmayer $ +# $Id$ # # - Find kerberos # Find the native KERBEROS includes and library diff -Nru wireshark-1.10.5/cmake/modules/FindLEX.cmake wireshark-1.10.6/cmake/modules/FindLEX.cmake --- wireshark-1.10.5/cmake/modules/FindLEX.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindLEX.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindLEX.cmake 34885 2010-11-15 20:25:28Z jmayer $ +# $Id$ # # - Find lex executable # diff -Nru wireshark-1.10.5/cmake/modules/FindLUA.cmake wireshark-1.10.6/cmake/modules/FindLUA.cmake --- wireshark-1.10.5/cmake/modules/FindLUA.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindLUA.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindLUA.cmake 44669 2012-08-25 19:12:03Z eapache $ +# $Id$ # # Locate Lua library # This module defines diff -Nru wireshark-1.10.5/cmake/modules/FindLYNX.cmake wireshark-1.10.6/cmake/modules/FindLYNX.cmake --- wireshark-1.10.5/cmake/modules/FindLYNX.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindLYNX.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindLYNX.cmake 31379 2009-12-29 12:12:26Z jmayer $ +# $Id$ # # - Find unix commands from cygwin # This module looks for some usual Unix commands. diff -Nru wireshark-1.10.5/cmake/modules/FindM.cmake wireshark-1.10.6/cmake/modules/FindM.cmake --- wireshark-1.10.5/cmake/modules/FindM.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindM.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindM.cmake 30104 2009-09-23 19:40:25Z jmayer $ +# $Id$ # # - Find math # Find the native M includes and library diff -Nru wireshark-1.10.5/cmake/modules/FindNL.cmake wireshark-1.10.6/cmake/modules/FindNL.cmake --- wireshark-1.10.5/cmake/modules/FindNL.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindNL.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindNL.cmake 48742 2013-04-04 21:09:10Z guy $ +# $Id$ # # Find the native netlink includes and library # diff -Nru wireshark-1.10.5/cmake/modules/FindPCAP.cmake wireshark-1.10.6/cmake/modules/FindPCAP.cmake --- wireshark-1.10.5/cmake/modules/FindPCAP.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindPCAP.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindPCAP.cmake 38372 2011-08-05 18:52:53Z gerald $ +# $Id$ # ################################################################### # diff -Nru wireshark-1.10.5/cmake/modules/FindPOD.cmake wireshark-1.10.6/cmake/modules/FindPOD.cmake --- wireshark-1.10.5/cmake/modules/FindPOD.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindPOD.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindPOD.cmake 32004 2010-02-25 12:30:44Z jmayer $ +# $Id$ # # - Find unix commands from cygwin # This module looks for some usual Unix commands. diff -Nru wireshark-1.10.5/cmake/modules/FindPORTAUDIO.cmake wireshark-1.10.6/cmake/modules/FindPORTAUDIO.cmake --- wireshark-1.10.5/cmake/modules/FindPORTAUDIO.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindPORTAUDIO.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindPORTAUDIO.cmake 30104 2009-09-23 19:40:25Z jmayer $ +# $Id$ # # - Find portaudio # Find the native PORTAUDIO includes and library diff -Nru wireshark-1.10.5/cmake/modules/FindPYTHON.cmake wireshark-1.10.6/cmake/modules/FindPYTHON.cmake --- wireshark-1.10.5/cmake/modules/FindPYTHON.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindPYTHON.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindPYTHON.cmake 30104 2009-09-23 19:40:25Z jmayer $ +# $Id$ # # - Find python libraries # This module finds if Python is installed and determines where the diff -Nru wireshark-1.10.5/cmake/modules/FindSED.cmake wireshark-1.10.6/cmake/modules/FindSED.cmake --- wireshark-1.10.5/cmake/modules/FindSED.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindSED.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindSED.cmake 31379 2009-12-29 12:12:26Z jmayer $ +# $Id$ # # - Find unix commands from cygwin # This module looks for some usual Unix commands. diff -Nru wireshark-1.10.5/cmake/modules/FindSH.cmake wireshark-1.10.6/cmake/modules/FindSH.cmake --- wireshark-1.10.5/cmake/modules/FindSH.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindSH.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindSH.cmake 30129 2009-09-24 20:42:08Z jmayer $ +# $Id$ # # - Find unix commands from cygwin # This module looks for some usual Unix commands. diff -Nru wireshark-1.10.5/cmake/modules/FindSMI.cmake wireshark-1.10.6/cmake/modules/FindSMI.cmake --- wireshark-1.10.5/cmake/modules/FindSMI.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindSMI.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindSMI.cmake 30104 2009-09-23 19:40:25Z jmayer $ +# $Id$ # # - Find smi # Find the native SMI includes and library diff -Nru wireshark-1.10.5/cmake/modules/FindXMLLINT.cmake wireshark-1.10.6/cmake/modules/FindXMLLINT.cmake --- wireshark-1.10.5/cmake/modules/FindXMLLINT.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindXMLLINT.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindXMLLINT.cmake 32004 2010-02-25 12:30:44Z jmayer $ +# $Id$ # # - Find unix commands from cygwin # This module looks for some usual Unix commands. diff -Nru wireshark-1.10.5/cmake/modules/FindXSLTPROC.cmake wireshark-1.10.6/cmake/modules/FindXSLTPROC.cmake --- wireshark-1.10.5/cmake/modules/FindXSLTPROC.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindXSLTPROC.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindXSLTPROC.cmake 32004 2010-02-25 12:30:44Z jmayer $ +# $Id$ # # - Find unix commands from cygwin # This module looks for some usual Unix commands. diff -Nru wireshark-1.10.5/cmake/modules/FindYACC.cmake wireshark-1.10.6/cmake/modules/FindYACC.cmake --- wireshark-1.10.5/cmake/modules/FindYACC.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindYACC.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindYACC.cmake 30129 2009-09-24 20:42:08Z jmayer $ +# $Id$ # # - Find unix commands from cygwin # This module looks for some usual Unix commands. diff -Nru wireshark-1.10.5/cmake/modules/FindYAPP.cmake wireshark-1.10.6/cmake/modules/FindYAPP.cmake --- wireshark-1.10.5/cmake/modules/FindYAPP.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindYAPP.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: FindYAPP.cmake 30151 2009-09-25 18:09:42Z jmayer $ +# $Id$ # # - Find unix commands from cygwin # This module looks for some usual Unix commands. diff -Nru wireshark-1.10.5/cmake/modules/FindZLIB.cmake wireshark-1.10.6/cmake/modules/FindZLIB.cmake --- wireshark-1.10.5/cmake/modules/FindZLIB.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/FindZLIB.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ # - Find zlib # -# $Id: FindZLIB.cmake 37626 2011-06-08 21:33:38Z jmayer $ +# $Id$ # # Find the native ZLIB includes and library. # Once done this will define diff -Nru wireshark-1.10.5/cmake/modules/LICENSE.txt wireshark-1.10.6/cmake/modules/LICENSE.txt --- wireshark-1.10.5/cmake/modules/LICENSE.txt 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/LICENSE.txt 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ included below, unless the individual license of a file says otherwise. - $Id: LICENSE.txt 19708 2006-10-26 16:39:34Z jmayer $ + $Id$ ################################################################### # diff -Nru wireshark-1.10.5/cmake/modules/readme.txt wireshark-1.10.6/cmake/modules/readme.txt --- wireshark-1.10.5/cmake/modules/readme.txt 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/readme.txt 2014-03-07 18:07:12.000000000 +0000 @@ -1,3 +1,3 @@ -The following modules have been copied from CMake trunk _without_ modifications: - -* FindZLIB.cmake +The following modules have been copied from CMake trunk _without_ modifications: + +* FindZLIB.cmake diff -Nru wireshark-1.10.5/cmake/modules/UseLemon.cmake wireshark-1.10.6/cmake/modules/UseLemon.cmake --- wireshark-1.10.5/cmake/modules/UseLemon.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/UseLemon.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: UseLemon.cmake 30461 2009-10-10 05:51:08Z krj $ +# $Id$ # MACRO(ADD_LEMON_FILES _sources ) set(_lemonpardir ${CMAKE_SOURCE_DIR}/tools/lemon) diff -Nru wireshark-1.10.5/cmake/modules/UseMakeDissectorReg.cmake wireshark-1.10.6/cmake/modules/UseMakeDissectorReg.cmake --- wireshark-1.10.5/cmake/modules/UseMakeDissectorReg.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/UseMakeDissectorReg.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: UseMakeDissectorReg.cmake 45118 2012-09-25 01:20:51Z jmayer $ +# $Id$ # MACRO(REGISTER_DISSECTOR_FILES _outputfile _registertype ) # FIXME: Only the Python stuff has been implemented diff -Nru wireshark-1.10.5/cmake/modules/UseMakeTapReg.cmake wireshark-1.10.6/cmake/modules/UseMakeTapReg.cmake --- wireshark-1.10.5/cmake/modules/UseMakeTapReg.cmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/cmake/modules/UseMakeTapReg.cmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: UseMakeTapReg.cmake 33616 2010-07-22 12:18:36Z stig $ +# $Id$ # MACRO(REGISTER_TAP_FILES _outputfile ) set( _sources ${ARGN} ) diff -Nru wireshark-1.10.5/CMakeLists.txt wireshark-1.10.6/CMakeLists.txt --- wireshark-1.10.5/CMakeLists.txt 2013-07-03 22:09:41.000000000 +0000 +++ wireshark-1.10.6/CMakeLists.txt 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 50375 2013-07-03 22:03:38Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -570,17 +570,19 @@ ) ADD_CUSTOM_TARGET( - svnversion ALL - COMMAND ${PERL} + gitversion ALL + COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl ) +set_target_properties(gitversion PROPERTIES FOLDER "Auxiliary") + ADD_CUSTOM_COMMAND( - OUTPUT svnversion.h - COMMAND ${PERL} + OUTPUT version.h + COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS @@ -632,7 +634,7 @@ packet-range.c print.c ps.c - svnversion.h + version.h sync_pipe_write.c timestats.c tap-megaco-common.c @@ -783,7 +785,7 @@ # qtshark and wireshark share wireshark_FILES add_executable(wireshark ${wireshark_FILES}) - add_dependencies(wireshark svnversion) + add_dependencies(wireshark gitversion) set_target_properties(wireshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") target_link_libraries(wireshark ${wireshark_LIBS}) install(TARGETS wireshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -807,7 +809,7 @@ # qtshark and wireshark share wireshark_FILES add_executable(qtshark ${wireshark_FILES}) - add_dependencies(qtshark svnversion) + add_dependencies(qtshark gitversion) set_target_properties(qtshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") target_link_libraries(qtshark ${qtshark_LIBS}) install(TARGETS qtshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -835,7 +837,7 @@ ${WIRESHARK_COMMON_SRC} ) add_executable(tshark ${tshark_FILES}) - add_dependencies(tshark svnversion) + add_dependencies(tshark gitversion) set_target_properties(tshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") target_link_libraries(tshark ${tshark_LIBS}) install(TARGETS tshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -853,7 +855,7 @@ ui/util.c ) add_executable(rawshark ${rawshark_FILES}) - add_dependencies(rawshark svnversion) + add_dependencies(rawshark gitversion) set_target_properties(rawshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") target_link_libraries(rawshark ${rawshark_LIBS}) install(TARGETS rawshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -910,7 +912,7 @@ text2pcap-scanner.l ) add_executable(text2pcap ${text2pcap_FILES}) - add_dependencies(text2pcap svnversion) + add_dependencies(text2pcap gitversion) set_target_properties(text2pcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") target_link_libraries(text2pcap ${text2pcap_LIBS}) install(TARGETS text2pcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -924,11 +926,11 @@ set(mergecap_FILES mergecap.c merge.c - svnversion.h + version.h ${WTAP_PLUGIN_SOURCES} ) add_executable(mergecap ${mergecap_FILES}) - add_dependencies(mergecap svnversion) + add_dependencies(mergecap gitversion) set_target_properties(mergecap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") target_link_libraries(mergecap ${mergecap_LIBS}) install(TARGETS mergecap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -941,11 +943,11 @@ ) set(reordercap_FILES reordercap.c - svnversion.h + version.h ${WTAP_PLUGIN_SOURCES} ) add_executable(reordercap ${reordercap_FILES}) - add_dependencies(reordercap svnversion) + add_dependencies(reordercap gitversion) set_target_properties(reordercap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") target_link_libraries(reordercap ${reordercap_LIBS}) install(TARGETS reordercap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -963,7 +965,7 @@ ${WTAP_PLUGIN_SOURCES} ) add_executable(capinfos ${capinfos_FILES}) - add_dependencies(capinfos svnversion) + add_dependencies(capinfos gitversion) set_target_properties(capinfos PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") target_link_libraries(capinfos ${capinfos_LIBS}) install(TARGETS capinfos RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -981,7 +983,7 @@ ${WTAP_PLUGIN_SOURCES} ) add_executable(editcap ${editcap_FILES}) - add_dependencies(editcap svnversion) + add_dependencies(editcap gitversion) set_target_properties(editcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") target_link_libraries(editcap ${editcap_LIBS}) install(TARGETS editcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -1003,7 +1005,7 @@ ${NL_LIBRARIES} ) set(dumpcap_FILES - svnversion.h + version.h capture_opts.c capture-pcap-util.c capture_stop_conditions.c @@ -1020,7 +1022,7 @@ ${PLATFORM_SRC} ) add_executable(dumpcap ${dumpcap_FILES}) - add_dependencies(dumpcap svnversion) + add_dependencies(dumpcap gitversion) set_target_properties(dumpcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") target_link_libraries(dumpcap ${dumpcap_LIBS}) install(TARGETS dumpcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -1165,6 +1167,7 @@ WORLD_EXECUTE WORLD_READ DESTINATION ${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME} + PATTERN ".git" EXCLUDE PATTERN ".svn" EXCLUDE PATTERN "Makefile.*" EXCLUDE PATTERN "faq.py" EXCLUDE diff -Nru wireshark-1.10.5/CMakeOptions.txt wireshark-1.10.6/CMakeOptions.txt --- wireshark-1.10.5/CMakeOptions.txt 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/CMakeOptions.txt 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ # Build options for use by CMake -# $Id: CMakeOptions.txt 48969 2013-04-22 17:56:25Z gerald $ +# $Id$ option(BUILD_wireshark "Build the GTK-GUI version of Wireshark" ON) option(BUILD_qtshark "Build the QT-GUI version of Wireshark" OFF) diff -Nru wireshark-1.10.5/cmdarg_err.h wireshark-1.10.6/cmdarg_err.h --- wireshark-1.10.5/cmdarg_err.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/cmdarg_err.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* cmdarg_err.h * Declarations of routines to report command-line errors. * - * $Id: cmdarg_err.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/codecs/CMakeLists.txt wireshark-1.10.6/codecs/CMakeLists.txt --- wireshark-1.10.5/codecs/CMakeLists.txt 2013-04-22 18:05:23.000000000 +0000 +++ wireshark-1.10.6/codecs/CMakeLists.txt 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/codecs/G711a/G711adecode.c wireshark-1.10.6/codecs/G711a/G711adecode.c --- wireshark-1.10.5/codecs/G711a/G711adecode.c 2013-04-22 18:05:23.000000000 +0000 +++ wireshark-1.10.6/codecs/G711a/G711adecode.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* G711adecode.c * A-law G.711 codec * - * $Id: G711adecode.c 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/codecs/G711a/G711adecode.h wireshark-1.10.6/codecs/G711a/G711adecode.h --- wireshark-1.10.5/codecs/G711a/G711adecode.h 2013-04-22 18:05:23.000000000 +0000 +++ wireshark-1.10.6/codecs/G711a/G711adecode.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* G711adecode.h * Definitions for A-law G.711 codec * - * $Id: G711adecode.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/codecs/G711a/G711atable.h wireshark-1.10.6/codecs/G711a/G711atable.h --- wireshark-1.10.5/codecs/G711a/G711atable.h 2013-04-22 18:05:23.000000000 +0000 +++ wireshark-1.10.6/codecs/G711a/G711atable.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* G711atable.h * Exponent table for A-law G.711 codec * - * $Id: G711atable.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/codecs/G711u/G711udecode.c wireshark-1.10.6/codecs/G711u/G711udecode.c --- wireshark-1.10.5/codecs/G711u/G711udecode.c 2013-04-22 18:05:23.000000000 +0000 +++ wireshark-1.10.6/codecs/G711u/G711udecode.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* G711udecode.c * mu-law G.711 codec * - * $Id: G711udecode.c 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/codecs/G711u/G711udecode.h wireshark-1.10.6/codecs/G711u/G711udecode.h --- wireshark-1.10.5/codecs/G711u/G711udecode.h 2013-04-22 18:05:23.000000000 +0000 +++ wireshark-1.10.6/codecs/G711u/G711udecode.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* G711udecode.h * Definitions for mu-law G.711 codec * - * $Id: G711udecode.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/codecs/G711u/G711utable.h wireshark-1.10.6/codecs/G711u/G711utable.h --- wireshark-1.10.5/codecs/G711u/G711utable.h 2013-04-22 18:05:23.000000000 +0000 +++ wireshark-1.10.6/codecs/G711u/G711utable.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* G711utable.h * Exponent table for mu-law G.711 codec * - * $Id: G711utable.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/codecs/Makefile.am wireshark-1.10.6/codecs/Makefile.am --- wireshark-1.10.5/codecs/Makefile.am 2013-04-22 18:05:23.000000000 +0000 +++ wireshark-1.10.6/codecs/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for the codecs for Wireshark # -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/codecs/Makefile.in wireshark-1.10.6/codecs/Makefile.in --- wireshark-1.10.5/codecs/Makefile.in 2013-12-19 19:13:43.000000000 +0000 +++ wireshark-1.10.6/codecs/Makefile.in 2014-03-07 18:07:32.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for the codecs for Wireshark # -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/codecs/Makefile.nmake wireshark-1.10.6/codecs/Makefile.nmake --- wireshark-1.10.5/codecs/Makefile.nmake 2013-04-22 18:05:23.000000000 +0000 +++ wireshark-1.10.6/codecs/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ ## Makefile for building codecs.lib with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 41943 2012-04-04 20:46:49Z morriss $ +# $Id$ include ..\config.nmake diff -Nru wireshark-1.10.5/color_filters.c wireshark-1.10.6/color_filters.c --- wireshark-1.10.5/color_filters.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/color_filters.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* color_filters.c * Routines for color filters * - * $Id: color_filters.c 48797 2013-04-09 02:48:03Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/color_filters.h wireshark-1.10.6/color_filters.h --- wireshark-1.10.5/color_filters.h 2013-06-04 18:51:25.000000000 +0000 +++ wireshark-1.10.6/color_filters.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* color_filters.h * Definitions for color filters * - * $Id: color_filters.h 49768 2013-06-04 18:44:42Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/color.h wireshark-1.10.6/color.h --- wireshark-1.10.5/color.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/color.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* color.h * Definitions for "toolkit-independent" colors * - * $Id: color.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/conditions.c wireshark-1.10.6/conditions.c --- wireshark-1.10.5/conditions.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/conditions.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* conditions.c * Implementation for condition handler. * - * $Id: conditions.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/conditions.h wireshark-1.10.6/conditions.h --- wireshark-1.10.5/conditions.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/conditions.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* conditions.h * Header for condition handler. * - * $Id: conditions.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/config.h.win32 wireshark-1.10.6/config.h.win32 --- wireshark-1.10.5/config.h.win32 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/config.h.win32 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -/* $Id: config.h.win32 48042 2013-03-03 19:34:58Z gerald $ */ +/* $Id$ */ /* config.h.win32. Generated manually. :-) */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.ac by autoheader. */ diff -Nru wireshark-1.10.5/config.nmake wireshark-1.10.6/config.nmake --- wireshark-1.10.5/config.nmake 2013-12-19 19:13:27.000000000 +0000 +++ wireshark-1.10.6/config.nmake 2014-03-07 18:07:18.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: config.nmake 54192 2013-12-17 20:03:59Z gerald $ +# $Id$ # Some more information about the settings in this file can be found in # the file README.windows and the Developer's Guide (available online). @@ -22,15 +22,15 @@ ##### Versions ##### -# The SVN revision of our build. Updated by make-version.pl -SVN_REVISION=54262 +# The Git description of our build. Updated by make-version.pl +GIT_REVISION=2253 # The current Wireshark version. Recommended: Leave unchanged. # Updated by make-version.pl VERSION_MAJOR=1 VERSION_MINOR=10 -VERSION_MICRO=5 -VERSION_BUILD=$(SVN_REVISION) +VERSION_MICRO=6 +VERSION_BUILD=$(GIT_REVISION) # Local build information. Recommended: Unique string for your # environment, e.g. "-JackStackBarbecue". Updated by make-version.pl @@ -58,6 +58,7 @@ # This setting is used only inside this file. # PROGRAM_FILES=$(PROGRAMFILES) +PROGRAM_FILES_W6432=$(PROGRAMW6432) # # Location of the "tools" directory. This affects HTML2TXT below and should @@ -730,14 +731,25 @@ TEXTIFY=$(SH) $(TOOLS_DIR)/textify.sh # -# Optional: To build the NSIS installer. +# Optional: Build the NSIS installer. # -# If you have the NSIS package, set this to the NSIS executable. +# If NSIS is installed in a standard location (under Program Files +# or Program Files (x86)) you shouldn't have to change anything. # -# If you don't have NSIS, comment this line out, so that MAKENSIS -# isn't defined. +# If NSIS is installed in a custom location uncomment the following +# line and adjust the path accordingly. # + +#MAKENSIS="\custom\path\to\NSIS\makensis.exe" + +# Find NSIS automatically +!IF !DEFINED(MAKENSIS) +!IF EXIST("$(PROGRAM_FILES)\NSIS\makensis.exe") MAKENSIS="$(PROGRAM_FILES)\NSIS\makensis.exe" +!ELSE IF EXIST("$(PROGRAM_FILES_W6432)\NSIS\makensis.exe") +MAKENSIS="$(PROGRAM_FILES_W6432)\NSIS\makensis.exe" +!ENDIF +!ENDIF # # Optional: To build the NSIS PortableApps installer. @@ -1151,7 +1163,7 @@ # The RC_VERSION should be comma-separated, not dot-separated, # as per Graham Bloice's message in # -# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html +# http://www.wireshark.org/lists/ethereal-dev/200303/msg00283.html # # "The RC_VERSION variable in config.nmake should be comma separated. # This allows the resources to be built correctly and the version diff -Nru wireshark-1.10.5/configure wireshark-1.10.6/configure --- wireshark-1.10.5/configure 2013-12-19 19:13:59.000000000 +0000 +++ wireshark-1.10.6/configure 2014-03-07 18:07:41.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for wireshark 1.10.5. +# Generated by GNU Autoconf 2.68 for wireshark 1.10.6. # # Report bugs to . # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='wireshark' PACKAGE_TARNAME='wireshark' -PACKAGE_VERSION='1.10.5' -PACKAGE_STRING='wireshark 1.10.5' +PACKAGE_VERSION='1.10.6' +PACKAGE_STRING='wireshark 1.10.6' PACKAGE_BUGREPORT='http://bugs.wireshark.org/' PACKAGE_URL='http://www.wireshark.org/' @@ -1553,7 +1553,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.10.5 to adapt to many kinds of systems. +\`configure' configures wireshark 1.10.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1624,7 +1624,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wireshark 1.10.5:";; + short | recursive ) echo "Configuration of wireshark 1.10.6:";; esac cat <<\_ACEOF @@ -1832,7 +1832,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wireshark configure 1.10.5 +wireshark configure 1.10.6 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2376,7 +2376,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.10.5, which was +It was created by wireshark $as_me 1.10.6, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3310,7 +3310,7 @@ # Define the identity of the package. PACKAGE='wireshark' - VERSION='1.10.5' + VERSION='1.10.6' cat >>confdefs.h <<_ACEOF @@ -3440,7 +3440,7 @@ $as_echo "#define VERSION_MINOR 10" >>confdefs.h -$as_echo "#define VERSION_MICRO 5" >>confdefs.h +$as_echo "#define VERSION_MICRO 6" >>confdefs.h # Check whether --enable-static was given. @@ -29403,7 +29403,13 @@ CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS" CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS" - CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS" + if test \( $gtk_config_major_version -eq 3 -a $gtk_config_minor_version -ge 10 \) ; then + ## Allow use of deprecated & disable deprecated warnings if Gtk >= 3.10; + ## The deprecations in Gtk 3.10 will not be fixed ... + CPPFLAGS="-DGDK_DISABLE_DEPRECATION_WARNINGS $CPPFLAGS" + else + CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS" + fi CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS" if test ! \( $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -lt 20 \) ; then # Enable GSEAL when building with GTK > 2.20 @@ -34967,7 +34973,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.10.5, which was +This file was extended by wireshark $as_me 1.10.6, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -35034,7 +35040,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.10.5 +wireshark config.status 1.10.6 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru wireshark-1.10.5/configure.ac wireshark-1.10.6/configure.ac --- wireshark-1.10.5/configure.ac 2013-12-19 19:13:26.000000000 +0000 +++ wireshark-1.10.6/configure.ac 2014-03-07 18:07:12.000000000 +0000 @@ -1,9 +1,9 @@ -# $Id: configure.ac 54192 2013-12-17 20:03:59Z gerald $ +# $Id$ # m4_define([version_major], [1]) m4_define([version_minor], [10]) -m4_define([version_micro], [5]) +m4_define([version_micro], [6]) m4_define([version_micro_extra], version_micro) m4_append([version_micro_extra], []) @@ -1390,7 +1390,13 @@ CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS" CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS" - CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS" + if test \( $gtk_config_major_version -eq 3 -a $gtk_config_minor_version -ge 10 \) ; then + ## Allow use of deprecated & disable deprecated warnings if Gtk >= 3.10; + ## The deprecations in Gtk 3.10 will not be fixed ... + CPPFLAGS="-DGDK_DISABLE_DEPRECATION_WARNINGS $CPPFLAGS" + else + CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS" + fi CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS" if test ! \( $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -lt 20 \) ; then # Enable GSEAL when building with GTK > 2.20 diff -Nru wireshark-1.10.5/ConfigureChecks.cmake wireshark-1.10.6/ConfigureChecks.cmake --- wireshark-1.10.5/ConfigureChecks.cmake 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/ConfigureChecks.cmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ # ConfigureChecks.cmake # -# $Id: ConfigureChecks.cmake 48932 2013-04-19 16:38:28Z jmayer $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/CPackConfig.txt wireshark-1.10.6/CPackConfig.txt --- wireshark-1.10.5/CPackConfig.txt 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/CPackConfig.txt 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ # CPackConfig.txt # -# $Id: CPackConfig.txt 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/debian/changelog wireshark-1.10.6/debian/changelog --- wireshark-1.10.5/debian/changelog 2014-01-15 19:02:46.000000000 +0000 +++ wireshark-1.10.6/debian/changelog 2014-03-08 17:56:08.000000000 +0000 @@ -1,3 +1,23 @@ +wireshark (1.10.6-1) unstable; urgency=high + + * New upstream release 1.10.6 + - release notes: + https://wireshark.org/docs/relnotes/wireshark-1.10.6.html + - security fixes: + - The NFS dissector could crash. Discovered by Moshe Kaplan + (CVE-2014-2281) + - The M3UA dissector could crash. Discovered by Laurent Butti. + (CVE-2014-2282) + - The RLC dissector could crash. (CVE-2014-2283) + - The MPEG file parser could overflow a buffer. + Discovered by Wesley Neelen. (CVE-2014-2299) + * Drop 10_allow-deprecated-gtk-functions.patch and + 11_fix-g_memmove-ftbfs-issues.patch since they are integrated upstream. + * Generate symbols files + * Ship wireshark.pc for pkg-config (Closes: #740716) + + -- Balint Reczey Sat, 08 Mar 2014 18:26:41 +0100 + wireshark (1.10.5-2) unstable; urgency=low [Thomas Ward] diff -Nru wireshark-1.10.5/debian/libwireshark3.symbols wireshark-1.10.6/debian/libwireshark3.symbols --- wireshark-1.10.5/debian/libwireshark3.symbols 1970-01-01 00:00:00.000000000 +0000 +++ wireshark-1.10.6/debian/libwireshark3.symbols 2014-02-15 14:31:30.000000000 +0000 @@ -0,0 +1,1383 @@ +asn1.so libwireshark3 #MINVER# + plugin_reg_handoff@Base 1.9.1 + plugin_register@Base 1.9.1 + version@Base 1.9.1 +docsis.so libwireshark3 #MINVER# + plugin_reg_handoff@Base 1.9.1 + plugin_register@Base 1.9.1 + version@Base 1.9.1 +ethercat.so libwireshark3 #MINVER# + plugin_reg_handoff@Base 1.9.1 + plugin_register@Base 1.9.1 + version@Base 1.9.1 +gryphon.so libwireshark3 #MINVER# + plugin_reg_handoff@Base 1.9.1 + plugin_register@Base 1.9.1 + version@Base 1.9.1 +irda.so libwireshark3 #MINVER# + plugin_reg_handoff@Base 1.9.1 + plugin_register@Base 1.9.1 + version@Base 1.9.1 +libwireshark.so.3 libwireshark3 #MINVER# + AdmissionRejectReason_vals@Base 1.9.1 + AirPDcapDestroyContext@Base 1.9.1 + AirPDcapInitContext@Base 1.9.1 + BandRejectReason_vals@Base 1.9.1 + CommandCode_vals_ext@Base 1.9.1 + DisengageReason_vals@Base 1.9.1 + DisengageRejectReason_vals@Base 1.9.1 + EBCDIC_to_ASCII1@Base 1.9.1 + EBCDIC_to_ASCII@Base 1.9.1 + FacilityReason_vals@Base 1.9.1 + GatekeeperRejectReason_vals@Base 1.9.1 + IA5_7BIT_decode@Base 1.9.1 + InfoRequestNakReason_vals@Base 1.9.1 + LocationRejectReason_vals@Base 1.9.1 + RegistrationRejectReason_vals@Base 1.9.1 + T_h323_message_body_vals@Base 1.9.1 + UnregRejectReason_vals@Base 1.9.1 + UnregRequestReason_vals@Base 1.9.1 + _try_val_to_str_ext_init@Base 1.9.1 + abs_time_secs_to_str@Base 1.9.1 + abs_time_to_str@Base 1.9.1 + add_hosts_file@Base 1.9.1 + add_ip_name_from_string@Base 1.9.1 + add_ipv4_name@Base 1.9.1 + add_ipv6_name@Base 1.9.1 + add_itu_tcap_subdissector@Base 1.9.1 + add_new_data_source@Base 1.9.1 + address_to_str_buf@Base 1.9.1 + addresses_ports_reassembly_table_functions@Base 1.9.1 + addresses_reassembly_table_functions@Base 1.9.1 + airpdcap_ctx@Base 1.9.1 + analyze_q708_ispc@Base 1.9.1 + ansi_a_bsmap_strings@Base 1.9.1 + ansi_a_dtap_strings@Base 1.9.1 + ansi_a_elem_1_strings@Base 1.9.1 + ansi_a_ios401_bsmap_strings@Base 1.9.1 + ansi_a_ios401_dtap_strings@Base 1.9.1 + ansi_a_ios501_bsmap_strings@Base 1.9.1 + ansi_a_ios501_dtap_strings@Base 1.9.1 + ansi_map_opr_code_strings@Base 1.9.1 + asn1_ctx_init@Base 1.9.1 + ber_decode_as@Base 1.9.1 + ber_decode_as_foreach@Base 1.9.1 + ber_set_filename@Base 1.9.1 + bssgp_cause_vals_ext@Base 1.9.1 + build_column_format_array@Base 1.9.1 + build_follow_filter@Base 1.9.1 + byte_array_dup@Base 1.9.1 + byte_array_equal@Base 1.9.1 + bytes_to_str@Base 1.9.1 + bytes_to_str_punct@Base 1.9.1 + bytestring_to_str@Base 1.9.1 + call_ber_oid_callback@Base 1.9.1 + call_dissector@Base 1.9.1 + call_dissector_only@Base 1.9.1 + call_dissector_with_data@Base 1.9.1 + camelSRTtype_naming@Base 1.9.1 + camel_opr_code_strings@Base 1.9.1 + capture_ap1394@Base 1.9.1 + capture_arcnet@Base 1.9.1 + capture_atm@Base 1.9.1 + capture_ax25@Base 1.9.1 + capture_ax25_kiss@Base 1.9.1 + capture_chdlc@Base 1.9.1 + capture_clip@Base 1.9.1 + capture_enc@Base 1.9.1 + capture_eth@Base 1.9.1 + capture_fddi@Base 1.9.1 + capture_fr@Base 1.9.1 + capture_i2c@Base 1.9.1 + capture_ieee80211@Base 1.9.1 + capture_ipfc@Base 1.9.1 + capture_llap@Base 1.9.1 + capture_null@Base 1.9.1 + capture_ppi@Base 1.9.1 + capture_ppp_hdlc@Base 1.9.1 + capture_prism@Base 1.9.1 + capture_radiotap@Base 1.9.1 + capture_raw@Base 1.9.1 + capture_sll@Base 1.9.1 + capture_tr@Base 1.9.1 + capture_wlancap@Base 1.9.1 + check_col@Base 1.9.1 + check_xdlc_control@Base 1.9.1 + circuit_add_proto_data@Base 1.9.1 + circuit_get_proto_data@Base 1.9.1 + circuit_new@Base 1.9.1 + cleanup_dissection@Base 1.9.1 + codec_decode@Base 1.9.1 + codec_init@Base 1.9.1 + codec_release@Base 1.9.1 + col_add_fstr@Base 1.9.1 + col_add_str@Base 1.9.1 + col_append_fstr@Base 1.9.1 + col_append_sep_fstr@Base 1.9.1 + col_append_sep_str@Base 1.9.1 + col_append_str@Base 1.9.1 + col_based_on_frame_data@Base 1.9.1 + col_cleanup@Base 1.9.1 + col_clear@Base 1.9.1 + col_custom_prime_edt@Base 1.9.1 + col_fill_in@Base 1.9.1 + col_fill_in_error@Base 1.9.1 + col_fill_in_frame_data@Base 1.9.1 + col_format_desc@Base 1.9.1 + col_format_to_string@Base 1.9.1 + col_get_writable@Base 1.9.1 + col_has_time_fmt@Base 1.9.1 + col_prepend_fence_fstr@Base 1.9.1 + col_prepend_fstr@Base 1.9.1 + col_set_fence@Base 1.9.1 + col_set_str@Base 1.9.1 + col_set_time@Base 1.9.1 + col_set_writable@Base 1.9.1 + col_setup@Base 1.9.1 + conversation_add_proto_data@Base 1.9.1 + conversation_delete_proto_data@Base 1.9.1 + conversation_get_proto_data@Base 1.9.1 + conversation_new@Base 1.9.1 + conversation_set_dissector@Base 1.9.1 + convert_string_case@Base 1.9.1 + convert_string_to_hex@Base 1.9.1 + copy_file_binary_mode@Base 1.9.1 + copy_persconffile_profile@Base 1.9.1 + crc16_ccitt_tvb@Base 1.9.1 + crc16_ccitt_tvb_offset@Base 1.9.1 + crc16_ccitt_tvb_offset_seed@Base 1.9.1 + crc16_ccitt_tvb_seed@Base 1.9.1 + crc16_plain_tvb_offset@Base 1.9.1 + crc16_plain_tvb_offset_seed@Base 1.9.1 + crc16_x25_ccitt_tvb@Base 1.9.1 + crc32_802_tvb@Base 1.9.1 + crc32_ccitt_tvb@Base 1.9.1 + crc32_ccitt_tvb_offset@Base 1.9.1 + crc32_ccitt_tvb_offset_seed@Base 1.9.1 + crc32_ccitt_tvb_seed@Base 1.9.1 + crc32_mpeg2_tvb@Base 1.9.1 + crc32_mpeg2_tvb_offset@Base 1.9.1 + crc32_mpeg2_tvb_offset_seed@Base 1.9.1 + crc32_mpeg2_tvb_seed@Base 1.9.1 + create_dissector_handle@Base 1.9.1 + create_persconffile_dir@Base 1.9.1 + create_persconffile_profile@Base 1.9.1 + data_out_file@Base 1.9.1 + dcerpc_add_conv_to_bind_table@Base 1.9.1 + dcerpc_get_proto_hf_opnum@Base 1.9.1 + dcerpc_get_proto_name@Base 1.9.1 + dcerpc_get_proto_sub_dissector@Base 1.9.1 + dcerpc_get_transport_salt@Base 1.9.1 + dcerpc_hooks_init_protos@Base 1.9.1 + dcerpc_init_uuid@Base 1.9.1 + dcerpc_uuids@Base 1.9.1 + dcom_hresult_vals@Base 1.9.1 + dcom_interface_find@Base 1.9.1 + dcom_interface_new@Base 1.9.1 + dcom_prefs_display_unmarshalling_details@Base 1.9.1 + dcom_variant_type_vals@Base 1.9.1 + de_cell_id@Base 1.9.1 + de_d_gb_call_ref@Base 1.9.1 + de_gmm_drx_param@Base 1.9.1 + de_gmm_ms_net_cap@Base 1.9.1 + de_gmm_ms_radio_acc_cap@Base 1.9.1 + de_gmm_rai@Base 1.9.1 + de_lai@Base 1.9.1 + de_mid@Base 1.9.1 + de_ms_cm_1@Base 1.9.1 + de_ms_cm_2@Base 1.9.1 + de_ms_cm_3@Base 1.9.1 + de_rej_cause@Base 1.9.1 + de_rr_cause@Base 1.9.1 + de_rr_cell_dsc@Base 1.9.1 + de_rr_ch_dsc@Base 1.9.1 + de_rr_ch_mode@Base 1.9.1 + de_rr_chnl_needed@Base 1.9.1 + de_rr_cip_mode_set@Base 1.9.1 + de_rr_cm_enq_mask@Base 1.9.1 + de_rr_multirate_conf@Base 1.9.1 + de_rr_sus_cau@Base 1.9.1 + de_rr_tlli@Base 1.9.1 + de_sm_apn@Base 1.9.1 + de_sm_pflow_id@Base 1.9.1 + de_sm_qos@Base 1.9.1 + decode_bitfield_value@Base 1.9.1 + decode_bits_in_field@Base 1.9.1 + decode_boolean_bitfield@Base 1.9.1 + decode_numeric_bitfield@Base 1.9.1 + delete_itu_tcap_subdissector@Base 1.9.1 + delete_persconffile_profile@Base 1.9.1 + deletefile@Base 1.9.1 + dfilter_apply_edt@Base 1.9.1 + dfilter_compile@Base 1.9.1 + dfilter_deprecated_tokens@Base 1.9.1 + dfilter_dump@Base 1.9.1 + dfilter_error_msg@Base 1.9.1 + dfilter_free@Base 1.9.1 + dfilter_macro_build_ftv_cache@Base 1.9.1 + dfilter_macro_foreach@Base 1.9.1 + dfilter_macro_get_uat@Base 1.9.1 + display_epoch_time@Base 1.9.1 + display_signed_time@Base 1.9.1 + dissect_IDispatch_GetIDsOfNames_resp@Base 1.9.1 + dissect_IDispatch_GetIDsOfNames_rqst@Base 1.9.1 + dissect_IDispatch_GetTypeInfoCount_resp@Base 1.9.1 + dissect_IDispatch_GetTypeInfo_resp@Base 1.9.1 + dissect_IDispatch_GetTypeInfo_rqst@Base 1.9.1 + dissect_IDispatch_Invoke_resp@Base 1.9.1 + dissect_IDispatch_Invoke_rqst@Base 1.9.1 + dissect_ber_EmbeddedPDV_Type@Base 1.9.1 + dissect_ber_GeneralizedTime@Base 1.9.1 + dissect_ber_UTCTime@Base 1.9.1 + dissect_ber_bitstring@Base 1.9.1 + dissect_ber_boolean@Base 1.9.1 + dissect_ber_choice@Base 1.9.1 + dissect_ber_identifier@Base 1.9.1 + dissect_ber_integer64@Base 1.9.1 + dissect_ber_integer@Base 1.9.1 + dissect_ber_length@Base 1.9.1 + dissect_ber_null@Base 1.9.1 + dissect_ber_object_identifier@Base 1.9.1 + dissect_ber_object_identifier_str@Base 1.9.1 + dissect_ber_octet_string@Base 1.9.1 + dissect_ber_old_choice@Base 1.9.1 + dissect_ber_old_sequence@Base 1.9.1 + dissect_ber_old_sequence_of@Base 1.9.1 + dissect_ber_restricted_string@Base 1.9.1 + dissect_ber_sequence@Base 1.9.1 + dissect_ber_sequence_of@Base 1.9.1 + dissect_ber_set@Base 1.9.1 + dissect_ber_set_of@Base 1.9.1 + dissect_ber_tagged_type@Base 1.9.1 + dissect_dap_SecurityParameters@Base 1.9.1 + dissect_dcerpc_uint16@Base 1.9.1 + dissect_dcerpc_uint32@Base 1.9.1 + dissect_dcerpc_uint64@Base 1.9.1 + dissect_dcerpc_uint8@Base 1.9.1 + dissect_dcerpc_uuid_t@Base 1.9.1 + dissect_dcom_BSTR@Base 1.9.1 + dissect_dcom_HRESULT@Base 1.9.1 + dissect_dcom_HRESULT_item@Base 1.9.1 + dissect_dcom_LPWSTR@Base 1.9.1 + dissect_dcom_MInterfacePointer@Base 1.9.1 + dissect_dcom_PMInterfacePointer@Base 1.9.1 + dissect_dcom_SAFEARRAY@Base 1.9.1 + dissect_dcom_VARIANT@Base 1.9.1 + dissect_dcom_VARTYPE@Base 1.9.1 + dissect_dcom_dcerpc_array_size@Base 1.9.1 + dissect_dcom_dcerpc_pointer@Base 1.9.1 + dissect_dcom_indexed_DWORD@Base 1.9.1 + dissect_dcom_indexed_HRESULT@Base 1.9.1 + dissect_dcom_indexed_LPWSTR@Base 1.9.1 + dissect_dcom_simple_resp@Base 1.9.1 + dissect_dcom_simple_rqst@Base 1.9.1 + dissect_dcom_that@Base 1.9.1 + dissect_dcom_this@Base 1.9.1 + dissect_dsp_AccessPointInformation@Base 1.9.1 + dissect_e164_cc@Base 1.9.1 + dissect_e212_mcc_mnc@Base 1.9.1 + dissect_e212_mcc_mnc_in_address@Base 1.9.1 + dissect_gsm_map_GlobalCellId@Base 1.9.1 + dissect_gsm_map_IMSI@Base 1.9.1 + dissect_gsm_map_ISDN_AddressString@Base 1.9.1 + dissect_gsm_map_lcs_Ext_GeographicalInformation@Base 1.9.1 + dissect_h225_RasMessage@Base 1.9.1 + dissect_h225_ReleaseCompleteReason@Base 1.9.1 + dissect_h245_H223Capability@Base 1.9.1 + dissect_isup_called_party_number_parameter@Base 1.9.1 + dissect_isup_calling_party_number_parameter@Base 1.9.1 + dissect_isup_original_called_number_parameter@Base 1.9.1 + dissect_isup_redirecting_number_parameter@Base 1.9.1 + dissect_isup_redirection_information_parameter@Base 1.9.1 + dissect_mscldap_string@Base 1.9.1 + dissect_ndr_double@Base 1.9.1 + dissect_ndr_duint32@Base 1.9.1 + dissect_ndr_uint1632@Base 1.9.1 + dissect_ndr_uint16@Base 1.9.1 + dissect_ndr_uint3264@Base 1.9.1 + dissect_ndr_uint32@Base 1.9.1 + dissect_ndr_uint8@Base 1.9.1 + dissect_ndr_uuid_t@Base 1.9.1 + dissect_nt_64bit_time@Base 1.9.1 + dissect_nt_sid@Base 1.9.1 + dissect_per_BMPString@Base 1.9.1 + dissect_per_GeneralString@Base 1.9.1 + dissect_per_IA5String@Base 1.9.1 + dissect_per_NumericString@Base 1.9.1 + dissect_per_PrintableString@Base 1.9.1 + dissect_per_VisibleString@Base 1.9.1 + dissect_per_bit_string@Base 1.9.1 + dissect_per_bit_string_containing_pdu@Base 1.9.1 + dissect_per_bit_string_containing_pdu_new@Base 1.9.1 + dissect_per_boolean@Base 1.9.1 + dissect_per_choice@Base 1.9.1 + dissect_per_constrained_integer@Base 1.9.1 + dissect_per_constrained_integer_64b@Base 1.9.1 + dissect_per_constrained_sequence_of@Base 1.9.1 + dissect_per_constrained_set_of@Base 1.9.1 + dissect_per_enumerated@Base 1.9.1 + dissect_per_external_type@Base 1.9.1 + dissect_per_integer@Base 1.9.1 + dissect_per_null@Base 1.9.1 + dissect_per_object_identifier@Base 1.9.1 + dissect_per_object_identifier_str@Base 1.9.1 + dissect_per_octet_string@Base 1.9.1 + dissect_per_octet_string_containing_pdu@Base 1.9.1 + dissect_per_octet_string_containing_pdu_new@Base 1.9.1 + dissect_per_open_type@Base 1.9.1 + dissect_per_open_type_pdu@Base 1.9.1 + dissect_per_open_type_pdu_new@Base 1.9.1 + dissect_per_real@Base 1.9.1 + dissect_per_restricted_character_string@Base 1.9.1 + dissect_per_sequence@Base 1.9.1 + dissect_per_sequence_eag@Base 1.9.1 + dissect_per_sequence_of@Base 1.9.1 + dissect_per_set_of@Base 1.9.1 + dissect_q931_bearer_capability_ie@Base 1.9.1 + dissect_q931_high_layer_compat_ie@Base 1.9.1 + dissect_q932_PartyNumber@Base 1.9.1 + dissect_q932_PartySubaddress@Base 1.9.1 + dissect_q932_PresentedNumberScreened@Base 1.9.1 + dissect_q932_PresentedNumberUnscreened@Base 1.9.1 + dissect_qsig_na_Name@Base 1.9.1 + dissect_rpc_array@Base 1.9.1 + dissect_rpc_bool@Base 1.9.1 + dissect_rpc_bytes@Base 1.9.1 + dissect_rpc_data@Base 1.9.1 + dissect_rpc_indir_call@Base 1.9.1 + dissect_rpc_indir_reply@Base 1.9.1 + dissect_rpc_list@Base 1.9.1 + dissect_rpc_opaque_data@Base 1.9.1 + dissect_rpc_string@Base 1.9.1 + dissect_rpc_uint32@Base 1.9.1 + dissect_rpc_uint64@Base 1.9.1 + dissect_tpkt_encap@Base 1.9.1 + dissect_unknown_ber@Base 1.9.1 + dissect_xdlc_control@Base 1.9.1 + dissector_add_handle@Base 1.9.1 + dissector_add_string@Base 1.9.1 + dissector_add_uint@Base 1.9.1 + dissector_all_heur_tables_foreach_table@Base 1.9.1 + dissector_all_tables_foreach_changed@Base 1.9.1 + dissector_all_tables_foreach_table@Base 1.9.1 + dissector_change_string@Base 1.9.1 + dissector_change_uint@Base 1.9.1 + dissector_delete_string@Base 1.9.1 + dissector_delete_uint@Base 1.9.1 + dissector_dump_decodes@Base 1.9.1 + dissector_dump_heur_decodes@Base 1.9.1 + dissector_filter_list@Base 1.9.1 + dissector_get_string_handle@Base 1.9.1 + dissector_get_uint_handle@Base 1.9.1 + dissector_handle_get_protocol_index@Base 1.9.1 + dissector_handle_get_short_name@Base 1.9.1 + dissector_reset_string@Base 1.9.1 + dissector_reset_uint@Base 1.9.1 + dissector_table_foreach@Base 1.9.1 + dissector_table_foreach_handle@Base 1.9.1 + dissector_try_heuristic@Base 1.9.1 + dissector_try_string@Base 1.9.1 + dissector_try_uint@Base 1.9.1 + draw_tap_listeners@Base 1.9.1 + dscp_vals_ext@Base 1.9.1 + dtbl_entry_get_handle@Base 1.9.1 + dtbl_entry_get_initial_handle@Base 1.9.1 + eap_aka_subtype_vals@Base 1.9.1 + eap_code_vals@Base 1.9.1 + eap_ms_chap_v2_opcode_vals@Base 1.9.1 + eap_sim_subtype_vals@Base 1.9.1 + eap_type_vals_ext@Base 1.9.1 + elem_lv@Base 1.9.1 + elem_t@Base 1.9.1 + elem_tlv@Base 1.9.1 + elem_tv@Base 1.9.1 + elem_tv_short@Base 1.9.1 + elem_v@Base 1.9.1 + elem_v_short@Base 1.9.1 + emem_init@Base 1.9.1 + emem_tree_foreach@Base 1.9.1 + emem_tree_insert32@Base 1.9.1 + emem_tree_insert32_array@Base 1.9.1 + emem_tree_insert_string@Base 1.9.1 + emem_tree_lookup32@Base 1.9.1 + emem_tree_lookup32_array@Base 1.9.1 + emem_tree_lookup32_array_le@Base 1.9.1 + emem_tree_lookup32_le@Base 1.9.1 + emem_tree_lookup_string@Base 1.9.1 + empty_tcp_stream@Base 1.9.1 + ep_address_to_str@Base 1.9.1 + ep_alloc0@Base 1.9.1 + ep_alloc@Base 1.9.1 + ep_memdup@Base 1.9.1 + ep_stack_new@Base 1.9.1 + ep_stack_pop@Base 1.9.1 + ep_stack_push@Base 1.9.1 + ep_strbuf_append@Base 1.9.1 + ep_strbuf_append_c@Base 1.9.1 + ep_strbuf_append_printf@Base 1.9.1 + ep_strbuf_append_unichar@Base 1.9.1 + ep_strbuf_append_vprintf@Base 1.9.1 + ep_strbuf_new@Base 1.9.1 + ep_strbuf_new_label@Base 1.9.1 + ep_strbuf_printf@Base 1.9.1 + ep_strbuf_sized_new@Base 1.9.1 + ep_strbuf_truncate@Base 1.9.1 + ep_strconcat@Base 1.9.1 + ep_strdup@Base 1.9.1 + ep_strdup_printf@Base 1.9.1 + ep_strdup_vprintf@Base 1.9.1 + ep_strndup@Base 1.9.1 + ep_strsplit@Base 1.9.1 + ep_tvb_get_bits@Base 1.9.1 + ep_tvb_memdup@Base 1.9.1 + epan_base64_decode@Base 1.9.1 + epan_cleanup@Base 1.9.1 + epan_dissect_cleanup@Base 1.9.1 + epan_dissect_fake_protocols@Base 1.9.1 + epan_dissect_fill_in_columns@Base 1.9.1 + epan_dissect_free@Base 1.9.1 + epan_dissect_init@Base 1.9.1 + epan_dissect_new@Base 1.9.1 + epan_dissect_prime_dfilter@Base 1.9.1 + epan_dissect_run@Base 1.9.1 + epan_dissect_run_with_taps@Base 1.9.1 + epan_get_compiled_version_info@Base 1.9.1 + epan_get_runtime_version_info@Base 1.9.1 + epan_get_version@Base 1.9.1 + epan_init@Base 1.9.1 + epan_memmem@Base 1.9.1 + epan_strcasestr@Base 1.9.1 + escape_string@Base 1.9.1 + escape_string_len@Base 1.9.1 + ether_to_str@Base 1.9.1 + ethertype@Base 1.9.1 + etype_vals@Base 1.9.1 + eui64_to_str@Base 1.9.1 + ex_opt_add@Base 1.9.1 + ex_opt_count@Base 1.9.1 + ex_opt_get_next@Base 1.9.1 + ex_opt_get_nth@Base 1.9.1 + except_alloc@Base 1.9.1 + except_deinit@Base 1.9.1 + except_free@Base 1.9.1 + except_init@Base 1.9.1 + except_pop@Base 1.9.1 + except_rethrow@Base 1.9.1 + except_set_allocator@Base 1.9.1 + except_setup_try@Base 1.9.1 + except_take_data@Base 1.9.1 + except_throw@Base 1.9.1 + except_throwd@Base 1.9.1 + except_throwf@Base 1.9.1 + except_unhandled_catcher@Base 1.9.1 + expert_add_info_format@Base 1.9.1 + expert_add_undecoded_item@Base 1.9.1 + expert_get_highest_severity@Base 1.9.1 + fc_fc4_val@Base 1.9.1 + fetch_tapped_data@Base 1.9.1 + file_exists@Base 1.9.1 + file_open_error_message@Base 1.9.1 + file_write_error_message@Base 1.9.1 + files_identical@Base 1.9.1 + filesystem_opt@Base 1.9.1 + filter_expression_new@Base 1.9.1 + find_circuit@Base 1.9.1 + find_codec@Base 1.9.1 + find_conversation@Base 1.9.1 + find_dissector@Base 1.9.1 + find_dissector_table@Base 1.9.1 + find_last_pathname_separator@Base 1.9.1 + find_or_create_conversation@Base 1.9.1 + find_protocol_by_id@Base 1.9.1 + find_sid_name@Base 1.9.1 + find_stream_circ@Base 1.9.1 + find_tap_id@Base 1.9.1 + follow_stats@Base 1.9.1 + follow_tcp_addr@Base 1.9.1 + follow_tcp_index@Base 1.9.1 + format_text@Base 1.9.1 + format_text_wsp@Base 1.9.1 + format_uri@Base 1.9.1 + fragment_add@Base 1.9.1 + fragment_add_check@Base 1.9.1 + fragment_add_multiple_ok@Base 1.9.1 + fragment_add_seq@Base 1.9.1 + fragment_add_seq_802_11@Base 1.9.1 + fragment_add_seq_check@Base 1.9.1 + fragment_add_seq_next@Base 1.9.1 + fragment_add_seq_offset@Base 1.9.1 + fragment_delete@Base 1.9.1 + fragment_end_seq_next@Base 1.9.1 + fragment_get@Base 1.9.1 + fragment_get_reassembled@Base 1.9.1 + fragment_get_reassembled_id@Base 1.9.1 + fragment_get_tot_len@Base 1.9.1 + fragment_set_partial_reassembly@Base 1.9.1 + fragment_set_tot_len@Base 1.9.1 + fragment_start_seq_check@Base 1.9.1 + frame_data_compare@Base 1.9.1 + frame_data_destroy@Base 1.9.1 + frame_data_init@Base 1.9.1 + frame_data_reset@Base 1.9.1 + frame_data_set_after_dissect@Base 1.9.1 + frame_data_set_before_dissect@Base 1.9.1 + ftype_can_contains@Base 1.9.1 + ftype_can_eq@Base 1.9.1 + ftype_can_ge@Base 1.9.1 + ftype_can_gt@Base 1.9.1 + ftype_can_le@Base 1.9.1 + ftype_can_lt@Base 1.9.1 + ftype_can_matches@Base 1.9.1 + ftype_can_ne@Base 1.9.1 + ftype_can_slice@Base 1.9.1 + ftype_name@Base 1.9.1 + ftype_pretty_name@Base 1.9.1 + funnel_get_funnel_ops@Base 1.9.1 + funnel_register_all_menus@Base 1.9.1 + funnel_register_menu@Base 1.9.1 + funnel_set_funnel_ops@Base 1.9.1 + fvalue_from_unparsed@Base 1.9.1 + fvalue_get@Base 1.9.1 + fvalue_get_floating@Base 1.9.1 + fvalue_get_integer64@Base 1.9.1 + fvalue_get_sinteger@Base 1.9.1 + fvalue_get_uinteger@Base 1.9.1 + fvalue_string_repr_len@Base 1.9.1 + fvalue_to_string_repr@Base 1.9.1 + gbl_resolv_flags@Base 1.9.1 + gcamel_StatSRT@Base 1.9.1 + gcp_cmd_type@Base 1.9.1 + gcp_term_types@Base 1.9.1 + geoip_db_get_paths@Base 1.9.1 + geoip_db_lookup_ipv4@Base 1.9.1 + geoip_db_lookup_ipv6@Base 1.9.1 + geoip_db_name@Base 1.9.1 + geoip_db_num_dbs@Base 1.9.1 + geoip_db_type@Base 1.9.1 + get_CDR_any@Base 1.9.1 + get_CDR_boolean@Base 1.9.1 + get_CDR_char@Base 1.9.1 + get_CDR_double@Base 1.9.1 + get_CDR_encap_info@Base 1.9.1 + get_CDR_enum@Base 1.9.1 + get_CDR_fixed@Base 1.9.1 + get_CDR_float@Base 1.9.1 + get_CDR_interface@Base 1.9.1 + get_CDR_long@Base 1.9.1 + get_CDR_long_long@Base 1.9.1 + get_CDR_object@Base 1.9.1 + get_CDR_octet@Base 1.9.1 + get_CDR_octet_seq@Base 1.9.1 + get_CDR_short@Base 1.9.1 + get_CDR_string@Base 1.9.1 + get_CDR_typeCode@Base 1.9.1 + get_CDR_ulong@Base 1.9.1 + get_CDR_ulong_long@Base 1.9.1 + get_CDR_ushort@Base 1.9.1 + get_CDR_wchar@Base 1.9.1 + get_CDR_wstring@Base 1.9.1 + get_addr_name@Base 1.9.1 + get_addrinfo_list@Base 1.9.1 + get_asn1_ctx@Base 1.9.1 + get_basename@Base 1.9.1 + get_ber_identifier@Base 1.9.1 + get_ber_length@Base 1.9.1 + get_column_char_width@Base 1.9.1 + get_column_custom_field@Base 1.9.1 + get_column_custom_occurrence@Base 1.9.1 + get_column_format@Base 1.9.1 + get_column_format_from_str@Base 1.9.1 + get_column_format_matches@Base 1.9.1 + get_column_longest_string@Base 1.9.1 + get_column_resolved@Base 1.9.1 + get_column_title@Base 1.9.1 + get_column_visible@Base 1.9.1 + get_column_width_string@Base 1.9.1 + get_data_source_name@Base 1.9.1 + get_data_source_tvb@Base 1.9.1 + get_datafile_dir@Base 1.9.1 + get_datafile_path@Base 1.9.1 + get_dirname@Base 1.9.1 + get_dissector_table_base@Base 1.9.1 + get_dissector_table_selector_type@Base 1.9.1 + get_dissector_table_ui_name@Base 1.9.1 + get_ether_name@Base 1.9.1 + get_global_profiles_dir@Base 1.9.1 + get_host_ipaddr6@Base 1.9.1 + get_host_ipaddr@Base 1.9.1 + get_hostname6@Base 1.9.1 + get_hostname@Base 1.9.1 + get_key_string@Base 1.9.1 + get_mac_lte_proto_data@Base 1.9.1 + get_manuf_name_if_known@Base 1.9.1 + get_persconffile_path@Base 1.9.1 + get_persdatafile_dir@Base 1.9.1 + get_plugin_dir@Base 1.9.1 + get_plugins_pers_dir@Base 1.9.1 + get_profile_name@Base 1.9.1 + get_profiles_dir@Base 1.9.1 + get_progfile_dir@Base 1.9.1 + get_rose_ctx@Base 1.9.1 + get_sctp_port@Base 1.9.1 + get_systemfile_dir@Base 1.9.1 + get_tcp_port@Base 1.9.1 + get_tempfile_path@Base 1.9.1 + get_token_len@Base 1.9.1 + get_udp_port@Base 1.9.1 + get_wspython_dir@Base 1.9.1 + golay_decode@Base 1.9.1 + golay_encode@Base 1.9.1 + golay_errors@Base 1.9.1 + gsm_a_bssmap_msg_strings@Base 1.9.1 + gsm_a_dtap_msg_cc_strings@Base 1.9.1 + gsm_a_dtap_msg_gmm_strings@Base 1.9.1 + gsm_a_dtap_msg_mm_strings@Base 1.9.1 + gsm_a_dtap_msg_rr_strings@Base 1.9.1 + gsm_a_dtap_msg_sm_strings@Base 1.9.1 + gsm_a_dtap_msg_sms_strings@Base 1.9.1 + gsm_a_dtap_msg_ss_strings@Base 1.9.1 + gsm_a_dtap_msg_tp_strings@Base 1.9.1 + gsm_a_pd_str@Base 1.9.1 + gsm_a_rr_short_pd_msg_strings@Base 1.9.1 + gsm_map_opr_code_strings@Base 1.9.1 + gtcap_StatSRT@Base 1.9.1 + guid_to_str@Base 1.9.1 + guids_add_guid@Base 1.9.1 + guids_get_guid_name@Base 1.9.1 + guids_init@Base 1.9.1 + guids_resolve_guid_to_str@Base 1.9.1 + h225_RasMessage_vals@Base 1.9.1 + h225_ReleaseCompleteReason_vals@Base 1.9.1 + h245_set_h223_add_lc_handle@Base 1.9.1 + h245_set_h223_set_mc_handle@Base 1.9.1 + h248_param_ber_integer@Base 1.9.1 + h248_register_package@Base 1.9.1 + has_global_profiles@Base 1.9.1 + have_custom_cols@Base 1.9.1 + have_filtering_tap_listeners@Base 1.9.1 + heur_dissector_add@Base 1.9.1 + heur_dissector_delete@Base 1.9.1 + hex_str_to_bytes@Base 1.9.1 + hf_frame_arrival_time@Base 1.9.1 + hf_frame_capture_len@Base 1.9.1 + hf_frame_len@Base 1.9.1 + hf_frame_number@Base 1.9.1 + hf_text_only@Base 1.9.1 + host_ip_af@Base 1.9.1 + host_name_lookup_process@Base 1.9.1 + http_dissector_add@Base 1.9.1 + http_port_add@Base 1.9.1 + ieee80211_chan_to_mhz@Base 1.9.1 + ieee80211_mhz_to_chan@Base 1.9.1 + ieee80211_mhz_to_str@Base 1.9.1 + ieee802a_add_oui@Base 1.9.1 + in_cksum@Base 1.9.1 + incomplete_tcp_stream@Base 1.9.1 + init_dissection@Base 1.9.1 + init_progfile_dir@Base 1.9.1 + ip6_to_str@Base 1.9.1 + ip_to_str@Base 1.9.1 + ipopt_type_class_vals@Base 1.9.1 + ipopt_type_number_vals@Base 1.9.1 + ipprotostr@Base 1.9.1 + ipv4_get_net_order_addr@Base 1.9.1 + is_big_endian@Base 1.9.1 + is_default_profile@Base 1.9.1 + is_tpkt@Base 1.9.1 + isup_calling_partys_category_value_ext@Base 1.9.1 + isup_message_type_value_acro_ext@Base 1.9.1 + list_stat_cmd_args@Base 1.9.1 + llc_add_oui@Base 1.9.1 + make_printable_string@Base 1.9.1 + mark_frame_as_depended_upon@Base 1.9.1 + md5_append@Base 1.9.1 + md5_finish@Base 1.9.1 + md5_hmac@Base 1.9.1 + md5_init@Base 1.9.1 + mtp3_addr_to_str_buf@Base 1.9.1 + mtp3_network_indicator_vals@Base 1.9.1 + mtp3_service_indicator_code_short_vals@Base 1.9.1 + mtp3_standard_vals@Base 1.9.1 + new_create_dissector_handle@Base 1.9.1 + new_register_dissector@Base 1.9.1 + next_tvb_add_handle@Base 1.9.1 + next_tvb_add_string@Base 1.9.1 + next_tvb_add_uint@Base 1.9.1 + next_tvb_call@Base 1.9.1 + next_tvb_init@Base 1.9.1 + nstime_cmp@Base 1.9.1 + nstime_copy@Base 1.9.1 + nstime_delta@Base 1.9.1 + nstime_is_unset@Base 1.9.1 + nstime_is_zero@Base 1.9.1 + nstime_set_unset@Base 1.9.1 + nstime_set_zero@Base 1.9.1 + nstime_sum@Base 1.9.1 + nstime_to_msec@Base 1.9.1 + nstime_to_sec@Base 1.9.1 + nt_cmd_vals_ext@Base 1.9.1 + num_tree_types@Base 1.9.1 + oid_add@Base 1.9.1 + oid_add_from_encoded@Base 1.9.1 + oid_add_from_string@Base 1.9.1 + oid_both@Base 1.9.1 + oid_both_from_encoded@Base 1.9.1 + oid_both_from_string@Base 1.9.1 + oid_encoded2string@Base 1.9.1 + oid_encoded2subid@Base 1.9.1 + oid_get@Base 1.9.1 + oid_get_default_mib_path@Base 1.9.1 + oid_get_from_encoded@Base 1.9.1 + oid_get_from_string@Base 1.9.1 + oid_has_dissector@Base 1.9.1 + oid_resolved@Base 1.9.1 + oid_resolved_from_encoded@Base 1.9.1 + oid_resolved_from_string@Base 1.9.1 + oid_str_to_bytes@Base 1.9.1 + oid_string2encoded@Base 1.9.1 + oid_string2subid@Base 1.9.1 + oid_subid2encoded@Base 1.9.1 + oid_subid2string@Base 1.9.1 + oids_cleanup@Base 1.9.1 + oids_init@Base 1.9.1 + other_decode_bitfield_value@Base 1.9.1 + p_add_proto_data@Base 1.9.1 + p_get_proto_data@Base 1.9.1 + parse_key_string@Base 1.9.1 + pe_tree_create@Base 1.9.1 + pfilter_expression_head@Base 1.9.1 + plugin_list@Base 1.9.1 + plugins_dump_all@Base 1.9.1 + postseq_cleanup_all_protocols@Base 1.9.1 + prefs@Base 1.9.1 + prefs_apply@Base 1.9.1 + prefs_apply_all@Base 1.9.1 + prefs_capture_device_monitor_mode@Base 1.9.1 + prefs_capture_options_dialog_column_is_visible@Base 1.9.1 + prefs_clear_string_list@Base 1.9.1 + prefs_find_module@Base 1.9.1 + prefs_find_preference@Base 1.9.1 + prefs_get_string_list@Base 1.9.1 + prefs_get_title_by_name@Base 1.9.1 + prefs_is_capture_device_hidden@Base 1.9.1 + prefs_is_registered_protocol@Base 1.9.1 + prefs_module_has_submodules@Base 1.9.1 + prefs_modules_foreach@Base 1.9.1 + prefs_modules_foreach_submodules@Base 1.9.1 + prefs_pref_foreach@Base 1.9.1 + prefs_pref_to_str@Base 1.9.1 + prefs_pref_type_description@Base 1.9.1 + prefs_pref_type_name@Base 1.9.1 + prefs_register_bool_preference@Base 1.9.1 + prefs_register_directory_preference@Base 1.9.1 + prefs_register_enum_preference@Base 1.9.1 + prefs_register_filename_preference@Base 1.9.1 + prefs_register_modules@Base 1.9.1 + prefs_register_obsolete_preference@Base 1.9.1 + prefs_register_protocol@Base 1.9.1 + prefs_register_protocol_subtree@Base 1.9.1 + prefs_register_range_preference@Base 1.9.1 + prefs_register_stat@Base 1.9.1 + prefs_register_static_text_preference@Base 1.9.1 + prefs_register_string_preference@Base 1.9.1 + prefs_register_uat_preference@Base 1.9.1 + prefs_register_uint_preference@Base 1.9.1 + prefs_reset@Base 1.9.1 + prefs_set_pref@Base 1.9.1 + process_reassembled_data@Base 1.9.1 + process_stat_cmd_arg@Base 1.9.1 + profile_exists@Base 1.9.1 + profile_store_persconffiles@Base 1.9.1 + proto_all_finfos@Base 1.9.1 + proto_can_match_selected@Base 1.9.1 + proto_can_toggle_protocol@Base 1.9.1 + proto_check_field_name@Base 1.9.1 + proto_construct_match_selected_string@Base 1.9.1 + proto_data@Base 1.9.1 + proto_enable_all@Base 1.9.1 + proto_expert@Base 1.9.1 + proto_field_is_referenced@Base 1.9.1 + proto_find_field_from_offset@Base 1.9.1 + proto_find_finfo@Base 1.9.1 + proto_frame@Base 1.9.1 + proto_get_data_protocol@Base 1.9.1 + proto_get_finfo_ptr_array@Base 1.9.1 + proto_get_first_protocol@Base 1.9.1 + proto_get_first_protocol_field@Base 1.9.1 + proto_get_id@Base 1.9.1 + proto_get_id_by_filter_name@Base 1.9.1 + proto_get_next_protocol@Base 1.9.1 + proto_get_next_protocol_field@Base 1.9.1 + proto_get_protocol_filter_name@Base 1.9.1 + proto_get_protocol_long_name@Base 1.9.1 + proto_get_protocol_name@Base 1.9.1 + proto_get_protocol_short_name@Base 1.9.1 + proto_initialize_all_prefixes@Base 1.9.1 + proto_is_private@Base 1.9.1 + proto_is_protocol_enabled@Base 1.9.1 + proto_item_add_subtree@Base 1.9.1 + proto_item_append_string@Base 1.9.1 + proto_item_append_text@Base 1.9.1 + proto_item_fill_label@Base 1.9.1 + proto_item_get_len@Base 1.9.1 + proto_item_get_parent@Base 1.9.1 + proto_item_get_parent_nth@Base 1.9.1 + proto_item_get_subtree@Base 1.9.1 + proto_item_prepend_text@Base 1.9.1 + proto_item_set_end@Base 1.9.1 + proto_item_set_expert_flags@Base 1.9.1 + proto_item_set_len@Base 1.9.1 + proto_item_set_text@Base 1.9.1 + proto_mark_private@Base 1.9.1 + proto_register_field_array@Base 1.9.1 + proto_register_prefix@Base 1.9.1 + proto_register_protocol@Base 1.9.1 + proto_register_subtree_array@Base 1.9.1 + proto_registrar_dump_fields@Base 1.9.1 + proto_registrar_dump_ftypes@Base 1.9.1 + proto_registrar_dump_protocols@Base 1.9.1 + proto_registrar_dump_values@Base 1.9.1 + proto_registrar_get_abbrev@Base 1.9.1 + proto_registrar_get_byname@Base 1.9.1 + proto_registrar_get_ftype@Base 1.9.1 + proto_registrar_get_nth@Base 1.9.1 + proto_registrar_get_parent@Base 1.9.1 + proto_registrar_is_protocol@Base 1.9.1 + proto_registrar_n@Base 1.9.1 + proto_set_cant_toggle@Base 1.9.1 + proto_set_decoding@Base 1.9.1 + proto_tracking_interesting_fields@Base 1.9.1 + proto_tree_add_bitmask@Base 1.9.1 + proto_tree_add_bitmask_len@Base 1.9.1 + proto_tree_add_bitmask_text@Base 1.9.1 + proto_tree_add_bits_item@Base 1.9.1 + proto_tree_add_bits_ret_val@Base 1.9.1 + proto_tree_add_boolean@Base 1.9.1 + proto_tree_add_boolean_format@Base 1.9.1 + proto_tree_add_boolean_format_value@Base 1.9.1 + proto_tree_add_bytes@Base 1.9.1 + proto_tree_add_bytes_format@Base 1.9.1 + proto_tree_add_bytes_format_value@Base 1.9.1 + proto_tree_add_debug_text@Base 1.9.1 + proto_tree_add_double@Base 1.9.1 + proto_tree_add_double_format@Base 1.9.1 + proto_tree_add_double_format_value@Base 1.9.1 + proto_tree_add_ether@Base 1.9.1 + proto_tree_add_ether_format@Base 1.9.1 + proto_tree_add_ether_format_value@Base 1.9.1 + proto_tree_add_eui64@Base 1.9.1 + proto_tree_add_eui64_format@Base 1.9.1 + proto_tree_add_eui64_format_value@Base 1.9.1 + proto_tree_add_float@Base 1.9.1 + proto_tree_add_float_format@Base 1.9.1 + proto_tree_add_float_format_value@Base 1.9.1 + proto_tree_add_guid@Base 1.9.1 + proto_tree_add_guid_format@Base 1.9.1 + proto_tree_add_guid_format_value@Base 1.9.1 + proto_tree_add_int64@Base 1.9.1 + proto_tree_add_int64_format@Base 1.9.1 + proto_tree_add_int64_format_value@Base 1.9.1 + proto_tree_add_int@Base 1.9.1 + proto_tree_add_int_format@Base 1.9.1 + proto_tree_add_int_format_value@Base 1.9.1 + proto_tree_add_ipv4@Base 1.9.1 + proto_tree_add_ipv4_format@Base 1.9.1 + proto_tree_add_ipv4_format_value@Base 1.9.1 + proto_tree_add_ipv6@Base 1.9.1 + proto_tree_add_ipv6_format@Base 1.9.1 + proto_tree_add_ipv6_format_value@Base 1.9.1 + proto_tree_add_ipxnet@Base 1.9.1 + proto_tree_add_ipxnet_format@Base 1.9.1 + proto_tree_add_ipxnet_format_value@Base 1.9.1 + proto_tree_add_item@Base 1.9.1 + proto_tree_add_none_format@Base 1.9.1 + proto_tree_add_protocol_format@Base 1.9.1 + proto_tree_add_string@Base 1.9.1 + proto_tree_add_string_format@Base 1.9.1 + proto_tree_add_string_format_value@Base 1.9.1 + proto_tree_add_text@Base 1.9.1 + proto_tree_add_time@Base 1.9.1 + proto_tree_add_time_format@Base 1.9.1 + proto_tree_add_time_format_value@Base 1.9.1 + proto_tree_add_uint64@Base 1.9.1 + proto_tree_add_uint64_format@Base 1.9.1 + proto_tree_add_uint64_format_value@Base 1.9.1 + proto_tree_add_uint@Base 1.9.1 + proto_tree_add_uint_bits_format_value@Base 1.9.1 + proto_tree_add_uint_format@Base 1.9.1 + proto_tree_add_uint_format_value@Base 1.9.1 + proto_tree_children_foreach@Base 1.9.1 + proto_tree_free@Base 1.9.1 + proto_tree_get_parent@Base 1.9.1 + proto_tree_get_root@Base 1.9.1 + proto_tree_move_item@Base 1.9.1 + proto_tree_set_appendix@Base 1.9.1 + proto_tree_set_visible@Base 1.9.1 + proto_unregister_field@Base 1.9.1 + protocols_module@Base 1.9.1 + ptvcursor_add@Base 1.9.1 + ptvcursor_add_no_advance@Base 1.9.1 + ptvcursor_add_text_with_subtree@Base 1.9.1 + ptvcursor_add_with_subtree@Base 1.9.1 + ptvcursor_advance@Base 1.9.1 + ptvcursor_current_offset@Base 1.9.1 + ptvcursor_free@Base 1.9.1 + ptvcursor_new@Base 1.9.1 + ptvcursor_pop_subtree@Base 1.9.1 + ptvcursor_push_subtree@Base 1.9.1 + ptvcursor_set_subtree@Base 1.9.1 + ptvcursor_set_tree@Base 1.9.1 + ptvcursor_tree@Base 1.9.1 + ptvcursor_tvbuff@Base 1.9.1 + q850_cause_code_vals_ext@Base 1.9.1 + q931_cause_code_vals_ext@Base 1.9.1 + q931_message_type_vals@Base 1.9.1 + qs_func_vals@Base 1.9.1 + qs_rate_vals_ext@Base 1.9.1 + range_convert_range@Base 1.9.1 + range_convert_str@Base 1.9.1 + range_copy@Base 1.9.1 + range_empty@Base 1.9.1 + range_foreach@Base 1.9.1 + ranges_are_equal@Base 1.9.1 + read_keytab_file@Base 1.9.1 + read_keytab_file_from_preferences@Base 1.9.1 + read_prefs@Base 1.9.1 + read_prefs_file@Base 1.9.1 + reassembly_table_destroy@Base 1.9.1 + reassembly_table_init@Base 1.9.1 + register_all_plugin_tap_listeners@Base 1.9.1 + register_all_protocol_handoffs@Base 1.9.1 + register_all_protocols@Base 1.9.1 + register_ber_oid_dissector@Base 1.9.1 + register_ber_oid_dissector_handle@Base 1.9.1 + register_ber_oid_syntax@Base 1.9.1 + register_ber_syntax_dissector@Base 1.9.1 + register_codec@Base 1.9.1 + register_count@Base 1.9.1 + register_dissector@Base 1.9.1 + register_dissector_filter@Base 1.9.1 + register_dissector_table@Base 1.9.1 + register_final_registration_routine@Base 1.9.1 + register_giop_user@Base 1.9.1 + register_giop_user_module@Base 1.9.1 + register_heur_dissector_list@Base 1.9.1 + register_init_routine@Base 1.9.1 + register_postdissector@Base 1.9.1 + register_postseq_cleanup_routine@Base 1.9.1 + register_stat_cmd_arg@Base 1.9.1 + register_tap@Base 1.9.1 + register_tap_listener@Base 1.9.1 + rel_time_to_secs_str@Base 1.9.1 + rel_time_to_str@Base 1.9.1 + remove_tap_listener@Base 1.9.1 + rename_persconffile_profile@Base 1.9.1 + report_failure@Base 1.9.1 + report_open_failure@Base 1.9.1 + report_read_failure@Base 1.9.1 + report_write_failure@Base 1.9.1 + req_resp_hdrs_do_reassembly@Base 1.9.1 + reset_tap_listeners@Base 1.9.1 + reset_tcp_reassembly@Base 1.9.1 + rose_ctx_clean_data@Base 1.9.1 + rose_ctx_init@Base 1.9.1 + rpc_init_proc_table@Base 1.9.1 + rpc_init_prog@Base 1.9.1 + rpc_proc_name@Base 1.9.1 + rpc_procs@Base 1.9.1 + rpc_prog_hf@Base 1.9.1 + rpc_prog_name@Base 1.9.1 + rpc_progs@Base 1.9.1 + rpc_roundup@Base 1.9.1 + rtcp_add_address@Base 1.9.1 + rtp_add_address@Base 1.9.1 + rtp_free_hash_dyn_payload@Base 1.9.1 + rtp_payload_type_short_vals_ext@Base 1.9.1 + rtp_payload_type_vals_ext@Base 1.9.1 + rtsp_status_code_vals@Base 1.9.1 + running_in_build_directory@Base 1.9.1 + rval_to_str@Base 1.9.1 + s1ap_CauseMisc_vals@Base 1.9.1 + s1ap_CauseNas_vals@Base 1.9.1 + s1ap_CauseProtocol_vals@Base 1.9.1 + s1ap_CauseRadioNetwork_vals@Base 1.9.1 + s1ap_CauseTransport_vals@Base 1.9.1 + sccp_address_signal_values@Base 1.9.1 + sccp_error_cause_values@Base 1.9.1 + sccp_message_type_acro_values@Base 1.9.1 + sccp_refusal_cause_values@Base 1.9.1 + sccp_release_cause_values@Base 1.9.1 + sccp_reset_cause_values@Base 1.9.1 + sccp_return_cause_values@Base 1.9.1 + scsi_mmc_vals@Base 1.9.1 + scsi_osd_vals@Base 1.9.1 + scsi_sbc_vals@Base 1.9.1 + scsi_smc_vals@Base 1.9.1 + scsi_ssc_vals@Base 1.9.1 + se_alloc0@Base 1.9.1 + se_alloc@Base 1.9.1 + se_memdup@Base 1.9.1 + se_strdup@Base 1.9.1 + se_strdup_printf@Base 1.9.1 + se_strdup_vprintf@Base 1.9.1 + se_strndup@Base 1.9.1 + se_tree_create@Base 1.9.1 + se_tree_create_non_persistent@Base 1.9.1 + set_actual_length@Base 1.9.1 + set_column_custom_field@Base 1.9.1 + set_column_custom_occurrence@Base 1.9.1 + set_column_format@Base 1.9.1 + set_column_resolved@Base 1.9.1 + set_column_title@Base 1.9.1 + set_column_visible@Base 1.9.1 + set_fd_time@Base 1.9.1 + set_mac_lte_proto_data@Base 1.9.1 + set_profile_name@Base 1.9.1 + set_tap_dfilter@Base 1.9.1 + show_exception@Base 1.9.1 + show_fragment_seq_tree@Base 1.9.1 + show_fragment_tree@Base 1.9.1 + sid_name_snooping@Base 1.9.1 + sid_name_table@Base 1.9.1 + smb2_cmd_vals_ext@Base 1.9.1 + smb_cmd_vals_ext@Base 1.9.1 + sminmpec_values_ext@Base 1.9.1 + srtcp_add_address@Base 1.9.1 + srtp_add_address@Base 1.9.1 + ssl_dissector_add@Base 1.9.1 + ssl_dissector_delete@Base 1.9.1 + ssl_session_hash@Base 1.9.1 + ssl_set_master_secret@Base 1.9.1 + start_requested_stats@Base 1.9.1 + stats_tree_branch_max_namelen@Base 1.9.1 + stats_tree_branch_to_str@Base 1.9.1 + stats_tree_create_node@Base 1.9.1 + stats_tree_create_node_by_pname@Base 1.9.1 + stats_tree_create_pivot@Base 1.9.1 + stats_tree_create_pivot_by_pname@Base 1.9.1 + stats_tree_create_range_node@Base 1.9.1 + stats_tree_create_range_node_string@Base 1.9.1 + stats_tree_free@Base 1.9.1 + stats_tree_get_abbr@Base 1.9.1 + stats_tree_get_cfg_by_abbr@Base 1.9.1 + stats_tree_get_cfg_list@Base 1.9.1 + stats_tree_get_strs_from_node@Base 1.9.1 + stats_tree_manip_node@Base 1.9.1 + stats_tree_new@Base 1.9.1 + stats_tree_node_to_str@Base 1.9.1 + stats_tree_packet@Base 1.9.1 + stats_tree_parent_id_by_name@Base 1.9.1 + stats_tree_presentation@Base 1.9.1 + stats_tree_range_node_with_pname@Base 1.9.1 + stats_tree_register@Base 1.9.1 + stats_tree_register_plugin@Base 1.9.1 + stats_tree_register_with_group@Base 1.9.1 + stats_tree_reinit@Base 1.9.1 + stats_tree_reset@Base 1.9.1 + stats_tree_tick_pivot@Base 1.9.1 + stats_tree_tick_range@Base 1.9.1 + str_to_str@Base 1.9.1 + str_to_val@Base 1.9.1 + str_to_val_idx@Base 1.9.1 + stream_add_frag@Base 1.9.1 + stream_find_frag@Base 1.9.1 + stream_new_circ@Base 1.9.1 + stream_process_reassembled@Base 1.9.1 + string_or_null@Base 1.9.1 + string_replace@Base 1.9.1 + string_to_name_resolve@Base 1.9.1 + sua_co_class_type_acro_values@Base 1.9.1 + swaptab@Base 1.9.1 + t30_facsimile_control_field_vals@Base 1.9.1 + t30_facsimile_control_field_vals_short@Base 1.9.1 + t38_T30_data_vals@Base 1.9.1 + t38_T30_indicator_vals@Base 1.9.1 + t38_add_address@Base 1.9.1 + tap_build_interesting@Base 1.9.1 + tap_listeners_require_dissection@Base 1.9.1 + tap_queue_packet@Base 1.9.1 + tcp_dissect_pdus@Base 1.9.1 + test_for_directory@Base 1.9.1 + test_for_fifo@Base 1.9.1 + tfs_accept_reject@Base 1.9.1 + tfs_accepted_not_accepted@Base 1.9.1 + tfs_ack_nack@Base 1.9.1 + tfs_active_inactive@Base 1.9.1 + tfs_allow_block@Base 1.9.1 + tfs_allowed_not_allowed@Base 1.9.1 + tfs_available_not_available@Base 1.9.1 + tfs_capable_not_capable@Base 1.9.1 + tfs_command_response@Base 1.9.1 + tfs_detected_not_detected@Base 1.9.1 + tfs_disabled_enabled@Base 1.9.1 + tfs_enabled_disabled@Base 1.9.1 + tfs_error_ok@Base 1.9.1 + tfs_fail_success@Base 1.9.1 + tfs_found_not_found@Base 1.9.1 + tfs_group_unique_name@Base 1.9.1 + tfs_high_low@Base 1.9.1 + tfs_implemented_not_implemented@Base 1.9.1 + tfs_inuse_not_inuse@Base 1.9.1 + tfs_more_nomore@Base 1.9.1 + tfs_no_yes@Base 1.9.1 + tfs_not_allowed_allowed@Base 1.9.1 + tfs_odd_even@Base 1.9.1 + tfs_ok_error@Base 1.9.1 + tfs_on_off@Base 1.9.1 + tfs_present_absent@Base 1.9.1 + tfs_present_not_present@Base 1.9.1 + tfs_pressed_not_pressed@Base 1.9.1 + tfs_reliable_not_reliable@Base 1.9.1 + tfs_requested_not_requested@Base 1.9.1 + tfs_restricted_allowed@Base 1.9.1 + tfs_set_notset@Base 1.9.1 + tfs_shared_independent@Base 1.9.1 + tfs_success_fail@Base 1.9.1 + tfs_supported_not_supported@Base 1.9.1 + tfs_true_false@Base 1.9.1 + tfs_used_notused@Base 1.9.1 + tfs_valid_invalid@Base 1.9.1 + tfs_yes_no@Base 1.9.1 + time_msecs_to_str@Base 1.9.1 + time_secs_to_str@Base 1.9.1 + timestamp_get_precision@Base 1.9.1 + timestamp_get_seconds_type@Base 1.9.1 + timestamp_get_type@Base 1.9.1 + timestamp_set_precision@Base 1.9.1 + timestamp_set_seconds_type@Base 1.9.1 + timestamp_set_type@Base 1.9.1 + trans2_cmd_vals_ext@Base 1.9.1 + tree_is_expanded@Base 1.9.1 + try_rval_to_str@Base 1.9.1 + try_rval_to_str_idx@Base 1.9.1 + try_str_to_str@Base 1.9.1 + try_str_to_str_idx@Base 1.9.1 + try_val_to_str@Base 1.9.1 + try_val_to_str_ext@Base 1.9.1 + try_val_to_str_idx@Base 1.9.1 + try_val_to_str_idx_ext@Base 1.9.1 + tvb_bcd_dig_to_ep_str@Base 1.9.1 + tvb_bytes_exist@Base 1.9.1 + tvb_bytes_to_str@Base 1.9.1 + tvb_bytes_to_str_punct@Base 1.9.1 + tvb_composite_append@Base 1.9.1 + tvb_composite_finalize@Base 1.9.1 + tvb_ensure_bytes_exist@Base 1.9.1 + tvb_ensure_length_remaining@Base 1.9.1 + tvb_ether_to_str@Base 1.9.1 + tvb_eui64_to_str@Base 1.9.1 + tvb_fake_unicode@Base 1.9.1 + tvb_fc_to_str@Base 1.9.1 + tvb_fcwwn_to_str@Base 1.9.1 + tvb_find_guint8@Base 1.9.1 + tvb_find_line_end@Base 1.9.1 + tvb_find_line_end_unquoted@Base 1.9.1 + tvb_find_tvb@Base 1.9.1 + tvb_format_text@Base 1.9.1 + tvb_format_text_wsp@Base 1.9.1 + tvb_free@Base 1.9.1 + tvb_get_bits16@Base 1.9.1 + tvb_get_bits32@Base 1.9.1 + tvb_get_bits64@Base 1.9.1 + tvb_get_bits8@Base 1.9.1 + tvb_get_bits@Base 1.9.1 + tvb_get_bits_buf@Base 1.9.1 + tvb_get_const_stringz@Base 1.9.1 + tvb_get_ds_tvb@Base 1.9.1 + tvb_get_ephemeral_faked_unicode@Base 1.9.1 + tvb_get_ephemeral_string@Base 1.9.1 + tvb_get_ephemeral_string_enc@Base 1.9.1 + tvb_get_ephemeral_stringz@Base 1.9.1 + tvb_get_ephemeral_stringz_enc@Base 1.9.1 + tvb_get_guid@Base 1.9.1 + tvb_get_guint8@Base 1.9.1 + tvb_get_ipv4@Base 1.9.1 + tvb_get_ipv6@Base 1.9.1 + tvb_get_letoh24@Base 1.9.1 + tvb_get_letoh40@Base 1.9.1 + tvb_get_letoh48@Base 1.9.1 + tvb_get_letoh56@Base 1.9.1 + tvb_get_letoh64@Base 1.9.1 + tvb_get_letohguid@Base 1.9.1 + tvb_get_letohieee_double@Base 1.9.1 + tvb_get_letohieee_float@Base 1.9.1 + tvb_get_letohl@Base 1.9.1 + tvb_get_letohs@Base 1.9.1 + tvb_get_manuf_name@Base 1.9.1 + tvb_get_manuf_name_if_known@Base 1.9.1 + tvb_get_nstringz0@Base 1.9.1 + tvb_get_nstringz@Base 1.9.1 + tvb_get_ntoh24@Base 1.9.1 + tvb_get_ntoh40@Base 1.9.1 + tvb_get_ntoh48@Base 1.9.1 + tvb_get_ntoh56@Base 1.9.1 + tvb_get_ntoh64@Base 1.9.1 + tvb_get_ntohguid@Base 1.9.1 + tvb_get_ntohieee_double@Base 1.9.1 + tvb_get_ntohieee_float@Base 1.9.1 + tvb_get_ntohl@Base 1.9.1 + tvb_get_ntohs@Base 1.9.1 + tvb_get_ptr@Base 1.9.1 + tvb_get_string@Base 1.9.1 + tvb_get_stringz@Base 1.9.1 + tvb_get_stringz_enc@Base 1.9.1 + tvb_get_unicode_string@Base 1.9.1 + tvb_ip6_to_str@Base 1.9.1 + tvb_ip_to_str@Base 1.9.1 + tvb_length@Base 1.9.1 + tvb_length_remaining@Base 1.9.1 + tvb_memcpy@Base 1.9.1 + tvb_memdup@Base 1.9.1 + tvb_memeql@Base 1.9.1 + tvb_new_child_real_data@Base 1.9.1 + tvb_new_composite@Base 1.9.1 + tvb_new_octet_aligned@Base 1.9.1 + tvb_new_real_data@Base 1.9.1 + tvb_new_subset@Base 1.9.1 + tvb_new_subset_length@Base 1.9.1 + tvb_new_subset_remaining@Base 1.9.1 + tvb_offset_exists@Base 1.9.1 + tvb_offset_from_real_beginning@Base 1.9.1 + tvb_pbrk_guint8@Base 1.9.1 + tvb_raw_offset@Base 1.9.1 + tvb_reported_length@Base 1.9.1 + tvb_reported_length_remaining@Base 1.9.1 + tvb_set_child_real_data_tvbuff@Base 1.9.1 + tvb_set_fragment@Base 1.9.1 + tvb_set_free_cb@Base 1.9.1 + tvb_set_reported_length@Base 1.9.1 + tvb_skip_wsp@Base 1.9.1 + tvb_skip_wsp_return@Base 1.9.1 + tvb_strncaseeql@Base 1.9.1 + tvb_strneql@Base 1.9.1 + tvb_strnlen@Base 1.9.1 + tvb_strsize@Base 1.9.1 + tvb_uncompress@Base 1.9.1 + tvb_unicode_strsize@Base 1.9.1 + tvbparse_casestring@Base 1.9.1 + tvbparse_char@Base 1.9.1 + tvbparse_chars@Base 1.9.1 + tvbparse_curr_offset@Base 1.9.1 + tvbparse_find@Base 1.9.1 + tvbparse_get@Base 1.9.1 + tvbparse_handle@Base 1.9.1 + tvbparse_hashed@Base 1.9.1 + tvbparse_hashed_add@Base 1.9.1 + tvbparse_init@Base 1.9.1 + tvbparse_not_char@Base 1.9.1 + tvbparse_not_chars@Base 1.9.1 + tvbparse_peek@Base 1.9.1 + tvbparse_quoted@Base 1.9.1 + tvbparse_reset@Base 1.9.1 + tvbparse_set_oneof@Base 1.9.1 + tvbparse_set_seq@Base 1.9.1 + tvbparse_shrink_token_cb@Base 1.9.1 + tvbparse_some@Base 1.9.1 + tvbparse_string@Base 1.9.1 + tvbparse_tree_add_elem@Base 1.9.1 + tvbparse_until@Base 1.9.1 + uat_add_record@Base 1.9.1 + uat_clear@Base 1.9.1 + uat_fld_chk_enum@Base 1.9.1 + uat_fld_chk_num_dec@Base 1.9.1 + uat_fld_chk_num_hex@Base 1.9.1 + uat_fld_chk_proto@Base 1.9.1 + uat_fld_chk_range@Base 1.9.1 + uat_fld_chk_str@Base 1.9.1 + uat_fld_chk_str_isalnum@Base 1.9.1 + uat_fld_chk_str_isalpha@Base 1.9.1 + uat_fld_chk_str_isdigit@Base 1.9.1 + uat_fld_chk_str_isprint@Base 1.9.1 + uat_fld_chk_str_isxdigit@Base 1.9.1 + uat_foreach_table@Base 1.9.1 + uat_get_table_by_name@Base 1.9.1 + uat_load@Base 1.9.1 + uat_new@Base 1.9.1 + uat_remove_record_idx@Base 1.9.1 + uat_save@Base 1.9.1 + uat_swap@Base 1.9.1 + union_of_tap_listener_flags@Base 1.9.1 + uri_str_to_bytes@Base 1.9.1 + val_to_str@Base 1.9.1 + val_to_str_const@Base 1.9.1 + val_to_str_ext@Base 1.9.1 + val_to_str_ext_const@Base 1.9.1 + value_is_in_range@Base 1.9.1 + value_string_ext_new@Base 1.9.1 + wmem_alloc0@Base 1.9.1 + wmem_alloc@Base 1.9.1 + wmem_allocator_new@Base 1.9.1 + wmem_destroy_allocator@Base 1.9.1 + wmem_epan_scope@Base 1.9.1 + wmem_file_scope@Base 1.9.1 + wmem_free@Base 1.9.1 + wmem_free_all@Base 1.9.1 + wmem_gc@Base 1.9.1 + wmem_packet_scope@Base 1.9.1 + wmem_realloc@Base 1.9.1 + wmem_slist_count@Base 1.9.1 + wmem_slist_frame_data@Base 1.9.1 + wmem_slist_frame_next@Base 1.9.1 + wmem_slist_front@Base 1.9.1 + wmem_slist_new@Base 1.9.1 + wmem_slist_prepend@Base 1.9.1 + wmem_slist_remove@Base 1.9.1 + wmem_stack_peek@Base 1.9.1 + wmem_stack_pop@Base 1.9.1 + wmem_stack_push@Base 1.9.1 + wmem_strbuf_append@Base 1.9.1 + wmem_strbuf_append_printf@Base 1.9.1 + wmem_strbuf_get_len@Base 1.9.1 + wmem_strbuf_get_str@Base 1.9.1 + wmem_strbuf_new@Base 1.9.1 + wmem_strbuf_sized_new@Base 1.9.1 + wmem_strdup@Base 1.9.1 + wmem_strdup_printf@Base 1.9.1 + wmem_strdup_vprintf@Base 1.9.1 + wmem_strndup@Base 1.9.1 + write_prefs@Base 1.9.1 + ws_strdup_escape_char@Base 1.9.1 + ws_strdup_unescape_char@Base 1.9.1 + wslua_plugin_list@Base 1.9.1 + wsp_vals_pdu_type_ext@Base 1.9.1 + wsp_vals_status_ext@Base 1.9.1 + wtap_nstime_to_sec@Base 1.9.1 + xml_escape@Base 1.9.1 + xml_get_attrib@Base 1.9.1 + xml_get_cdata@Base 1.9.1 + xml_get_tag@Base 1.9.1 +m2m.so libwireshark3 #MINVER# + plugin_reg_handoff@Base 1.9.1 + plugin_register@Base 1.9.1 + version@Base 1.9.1 +mate.so libwireshark3 #MINVER# + plugin_reg_handoff@Base 1.9.1 + plugin_register@Base 1.9.1 + version@Base 1.9.1 +opcua.so libwireshark3 #MINVER# + plugin_reg_handoff@Base 1.9.1 + plugin_register@Base 1.9.1 + version@Base 1.9.1 +profinet.so libwireshark3 #MINVER# + plugin_reg_handoff@Base 1.9.1 + plugin_register@Base 1.9.1 + version@Base 1.9.1 +stats_tree.so libwireshark3 #MINVER# + plugin_register_tap_listener@Base 1.9.1 + version@Base 1.9.1 +unistim.so libwireshark3 #MINVER# + plugin_reg_handoff@Base 1.9.1 + plugin_register@Base 1.9.1 + version@Base 1.9.1 +wimax.so libwireshark3 #MINVER# + plugin_reg_handoff@Base 1.9.1 + plugin_register@Base 1.9.1 + version@Base 1.9.1 +wimaxasncp.so libwireshark3 #MINVER# + plugin_reg_handoff@Base 1.9.1 + plugin_register@Base 1.9.1 + version@Base 1.9.1 +wimaxmacphy.so libwireshark3 #MINVER# + plugin_reg_handoff@Base 1.9.1 + plugin_register@Base 1.9.1 + version@Base 1.9.1 diff -Nru wireshark-1.10.5/debian/libwireshark-dev.install wireshark-1.10.6/debian/libwireshark-dev.install --- wireshark-1.10.5/debian/libwireshark-dev.install 2013-12-09 15:20:57.000000000 +0000 +++ wireshark-1.10.6/debian/libwireshark-dev.install 2014-03-05 09:52:34.000000000 +0000 @@ -1,4 +1,5 @@ usr/lib/*/libwireshark.so +usr/lib/*/pkgconfig/wireshark.pc color.h usr/include/wireshark config.h usr/include/wireshark register.h usr/include/wireshark diff -Nru wireshark-1.10.5/debian/libwiretap3.symbols wireshark-1.10.6/debian/libwiretap3.symbols --- wireshark-1.10.5/debian/libwiretap3.symbols 1970-01-01 00:00:00.000000000 +0000 +++ wireshark-1.10.6/debian/libwiretap3.symbols 2014-02-15 14:31:30.000000000 +0000 @@ -0,0 +1,71 @@ +libwiretap.so.3 libwireshark3 #MINVER# + buffer_append@Base 1.9.1 + buffer_assure_space@Base 1.9.1 + buffer_free@Base 1.9.1 + buffer_init@Base 1.9.1 + buffer_remove_start@Base 1.9.1 + file_eof@Base 1.9.1 + file_error@Base 1.9.1 + file_getc@Base 1.9.1 + file_gets@Base 1.9.1 + file_read@Base 1.9.1 + file_seek@Base 1.9.1 + file_tell@Base 1.9.1 + wtap_buf_ptr@Base 1.9.1 + wtap_cleareof@Base 1.9.1 + wtap_close@Base 1.9.1 + wtap_default_file_extension@Base 1.9.1 + wtap_dump@Base 1.9.1 + wtap_dump_can_compress@Base 1.9.1 + wtap_dump_can_open@Base 1.9.1 + wtap_dump_can_write@Base 1.9.1 + wtap_dump_close@Base 1.9.1 + wtap_dump_fdopen@Base 1.9.1 + wtap_dump_fdopen_ng@Base 1.9.1 + wtap_dump_file_encap_type@Base 1.9.1 + wtap_dump_flush@Base 1.9.1 + wtap_dump_has_name_resolution@Base 1.9.1 + wtap_dump_open@Base 1.9.1 + wtap_dump_open_ng@Base 1.9.1 + wtap_dump_set_addrinfo_list@Base 1.9.1 + wtap_dump_supports_comment_types@Base 1.9.1 + wtap_encap_requires_phdr@Base 1.9.1 + wtap_encap_short_string@Base 1.9.1 + wtap_encap_string@Base 1.9.1 + wtap_fdclose@Base 1.9.1 + wtap_fdreopen@Base 1.9.1 + wtap_file_encap@Base 1.9.1 + wtap_file_get_idb_info@Base 1.9.1 + wtap_file_get_shb_info@Base 1.9.1 + wtap_file_size@Base 1.9.1 + wtap_file_tsprecision@Base 1.9.1 + wtap_file_type@Base 1.9.1 + wtap_file_type_short_string@Base 1.9.1 + wtap_file_type_string@Base 1.9.1 + wtap_free_file_extensions_list@Base 1.9.1 + wtap_fstat@Base 1.9.1 + wtap_get_bytes_dumped@Base 1.9.1 + wtap_get_file_extensions_list@Base 1.9.1 + wtap_get_num_encap_types@Base 1.9.1 + wtap_get_num_file_types@Base 1.9.1 + wtap_get_savable_file_types@Base 1.9.1 + wtap_iscompressed@Base 1.9.1 + wtap_open_offline@Base 1.9.1 + wtap_pcap_encap_to_wtap_encap@Base 1.9.1 + wtap_phdr@Base 1.9.1 + wtap_read@Base 1.9.1 + wtap_read_so_far@Base 1.9.1 + wtap_register_encap_type@Base 1.9.1 + wtap_register_file_type@Base 1.9.1 + wtap_register_open_routine@Base 1.9.1 + wtap_seek_read@Base 1.9.1 + wtap_sequential_close@Base 1.9.1 + wtap_set_bytes_dumped@Base 1.9.1 + wtap_set_cb_new_ipv4@Base 1.9.1 + wtap_set_cb_new_ipv6@Base 1.9.1 + wtap_short_string_to_encap@Base 1.9.1 + wtap_short_string_to_file_type@Base 1.9.1 + wtap_snapshot_length@Base 1.9.1 + wtap_strerror@Base 1.9.1 + wtap_write_shb_comment@Base 1.9.1 + wtap_wtap_encap_to_pcap_encap@Base 1.9.1 diff -Nru wireshark-1.10.5/debian/libwsutil3.symbols wireshark-1.10.6/debian/libwsutil3.symbols --- wireshark-1.10.5/debian/libwsutil3.symbols 1970-01-01 00:00:00.000000000 +0000 +++ wireshark-1.10.6/debian/libwsutil3.symbols 2014-02-15 14:31:30.000000000 +0000 @@ -0,0 +1,41 @@ +libwsutil.so.3 libwireshark3 #MINVER# + AirPDcapWepDecrypt@Base 1.10.0 + ascii_strdown_inplace@Base 1.10.0 + ascii_strup_inplace@Base 1.10.0 + crc11_307_noreflect_noxor@Base 1.10.0 + crc16_0x5935@Base 1.10.0 + crc16_8005_noreflect_noxor@Base 1.10.0 + crc16_ccitt@Base 1.10.0 + crc16_ccitt_seed@Base 1.10.0 + crc16_plain_update@Base 1.10.0 + crc16_x25_ccitt@Base 1.10.0 + crc32_ccitt@Base 1.10.0 + crc32_ccitt_seed@Base 1.10.0 + crc32_ccitt_table_lookup@Base 1.10.0 + crc32_mpeg2_seed@Base 1.10.0 + crc32c_calculate@Base 1.10.0 + crc32c_calculate_no_swap@Base 1.10.0 + crc32c_table_lookup@Base 1.10.0 + crc7update@Base 1.10.0 + crc8_0x2F@Base 1.10.0 + crc_drm@Base 1.10.0 + format_size@Base 1.10.0 + get_cur_groupname@Base 1.10.0 + get_cur_username@Base 1.10.0 + init_process_policies@Base 1.10.0 + isdigit_string@Base 1.10.0 + isprint_string@Base 1.10.0 + mpa_bitrate@Base 1.10.0 + mpa_frequency@Base 1.10.0 + mpa_layer@Base 1.10.0 + mpa_padding@Base 1.10.0 + mpa_samples@Base 1.10.0 + mpa_version@Base 1.10.0 + relinquish_special_privs_perm@Base 1.10.0 + running_with_special_privs@Base 1.10.0 + started_with_special_privs@Base 1.10.0 + type_util_gdouble_to_guint64@Base 1.10.0 + type_util_guint64_to_gdouble@Base 1.10.0 + update_crc10_by_bytes@Base 1.10.0 + update_crc6_by_bytes@Base 1.10.0 + ws_add_crash_info@Base 1.10.0 diff -Nru wireshark-1.10.5/debian/patches/01-Use-GitVersion-to-fix-guide-creation.patch wireshark-1.10.6/debian/patches/01-Use-GitVersion-to-fix-guide-creation.patch --- wireshark-1.10.5/debian/patches/01-Use-GitVersion-to-fix-guide-creation.patch 1970-01-01 00:00:00.000000000 +0000 +++ wireshark-1.10.6/debian/patches/01-Use-GitVersion-to-fix-guide-creation.patch 2014-03-08 18:31:06.000000000 +0000 @@ -0,0 +1,62 @@ +From c49ddfc3f14c46ad43b028f8b982720ee8e43bbc Mon Sep 17 00:00:00 2001 +From: Balint Reczey +Date: Sat, 8 Mar 2014 19:30:24 +0100 +Subject: [PATCH] Use &GitVersion; to fix guide creation + +Change-Id: I4b268d5c7f371ce8b5420586f8ea3a2ff0dd302b +--- + docbook/developer-guide.xml | 6 +++--- + docbook/user-guide.xml | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/docbook/developer-guide.xml b/docbook/developer-guide.xml +index 1e03615..24f7c21 100644 +--- a/docbook/developer-guide.xml ++++ b/docbook/developer-guide.xml +@@ -28,7 +28,7 @@ DOCUMENT SECTION + --> + + Wireshark Developer's Guide"> +- ++ + + + +@@ -37,8 +37,8 @@ DOCUMENT SECTION + + + +- +- %SvnVersionFile; ++ ++ %GitVersionFile; + + Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.All logos and trademarks in this document are property of their respective owner."> + +diff --git a/docbook/user-guide.xml b/docbook/user-guide.xml +index ab0f4b3..ae9baac 100644 +--- a/docbook/user-guide.xml ++++ b/docbook/user-guide.xml +@@ -61,7 +61,7 @@ DOCUMENT SECTION + --> + + Wireshark User's Guide"> +- ++ + + + +@@ -73,8 +73,8 @@ DOCUMENT SECTION + + + +- +- %SvnVersionFile; ++ ++ %GitVersionFile; + Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.All logos and trademarks in this document are property of their respective owner."> + + + diff -Nru wireshark-1.10.5/diameter/chargecontrol.xml wireshark-1.10.6/diameter/chargecontrol.xml --- wireshark-1.10.5/diameter/chargecontrol.xml 2013-11-07 05:54:24.000000000 +0000 +++ wireshark-1.10.6/diameter/chargecontrol.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/diameter/ChinaTelecom.xml wireshark-1.10.6/diameter/ChinaTelecom.xml --- wireshark-1.10.5/diameter/ChinaTelecom.xml 2013-04-26 20:37:20.000000000 +0000 +++ wireshark-1.10.6/diameter/ChinaTelecom.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/diameter/Cisco.xml wireshark-1.10.6/diameter/Cisco.xml --- wireshark-1.10.5/diameter/Cisco.xml 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/diameter/Cisco.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/diameter/dictionary.xml wireshark-1.10.6/diameter/dictionary.xml --- wireshark-1.10.5/diameter/dictionary.xml 2013-10-29 21:46:26.000000000 +0000 +++ wireshark-1.10.6/diameter/dictionary.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/diameter/eap.xml wireshark-1.10.6/diameter/eap.xml --- wireshark-1.10.5/diameter/eap.xml 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/diameter/eap.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/diameter/Ericsson.xml wireshark-1.10.6/diameter/Ericsson.xml --- wireshark-1.10.5/diameter/Ericsson.xml 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/diameter/Ericsson.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/diameter/etsie2e4.xml wireshark-1.10.6/diameter/etsie2e4.xml --- wireshark-1.10.5/diameter/etsie2e4.xml 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/diameter/etsie2e4.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/diameter/gqpolicy.xml wireshark-1.10.6/diameter/gqpolicy.xml --- wireshark-1.10.5/diameter/gqpolicy.xml 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/diameter/gqpolicy.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/diameter/imscxdx.xml wireshark-1.10.6/diameter/imscxdx.xml --- wireshark-1.10.5/diameter/imscxdx.xml 2013-11-07 05:54:24.000000000 +0000 +++ wireshark-1.10.6/diameter/imscxdx.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/diameter/mobileipv4.xml wireshark-1.10.6/diameter/mobileipv4.xml --- wireshark-1.10.5/diameter/mobileipv4.xml 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/diameter/mobileipv4.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/diameter/mobileipv6.xml wireshark-1.10.6/diameter/mobileipv6.xml --- wireshark-1.10.5/diameter/mobileipv6.xml 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/diameter/mobileipv6.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/diameter/nasreq.xml wireshark-1.10.6/diameter/nasreq.xml --- wireshark-1.10.5/diameter/nasreq.xml 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/diameter/nasreq.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/diameter/NokiaSiemensNetworks.xml wireshark-1.10.6/diameter/NokiaSiemensNetworks.xml --- wireshark-1.10.5/diameter/NokiaSiemensNetworks.xml 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/diameter/NokiaSiemensNetworks.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ - + diff -Nru wireshark-1.10.5/diameter/Nokia.xml wireshark-1.10.6/diameter/Nokia.xml --- wireshark-1.10.5/diameter/Nokia.xml 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/diameter/Nokia.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ - + diff -Nru wireshark-1.10.5/diameter/sip.xml wireshark-1.10.6/diameter/sip.xml --- wireshark-1.10.5/diameter/sip.xml 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/diameter/sip.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/diameter/SKT.xml wireshark-1.10.6/diameter/SKT.xml --- wireshark-1.10.5/diameter/SKT.xml 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/diameter/SKT.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/diameter/sunping.xml wireshark-1.10.6/diameter/sunping.xml --- wireshark-1.10.5/diameter/sunping.xml 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/diameter/sunping.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/diameter/TGPPGmb.xml wireshark-1.10.6/diameter/TGPPGmb.xml --- wireshark-1.10.5/diameter/TGPPGmb.xml 2013-11-07 05:54:24.000000000 +0000 +++ wireshark-1.10.6/diameter/TGPPGmb.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ - + diff -Nru wireshark-1.10.5/diameter/TGPPRx.xml wireshark-1.10.6/diameter/TGPPRx.xml --- wireshark-1.10.5/diameter/TGPPRx.xml 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/diameter/TGPPRx.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/diameter/TGPPS9.xml wireshark-1.10.6/diameter/TGPPS9.xml --- wireshark-1.10.5/diameter/TGPPS9.xml 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/diameter/TGPPS9.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/diameter/TGPPSh.xml wireshark-1.10.6/diameter/TGPPSh.xml --- wireshark-1.10.5/diameter/TGPPSh.xml 2013-11-07 05:54:24.000000000 +0000 +++ wireshark-1.10.6/diameter/TGPPSh.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/diameter/Vodafone.xml wireshark-1.10.6/diameter/Vodafone.xml --- wireshark-1.10.5/diameter/Vodafone.xml 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/diameter/Vodafone.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/disabled_protos.c wireshark-1.10.6/disabled_protos.c --- wireshark-1.10.5/disabled_protos.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/disabled_protos.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* disabled_protos.c * Code for reading and writing the disabled protocols file. * - * $Id: disabled_protos.c 48797 2013-04-09 02:48:03Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/disabled_protos.h wireshark-1.10.6/disabled_protos.h --- wireshark-1.10.5/disabled_protos.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/disabled_protos.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* disabled_protos.h * Declarations of routines for reading and writing the disabled protocols file. * - * $Id: disabled_protos.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/doc/dfilter2pod.pl wireshark-1.10.6/doc/dfilter2pod.pl --- wireshark-1.10.5/doc/dfilter2pod.pl 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/dfilter2pod.pl 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ # will be replaced by the pod-formatted glossary # STDOUT is the output # -# $Id: dfilter2pod.pl 32766 2010-05-11 21:49:30Z jake $ +# $Id$ use Getopt::Std; diff -Nru wireshark-1.10.5/doc/eproto2sgml wireshark-1.10.6/doc/eproto2sgml --- wireshark-1.10.5/doc/eproto2sgml 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/eproto2sgml 2014-03-07 18:07:12.000000000 +0000 @@ -8,7 +8,7 @@ # will be replaced by the pod-formatted glossary # STDOUT is the output # -# $Id: eproto2sgml 18271 2006-05-31 19:12:15Z gerald $ +# $Id$ # Read all the data into memory while () { diff -Nru wireshark-1.10.5/doc/make-authors-format.pl wireshark-1.10.6/doc/make-authors-format.pl --- wireshark-1.10.5/doc/make-authors-format.pl 2013-04-22 21:38:17.000000000 +0000 +++ wireshark-1.10.6/doc/make-authors-format.pl 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: make-authors-format.pl 48991 2013-04-22 21:32:55Z gerald $ +# $Id$ # Convert AUTHORS-SHORT file for use in man page and HTML documentation # after processing through pod2man and pod2html. diff -Nru wireshark-1.10.5/doc/make-authors-short.pl wireshark-1.10.6/doc/make-authors-short.pl --- wireshark-1.10.5/doc/make-authors-short.pl 2013-04-22 21:38:17.000000000 +0000 +++ wireshark-1.10.6/doc/make-authors-short.pl 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: make-authors-short.pl 48991 2013-04-22 21:32:55Z gerald $ +# $Id$ # Remove tasks from individual author entries from AUTHORS file # for use in the about dialog. diff -Nru wireshark-1.10.5/doc/Makefile.am wireshark-1.10.6/doc/Makefile.am --- wireshark-1.10.5/doc/Makefile.am 2013-05-20 23:00:25.000000000 +0000 +++ wireshark-1.10.6/doc/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Wireshark documentation # -# $Id: Makefile.am 49467 2013-05-20 22:54:28Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/doc/Makefile.in wireshark-1.10.6/doc/Makefile.in --- wireshark-1.10.5/doc/Makefile.in 2013-12-19 19:13:43.000000000 +0000 +++ wireshark-1.10.6/doc/Makefile.in 2014-03-07 18:07:32.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for Wireshark documentation # -# $Id: Makefile.am 49467 2013-05-20 22:54:28Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/doc/Makefile.nmake wireshark-1.10.6/doc/Makefile.nmake --- wireshark-1.10.5/doc/Makefile.nmake 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.nmake # Nmake file for Wireshark documentation # -# $Id: Makefile.nmake 48133 2013-03-06 13:31:08Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/doc/perlnoutf.pl wireshark-1.10.6/doc/perlnoutf.pl --- wireshark-1.10.5/doc/perlnoutf.pl 2013-04-22 21:38:17.000000000 +0000 +++ wireshark-1.10.6/doc/perlnoutf.pl 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# $Id: perlnoutf.pl 48991 2013-04-22 21:32:55Z gerald $ +# $Id$ # Call another Perl script, passing our caller's arguments, with # environment variables unset so perl doesn't interpret bytes as UTF-8 diff -Nru wireshark-1.10.5/doc/randpkt.txt wireshark-1.10.6/doc/randpkt.txt --- wireshark-1.10.5/doc/randpkt.txt 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/randpkt.txt 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ Random Packet Generator ----------------------- -$Id: randpkt.txt 18271 2006-05-31 19:12:15Z gerald $ +$Id$ randpkt is a small utility creates a libpcap trace file full of random packets. You can control the number of packets, the maximum size of each packet, diff -Nru wireshark-1.10.5/doc/README.binarytrees wireshark-1.10.6/doc/README.binarytrees --- wireshark-1.10.5/doc/README.binarytrees 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/README.binarytrees 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.binarytrees 31812 2010-02-07 11:01:13Z stig $ +$Id$ 1. Introduction diff -Nru wireshark-1.10.5/doc/README.capture wireshark-1.10.6/doc/README.capture --- wireshark-1.10.5/doc/README.capture 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/README.capture 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.capture 33924 2010-08-25 20:30:59Z gerald $ +$Id$ This document is an attempt, to bring some light to the things done, when packet capturing is performed. There might be things missing, and others diff -Nru wireshark-1.10.5/doc/README.design wireshark-1.10.6/doc/README.design --- wireshark-1.10.5/doc/README.design 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/README.design 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.design 18271 2006-05-31 19:12:15Z gerald $ +$Id$ Unfortunately, the closest thing to a design document is the "README.developer" document in the "doc" directory of the Wireshark diff -Nru wireshark-1.10.5/doc/README.developer wireshark-1.10.6/doc/README.developer --- wireshark-1.10.5/doc/README.developer 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/README.developer 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ -$Revision: 48861 $ -$Date: 2013-04-15 14:43:40 -0700 (Mon, 15 Apr 2013) $ -$Author: eapache $ +$Revision$ +$Date$ +$Author$ Tabsize: 4 This file is a HOWTO for Wireshark developers. It describes how to start coding diff -Nru wireshark-1.10.5/doc/README.heuristic wireshark-1.10.6/doc/README.heuristic --- wireshark-1.10.5/doc/README.heuristic 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/README.heuristic 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ -$Revision: 47627 $ -$Date: 2013-02-10 18:42:41 -0800 (Sun, 10 Feb 2013) $ -$Author: guy $ +$Revision$ +$Date$ +$Author$ This file is a HOWTO for Wireshark developers. It describes how Wireshark diff -Nru wireshark-1.10.5/doc/README.idl2wrs wireshark-1.10.6/doc/README.idl2wrs --- wireshark-1.10.5/doc/README.idl2wrs 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/README.idl2wrs 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.idl2wrs 44021 2012-07-26 01:50:39Z cmaynard $ +$Id$ Copyright (C) 2001 Frank Singleton diff -Nru wireshark-1.10.5/doc/README.malloc wireshark-1.10.6/doc/README.malloc --- wireshark-1.10.5/doc/README.malloc 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/README.malloc 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.malloc 46472 2012-12-08 21:57:05Z eapache $ +$Id$ IMPORTANT NOTE: The emem interface (as described in this file) is gradually being diff -Nru wireshark-1.10.5/doc/README.packaging wireshark-1.10.6/doc/README.packaging --- wireshark-1.10.5/doc/README.packaging 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/README.packaging 2014-03-07 18:07:12.000000000 +0000 @@ -93,7 +93,7 @@ 4.1. Source-level version detection. -The SVN version corresponding to each release is in svnversion.h. It's +The Git version corresponding to each release is in version.h. It's defined as a string. If you need a numeric definition, let us know. 5. Trademarks. @@ -110,4 +110,4 @@ If you have a question not addressed here, send it to wireshark-dev@wireshark.org. -$Id: README.packaging 34311 2010-10-01 15:25:38Z gerald $ +$Id$ diff -Nru wireshark-1.10.5/doc/README.plugins wireshark-1.10.6/doc/README.plugins --- wireshark-1.10.5/doc/README.plugins 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/README.plugins 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.plugins 47992 2013-03-01 23:53:11Z rbalint $ +$Id$ 1. Plugins diff -Nru wireshark-1.10.5/doc/README.regression wireshark-1.10.6/doc/README.regression --- wireshark-1.10.5/doc/README.regression 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/README.regression 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # # Wireshark/TShark Regression Testing # -# $Id: README.regression 18271 2006-05-31 19:12:15Z gerald $ +# $Id$ # # This is a sample Makefile for regression testing of the # Wireshark engine. These tests use that uses 'tshark -V' to analyze all diff -Nru wireshark-1.10.5/doc/README.request_response_tracking wireshark-1.10.6/doc/README.request_response_tracking --- wireshark-1.10.5/doc/README.request_response_tracking 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/README.request_response_tracking 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.request_response_tracking 32793 2010-05-13 18:59:35Z morriss $ +$Id$ 1. Introduction diff -Nru wireshark-1.10.5/doc/README.stats_tree wireshark-1.10.6/doc/README.stats_tree --- wireshark-1.10.5/doc/README.stats_tree 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/README.stats_tree 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.stats_tree 47992 2013-03-01 23:53:11Z rbalint $ +$Id$ tapping with stats_tree Let's suppose that you want to write a tap only to keep counters, and you diff -Nru wireshark-1.10.5/doc/README.tapping wireshark-1.10.6/doc/README.tapping --- wireshark-1.10.5/doc/README.tapping 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/README.tapping 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.tapping 36480 2011-04-05 20:21:59Z cmaynard $ +$Id$ The TAP system in Wireshark is a powerful and flexible mechanism to get event driven notification on packets matching certain protocols and/or filters. diff -Nru wireshark-1.10.5/doc/README.wmem wireshark-1.10.6/doc/README.wmem --- wireshark-1.10.5/doc/README.wmem 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/README.wmem 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.wmem 48251 2013-03-11 19:17:26Z eapache $ +$Id$ 1. Introduction diff -Nru wireshark-1.10.5/doc/README.xml-output wireshark-1.10.6/doc/README.xml-output --- wireshark-1.10.5/doc/README.xml-output 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/doc/README.xml-output 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ Protocol Dissection in XML Format ================================= -$Id: README.xml-output 47259 2013-01-24 18:16:32Z gram $ +$Id$ Copyright (c) 2003 by Gilbert Ramirez diff -Nru wireshark-1.10.5/docbook/asciidoc.conf wireshark-1.10.6/docbook/asciidoc.conf --- wireshark-1.10.5/docbook/asciidoc.conf 2013-12-17 20:10:15.000000000 +0000 +++ wireshark-1.10.6/docbook/asciidoc.conf 2014-03-07 18:07:12.000000000 +0000 @@ -1,10 +1,10 @@ # AsciiDoc configuration for Wireshark -# $Id: asciidoc.conf 54192 2013-12-17 20:03:59Z gerald $ +# $Id$ [replacements] # Yes, this is a fake macro. -wireshark-version:\[\]=1.10.5 +wireshark-version:\[\]=1.10.6 [macros] diff -Nru wireshark-1.10.5/docbook/check_git_version.sh wireshark-1.10.6/docbook/check_git_version.sh --- wireshark-1.10.5/docbook/check_git_version.sh 1970-01-01 00:00:00.000000000 +0000 +++ wireshark-1.10.6/docbook/check_git_version.sh 2014-03-07 18:07:12.000000000 +0000 @@ -0,0 +1,44 @@ +#!/bin/bash +# +# Check for Git version +# +# $Id$ +# +# Wireshark - Network traffic analyzer +# By Gerald Combs +# Copyright 2005 Ulf Lamping +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if [ -d ../.git ] ; then + GIT_VERSION=`git describe --tags --dirty` +fi +echo '' > git_version_tmp.xml + +#echo -n ' git_version_tmp.xml +#[ -x svnversion ] && svnversion -n . >> git_version_tmp.xml +#echo '">' >> git_version_tmp.xml + +# /dev/null buries the output of the "cmp" command. +diff git_version.xml git_version_tmp.xml &> /dev/null + +if [ $? -ne 0 ] +then + cp git_version_tmp.xml git_version.xml +fi + +rm git_version_tmp.xml + diff -Nru wireshark-1.10.5/docbook/check_svn_version.sh wireshark-1.10.6/docbook/check_svn_version.sh --- wireshark-1.10.5/docbook/check_svn_version.sh 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/check_svn_version.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -#!/bin/bash -# -# Check for SVN version -# -# $Id: check_svn_version.sh 43536 2012-06-28 22:56:06Z darkjames $ -# -# Wireshark - Network traffic analyzer -# By Gerald Combs -# Copyright 2005 Ulf Lamping -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# - -echo -n ' svn_version_tmp.xml -[ -x svnversion ] && svnversion -n . >> svn_version_tmp.xml -echo '">' >> svn_version_tmp.xml - -# /dev/null buries the output of the "cmp" command. -diff svn_version.xml svn_version_tmp.xml &> /dev/null - -if [ $? -ne 0 ] -then - cp svn_version_tmp.xml svn_version.xml -fi - -rm svn_version_tmp.xml - diff -Nru wireshark-1.10.5/docbook/CMakeLists.txt wireshark-1.10.6/docbook/CMakeLists.txt --- wireshark-1.10.5/docbook/CMakeLists.txt 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/CMakeLists.txt 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -208,7 +208,7 @@ # user-guide.xml must be first in the list set(WSUG_SOURCE user-guide.xml - svn_version.xml + git_version.xml wsluarm ${WSUG_FILES} ${WSUG_GRAPHICS} @@ -217,14 +217,14 @@ # developer-guide.xml must be first in the list set(WSDG_SOURCE developer-guide.xml - svn_version.xml + git_version.xml ${WSDG_FILES} ${WSDG_GRAPHICS} ) set(RELEASE_NOTES_SOURCE release-notes.xml - svn_version.xml + git_version.xml ) set(WSLUA_MODULES @@ -246,11 +246,11 @@ ADD_CUSTOM_COMMAND( OUTPUT - svn_version.xml + git_version.xml COMMAND ${SH} - ${CMAKE_CURRENT_SOURCE_DIR}/check_svn_version.sh + ${CMAKE_CURRENT_SOURCE_DIR}/check_git_version.sh DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/check_svn_version.sh + ${CMAKE_CURRENT_SOURCE_DIR}/check_git_version.sh ) add_custom_target( diff -Nru wireshark-1.10.5/docbook/custom_layer_pdf.xsl wireshark-1.10.6/docbook/custom_layer_pdf.xsl --- wireshark-1.10.5/docbook/custom_layer_pdf.xsl 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/custom_layer_pdf.xsl 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ - + diff -Nru wireshark-1.10.5/docbook/developer-guide.xml wireshark-1.10.6/docbook/developer-guide.xml --- wireshark-1.10.5/docbook/developer-guide.xml 2013-04-22 19:57:17.000000000 +0000 +++ wireshark-1.10.6/docbook/developer-guide.xml 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ + - + This Document's License (GPL) As with the original license and documentation distributed with Wireshark, this document is covered by the GNU General Public diff -Nru wireshark-1.10.5/docbook/Makefile.am wireshark-1.10.6/docbook/Makefile.am --- wireshark-1.10.5/docbook/Makefile.am 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ # in several formats. # See the Readme.txt file for instructions. # -# $Id: Makefile.am 48307 2013-03-15 00:08:18Z gerald $ +# $Id$ # # formatting objects processor @@ -57,10 +57,10 @@ if HAVE_XSLTPROC -ALL_TARGETS=svn_version_check wsug wsdg release_notes +ALL_TARGETS=git_version_check wsug wsdg release_notes else # if we don't have XSLTPROC, there's nothing to do... -ALL_TARGETS=svn_version_check +ALL_TARGETS=git_version_check endif all: $(ALL_TARGETS) @@ -71,10 +71,10 @@ # FORCE is the portable version of .PHONY FORCE: -svn_version_check: FORCE - cat $(srcdir)/check_svn_version.sh | tr -d '\015' | /bin/bash +git_version_check: FORCE + cat $(srcdir)/check_git_version.sh | tr -d '\015' | /bin/bash -svn_version.xml: svn_version_check +git_version.xml: git_version_check # Wireshark User Guide if HAVE_FOP @@ -258,7 +258,7 @@ $(WSUG_SOURCE) \ $(WSDG_SOURCE) \ $(RELEASE_NOTES_SOURCE) \ - check_svn_version.sh \ + check_git_version.sh \ docbook.vcproj \ dfilter2xml.pl \ make-wsluarm.pl \ diff -Nru wireshark-1.10.5/docbook/Makefile.common wireshark-1.10.6/docbook/Makefile.common --- wireshark-1.10.5/docbook/Makefile.common 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Makefile.common 48307 2013-03-15 00:08:18Z gerald $ +# $Id$ # WSUG_FILES = \ wsug_src/WSUG_app_files.xml \ @@ -189,7 +189,7 @@ # user-guide.xml must be first in the list (to match $<) WSUG_SOURCE = \ user-guide.xml \ - svn_version.xml \ + git_version.xml \ GPL_appendix.xml \ custom_layer_pdf.xsl \ Makefile.common \ @@ -199,7 +199,7 @@ # developer-guide.xml must be first in the list (to match $<) WSDG_SOURCE = \ developer-guide.xml \ - svn_version.xml \ + git_version.xml \ GPL_appendix.xml \ custom_layer_pdf.xsl \ Makefile.common \ @@ -228,7 +228,7 @@ release_notes_chm \ release-notes.html \ release-notes.txt \ - svn_version.xml \ + git_version.xml \ user-guide.zip \ wsluarm diff -Nru wireshark-1.10.5/docbook/Makefile.in wireshark-1.10.6/docbook/Makefile.in --- wireshark-1.10.5/docbook/Makefile.in 2013-12-19 19:13:43.000000000 +0000 +++ wireshark-1.10.6/docbook/Makefile.in 2014-03-07 18:07:32.000000000 +0000 @@ -20,7 +20,7 @@ # in several formats. # See the Readme.txt file for instructions. # -# $Id: Makefile.am 48307 2013-03-15 00:08:18Z gerald $ +# $Id$ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -350,7 +350,7 @@ @HAVE_ELINKS_TRUE@HTML2TXT = $(ELINKS) -dump -dump-width 72 # -# $Id: Makefile.common 48307 2013-03-15 00:08:18Z gerald $ +# $Id$ # WSUG_FILES = \ wsug_src/WSUG_app_files.xml \ @@ -541,7 +541,7 @@ # user-guide.xml must be first in the list (to match $<) WSUG_SOURCE = \ user-guide.xml \ - svn_version.xml \ + git_version.xml \ GPL_appendix.xml \ custom_layer_pdf.xsl \ Makefile.common \ @@ -552,7 +552,7 @@ # developer-guide.xml must be first in the list (to match $<) WSDG_SOURCE = \ developer-guide.xml \ - svn_version.xml \ + git_version.xml \ GPL_appendix.xml \ custom_layer_pdf.xsl \ Makefile.common \ @@ -581,7 +581,7 @@ release_notes_chm \ release-notes.html \ release-notes.txt \ - svn_version.xml \ + git_version.xml \ user-guide.zip \ wsluarm @@ -604,8 +604,8 @@ ../epan/wslua/wslua_util.c # if we don't have XSLTPROC, there's nothing to do... -@HAVE_XSLTPROC_FALSE@ALL_TARGETS = svn_version_check -@HAVE_XSLTPROC_TRUE@ALL_TARGETS = svn_version_check wsug wsdg release_notes +@HAVE_XSLTPROC_FALSE@ALL_TARGETS = git_version_check +@HAVE_XSLTPROC_TRUE@ALL_TARGETS = git_version_check wsug wsdg release_notes @HAVE_FOP_FALSE@WSUG_TARGETS = wsug.validated wsug_html_chunked user-guide.html # Wireshark User Guide @@ -620,7 +620,7 @@ $(WSUG_SOURCE) \ $(WSDG_SOURCE) \ $(RELEASE_NOTES_SOURCE) \ - check_svn_version.sh \ + check_git_version.sh \ docbook.vcproj \ dfilter2xml.pl \ make-wsluarm.pl \ @@ -844,10 +844,10 @@ # FORCE is the portable version of .PHONY FORCE: -svn_version_check: FORCE - cat $(srcdir)/check_svn_version.sh | tr -d '\015' | /bin/bash +git_version_check: FORCE + cat $(srcdir)/check_git_version.sh | tr -d '\015' | /bin/bash -svn_version.xml: svn_version_check +git_version.xml: git_version_check wsug: $(WSUG_TARGETS) diff -Nru wireshark-1.10.5/docbook/Makefile.nmake wireshark-1.10.6/docbook/Makefile.nmake --- wireshark-1.10.5/docbook/Makefile.nmake 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ # ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake [target ...] # -# $Id: Makefile.nmake 48327 2013-03-15 21:18:16Z gerald $ +# $Id$ # ############### YOU SHOULDN'T HAVE TO EDIT ANYTHING BELOW THIS LINE! ################ @@ -33,10 +33,10 @@ .SUFFIXES: .fo .pdf # On every build, record the working copy revision string -# in svn_version.xml (if the svn version has changed). +# in git_version.xml (if the svn version has changed). # This is done during nmake "preprocessing" so that it's done *before* # nmake gets the date/time of the dependency file(s)]. -!IF [$(SH) ./check_svn_version.sh] +!IF [$(SH) ./check_git_version.sh] !ENDIF diff -Nru wireshark-1.10.5/docbook/make-wsluarm.pl wireshark-1.10.6/docbook/make-wsluarm.pl --- wireshark-1.10.5/docbook/make-wsluarm.pl 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/make-wsluarm.pl 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ # # (c) 2006, Luis E. Garcia Onatnon # -# $Id: make-wsluarm.pl 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/docbook/README.txt wireshark-1.10.6/docbook/README.txt --- wireshark-1.10.5/docbook/README.txt 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/README.txt 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.txt 48327 2013-03-15 21:18:16Z gerald $ +$Id$ This directory contains the source files needed to build the: diff -Nru wireshark-1.10.5/docbook/release-notes.asciidoc wireshark-1.10.6/docbook/release-notes.asciidoc --- wireshark-1.10.5/docbook/release-notes.asciidoc 2013-12-19 18:19:39.000000000 +0000 +++ wireshark-1.10.6/docbook/release-notes.asciidoc 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,4 @@ = Wireshark wireshark-version:[] Release Notes -// $Id: release-notes.asciidoc 54253 2013-12-19 17:40:32Z gerald $ == What is Wireshark? @@ -17,32 +16,78 @@ //* ws-salink:2013-11[] //* cve-idlink:2013-2486[] -// * ws-salink:2013-69[] -// + -// A dissector went awry. -// // Fixed in trunk: r00000 -// // Fixed in trunk-1.10: r00000 -// // Fixed in trunk-1.8: r00000 -// (ws-buglink:0000[]) -// + -// Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 -// + -// cve-idlink:2013-0000[] - +* ws-salink:2014-01[] ++ +The NFS dissector could crash. Discovered by Moshe Kaplan. +// Fixed in trunk: r54875 / gf4ab2b2 +// Fixed in trunk-1.10: g312f7e1 +// Fixed in trunk-1.8: g2fb9848 +(ws-buglink:9672[]) ++ +Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 ++ +cve-idlink:2014-2281[] + +* ws-salink:2014-02[] ++ +The M3UA dissector could crash. Discovered by Laurent Butti. +// Fixed in master: r51608 / ga8f4327 +// Fixed in master-1.10: gd3bd396 +(ws-buglink:9699[]) ++ +Versions affected: 1.10.0 to 1.10.5 ++ +cve-idlink:2014-2282[] + +* ws-salink:2014-03[] ++ +The RLC dissector could crash. +// Fixed in trunk: n/a +// Fixed in trunk-1.10: gd8075e7 +// Fixed in trunk-1.8: g217293b +(ws-buglink:9730[]) ++ +Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 ++ +cve-idlink:2014-2283[] + +* ws-salink:2014-04[] ++ +The MPEG file parser could overflow a buffer. Discovered by Wesley +Neelen. +// Fixed in trunk: n/a +// Fixed in trunk-1.10: g34144b8 +// Fixed in trunk-1.8: gf567435 +(ws-buglink:9843[]) ++ +Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 ++ +cve-idlink:2014-2299[] The following bugs have been fixed: //* Wireshark will practice the jazz flute for hours on end when you're trying to sleep. (ws-buglink:0000[]) -* Wireshark stops showing new packets but dumpcap keeps writing them to the temp file. (ws-buglink:9571[]) - -* Wireshark 1.10.4 shuts down when promiscuous mode is unchecked. (ws-buglink:9577[]) - -* Homeplug dissector bug: STATUS_ACCESS_VIOLATION: dissector accessed an invalid memory address. (ws-buglink:9578[]) +* Customized OUI is not recognized correctly during dissection. (ws-buglink:9122[]) +* Properly decode CAPWAP Data Keep-Alives. (ws-buglink:9165[]) +* Build failure with GTK 3.10 - GTK developers have gone insane. (ws-buglink:9340[]) +* SIGSEGV/SIGABRT during free of TvbRange using a chained dissector in lua. (ws-buglink:9483[]) +* MPLS dissector no longer registers itself in "ppp.protocol" table. (ws-buglink:9492[]) +* Tshark doesn't display the longer data fields (mbtcp). (ws-buglink:9572[]) +* DMX-CHAN disector does not clear strbuf between rows. (ws-buglink:9598[]) +* Dissector bug, protocol SDP: proto.c:4214: failed assertion "length >= 0". (ws-buglink:9633[]) +* False error: capture file appears to be damaged or corrupt. (ws-buglink:9634[]) +* SMPP field source_telematics_id field length different from spec. (ws-buglink:9649[]) +* Lua: bitop library is missing in Lua 5.2. (ws-buglink:9720[]) +* GTPv1-C / MM Context / Authentication quintuplet / RAND is not correct. (ws-buglink:9722[]) +* Lua: ProtoField.new() is buggy. (ws-buglink:9725[]) +* Lua: ProtoField.bool() VALUESTRING argument is not optional but was supposed to be. (ws-buglink:9728[]) +* Problem with CAPWAP Wireshark Dissector. (ws-buglink:9752[]) +* nas-eps dissector: CS Service notification dissection stops after Paging identity IE. (ws-buglink:9789[]) === New and Updated Features -There are no new features in this release. +IPv4 checksum verfification is now disabled by default. === New Protocol Support @@ -52,22 +97,33 @@ --sort-and-group-- -GSM BSSMAP -GSM BSSMAP LE -GSM SMS -Homeplug +AppleTalk +CAPWAP +GTPv1 +DMX-CHAN +DSI +DVB-CI +ESS +IEEE 802a +M3UA +Modbus/TCP NAS-EPS -SGSAP +NFS +OpenSafety +SDP +SMPP --sort-and-group-- === New and Updated Capture File Support -//--sort-and-group-- +--sort-and-group-- -There is no updated capture file support in this release. +libpcap +MPEG +pcap-ng -//--sort-and-group-- +--sort-and-group-- == Getting Wireshark diff -Nru wireshark-1.10.5/docbook/svn_version.xml wireshark-1.10.6/docbook/svn_version.xml --- wireshark-1.10.5/docbook/svn_version.xml 2013-12-19 19:28:48.000000000 +0000 +++ wireshark-1.10.6/docbook/svn_version.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ - diff -Nru wireshark-1.10.5/docbook/user-guide.xml wireshark-1.10.6/docbook/user-guide.xml --- wireshark-1.10.5/docbook/user-guide.xml 2013-04-22 19:57:17.000000000 +0000 +++ wireshark-1.10.6/docbook/user-guide.xml 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ + - + Introduction diff -Nru wireshark-1.10.5/docbook/wsdg_src/WSDG_chapter_capture.xml wireshark-1.10.6/docbook/wsdg_src/WSDG_chapter_capture.xml --- wireshark-1.10.5/docbook/wsdg_src/WSDG_chapter_capture.xml 2013-04-22 18:04:36.000000000 +0000 +++ wireshark-1.10.6/docbook/wsdg_src/WSDG_chapter_capture.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Packet capturing diff -Nru wireshark-1.10.5/docbook/wsdg_src/WSDG_chapter_dissection.xml wireshark-1.10.6/docbook/wsdg_src/WSDG_chapter_dissection.xml --- wireshark-1.10.5/docbook/wsdg_src/WSDG_chapter_dissection.xml 2013-04-22 18:04:36.000000000 +0000 +++ wireshark-1.10.6/docbook/wsdg_src/WSDG_chapter_dissection.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Packet dissection diff -Nru wireshark-1.10.5/docbook/wsdg_src/WSDG_chapter_env_intro.xml wireshark-1.10.6/docbook/wsdg_src/WSDG_chapter_env_intro.xml --- wireshark-1.10.5/docbook/wsdg_src/WSDG_chapter_env_intro.xml 2013-04-22 18:04:36.000000000 +0000 +++ wireshark-1.10.6/docbook/wsdg_src/WSDG_chapter_env_intro.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Introduction diff -Nru wireshark-1.10.5/docbook/wsdg_src/WSDG_chapter_libraries.xml wireshark-1.10.6/docbook/wsdg_src/WSDG_chapter_libraries.xml --- wireshark-1.10.5/docbook/wsdg_src/WSDG_chapter_libraries.xml 2013-04-22 18:04:36.000000000 +0000 +++ wireshark-1.10.6/docbook/wsdg_src/WSDG_chapter_libraries.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Library Reference diff -Nru wireshark-1.10.5/docbook/wsdg_src/WSDG_chapter_quick_setup.xml wireshark-1.10.6/docbook/wsdg_src/WSDG_chapter_quick_setup.xml --- wireshark-1.10.5/docbook/wsdg_src/WSDG_chapter_quick_setup.xml 2013-04-22 18:04:36.000000000 +0000 +++ wireshark-1.10.6/docbook/wsdg_src/WSDG_chapter_quick_setup.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Quick Setup diff -Nru wireshark-1.10.5/docbook/wsdg_src/WSDG_chapter_sources.xml wireshark-1.10.6/docbook/wsdg_src/WSDG_chapter_sources.xml --- wireshark-1.10.5/docbook/wsdg_src/WSDG_chapter_sources.xml 2013-04-22 18:04:36.000000000 +0000 +++ wireshark-1.10.6/docbook/wsdg_src/WSDG_chapter_sources.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Work with the Wireshark sources @@ -1051,7 +1051,7 @@ - Verify that that file is complete (has Wireshark boilerplate, $Id: WSDG_chapter_sources.xml 48110 2013-03-05 22:26:03Z morriss $, etc). + Verify that that file is complete (has Wireshark boilerplate, $Id$, etc). diff -Nru wireshark-1.10.5/docbook/wsdg_src/WSDG_chapter_tools.xml wireshark-1.10.6/docbook/wsdg_src/WSDG_chapter_tools.xml --- wireshark-1.10.5/docbook/wsdg_src/WSDG_chapter_tools.xml 2013-04-22 18:04:36.000000000 +0000 +++ wireshark-1.10.6/docbook/wsdg_src/WSDG_chapter_tools.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Tool Reference
diff -Nru wireshark-1.10.5/docbook/wsdg_src/WSDG_chapter_userinterface.xml wireshark-1.10.6/docbook/wsdg_src/WSDG_chapter_userinterface.xml --- wireshark-1.10.5/docbook/wsdg_src/WSDG_chapter_userinterface.xml 2013-04-22 18:04:36.000000000 +0000 +++ wireshark-1.10.6/docbook/wsdg_src/WSDG_chapter_userinterface.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@  - + User Interface diff -Nru wireshark-1.10.5/docbook/wsdg_src/WSDG_chapter_works.xml wireshark-1.10.6/docbook/wsdg_src/WSDG_chapter_works.xml --- wireshark-1.10.5/docbook/wsdg_src/WSDG_chapter_works.xml 2013-04-22 18:04:36.000000000 +0000 +++ wireshark-1.10.6/docbook/wsdg_src/WSDG_chapter_works.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + How Wireshark Works diff -Nru wireshark-1.10.5/docbook/wsdg_src/WSDG_meta_info.xml wireshark-1.10.6/docbook/wsdg_src/WSDG_meta_info.xml --- wireshark-1.10.5/docbook/wsdg_src/WSDG_meta_info.xml 2013-04-22 18:04:36.000000000 +0000 +++ wireshark-1.10.6/docbook/wsdg_src/WSDG_meta_info.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ - + <inlinegraphic entityref="WiresharkLogo" valign="middle" format="PNG"/> &DocumentTitle; diff -Nru wireshark-1.10.5/docbook/wsdg_src/WSDG_preface.xml wireshark-1.10.6/docbook/wsdg_src/WSDG_preface.xml --- wireshark-1.10.5/docbook/wsdg_src/WSDG_preface.xml 2013-04-22 18:04:36.000000000 +0000 +++ wireshark-1.10.6/docbook/wsdg_src/WSDG_preface.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ - + Preface diff -Nru wireshark-1.10.5/docbook/wsluarm.xml wireshark-1.10.6/docbook/wsluarm.xml --- wireshark-1.10.5/docbook/wsluarm.xml 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/wsluarm.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ - + Lua Support in Wireshark
diff -Nru wireshark-1.10.5/docbook/wsug_src/WSUG_app_files.xml wireshark-1.10.6/docbook/wsug_src/WSUG_app_files.xml --- wireshark-1.10.5/docbook/wsug_src/WSUG_app_files.xml 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/wsug_src/WSUG_app_files.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Files and Folders diff -Nru wireshark-1.10.5/docbook/wsug_src/WSUG_app_howitworks.xml wireshark-1.10.6/docbook/wsug_src/WSUG_app_howitworks.xml --- wireshark-1.10.5/docbook/wsug_src/WSUG_app_howitworks.xml 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/wsug_src/WSUG_app_howitworks.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + How Wireshark Works diff -Nru wireshark-1.10.5/docbook/wsug_src/WSUG_app_messages.xml wireshark-1.10.6/docbook/wsug_src/WSUG_app_messages.xml --- wireshark-1.10.5/docbook/wsug_src/WSUG_app_messages.xml 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/wsug_src/WSUG_app_messages.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Wireshark Messages diff -Nru wireshark-1.10.5/docbook/wsug_src/WSUG_app_protocols.xml wireshark-1.10.6/docbook/wsug_src/WSUG_app_protocols.xml --- wireshark-1.10.5/docbook/wsug_src/WSUG_app_protocols.xml 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/wsug_src/WSUG_app_protocols.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Protocols and Protocol Fields diff -Nru wireshark-1.10.5/docbook/wsug_src/WSUG_app_tools.xml wireshark-1.10.6/docbook/wsug_src/WSUG_app_tools.xml --- wireshark-1.10.5/docbook/wsug_src/WSUG_app_tools.xml 2013-04-22 19:57:17.000000000 +0000 +++ wireshark-1.10.6/docbook/wsug_src/WSUG_app_tools.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Related command line tools diff -Nru wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_advanced.xml wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_advanced.xml --- wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_advanced.xml 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_advanced.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Advanced Topics
diff -Nru wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_build_install.xml wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_build_install.xml --- wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_build_install.xml 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_build_install.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Building and Installing Wireshark diff -Nru wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_capture.xml wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_capture.xml --- wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_capture.xml 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_capture.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@  - + Capturing Live Network Data diff -Nru wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_customize.xml wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_customize.xml --- wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_customize.xml 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_customize.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Customizing Wireshark diff -Nru wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_introduction.xml wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_introduction.xml --- wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_introduction.xml 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_introduction.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Introduction diff -Nru wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_io.xml wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_io.xml --- wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_io.xml 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_io.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + File Input / Output and Printing diff -Nru wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_statistics.xml wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_statistics.xml --- wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_statistics.xml 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_statistics.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Statistics diff -Nru wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_telephony.xml wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_telephony.xml --- wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_telephony.xml 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_telephony.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Telephony diff -Nru wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_troubleshoot.xml wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_troubleshoot.xml --- wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_troubleshoot.xml 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_troubleshoot.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Troubleshooting with <application>Wireshark</application> diff -Nru wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_use.xml wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_use.xml --- wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_use.xml 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_use.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@  - + User Interface diff -Nru wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_work.xml wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_work.xml --- wireshark-1.10.5/docbook/wsug_src/WSUG_chapter_work.xml 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/wsug_src/WSUG_chapter_work.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Working with captured packets diff -Nru wireshark-1.10.5/docbook/wsug_src/WSUG_meta_info.xml wireshark-1.10.6/docbook/wsug_src/WSUG_meta_info.xml --- wireshark-1.10.5/docbook/wsug_src/WSUG_meta_info.xml 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/wsug_src/WSUG_meta_info.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ - + <inlinegraphic entityref="WiresharkLogo" valign="middle" format="PNG"/> &DocumentTitle; diff -Nru wireshark-1.10.5/docbook/wsug_src/WSUG_preface.xml wireshark-1.10.6/docbook/wsug_src/WSUG_preface.xml --- wireshark-1.10.5/docbook/wsug_src/WSUG_preface.xml 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/docbook/wsug_src/WSUG_preface.xml 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ - + Preface diff -Nru wireshark-1.10.5/doxygen.cfg.in wireshark-1.10.6/doxygen.cfg.in --- wireshark-1.10.5/doxygen.cfg.in 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/doxygen.cfg.in 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: doxygen.cfg.in 41594 2012-03-16 03:39:51Z guy $ +# $Id$ # @configure_input@ # The PROJECT_NAME tag is a single word (or a sequence of words surrounded diff -Nru wireshark-1.10.5/dtds/dc.dtd wireshark-1.10.6/dtds/dc.dtd --- wireshark-1.10.5/dtds/dc.dtd 2013-04-22 18:05:20.000000000 +0000 +++ wireshark-1.10.6/dtds/dc.dtd 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ diff -Nru wireshark-1.10.5/dtds/presence.dtd wireshark-1.10.6/dtds/presence.dtd --- wireshark-1.10.5/dtds/presence.dtd 2013-04-22 18:05:20.000000000 +0000 +++ wireshark-1.10.6/dtds/presence.dtd 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ media="application/cpim-pidf+xml" hierarchy="yes" ?> diff -Nru wireshark-1.10.5/dtds/reginfo.dtd wireshark-1.10.6/dtds/reginfo.dtd --- wireshark-1.10.5/dtds/reginfo.dtd 2013-04-22 18:05:20.000000000 +0000 +++ wireshark-1.10.6/dtds/reginfo.dtd 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ hierarchy="yes" ?> diff -Nru wireshark-1.10.5/dtds/rlmi.dtd wireshark-1.10.6/dtds/rlmi.dtd --- wireshark-1.10.5/dtds/rlmi.dtd 2013-04-22 18:05:20.000000000 +0000 +++ wireshark-1.10.6/dtds/rlmi.dtd 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ hierarchy="yes" ?> diff -Nru wireshark-1.10.5/dtds/rss.dtd wireshark-1.10.6/dtds/rss.dtd --- wireshark-1.10.5/dtds/rss.dtd 2013-04-22 18:05:20.000000000 +0000 +++ wireshark-1.10.6/dtds/rss.dtd 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ diff -Nru wireshark-1.10.5/dtds/xcap-caps.dtd wireshark-1.10.6/dtds/xcap-caps.dtd --- wireshark-1.10.5/dtds/xcap-caps.dtd 2013-04-22 18:05:20.000000000 +0000 +++ wireshark-1.10.6/dtds/xcap-caps.dtd 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ hierarchy="yes" ?> diff -Nru wireshark-1.10.5/dtds/xcap-error.dtd wireshark-1.10.6/dtds/xcap-error.dtd --- wireshark-1.10.5/dtds/xcap-error.dtd 2013-04-22 18:05:20.000000000 +0000 +++ wireshark-1.10.6/dtds/xcap-error.dtd 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ description="XCAP Error XML doc (RFC 4825)" hierarchy="yes" ?> @@ -443,7 +443,7 @@ "Dumpcap " VERSION "%s\n" "Capture network packets and dump them into a pcapng file.\n" "See http://www.wireshark.org for more information.\n", - wireshark_svnversion); + wireshark_gitversion); } else { output = stderr; } @@ -523,7 +523,7 @@ "%s\n" "%s\n" "See http://www.wireshark.org for more information.\n", - wireshark_svnversion, get_copyright_info(), comp_info_str->str, runtime_info_str->str); + wireshark_gitversion, get_copyright_info(), comp_info_str->str, runtime_info_str->str); } /* @@ -2829,7 +2829,7 @@ os_info_str = g_string_new(""); get_os_version_info(os_info_str); - g_snprintf(appname, sizeof(appname), "Dumpcap " VERSION "%s", wireshark_svnversion); + g_snprintf(appname, sizeof(appname), "Dumpcap " VERSION "%s", wireshark_gitversion); successful = libpcap_write_session_header_block(libpcap_write_to_file, ld->pdh, NULL, /* Comment*/ NULL, /* HW*/ @@ -3322,7 +3322,7 @@ os_info_str = g_string_new(""); get_os_version_info(os_info_str); - g_snprintf(appname, sizeof(appname), "Dumpcap " VERSION "%s", wireshark_svnversion); + g_snprintf(appname, sizeof(appname), "Dumpcap " VERSION "%s", wireshark_gitversion); successful = libpcap_write_session_header_block(libpcap_write_to_file, global_ld.pdh, NULL, /* Comment */ NULL, /* HW */ @@ -4166,7 +4166,7 @@ "%s" "\n" "%s", - wireshark_svnversion, comp_info_str->str, runtime_info_str->str); + wireshark_gitversion, comp_info_str->str, runtime_info_str->str); #ifdef _WIN32 arg_list_utf_16to8(argc, argv); diff -Nru wireshark-1.10.5/editcap.c wireshark-1.10.6/editcap.c --- wireshark-1.10.5/editcap.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/editcap.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ * * Copyright 2013, Richard Sharpe * - * $Id: editcap.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -93,7 +93,7 @@ #undef WS_BUILD_DLL #define RESET_SYMBOL_EXPORT -#include "svnversion.h" +#include "version.h" #include "ringbuffer.h" /* For RINGBUFFER_MAX_NUM_FILES */ @@ -692,9 +692,9 @@ else output = stderr; - fprintf(output, "Editcap %s" -#ifdef SVNVERSION - " (" SVNVERSION " from " SVNPATH ")" + fprintf(output, "Editcap %s" +#ifdef GITVERSION + " (" GITVERSION " from " GITBRANCH ")" #endif "\n", VERSION); fprintf(output, "Edit and/or translate the format of capture files.\n"); diff -Nru wireshark-1.10.5/epan/addr_and_mask.c wireshark-1.10.6/epan/addr_and_mask.c --- wireshark-1.10.5/epan/addr_and_mask.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/addr_and_mask.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines to fetch IPv4 and IPv6 addresses from a tvbuff and then mask * out bits other than those covered by a prefix length * - * $Id: addr_and_mask.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/addr_and_mask.h wireshark-1.10.6/epan/addr_and_mask.h --- wireshark-1.10.5/epan/addr_and_mask.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/addr_and_mask.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Declarations of routines to fetch IPv4 and IPv6 addresses from a tvbuff * and then mask out bits other than those covered by a prefix length * - * $Id: addr_and_mask.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/address.h wireshark-1.10.6/epan/address.h --- wireshark-1.10.5/epan/address.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/address.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for structures storing addresses, and for the type of * variables holding port-type values * - * $Id: address.h 48605 2013-03-28 03:06:30Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/address_to_str.c wireshark-1.10.6/epan/address_to_str.c --- wireshark-1.10.5/epan/address_to_str.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/address_to_str.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* address_to_str.c * Routines for utilities to convert addresses to strings. * - * $Id: address_to_str.c 48312 2013-03-15 05:42:50Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/addr_resolv.c wireshark-1.10.6/epan/addr_resolv.c --- wireshark-1.10.5/epan/addr_resolv.c 2013-07-17 01:24:19.000000000 +0000 +++ wireshark-1.10.6/epan/addr_resolv.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* addr_resolv.c * Routines for network object lookup * - * $Id: addr_resolv.c 50687 2013-07-17 01:18:54Z gerald $ + * $Id$ * * Laurent Deniel * diff -Nru wireshark-1.10.5/epan/addr_resolv.h wireshark-1.10.6/epan/addr_resolv.h --- wireshark-1.10.5/epan/addr_resolv.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/addr_resolv.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* addr_resolv.h * Definitions for network object lookup * - * $Id: addr_resolv.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Laurent Deniel * diff -Nru wireshark-1.10.5/epan/adler32.c wireshark-1.10.6/epan/adler32.c --- wireshark-1.10.5/epan/adler32.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/adler32.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * 2003 Tomas Kukosa * Based on code from RFC 1950 (Chapter 9. Appendix: Sample code) * - * $Id: adler32.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/adler32.h wireshark-1.10.6/epan/adler32.h --- wireshark-1.10.5/epan/adler32.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/adler32.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Compute the Adler32 checksum (RFC 1950) * 2003 Tomas Kukosa * - * $Id: adler32.h 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/afn.c wireshark-1.10.6/epan/afn.c --- wireshark-1.10.5/epan/afn.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/afn.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* afn.c * RFC 1700 address family numbers * - * $Id: afn.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/afn.h wireshark-1.10.6/epan/afn.h --- wireshark-1.10.5/epan/afn.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/afn.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* afn.h * RFC 1700 address family numbers * - * $Id: afn.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/aftypes.h wireshark-1.10.6/epan/aftypes.h --- wireshark-1.10.5/epan/aftypes.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/aftypes.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * AF_ values on various OSes; they're used in some network protocols, as * well as in BSD DLT_NULL and DLT_LOOP headers. * - * $Id: aftypes.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/arcnet_pids.h wireshark-1.10.6/epan/arcnet_pids.h --- wireshark-1.10.5/epan/arcnet_pids.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/arcnet_pids.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * ARCNET protocol ID values * Copyright 2001-2002, Peter Fales * - * $Id: arcnet_pids.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/arptypes.h wireshark-1.10.6/epan/arptypes.h --- wireshark-1.10.5/epan/arptypes.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/arptypes.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* arptypes.h * Declarations of ARP address types. * - * $Id: arptypes.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/asm_utils.c wireshark-1.10.6/epan/asm_utils.c --- wireshark-1.10.5/epan/asm_utils.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/asm_utils.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* asm_utils.c * Functions optionally implemented in assembler * - * $Id: asm_utils.c 48338 2013-03-16 08:52:09Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/asm_utils.h wireshark-1.10.6/epan/asm_utils.h --- wireshark-1.10.5/epan/asm_utils.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/asm_utils.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* asm_utils.h * Functions optionally implemented in assembler * - * $Id: asm_utils.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/asm_utils_win32_x86.asm wireshark-1.10.6/epan/asm_utils_win32_x86.asm --- wireshark-1.10.5/epan/asm_utils_win32_x86.asm 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/asm_utils_win32_x86.asm 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ ; asm_utils_win32_x86.asm ; Functions optionally implemented in assembler ; -; $Id: asm_utils_win32_x86.asm 43536 2012-06-28 22:56:06Z darkjames $ +; $Id$ ; ; Wireshark - Network traffic analyzer ; By Gerald Combs diff -Nru wireshark-1.10.5/epan/asn1.c wireshark-1.10.6/epan/asn1.c --- wireshark-1.10.5/epan/asn1.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/asn1.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Common routines for ASN.1 * 2007 Anders Broman * - * $Id: asn1.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/asn1.h wireshark-1.10.6/epan/asn1.h --- wireshark-1.10.5/epan/asn1.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/asn1.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Common data for ASN.1 * 2007 Anders Broman * - * $Id: asn1.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/atalk-utils.c wireshark-1.10.6/epan/atalk-utils.c --- wireshark-1.10.5/epan/atalk-utils.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/atalk-utils.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* atalk-utils.c * Routines for Appletalk utilities (DDP, currently). * - * $Id: atalk-utils.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Simon Wilkinson * diff -Nru wireshark-1.10.5/epan/atalk-utils.h wireshark-1.10.6/epan/atalk-utils.h --- wireshark-1.10.5/epan/atalk-utils.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/atalk-utils.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* atalk-utils.h * Definitions for Appletalk utilities (DDP, currently). * - * $Id: atalk-utils.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/epan/ax25_pids.h wireshark-1.10.6/epan/ax25_pids.h --- wireshark-1.10.5/epan/ax25_pids.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/ax25_pids.h 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Protocol IDs for Amateur Packet Radio protocol dissection * Copyright 2005,2006,2007,2008,2009,2010,2012 R.W. Stearn * - * $Id: ax25_pids.h 46365 2012-12-04 14:23:53Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/base64.c wireshark-1.10.6/epan/base64.c --- wireshark-1.10.5/epan/base64.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/base64.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* base64.c * Base-64 conversion * - * $Id: base64.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/base64.h wireshark-1.10.6/epan/base64.h --- wireshark-1.10.5/epan/base64.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/base64.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* base64.h * Base-64 conversion * - * $Id: base64.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/bitswap.c wireshark-1.10.6/epan/bitswap.c --- wireshark-1.10.5/epan/bitswap.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/bitswap.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* bitswap.c * Table of bit-swapped values of bytes * - * $Id: bitswap.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/bitswap.h wireshark-1.10.6/epan/bitswap.h --- wireshark-1.10.5/epan/bitswap.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/bitswap.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* bitswap.h * Macro to bitswap a byte by looking it up in a table * - * $Id: bitswap.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/bridged_pids.h wireshark-1.10.6/epan/bridged_pids.h --- wireshark-1.10.5/epan/bridged_pids.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/bridged_pids.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions of protocol IDs for the 00-80-C2 OUI, used for * bridging various networks over ATM (RFC 2684) or Frame Relay (RFC 2427). * - * $Id: bridged_pids.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/camel-persistentdata.c wireshark-1.10.6/epan/camel-persistentdata.c --- wireshark-1.10.5/epan/camel-persistentdata.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/camel-persistentdata.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * for calculation of delays in camel calls * Copyright 2006 Florent Drouin * - * $Id: camel-persistentdata.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/camel-persistentdata.h wireshark-1.10.6/epan/camel-persistentdata.h --- wireshark-1.10.5/epan/camel-persistentdata.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/camel-persistentdata.h 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * for calculation of delays in camel-transactions * Copyright 2006 Florent Drouin * - * $Id: camel-persistentdata.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/charsets.c wireshark-1.10.6/epan/charsets.c --- wireshark-1.10.5/epan/charsets.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/charsets.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* charsets.c * Routines for handling character sets * - * $Id: charsets.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/charsets.h wireshark-1.10.6/epan/charsets.h --- wireshark-1.10.5/epan/charsets.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/charsets.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* charsets.h * Routines for handling character sets * - * $Id: charsets.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/chdlctypes.h wireshark-1.10.6/epan/chdlctypes.h --- wireshark-1.10.5/epan/chdlctypes.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/chdlctypes.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* chdlctypes.h * Defines Cisco HDLC packet types that aren't just Ethernet types * - * $Id: chdlctypes.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/circuit.c wireshark-1.10.6/epan/circuit.c --- wireshark-1.10.5/epan/circuit.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/circuit.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* circuit.c * Routines for building lists of packets that are part of a "circuit" * - * $Id: circuit.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/circuit.h wireshark-1.10.6/epan/circuit.h --- wireshark-1.10.5/epan/circuit.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/circuit.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* circuit.h * Routines for building lists of packets that are part of a "circuit" * - * $Id: circuit.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/CMakeLists.txt wireshark-1.10.6/epan/CMakeLists.txt --- wireshark-1.10.5/epan/CMakeLists.txt 2013-09-10 15:45:17.000000000 +0000 +++ wireshark-1.10.6/epan/CMakeLists.txt 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 51931 2013-09-10 15:39:51Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -1549,7 +1549,7 @@ ${LIBWIRESHARK_ASM_FILES} ) -add_dependencies(epan svnversion) +add_dependencies(epan gitversion) set(FULL_SO_VERSION "3.1.1") diff -Nru wireshark-1.10.5/epan/codecs.c wireshark-1.10.6/epan/codecs.c --- wireshark-1.10.5/epan/codecs.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/codecs.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* codecs.c * codecs interface 2007 Tomas Kukosa * - * $Id: codecs.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/codecs.h wireshark-1.10.6/epan/codecs.h --- wireshark-1.10.5/epan/codecs.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/codecs.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* codecs.h * codecs interface 2007 Tomas Kukosa * - * $Id: codecs.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/column.c wireshark-1.10.6/epan/column.c --- wireshark-1.10.5/epan/column.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/column.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* column.c * Routines for handling column preferences * - * $Id: column.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/column.h wireshark-1.10.6/epan/column.h --- wireshark-1.10.5/epan/column.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/column.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* column.h * Definitions for column handling routines * - * $Id: column.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/column_info.h wireshark-1.10.6/epan/column_info.h --- wireshark-1.10.5/epan/column_info.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/column_info.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* column_info.h * Definitions for column structures and routines * - * $Id: column_info.h 44750 2012-09-03 15:12:49Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/column-utils.c wireshark-1.10.6/epan/column-utils.c --- wireshark-1.10.5/epan/column-utils.c 2013-06-04 21:46:29.000000000 +0000 +++ wireshark-1.10.6/epan/column-utils.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* column-utils.c * Routines for column utilities. * - * $Id: column-utils.c 49777 2013-06-04 21:40:58Z sake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/column-utils.h wireshark-1.10.6/epan/column-utils.h --- wireshark-1.10.5/epan/column-utils.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/column-utils.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* column-utils.h * Definitions for column utility structures and routines * - * $Id: column-utils.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/conversation.c wireshark-1.10.6/epan/conversation.c --- wireshark-1.10.5/epan/conversation.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/conversation.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* conversation.c * Routines for building lists of packets that are part of a "conversation" * - * $Id: conversation.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/conversation.h wireshark-1.10.6/epan/conversation.h --- wireshark-1.10.5/epan/conversation.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/conversation.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* conversation.h * Routines for building lists of packets that are part of a "conversation" * - * $Id: conversation.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/conv_id.h wireshark-1.10.6/epan/conv_id.h --- wireshark-1.10.5/epan/conv_id.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/conv_id.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* conv_id.h * conv_id 2011 Robert Bullen * - * $Id: conv_id.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/crc16-tvb.c wireshark-1.10.6/epan/crc16-tvb.c --- wireshark-1.10.5/epan/crc16-tvb.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/crc16-tvb.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * 2004 Richard van der Hoff * - * $Id: crc16-tvb.c 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/crc16-tvb.h wireshark-1.10.6/epan/crc16-tvb.h --- wireshark-1.10.5/epan/crc16-tvb.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/crc16-tvb.h 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * 2004 Richard van der Hoff * - * $Id: crc16-tvb.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/crc32-tvb.c wireshark-1.10.6/epan/crc32-tvb.c --- wireshark-1.10.5/epan/crc32-tvb.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/crc32-tvb.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* crc32-tvb.c * CRC-32 tvbuff routines * - * $Id: crc32-tvb.c 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/crc32-tvb.h wireshark-1.10.6/epan/crc32-tvb.h --- wireshark-1.10.5/epan/crc32-tvb.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/crc32-tvb.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* crc32-tvb.h * Declaration of CRC-32 tvbuff routines * - * $Id: crc32-tvb.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/crc8-tvb.c wireshark-1.10.6/epan/crc8-tvb.c --- wireshark-1.10.5/epan/crc8-tvb.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/crc8-tvb.c 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * 2011 Hans-Christoph Schemmel * * - * $Id: crc8-tvb.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/crc8-tvb.h wireshark-1.10.6/epan/crc8-tvb.h --- wireshark-1.10.5/epan/crc8-tvb.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/crc8-tvb.h 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * 2011 Hans-Christoph Schemmel * * - * $Id: crc8-tvb.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/crypt/aes.c wireshark-1.10.6/epan/crypt/aes.c --- wireshark-1.10.5/epan/crypt/aes.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/aes.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copied from airpdcap_rijndael.c and broken out into its own file * - * $Id: aes.c 40511 2012-01-15 12:29:44Z jmayer $ + * $Id$ * * @version 3.0 (December 2000) * diff -Nru wireshark-1.10.5/epan/crypt/aes.h wireshark-1.10.6/epan/crypt/aes.h --- wireshark-1.10.5/epan/crypt/aes.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/aes.h 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copied from airpdcap_rijndael.h * - * $Id: aes.h 40511 2012-01-15 12:29:44Z jmayer $ + * $Id$ * * @version 3.0 (December 2000) * diff -Nru wireshark-1.10.5/epan/crypt/airpdcap.c wireshark-1.10.6/epan/crypt/airpdcap.c --- wireshark-1.10.5/epan/crypt/airpdcap.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/airpdcap.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* airpdcap.c * - * $Id: airpdcap.c 48308 2013-03-15 01:31:53Z mmann $ + * $Id$ * Copyright (c) 2006 CACE Technologies, Davis (California) * All rights reserved. * diff -Nru wireshark-1.10.5/epan/crypt/airpdcap_ccmp.c wireshark-1.10.6/epan/crypt/airpdcap_ccmp.c --- wireshark-1.10.5/epan/crypt/airpdcap_ccmp.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/airpdcap_ccmp.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* airpdcap_ccmp.c * - * $Id: airpdcap_ccmp.c 40511 2012-01-15 12:29:44Z jmayer $ + * $Id$ * * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting * Copyright (c) 2006 CACE Technologies, Davis (California) diff -Nru wireshark-1.10.5/epan/crypt/airpdcap_debug.c wireshark-1.10.6/epan/crypt/airpdcap_debug.c --- wireshark-1.10.5/epan/crypt/airpdcap_debug.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/airpdcap_debug.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* airpdcap_debug.c * - * $Id: airpdcap_debug.c 47309 2013-01-26 21:21:25Z eapache $ + * $Id$ * * Copyright (c) 2006 CACE Technologies, Davis (California) * All rights reserved. diff -Nru wireshark-1.10.5/epan/crypt/airpdcap_debug.h wireshark-1.10.6/epan/crypt/airpdcap_debug.h --- wireshark-1.10.5/epan/crypt/airpdcap_debug.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/airpdcap_debug.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* airpcap_debug.h * - * $Id: airpdcap_debug.h 47309 2013-01-26 21:21:25Z eapache $ + * $Id$ * * Copyright (c) 2006 CACE Technologies, Davis (California) * All rights reserved. diff -Nru wireshark-1.10.5/epan/crypt/airpdcap_interop.h wireshark-1.10.6/epan/crypt/airpdcap_interop.h --- wireshark-1.10.5/epan/crypt/airpdcap_interop.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/airpdcap_interop.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* airpdcap_interop.h * - * $Id: airpdcap_interop.h 24599 2008-03-10 17:20:15Z gerald $ + * $Id$ * * Copyright (c) 2006 CACE Technologies, Davis (California) * All rights reserved. diff -Nru wireshark-1.10.5/epan/crypt/airpdcap_int.h wireshark-1.10.6/epan/crypt/airpdcap_int.h --- wireshark-1.10.5/epan/crypt/airpdcap_int.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/airpdcap_int.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* airpcap_int.h * - * $Id: airpdcap_int.h 40595 2012-01-19 22:55:37Z rbalint $ + * $Id$ * * Copyright (c) 2006 CACE Technologies, Davis (California) * All rights reserved. diff -Nru wireshark-1.10.5/epan/crypt/airpdcap_rijndael.c wireshark-1.10.6/epan/crypt/airpdcap_rijndael.c --- wireshark-1.10.5/epan/crypt/airpdcap_rijndael.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/airpdcap_rijndael.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /** * airpdcap_rijndael.c * - * $Id: airpdcap_rijndael.c 40511 2012-01-15 12:29:44Z jmayer $ + * $Id$ * * @version 3.0 (December 2000) * diff -Nru wireshark-1.10.5/epan/crypt/airpdcap_rijndael.h wireshark-1.10.6/epan/crypt/airpdcap_rijndael.h --- wireshark-1.10.5/epan/crypt/airpdcap_rijndael.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/airpdcap_rijndael.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /** * airpdcap_rijndael.h * - * $Id: airpdcap_rijndael.h 29228 2009-07-29 10:01:14Z sahlberg $ + * $Id$ * * @version 3.0 (December 2000) * diff -Nru wireshark-1.10.5/epan/crypt/airpdcap_system.h wireshark-1.10.6/epan/crypt/airpdcap_system.h --- wireshark-1.10.5/epan/crypt/airpdcap_system.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/airpdcap_system.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* airpdcap_system.h * - * $Id: airpdcap_system.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Copyright (c) 2006 CACE Technologies, Davis (California) * All rights reserved. diff -Nru wireshark-1.10.5/epan/crypt/airpdcap_tkip.c wireshark-1.10.6/epan/crypt/airpdcap_tkip.c --- wireshark-1.10.5/epan/crypt/airpdcap_tkip.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/airpdcap_tkip.c 2014-03-07 18:07:12.000000000 +0000 @@ -30,7 +30,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $Id: airpdcap_tkip.c 38969 2011-09-12 08:23:15Z etxrab $ */ +/* $Id$ */ /******************************************************************************/ /* File includes */ diff -Nru wireshark-1.10.5/epan/crypt/airpdcap_user.h wireshark-1.10.6/epan/crypt/airpdcap_user.h --- wireshark-1.10.5/epan/crypt/airpdcap_user.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/airpdcap_user.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* airpdcap_user.h * - * $Id: airpdcap_user.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Copyright (c) 2006 CACE Technologies, Davis (California) * All rights reserved. diff -Nru wireshark-1.10.5/epan/crypt/airpdcap_ws.h wireshark-1.10.6/epan/crypt/airpdcap_ws.h --- wireshark-1.10.5/epan/crypt/airpdcap_ws.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/airpdcap_ws.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* airpdcap_ws.h * - * $Id: airpdcap_ws.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Copyright (c) 2006 CACE Technologies, Davis (California) * All rights reserved. diff -Nru wireshark-1.10.5/epan/crypt/Custom.common wireshark-1.10.6/epan/crypt/Custom.common --- wireshark-1.10.5/epan/crypt/Custom.common 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/Custom.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ ## -## $Id: Custom.common 44384 2012-08-09 16:42:31Z etxrab $ +## $Id$ ## Here you can add custom crypto files # diff -Nru wireshark-1.10.5/epan/crypt/des.c wireshark-1.10.6/epan/crypt/des.c --- wireshark-1.10.5/epan/crypt/des.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/des.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ Copyright (C) Andrew Tridgell 1998 - $Id: des.c 48848 2013-04-14 18:55:28Z eapache $ + $Id$ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru wireshark-1.10.5/epan/crypt/des.h wireshark-1.10.6/epan/crypt/des.h --- wireshark-1.10.5/epan/crypt/des.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/des.h 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ Copyright (C) Andrew Tridgell 1998 - $Id: des.h 48848 2013-04-14 18:55:28Z eapache $ + $Id$ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru wireshark-1.10.5/epan/crypt/eax.c wireshark-1.10.6/epan/crypt/eax.c --- wireshark-1.10.5/epan/crypt/eax.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/eax.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Encryption and decryption routines implementing the EAX' encryption mode * Copyright 2010, Edward J. Beroset, edward.j.beroset@us.elster.com * - * $Id: eax.c 48006 2013-03-02 12:10:56Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/crypt/eax.h wireshark-1.10.6/epan/crypt/eax.h --- wireshark-1.10.5/epan/crypt/eax.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/eax.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Encryption and decryption routines implementing the EAX' encryption mode * Copyright 2010, Edward J. Beroset, edward.j.beroset@us.elster.com * - * $Id: eax.h 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/crypt/kasumi.h wireshark-1.10.6/epan/crypt/kasumi.h --- wireshark-1.10.5/epan/crypt/kasumi.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/kasumi.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* kasumi.h * - * $Id: kasumi.h 44398 2012-08-09 19:33:36Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/crypt/Makefile.am wireshark-1.10.6/epan/crypt/Makefile.am --- wireshark-1.10.5/epan/crypt/Makefile.am 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for the airpdcap for Wireshark # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/crypt/Makefile.common wireshark-1.10.6/epan/crypt/Makefile.common --- wireshark-1.10.5/epan/crypt/Makefile.common 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 44384 2012-08-09 16:42:31Z etxrab $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/crypt/Makefile.in wireshark-1.10.6/epan/crypt/Makefile.in --- wireshark-1.10.5/epan/crypt/Makefile.in 2013-12-19 19:13:44.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/Makefile.in 2014-03-07 18:07:32.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for the airpdcap for Wireshark # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -43,7 +43,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 44384 2012-08-09 16:42:31Z etxrab $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/crypt/Makefile.nmake wireshark-1.10.6/epan/crypt/Makefile.nmake --- wireshark-1.10.5/epan/crypt/Makefile.nmake 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ ## Makefile for building airpdcap.lib with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ include ..\..\config.nmake include Makefile.common diff -Nru wireshark-1.10.5/epan/crypt/md4.c wireshark-1.10.6/epan/crypt/md4.c --- wireshark-1.10.5/epan/crypt/md4.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/md4.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ a implementation of MD4 designed for use in the SMB authentication protocol Copyright (C) Andrew Tridgell 1997-1998. - $Id: md4.c 48848 2013-04-14 18:55:28Z eapache $ + $Id$ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru wireshark-1.10.5/epan/crypt/md4.h wireshark-1.10.6/epan/crypt/md4.h --- wireshark-1.10.5/epan/crypt/md4.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/md4.h 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ a implementation of MD4 designed for use in the SMB authentication protocol Copyright (C) Andrew Tridgell 1997-1998. - $Id: md4.h 48848 2013-04-14 18:55:28Z eapache $ + $Id$ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru wireshark-1.10.5/epan/crypt/md5.c wireshark-1.10.6/epan/crypt/md5.c --- wireshark-1.10.5/epan/crypt/md5.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/md5.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -/* $Id: md5.c 46928 2013-01-04 05:22:43Z mmann $ */ +/* $Id$ */ /* * Copyright (C) 2003-2006 Benny Prijono * Copyright (C) 2012 C Elston, Katalix Systems Ltd diff -Nru wireshark-1.10.5/epan/crypt/md5.h wireshark-1.10.6/epan/crypt/md5.h --- wireshark-1.10.5/epan/crypt/md5.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/md5.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -/* $Id: md5.h 47992 2013-03-01 23:53:11Z rbalint $ */ +/* $Id$ */ /* * Copyright (C) 2003-2005 Benny Prijono * Copyright (C) 2012 C Elston, Katalix Systems Ltd diff -Nru wireshark-1.10.5/epan/crypt/rc4.c wireshark-1.10.6/epan/crypt/rc4.c --- wireshark-1.10.5/epan/crypt/rc4.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/rc4.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ Copyright (C) Andrew Tridgell 1998 - $Id: rc4.c 48848 2013-04-14 18:55:28Z eapache $ + $Id$ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru wireshark-1.10.5/epan/crypt/rc4.h wireshark-1.10.6/epan/crypt/rc4.h --- wireshark-1.10.5/epan/crypt/rc4.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/rc4.h 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ Copyright (C) Andrew Tridgell 1998 - $Id: rc4.h 48848 2013-04-14 18:55:28Z eapache $ + $Id$ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru wireshark-1.10.5/epan/crypt/sha1.c wireshark-1.10.6/epan/crypt/sha1.c --- wireshark-1.10.5/epan/crypt/sha1.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/sha1.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* * FIPS-180-1 compliant SHA-1 implementation * - * $Id: sha1.c 44709 2012-08-31 09:25:36Z etxrab $ + * $Id$ * * Copyright (C) 2001-2003 Christophe Devine * Copyright (C) 2012 Chris Elston, Katalix Systems Ltd diff -Nru wireshark-1.10.5/epan/crypt/sha1.h wireshark-1.10.6/epan/crypt/sha1.h --- wireshark-1.10.5/epan/crypt/sha1.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/sha1.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* * FIPS-180-1 compliant SHA-1 implementation * - * $Id: sha1.h 44709 2012-08-31 09:25:36Z etxrab $ + * $Id$ * * Copyright (C) 2001-2003 Christophe Devine * Copyright (C) 2012 Chris Elston, Katalix Systems Ltd diff -Nru wireshark-1.10.5/epan/crypt/wep-wpadefs.h wireshark-1.10.6/epan/crypt/wep-wpadefs.h --- wireshark-1.10.5/epan/crypt/wep-wpadefs.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/crypt/wep-wpadefs.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* wap-wpadefs.h * - * $Id: wep-wpadefs.h 24599 2008-03-10 17:20:15Z gerald $ + * $Id$ * * Copyright (c) 2006 CACE Technologies, Davis (California) * All rights reserved. diff -Nru wireshark-1.10.5/epan/dfilter/dfilter.c wireshark-1.10.6/epan/dfilter/dfilter.c --- wireshark-1.10.5/epan/dfilter/dfilter.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/dfilter.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: dfilter.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/dfilter.h wireshark-1.10.6/epan/dfilter/dfilter.h --- wireshark-1.10.5/epan/dfilter/dfilter.h 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/dfilter.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: dfilter.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/dfilter-int.h wireshark-1.10.6/epan/dfilter/dfilter-int.h --- wireshark-1.10.5/epan/dfilter/dfilter-int.h 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/dfilter-int.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: dfilter-int.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/dfilter-macro.c wireshark-1.10.6/epan/dfilter/dfilter-macro.c --- wireshark-1.10.5/epan/dfilter/dfilter-macro.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/dfilter-macro.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* dfilter-macro.c * - * $Id: dfilter-macro.c 48355 2013-03-17 16:48:47Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/dfilter-macro.h wireshark-1.10.6/epan/dfilter/dfilter-macro.h --- wireshark-1.10.5/epan/dfilter/dfilter-macro.h 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/dfilter-macro.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* dfilter-macro.h * - * $Id: dfilter-macro.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/dfunctions.c wireshark-1.10.6/epan/dfilter/dfunctions.c --- wireshark-1.10.5/epan/dfilter/dfunctions.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/dfunctions.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: dfunctions.c 48424 2013-03-19 19:02:25Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * diff -Nru wireshark-1.10.5/epan/dfilter/dfunctions.h wireshark-1.10.6/epan/dfilter/dfunctions.h --- wireshark-1.10.5/epan/dfilter/dfunctions.h 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/dfunctions.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: dfunctions.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * diff -Nru wireshark-1.10.5/epan/dfilter/dfvm.c wireshark-1.10.6/epan/dfilter/dfvm.c --- wireshark-1.10.5/epan/dfilter/dfvm.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/dfvm.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: dfvm.c 48424 2013-03-19 19:02:25Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/dfvm.h wireshark-1.10.6/epan/dfilter/dfvm.h --- wireshark-1.10.5/epan/dfilter/dfvm.h 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/dfvm.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: dfvm.h 48083 2013-03-05 06:16:45Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/drange.c wireshark-1.10.6/epan/dfilter/drange.c --- wireshark-1.10.5/epan/dfilter/drange.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/drange.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* drange.c * Routines for providing general range support to the dfilter library * - * $Id: drange.c 48083 2013-03-05 06:16:45Z etxrab $ + * $Id$ * * Copyright (c) 2000 by Ed Warnicke * diff -Nru wireshark-1.10.5/epan/dfilter/drange.h wireshark-1.10.6/epan/dfilter/drange.h --- wireshark-1.10.5/epan/dfilter/drange.h 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/drange.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* drange.h * Routines for providing general range support to the dfilter library * - * $Id: drange.h 48083 2013-03-05 06:16:45Z etxrab $ + * $Id$ * * Copyright (c) 2000 by Ed Warnicke * diff -Nru wireshark-1.10.5/epan/dfilter/gencode.c wireshark-1.10.6/epan/dfilter/gencode.c --- wireshark-1.10.5/epan/dfilter/gencode.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/gencode.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: gencode.c 48083 2013-03-05 06:16:45Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/gencode.h wireshark-1.10.6/epan/dfilter/gencode.h --- wireshark-1.10.5/epan/dfilter/gencode.h 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/gencode.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* gencode.h * - * $Id: gencode.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/grammar.lemon wireshark-1.10.6/epan/dfilter/grammar.lemon --- wireshark-1.10.5/epan/dfilter/grammar.lemon 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/grammar.lemon 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -/* $Id: grammar.lemon 45016 2012-09-20 01:48:30Z morriss $ */ +/* $Id$ */ %include { #include "config.h" diff -Nru wireshark-1.10.5/epan/dfilter/Makefile.am wireshark-1.10.6/epan/dfilter/Makefile.am --- wireshark-1.10.5/epan/dfilter/Makefile.am 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ # Makefile.am # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/Makefile.common wireshark-1.10.6/epan/dfilter/Makefile.common --- wireshark-1.10.5/epan/dfilter/Makefile.common 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47599 2013-02-09 23:35:30Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/Makefile.in wireshark-1.10.6/epan/dfilter/Makefile.in --- wireshark-1.10.5/epan/dfilter/Makefile.in 2013-12-19 19:13:44.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/Makefile.in 2014-03-07 18:07:33.000000000 +0000 @@ -17,7 +17,7 @@ # Makefile.am # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -41,7 +41,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -66,7 +66,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47599 2013-02-09 23:35:30Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/Makefile.nmake wireshark-1.10.6/epan/dfilter/Makefile.nmake --- wireshark-1.10.5/epan/dfilter/Makefile.nmake 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ ## Makefile for building wireshark.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 48021 2013-03-02 22:19:33Z pascal $ +# $Id$ include ..\..\config.nmake include ..\..\Makefile.nmake.inc diff -Nru wireshark-1.10.5/epan/dfilter/scanner.c wireshark-1.10.6/epan/dfilter/scanner.c --- wireshark-1.10.5/epan/dfilter/scanner.c 2013-12-19 19:15:45.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/scanner.c 2014-03-07 18:09:13.000000000 +0000 @@ -609,7 +609,7 @@ */ #line 23 "scanner.l" /* - * $Id: scanner.l 47613 2013-02-10 19:13:07Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/scanner.l wireshark-1.10.6/epan/dfilter/scanner.l --- wireshark-1.10.5/epan/dfilter/scanner.l 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/scanner.l 2014-03-07 18:07:12.000000000 +0000 @@ -21,7 +21,7 @@ %{ /* - * $Id: scanner.l 47613 2013-02-10 19:13:07Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/semcheck.c wireshark-1.10.6/epan/dfilter/semcheck.c --- wireshark-1.10.5/epan/dfilter/semcheck.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/semcheck.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: semcheck.c 48083 2013-03-05 06:16:45Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/semcheck.h wireshark-1.10.6/epan/dfilter/semcheck.h --- wireshark-1.10.5/epan/dfilter/semcheck.h 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/semcheck.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: semcheck.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/sttype-function.c wireshark-1.10.6/epan/dfilter/sttype-function.c --- wireshark-1.10.5/epan/dfilter/sttype-function.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/sttype-function.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: sttype-function.c 48083 2013-03-05 06:16:45Z etxrab $ + * $Id$ * * Copyright (c) 2006 by Gilbert Ramirez * diff -Nru wireshark-1.10.5/epan/dfilter/sttype-function.h wireshark-1.10.6/epan/dfilter/sttype-function.h --- wireshark-1.10.5/epan/dfilter/sttype-function.h 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/sttype-function.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: sttype-function.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/sttype-integer.c wireshark-1.10.6/epan/dfilter/sttype-integer.c --- wireshark-1.10.5/epan/dfilter/sttype-integer.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/sttype-integer.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: sttype-integer.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/sttype-pointer.c wireshark-1.10.6/epan/dfilter/sttype-pointer.c --- wireshark-1.10.5/epan/dfilter/sttype-pointer.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/sttype-pointer.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: sttype-pointer.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/sttype-range.c wireshark-1.10.6/epan/dfilter/sttype-range.c --- wireshark-1.10.5/epan/dfilter/sttype-range.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/sttype-range.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: sttype-range.c 48083 2013-03-05 06:16:45Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/sttype-range.h wireshark-1.10.6/epan/dfilter/sttype-range.h --- wireshark-1.10.5/epan/dfilter/sttype-range.h 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/sttype-range.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: sttype-range.h 48083 2013-03-05 06:16:45Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/sttype-string.c wireshark-1.10.6/epan/dfilter/sttype-string.c --- wireshark-1.10.5/epan/dfilter/sttype-string.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/sttype-string.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: sttype-string.c 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/sttype-test.c wireshark-1.10.6/epan/dfilter/sttype-test.c --- wireshark-1.10.5/epan/dfilter/sttype-test.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/sttype-test.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: sttype-test.c 48083 2013-03-05 06:16:45Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/sttype-test.h wireshark-1.10.6/epan/dfilter/sttype-test.h --- wireshark-1.10.5/epan/dfilter/sttype-test.h 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/sttype-test.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: sttype-test.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/syntax-tree.c wireshark-1.10.6/epan/dfilter/syntax-tree.c --- wireshark-1.10.5/epan/dfilter/syntax-tree.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/syntax-tree.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: syntax-tree.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dfilter/syntax-tree.h wireshark-1.10.6/epan/dfilter/syntax-tree.h --- wireshark-1.10.5/epan/dfilter/syntax-tree.h 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/dfilter/syntax-tree.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: syntax-tree.h 48424 2013-03-19 19:02:25Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/diam_dict.c wireshark-1.10.6/epan/diam_dict.c --- wireshark-1.10.5/epan/diam_dict.c 2013-12-19 19:21:24.000000000 +0000 +++ wireshark-1.10.6/epan/diam_dict.c 2014-03-07 18:14:07.000000000 +0000 @@ -931,7 +931,7 @@ ** diam_dict.h ** Diameter Dictionary Import Routines ** - ** $Id: diam_dict.l 48338 2013-03-16 08:52:09Z etxrab $ + ** $Id$ ** ** (c) 2007, Luis E. Garcia Ontanon ** diff -Nru wireshark-1.10.5/epan/diam_dict.h wireshark-1.10.6/epan/diam_dict.h --- wireshark-1.10.5/epan/diam_dict.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/diam_dict.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ ** diam_dict.h ** Diameter Dictionary Import Routines ** - ** $Id: diam_dict.h 48869 2013-04-16 00:00:09Z eapache $ + ** $Id$ ** ** (c) 2007, Luis E. Garcia Ontanon ** diff -Nru wireshark-1.10.5/epan/diam_dict.l wireshark-1.10.6/epan/diam_dict.l --- wireshark-1.10.5/epan/diam_dict.l 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/diam_dict.l 2014-03-07 18:07:12.000000000 +0000 @@ -36,7 +36,7 @@ ** diam_dict.h ** Diameter Dictionary Import Routines ** - ** $Id: diam_dict.l 48338 2013-03-16 08:52:09Z etxrab $ + ** $Id$ ** ** (c) 2007, Luis E. Garcia Ontanon ** diff -Nru wireshark-1.10.5/epan/dissector_filters.c wireshark-1.10.6/epan/dissector_filters.c --- wireshark-1.10.5/epan/dissector_filters.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/dissector_filters.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* dissector_filters.c * Routines for dissector generated display filters * - * $Id: dissector_filters.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissector_filters.h wireshark-1.10.6/epan/dissector_filters.h --- wireshark-1.10.5/epan/dissector_filters.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/dissector_filters.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* dissector_filters.h * Routines for dissector generated display filters * - * $Id: dissector_filters.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/Custom.common wireshark-1.10.6/epan/dissectors/Custom.common --- wireshark-1.10.5/epan/dissectors/Custom.common 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/Custom.common 2014-03-07 18:07:12.000000000 +0000 @@ -1,5 +1,5 @@ ## -## $Id: Custom.common 42707 2012-05-18 16:20:36Z morriss $ +## $Id$ ## Here you can add custom dissectors # diff -Nru wireshark-1.10.5/epan/dissectors/dcerpc/budb/Makefile wireshark-1.10.6/epan/dissectors/dcerpc/budb/Makefile --- wireshark-1.10.5/epan/dissectors/dcerpc/budb/Makefile 2013-04-22 18:04:54.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/dcerpc/budb/Makefile 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile 30424 2009-10-09 09:34:07Z krj $ +# $Id$ PROTOCOL_NAME=budb include ../Makefile.inc diff -Nru wireshark-1.10.5/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.c wireshark-1.10.6/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.c --- wireshark-1.10.5/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.c 2013-04-22 18:04:54.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * Routines for BUDB packet disassembly * ronnie sahlberg 2005 * - * $Id: packet-dcerpc-budb-template.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.h wireshark-1.10.6/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.h --- wireshark-1.10.5/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.h 2013-04-22 18:04:54.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ /* packet-dcerpc-budb.h * Routines for BUDB packet disassembly * - * $Id: packet-dcerpc-budb-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/dcerpc/butc/Makefile wireshark-1.10.6/epan/dissectors/dcerpc/butc/Makefile --- wireshark-1.10.5/epan/dissectors/dcerpc/butc/Makefile 2013-04-22 18:04:54.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/dcerpc/butc/Makefile 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile 30424 2009-10-09 09:34:07Z krj $ +# $Id$ PROTOCOL_NAME=butc include ../Makefile.inc diff -Nru wireshark-1.10.5/epan/dissectors/dcerpc/butc/packet-dcerpc-butc-template.c wireshark-1.10.6/epan/dissectors/dcerpc/butc/packet-dcerpc-butc-template.c --- wireshark-1.10.5/epan/dissectors/dcerpc/butc/packet-dcerpc-butc-template.c 2013-04-22 18:04:54.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/dcerpc/butc/packet-dcerpc-butc-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ /* packet-dcerpc-butc.c * Routines for BUTC packet disassembly * - * $Id: packet-dcerpc-butc-template.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/dcerpc/butc/packet-dcerpc-butc-template.h wireshark-1.10.6/epan/dissectors/dcerpc/butc/packet-dcerpc-butc-template.h --- wireshark-1.10.5/epan/dissectors/dcerpc/butc/packet-dcerpc-butc-template.h 2013-04-22 18:04:54.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/dcerpc/butc/packet-dcerpc-butc-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ /* packet-dcerpc-butc.h * Routines for BUTC packet disassembly * - * $Id: packet-dcerpc-butc-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/dcerpc/CMakeLists.txt wireshark-1.10.6/epan/dissectors/dcerpc/CMakeLists.txt --- wireshark-1.10.5/epan/dissectors/dcerpc/CMakeLists.txt 2013-04-22 18:04:56.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/dcerpc/CMakeLists.txt 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/dcerpc/drsuapi/Makefile wireshark-1.10.6/epan/dissectors/dcerpc/drsuapi/Makefile --- wireshark-1.10.5/epan/dissectors/dcerpc/drsuapi/Makefile 2013-04-22 18:04:54.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/dcerpc/drsuapi/Makefile 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile 30424 2009-10-09 09:34:07Z krj $ +# $Id$ PROTOCOL_NAME=drsuapi include ../Makefile.inc diff -Nru wireshark-1.10.5/epan/dissectors/dcerpc/drsuapi/packet-dcerpc-drsuapi-template.c wireshark-1.10.6/epan/dissectors/dcerpc/drsuapi/packet-dcerpc-drsuapi-template.c --- wireshark-1.10.5/epan/dissectors/dcerpc/drsuapi/packet-dcerpc-drsuapi-template.c 2013-04-22 18:04:54.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/dcerpc/drsuapi/packet-dcerpc-drsuapi-template.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * Routines for DRSUAPI packet disassembly * ronnie sahlberg 2005 * - * $Id: packet-dcerpc-drsuapi-template.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/dcerpc/drsuapi/packet-dcerpc-drsuapi-template.h wireshark-1.10.6/epan/dissectors/dcerpc/drsuapi/packet-dcerpc-drsuapi-template.h --- wireshark-1.10.5/epan/dissectors/dcerpc/drsuapi/packet-dcerpc-drsuapi-template.h 2013-04-22 18:04:54.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/dcerpc/drsuapi/packet-dcerpc-drsuapi-template.h 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ /* packet-dcerpc-drsuapi.h * Routines for DRSUAPI packet disassembly * - * $Id: packet-dcerpc-drsuapi-template.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/dcerpc/idl2wrs.c wireshark-1.10.6/epan/dissectors/dcerpc/idl2wrs.c --- wireshark-1.10.5/epan/dissectors/dcerpc/idl2wrs.c 2013-04-22 18:04:56.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/dcerpc/idl2wrs.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* idl2wrs.c * IDL to Wireshark dissector compiler * - * $Id: idl2wrs.c 48875 2013-04-16 12:48:27Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/dcerpc/Makefile.am wireshark-1.10.6/epan/dissectors/dcerpc/Makefile.am --- wireshark-1.10.5/epan/dissectors/dcerpc/Makefile.am 2013-04-22 18:04:56.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/dcerpc/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ # Makefile.am # -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/dcerpc/Makefile.in wireshark-1.10.6/epan/dissectors/dcerpc/Makefile.in --- wireshark-1.10.5/epan/dissectors/dcerpc/Makefile.in 2013-12-19 19:13:47.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/dcerpc/Makefile.in 2014-03-07 18:07:36.000000000 +0000 @@ -17,7 +17,7 @@ # Makefile.am # -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/dcerpc/Makefile.inc wireshark-1.10.6/epan/dissectors/dcerpc/Makefile.inc --- wireshark-1.10.5/epan/dissectors/dcerpc/Makefile.inc 2013-04-22 18:04:56.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/dcerpc/Makefile.inc 2014-03-07 18:07:12.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.inc 32809 2010-05-14 17:05:50Z morriss $ +# $Id$ IDL2WRS=../idl2wrs diff -Nru wireshark-1.10.5/epan/dissectors/Makefile.am wireshark-1.10.6/epan/dissectors/Makefile.am --- wireshark-1.10.5/epan/dissectors/Makefile.am 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ # Makefile.am # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/Makefile.common wireshark-1.10.6/epan/dissectors/Makefile.common --- wireshark-1.10.5/epan/dissectors/Makefile.common 2013-05-20 21:52:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 49462 2013-05-20 21:46:36Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/Makefile.in wireshark-1.10.6/epan/dissectors/Makefile.in --- wireshark-1.10.5/epan/dissectors/Makefile.in 2013-12-19 19:13:47.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/Makefile.in 2014-03-07 18:07:36.000000000 +0000 @@ -17,7 +17,7 @@ # Makefile.am # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -42,7 +42,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 49462 2013-05-20 21:46:36Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/Makefile.nmake wireshark-1.10.6/epan/dissectors/Makefile.nmake --- wireshark-1.10.5/epan/dissectors/Makefile.nmake 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ ## Makefile for building wireshark.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ include ..\..\config.nmake diff -Nru wireshark-1.10.5/epan/dissectors/packet-2dparityfec.c wireshark-1.10.6/epan/dissectors/packet-2dparityfec.c --- wireshark-1.10.5/epan/dissectors/packet-2dparityfec.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-2dparityfec.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-2dparityfec.c * Mark Lewis * - * $Id: packet-2dparityfec.c 48310 2013-03-15 04:52:42Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-3com-njack.c wireshark-1.10.6/epan/dissectors/packet-3com-njack.c --- wireshark-1.10.5/epan/dissectors/packet-3com-njack.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-3com-njack.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-3com-njack.c * Routines for the disassembly of the 3com NetworkJack management protocol * - * $Id: packet-3com-njack.c 48265 2013-03-12 20:00:50Z etxrab $ + * $Id$ * * Copyright 2005 Joerg Mayer (see AUTHORS file) * diff -Nru wireshark-1.10.5/epan/dissectors/packet-3com-xns.c wireshark-1.10.6/epan/dissectors/packet-3com-xns.c --- wireshark-1.10.5/epan/dissectors/packet-3com-xns.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-3com-xns.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for 3Com's encapsulation of XNS over 802.2 LLC * (and other protocols using DSAP 80) * - * $Id: packet-3com-xns.c 48265 2013-03-12 20:00:50Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-3g-a11.c wireshark-1.10.6/epan/dissectors/packet-3g-a11.c --- wireshark-1.10.5/epan/dissectors/packet-3g-a11.c 2013-10-29 22:38:53.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-3g-a11.c 2014-03-07 18:07:12.000000000 +0000 @@ -11,7 +11,7 @@ * Routines for Mobile IP dissection * Copyright 2000, Stefan Raab * - * $Id: packet-3g-a11.c 52973 2013-10-29 22:19:18Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-6lowpan.c wireshark-1.10.6/epan/dissectors/packet-6lowpan.c --- wireshark-1.10.5/epan/dissectors/packet-6lowpan.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-6lowpan.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * By Owen Kirby * Copyright 2009 Owen Kirby * - * $Id: packet-6lowpan.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-6lowpan.h wireshark-1.10.6/epan/dissectors/packet-6lowpan.h --- wireshark-1.10.5/epan/dissectors/packet-6lowpan.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-6lowpan.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-6lowpan.h * Routines for 6LoWPAN packet disassembly * - * $Id: packet-6lowpan.h 48848 2013-04-14 18:55:28Z eapache $ + * $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/epan/dissectors/packet-9p.c wireshark-1.10.6/epan/dissectors/packet-9p.c --- wireshark-1.10.5/epan/dissectors/packet-9p.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-9p.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for 9P dissection * Copyright 2005, Nils O. Selaasdal * - * $Id: packet-9p.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aarp.c wireshark-1.10.6/epan/dissectors/packet-aarp.c --- wireshark-1.10.5/epan/dissectors/packet-aarp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aarp.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-aarp.c * Routines for Appletalk ARP packet disassembly * - * $Id: packet-aarp.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Simon Wilkinson * diff -Nru wireshark-1.10.5/epan/dissectors/packet-aastra-aasp.c wireshark-1.10.6/epan/dissectors/packet-aastra-aasp.c --- wireshark-1.10.5/epan/dissectors/packet-aastra-aasp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aastra-aasp.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AASP (Aastra Signalling Protocol) packet dissection. * Copyright 2011, Marek Tews * - * $Id: packet-aastra-aasp.c 48265 2013-03-12 20:00:50Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-acap.c wireshark-1.10.6/epan/dissectors/packet-acap.c --- wireshark-1.10.5/epan/dissectors/packet-acap.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-acap.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2003, Brad Hards * Heavily based in packet-imap.c, Copyright 1999, Richard Sharpe * - * $Id: packet-acap.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-acn.c wireshark-1.10.6/epan/dissectors/packet-acn.c --- wireshark-1.10.5/epan/dissectors/packet-acn.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-acn.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-acn.c * Routines for ACN packet disassembly * - * $Id: packet-acn.c 48265 2013-03-12 20:00:50Z etxrab $ + * $Id$ * * Copyright (c) 2003 by Erwin Rol * Copyright (c) 2006 by Electronic Theatre Controls, Inc. diff -Nru wireshark-1.10.5/epan/dissectors/packet-acp133.c wireshark-1.10.6/epan/dissectors/packet-acp133.c --- wireshark-1.10.5/epan/dissectors/packet-acp133.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-acp133.c 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for ACP133 specific syntaxes in X.500 packet dissection * Graeme Lunt 2005 * - * $Id: packet-acp133.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-acp133.h wireshark-1.10.6/epan/dissectors/packet-acp133.h --- wireshark-1.10.5/epan/dissectors/packet-acp133.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-acp133.h 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for ACP133 specific syntaxes in X.500 packet dissection * Graeme Lunt 2005 * - * $Id: packet-acp133.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-acse.c wireshark-1.10.6/epan/dissectors/packet-acse.c --- wireshark-1.10.5/epan/dissectors/packet-acse.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-acse.c 2014-03-07 18:07:12.000000000 +0000 @@ -21,7 +21,7 @@ * Yuriy Sidelnikov * * - * $Id: packet-acse.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-acse.h wireshark-1.10.6/epan/dissectors/packet-acse.h --- wireshark-1.10.5/epan/dissectors/packet-acse.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-acse.h 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for ACSE packet dissection * Ronnie Sahlberg 2005 * - * $Id: packet-acse.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-actrace.c wireshark-1.10.6/epan/dissectors/packet-actrace.c --- wireshark-1.10.5/epan/dissectors/packet-actrace.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-actrace.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright (c) 2005 by Alejandro Vaquero * - * $Id: packet-actrace.c 48265 2013-03-12 20:00:50Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-actrace.h wireshark-1.10.6/epan/dissectors/packet-actrace.h --- wireshark-1.10.5/epan/dissectors/packet-actrace.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-actrace.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-actrace.h * Routines for AudioCodes Trunk traces packet disassembly * - * $Id: packet-actrace.h 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Copyright (c) 2005 by Alejandro Vaquero * diff -Nru wireshark-1.10.5/epan/dissectors/packet-adwin.c wireshark-1.10.6/epan/dissectors/packet-adwin.c --- wireshark-1.10.5/epan/dissectors/packet-adwin.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-adwin.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ADwin protocol dissection * Copyright 2010, Thomas Boehne * - * $Id: packet-adwin.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-adwin-config.c wireshark-1.10.6/epan/dissectors/packet-adwin-config.c --- wireshark-1.10.5/epan/dissectors/packet-adwin-config.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-adwin-config.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ADwin configuration protocol dissection * Copyright 2010, Thomas Boehne * - * $Id: packet-adwin-config.c 48265 2013-03-12 20:00:50Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-afp.c wireshark-1.10.6/epan/dissectors/packet-afp.c --- wireshark-1.10.5/epan/dissectors/packet-afp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-afp.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for afp packet dissection * Copyright 2002, Didier Gautheron * - * $Id: packet-afp.c 48685 2013-04-01 15:29:49Z jake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-afp.h wireshark-1.10.6/epan/dissectors/packet-afp.h --- wireshark-1.10.5/epan/dissectors/packet-afp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-afp.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-afp.h * Definitions for packet disassembly structures and routines * - * $Id: packet-afp.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-afs.c wireshark-1.10.6/epan/dissectors/packet-afs.c --- wireshark-1.10.5/epan/dissectors/packet-afs.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-afs.c 2014-03-07 18:07:12.000000000 +0000 @@ -8,7 +8,7 @@ * Portions based on information/specs retrieved from the OpenAFS sources at * www.openafs.org, Copyright IBM. * - * $Id: packet-afs.c 48266 2013-03-12 20:14:45Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-agentx.c wireshark-1.10.6/epan/dissectors/packet-agentx.c --- wireshark-1.10.5/epan/dissectors/packet-agentx.c 2013-04-22 21:38:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-agentx.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Agent Extensibility (AgentX) Protocol disassembly * RFC 2257 * - * $Id: packet-agentx.c 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Copyright (c) 2005 by Oleg Terletsky * diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-admin.c wireshark-1.10.6/epan/dissectors/packet-aim-admin.c --- wireshark-1.10.5/epan/dissectors/packet-aim-admin.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-admin.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AIM (OSCAR) dissection, Administration Service * Copyright 2004, Jelmer Vernooij * - * $Id: packet-aim-admin.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-adverts.c wireshark-1.10.6/epan/dissectors/packet-aim-adverts.c --- wireshark-1.10.5/epan/dissectors/packet-aim-adverts.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-adverts.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AIM (OSCAR) dissection, SNAC Advertisements * Copyright 2004, Jelmer Vernooij * - * $Id: packet-aim-adverts.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-bos.c wireshark-1.10.6/epan/dissectors/packet-aim-bos.c --- wireshark-1.10.5/epan/dissectors/packet-aim-bos.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-bos.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AIM (OSCAR) dissection, SNAC BOS * Copyright 2004, Jelmer Vernooij * - * $Id: packet-aim-bos.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-buddylist.c wireshark-1.10.6/epan/dissectors/packet-aim-buddylist.c --- wireshark-1.10.5/epan/dissectors/packet-aim-buddylist.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-buddylist.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AIM Instant Messenger (OSCAR) dissection, SNAC Buddylist * Copyright 2004, Jelmer Vernooij * - * $Id: packet-aim-buddylist.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim.c wireshark-1.10.6/epan/dissectors/packet-aim.c --- wireshark-1.10.5/epan/dissectors/packet-aim.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2004, Jelmer Vernooij * Copyright 2004, Devin Heitmueller * - * $Id: packet-aim.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-chat.c wireshark-1.10.6/epan/dissectors/packet-aim-chat.c --- wireshark-1.10.5/epan/dissectors/packet-aim-chat.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-chat.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2004, Jelmer Vernooij * Copyright 2000, Ralf Hoelzer * - * $Id: packet-aim-chat.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-chatnav.c wireshark-1.10.6/epan/dissectors/packet-aim-chatnav.c --- wireshark-1.10.5/epan/dissectors/packet-aim-chatnav.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-chatnav.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AIM Instant Messenger (OSCAR) dissection * Copyright 2004, Jelmer Vernooij * - * $Id: packet-aim-chatnav.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-directory.c wireshark-1.10.6/epan/dissectors/packet-aim-directory.c --- wireshark-1.10.5/epan/dissectors/packet-aim-directory.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-directory.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AIM Instant Messenger (OSCAR) dissection, SNAC Directory * Copyright 2004, Jelmer Vernooij * - * $Id: packet-aim-directory.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-email.c wireshark-1.10.6/epan/dissectors/packet-aim-email.c --- wireshark-1.10.5/epan/dissectors/packet-aim-email.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-email.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AIM (OSCAR) dissection, SNAC Email * Copyright 2004, Jelmer Vernooij * - * $Id: packet-aim-email.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-generic.c wireshark-1.10.6/epan/dissectors/packet-aim-generic.c --- wireshark-1.10.5/epan/dissectors/packet-aim-generic.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-generic.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AIM Instant Messenger (OSCAR) dissection, SNAC Family Generic * Copyright 2004, Jelmer Vernooij * - * $Id: packet-aim-generic.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim.h wireshark-1.10.6/epan/dissectors/packet-aim.h --- wireshark-1.10.5/epan/dissectors/packet-aim.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-aim.h * Copyright 2004, Jelmer Vernooij * - * $Id: packet-aim.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-icq.c wireshark-1.10.6/epan/dissectors/packet-aim-icq.c --- wireshark-1.10.5/epan/dissectors/packet-aim-icq.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-icq.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AIM Instant Messenger (OSCAR) dissection, SNAC ICQ * Copyright 2004, Jelmer Vernooij * - * $Id: packet-aim-icq.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-invitation.c wireshark-1.10.6/epan/dissectors/packet-aim-invitation.c --- wireshark-1.10.5/epan/dissectors/packet-aim-invitation.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-invitation.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AIM Instant Messenger (OSCAR) dissection, SNAC Invitation * Copyright 2004, Jelmer Vernooij * - * $Id: packet-aim-invitation.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-location.c wireshark-1.10.6/epan/dissectors/packet-aim-location.c --- wireshark-1.10.5/epan/dissectors/packet-aim-location.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-location.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2004, Jelmer Vernooij * Copyright 2000, Ralf Hoelzer * - * $Id: packet-aim-location.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-messaging.c wireshark-1.10.6/epan/dissectors/packet-aim-messaging.c --- wireshark-1.10.5/epan/dissectors/packet-aim-messaging.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-messaging.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2000, Ralf Hoelzer * Copyright 2004, Devin Heitmueller * - * $Id: packet-aim-messaging.c 48282 2013-03-13 21:14:20Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-oft.c wireshark-1.10.6/epan/dissectors/packet-aim-oft.c --- wireshark-1.10.5/epan/dissectors/packet-aim-oft.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-oft.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AIM Instant Messenger (OSCAR) dissection * Copyright 2004, Jelmer Vernooij * - * $Id: packet-aim-oft.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-popup.c wireshark-1.10.6/epan/dissectors/packet-aim-popup.c --- wireshark-1.10.5/epan/dissectors/packet-aim-popup.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-popup.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AIM Instant Messenger (OSCAR) dissection * Copyright 2004, Jelmer Vernooij * - * $Id: packet-aim-popup.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-signon.c wireshark-1.10.6/epan/dissectors/packet-aim-signon.c --- wireshark-1.10.5/epan/dissectors/packet-aim-signon.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-signon.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2004, Jelmer Vernooij * Copyright 2000, Ralf Hoelzer * - * $Id: packet-aim-signon.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-ssi.c wireshark-1.10.6/epan/dissectors/packet-aim-ssi.c --- wireshark-1.10.5/epan/dissectors/packet-aim-ssi.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-ssi.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2004, Jelmer Vernooij * Copyright 2000, Ralf Hoelzer * - * $Id: packet-aim-ssi.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-sst.c wireshark-1.10.6/epan/dissectors/packet-aim-sst.c --- wireshark-1.10.5/epan/dissectors/packet-aim-sst.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-sst.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AIM (OSCAR) dissection, SNAC Server Stored Themes * Copyright 2004, Jelmer Vernooij * - * $Id: packet-aim-sst.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-stats.c wireshark-1.10.6/epan/dissectors/packet-aim-stats.c --- wireshark-1.10.5/epan/dissectors/packet-aim-stats.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-stats.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AIM Instant Messenger (OSCAR) dissection, SNAC Stats * Copyright 2004, Jelmer Vernooij * - * $Id: packet-aim-stats.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-translate.c wireshark-1.10.6/epan/dissectors/packet-aim-translate.c --- wireshark-1.10.5/epan/dissectors/packet-aim-translate.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-translate.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AIM Instant Messenger (OSCAR) dissection, SNAC Translate * Copyright 2004, Jelmer Vernooij * - * $Id: packet-aim-translate.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aim-userlookup.c wireshark-1.10.6/epan/dissectors/packet-aim-userlookup.c --- wireshark-1.10.5/epan/dissectors/packet-aim-userlookup.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aim-userlookup.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AIM Instant Messenger (OSCAR) dissection, SNAC Userlookup * Copyright 2004, Jelmer Vernooij * - * $Id: packet-aim-userlookup.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ajp13.c wireshark-1.10.6/epan/dissectors/packet-ajp13.c --- wireshark-1.10.5/epan/dissectors/packet-ajp13.c 2013-06-04 02:15:24.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ajp13.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AJP13 dissection * Copyright 2002, Christopher K. St. John * - * $Id: packet-ajp13.c 49745 2013-06-04 02:09:49Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-alcap.c wireshark-1.10.6/epan/dissectors/packet-alcap.c --- wireshark-1.10.5/epan/dissectors/packet-alcap.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-alcap.c 2014-03-07 18:07:12.000000000 +0000 @@ -8,7 +8,7 @@ * * Copyright 2005, Luis E. Garcia Ontanon * -* $Id: packet-alcap.c 48272 2013-03-12 21:58:04Z etxrab $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-alcap.h wireshark-1.10.6/epan/dissectors/packet-alcap.h --- wireshark-1.10.5/epan/dissectors/packet-alcap.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-alcap.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-alcap.h * - * $Id: packet-alcap.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-amqp.c wireshark-1.10.6/epan/dissectors/packet-amqp.c --- wireshark-1.10.5/epan/dissectors/packet-amqp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-amqp.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ * * Copyright (c) 1996-2007 iMatix Corporation * - * $Id: packet-amqp.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-amr.c wireshark-1.10.6/epan/dissectors/packet-amr.c --- wireshark-1.10.5/epan/dissectors/packet-amr.c 2013-05-20 22:17:14.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-amr.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AMR dissection * Copyright 2005-2008, Anders Broman * - * $Id: packet-amr.c 49465 2013-05-20 22:07:30Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ancp.c wireshark-1.10.6/epan/dissectors/packet-ancp.c --- wireshark-1.10.5/epan/dissectors/packet-ancp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ancp.c 2014-03-07 18:07:12.000000000 +0000 @@ -8,7 +8,7 @@ * * Copyright 2010, Aniruddha.A (anira@cisco.com) * - * $Id: packet-ancp.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ans.c wireshark-1.10.6/epan/dissectors/packet-ans.c --- wireshark-1.10.5/epan/dissectors/packet-ans.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ans.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ans.c * Routines for Intel ANS probe dissection * - * $Id: packet-ans.c 48272 2013-03-12 21:58:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ansi_637.c wireshark-1.10.6/epan/dissectors/packet-ansi_637.c --- wireshark-1.10.5/epan/dissectors/packet-ansi_637.c 2013-12-17 10:52:30.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ansi_637.c 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ * Short Message Service * 3GPP2 C.S0015-0 TIA/EIA-637-A * - * $Id: packet-ansi_637.c 54172 2013-12-17 10:46:09Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ansi_683.c wireshark-1.10.6/epan/dissectors/packet-ansi_683.c --- wireshark-1.10.5/epan/dissectors/packet-ansi_683.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ansi_683.c 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ * Last Updated to: * http://www.3gpp2.org/Public_html/specs/C.S0016-C_v2.0_081031.pdf * - * $Id: packet-ansi_683.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ansi_801.c wireshark-1.10.6/epan/dissectors/packet-ansi_801.c --- wireshark-1.10.5/epan/dissectors/packet-ansi_801.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ansi_801.c 2014-03-07 18:07:12.000000000 +0000 @@ -12,7 +12,7 @@ * Copyright 2007, Michael Lum * In association with UTStarcom Inc. * - * $Id: packet-ansi_801.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ansi_a.c wireshark-1.10.6/epan/dissectors/packet-ansi_a.c --- wireshark-1.10.5/epan/dissectors/packet-ansi_a.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ansi_a.c 2014-03-07 18:07:12.000000000 +0000 @@ -14,7 +14,7 @@ * 2000 Access Network Interfaces * 3GPP2 A.S0001-1 TIA/EIA-2001 * - * $Id: packet-ansi_a.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ansi_a.h wireshark-1.10.6/epan/dissectors/packet-ansi_a.h --- wireshark-1.10.5/epan/dissectors/packet-ansi_a.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ansi_a.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ansi_a.h * - * $Id: packet-ansi_a.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Copyright 2003, Michael Lum , * In association with Telos Technology Inc. diff -Nru wireshark-1.10.5/epan/dissectors/packet-ansi_map.c wireshark-1.10.6/epan/dissectors/packet-ansi_map.c --- wireshark-1.10.5/epan/dissectors/packet-ansi_map.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ansi_map.c 2014-03-07 18:07:12.000000000 +0000 @@ -15,7 +15,7 @@ * * Copyright 2005 - 2009, Anders Broman * - * $Id: packet-ansi_map.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ansi_map.h wireshark-1.10.6/epan/dissectors/packet-ansi_map.h --- wireshark-1.10.5/epan/dissectors/packet-ansi_map.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ansi_map.h 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for ansi_map packet dissection * Copyright 2005, Anders Broman * - * $Id: packet-ansi_map.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ansi_tcap.c wireshark-1.10.6/epan/dissectors/packet-ansi_tcap.c --- wireshark-1.10.5/epan/dissectors/packet-ansi_tcap.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ansi_tcap.c 2014-03-07 18:07:12.000000000 +0000 @@ -11,7 +11,7 @@ * Copyright 2007 Anders Broman * Built from the gsm-map dissector Copyright 2004 - 2005, Anders Broman * - * $Id: packet-ansi_tcap.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * Wireshark - Network traffic analyzer * By Gerald Combs * Copyright 1998 Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ansi_tcap.h wireshark-1.10.6/epan/dissectors/packet-ansi_tcap.h --- wireshark-1.10.5/epan/dissectors/packet-ansi_tcap.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ansi_tcap.h 2014-03-07 18:07:12.000000000 +0000 @@ -8,7 +8,7 @@ #line 1 "../../asn1/ansi_tcap/packet-ansi_tcap-template.h" /* packet-ansi_tcap.h * - * $Id: packet-ansi_tcap.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Copyright 2007 Anders Broman * diff -Nru wireshark-1.10.5/epan/dissectors/packet-aodv.c wireshark-1.10.6/epan/dissectors/packet-aodv.c --- wireshark-1.10.5/epan/dissectors/packet-aodv.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aodv.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AODV dissection * Copyright 2000, Erik Nordstrom * - * $Id: packet-aodv.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aoe.c wireshark-1.10.6/epan/dissectors/packet-aoe.c --- wireshark-1.10.5/epan/dissectors/packet-aoe.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aoe.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for dissecting the ATA over Ethernet protocol. * Ronnie Sahlberg 2004 * - * $Id: packet-aoe.c 48282 2013-03-13 21:14:20Z etxrab $ + * $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/epan/dissectors/packet-aol.c wireshark-1.10.6/epan/dissectors/packet-aol.c --- wireshark-1.10.5/epan/dissectors/packet-aol.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aol.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * More information on the P3 frame protocol can be found on page 66 of: * http://koin.org/files/aol.aim/aol/fdo/manuals/WAOL.doc * - * $Id: packet-aol.c 48274 2013-03-12 23:09:37Z etxrab $ + * $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/epan/dissectors/packet-ap1394.c wireshark-1.10.6/epan/dissectors/packet-ap1394.c --- wireshark-1.10.5/epan/dissectors/packet-ap1394.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ap1394.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ap1394.c * Routines for Apple IP-over-IEEE 1394 packet disassembly * - * $Id: packet-ap1394.c 48274 2013-03-12 23:09:37Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ap1394.h wireshark-1.10.6/epan/dissectors/packet-ap1394.h --- wireshark-1.10.5/epan/dissectors/packet-ap1394.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ap1394.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ap1394.h * - * $Id: packet-ap1394.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-applemidi.c wireshark-1.10.6/epan/dissectors/packet-applemidi.c --- wireshark-1.10.5/epan/dissectors/packet-applemidi.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-applemidi.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for dissection of Apple network-midi session establishment. * Copyright 2006-2012, Tobias Erichsen * - * $Id: packet-applemidi.c 48274 2013-03-12 23:09:37Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-app-pkix-cert.c wireshark-1.10.6/epan/dissectors/packet-app-pkix-cert.c --- wireshark-1.10.5/epan/dissectors/packet-app-pkix-cert.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-app-pkix-cert.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * Refer to the AUTHORS file or the AUTHORS section in the man page * for contacting the author(s) of this file. * - * $Id: packet-app-pkix-cert.c 48274 2013-03-12 23:09:37Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-aprs.c wireshark-1.10.6/epan/dissectors/packet-aprs.c --- wireshark-1.10.5/epan/dissectors/packet-aprs.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aprs.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for Amateur Packet Radio protocol dissection * Copyright 2007,2008,2009,2010,2012 R.W. Stearn * - * $Id: packet-aprs.c 48274 2013-03-12 23:09:37Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-arcnet.c wireshark-1.10.6/epan/dissectors/packet-arcnet.c --- wireshark-1.10.5/epan/dissectors/packet-arcnet.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-arcnet.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for arcnet dissection * Copyright 2001-2002, Peter Fales * - * $Id: packet-arcnet.c 48274 2013-03-12 23:09:37Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-arcnet.h wireshark-1.10.6/epan/dissectors/packet-arcnet.h --- wireshark-1.10.5/epan/dissectors/packet-arcnet.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-arcnet.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-arcnet.h * - * $Id: packet-arcnet.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ar_drone.c wireshark-1.10.6/epan/dissectors/packet-ar_drone.c --- wireshark-1.10.5/epan/dissectors/packet-ar_drone.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ar_drone.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * and Claire Brantley * Copyright 2012 BIT Systems * - * $Id: packet-ar_drone.c 48274 2013-03-12 23:09:37Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-armagetronad.c wireshark-1.10.6/epan/dissectors/packet-armagetronad.c --- wireshark-1.10.5/epan/dissectors/packet-armagetronad.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-armagetronad.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the Armagetronad packet dissection * Copyright 2005, Guillaume Chazarain * - * $Id: packet-armagetronad.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-arp.c wireshark-1.10.6/epan/dissectors/packet-arp.c --- wireshark-1.10.5/epan/dissectors/packet-arp.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-arp.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-arp.c * Routines for ARP packet disassembly (RFC 826) * - * $Id: packet-arp.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-arp.h wireshark-1.10.6/epan/dissectors/packet-arp.h --- wireshark-1.10.5/epan/dissectors/packet-arp.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-arp.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions of routines for ARP packet disassembly that are used * elsewhere * - * $Id: packet-arp.h 45535 2012-10-14 15:27:52Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-artnet.c wireshark-1.10.6/epan/dissectors/packet-artnet.c --- wireshark-1.10.5/epan/dissectors/packet-artnet.c 2013-04-22 21:38:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-artnet.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-artnet.c * Routines for Art-Net packet disassembly * - * $Id: packet-artnet.c 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Copyright (c) 2003, 2011 by Erwin Rol * diff -Nru wireshark-1.10.5/epan/dissectors/packet-aruba-adp.c wireshark-1.10.6/epan/dissectors/packet-aruba-adp.c --- wireshark-1.10.5/epan/dissectors/packet-aruba-adp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aruba-adp.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-aruba-adp.c * Routines for Aruba ADP header disassembly * - * $Id: packet-aruba-adp.c 48274 2013-03-12 23:09:37Z etxrab $ + * $Id$ * * Giles Scott < gscott arubanetworks dot com> * diff -Nru wireshark-1.10.5/epan/dissectors/packet-aruba-erm.c wireshark-1.10.6/epan/dissectors/packet-aruba-erm.c --- wireshark-1.10.5/epan/dissectors/packet-aruba-erm.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aruba-erm.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the disassembly of Aruba encapsulated remote mirroring frames * (Adapted from packet-hp-erm.c and packet-cisco-erspan.c) * - * $Id: packet-aruba-erm.c 48282 2013-03-13 21:14:20Z etxrab $ + * $Id$ * * Copyright 2010 Alexis La Goutte * diff -Nru wireshark-1.10.5/epan/dissectors/packet-aruba-papi.c wireshark-1.10.6/epan/dissectors/packet-aruba-papi.c --- wireshark-1.10.5/epan/dissectors/packet-aruba-papi.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-aruba-papi.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2010, Alexis La Goutte * * Real name of PAPI : Protocol Application Program Interface - * $Id: packet-aruba-papi.c 48282 2013-03-13 21:14:20Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-asap.c wireshark-1.10.6/epan/dissectors/packet-asap.c --- wireshark-1.10.5/epan/dissectors/packet-asap.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-asap.c 2014-03-07 18:07:12.000000000 +0000 @@ -17,7 +17,7 @@ * Copyright 2004, 2005, 2006, 2007 Michael Tuexen * Copyright 2008 Thomas Dreibholz * - * $Id: packet-asap.c 48282 2013-03-13 21:14:20Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ascend.c wireshark-1.10.6/epan/dissectors/packet-ascend.c --- wireshark-1.10.5/epan/dissectors/packet-ascend.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ascend.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ascend.c * Routines for decoding Lucent/Ascend packet traces * - * $Id: packet-ascend.c 48282 2013-03-13 21:14:20Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-asf.c wireshark-1.10.6/epan/dissectors/packet-asf.c --- wireshark-1.10.5/epan/dissectors/packet-asf.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-asf.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Duncan Laurie * - * $Id: packet-asf.c 48848 2013-04-14 18:55:28Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-assa_r3.c wireshark-1.10.6/epan/dissectors/packet-assa_r3.c --- wireshark-1.10.5/epan/dissectors/packet-assa_r3.c 2013-08-09 02:20:04.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-assa_r3.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * R3 is an electronic lock management protocol for configuring operational * parameters, adding/removing/altering users, dumping log files, etc. * - * $Id: packet-assa_r3.c 51231 2013-08-09 02:04:46Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-atalk.c wireshark-1.10.6/epan/dissectors/packet-atalk.c --- wireshark-1.10.5/epan/dissectors/packet-atalk.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-atalk.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for AppleTalk packet disassembly: LLAP, DDP, NBP, ATP, ASP, * RTMP, PAP. * - * $Id: packet-atalk.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Simon Wilkinson * @@ -1057,8 +1057,9 @@ if (machine_ofs) proto_tree_add_item(tree, hf_asp_server_type, tvb, machine_ofs, 1, ENC_ASCII|ENC_NA); - ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_VERSOFF); + ofs = tvb_get_ntohs(tvb, offset +AFPSTATUS_VERSOFF); if (ofs) { + ofs += offset; nbe = tvb_get_guint8(tvb, ofs); ti = proto_tree_add_text(tree, tvb, ofs, 1, "Version list: %u", nbe); ofs++; @@ -1070,8 +1071,9 @@ } } - ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_UAMSOFF); + ofs = tvb_get_ntohs(tvb, offset +AFPSTATUS_UAMSOFF); if (ofs) { + ofs += offset; nbe = tvb_get_guint8(tvb, ofs); ti = proto_tree_add_text(tree, tvb, ofs, 1, "UAMS list: %u", nbe); ofs++; @@ -1083,9 +1085,11 @@ } } - ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_ICONOFF); - if (ofs) + ofs = tvb_get_ntohs(tvb, offset +AFPSTATUS_ICONOFF); + if (ofs) { + ofs += offset; proto_tree_add_item(tree, hf_asp_server_icon, tvb, ofs, 256, ENC_NA); + } if (sign_ofs) { proto_tree_add_item(tree, hf_asp_server_signature, tvb, sign_ofs, 16, ENC_NA); diff -Nru wireshark-1.10.5/epan/dissectors/packet-atalk.h wireshark-1.10.6/epan/dissectors/packet-atalk.h --- wireshark-1.10.5/epan/dissectors/packet-atalk.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-atalk.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-atalk.h * Definitions for Appletalk packet disassembly (DDP, currently). * - * $Id: packet-atalk.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/epan/dissectors/packet-at.c wireshark-1.10.6/epan/dissectors/packet-at.c --- wireshark-1.10.5/epan/dissectors/packet-at.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-at.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2011, Tyson Key * - * $Id: packet-at.c 48293 2013-03-14 07:37:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-atm.c wireshark-1.10.6/epan/dissectors/packet-atm.c --- wireshark-1.10.5/epan/dissectors/packet-atm.c 2013-06-19 21:15:32.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-atm.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-atm.c * Routines for ATM packet disassembly * - * $Id: packet-atm.c 50059 2013-06-19 21:09:23Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-atm.h wireshark-1.10.6/epan/dissectors/packet-atm.h --- wireshark-1.10.5/epan/dissectors/packet-atm.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-atm.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-atm.h * - * $Id: packet-atm.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-atmtcp.c wireshark-1.10.6/epan/dissectors/packet-atmtcp.c --- wireshark-1.10.5/epan/dissectors/packet-atmtcp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-atmtcp.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ATM over TCP dissection * Copyright 2011, Alexis La Goutte * - * $Id: packet-atmtcp.c 48282 2013-03-13 21:14:20Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-auto_rp.c wireshark-1.10.6/epan/dissectors/packet-auto_rp.c --- wireshark-1.10.5/epan/dissectors/packet-auto_rp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-auto_rp.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * * Heikki Vatiainen * - * $Id: packet-auto_rp.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ax25.c wireshark-1.10.6/epan/dissectors/packet-ax25.c --- wireshark-1.10.5/epan/dissectors/packet-ax25.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ax25.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * AX.25 frames * Copyright 2005,2006,2007,2008,2009,2010,2012 R.W. Stearn * - * $Id: packet-ax25.c 48282 2013-03-13 21:14:20Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ax25.h wireshark-1.10.6/epan/dissectors/packet-ax25.h --- wireshark-1.10.5/epan/dissectors/packet-ax25.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ax25.h 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for Amateur Packet Radio protocol dissection * Copyright 2005,2006,2007,2008,2009,2010,2012 R.W. Stearn * - * $Id: packet-ax25.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ax25-kiss.c wireshark-1.10.6/epan/dissectors/packet-ax25-kiss.c --- wireshark-1.10.5/epan/dissectors/packet-ax25-kiss.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ax25-kiss.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for AX.25 KISS protocol dissection * Copyright 2010,2012 R.W. Stearn * - * $Id: packet-ax25-kiss.c 48282 2013-03-13 21:14:20Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ax25-kiss.h wireshark-1.10.6/epan/dissectors/packet-ax25-kiss.h --- wireshark-1.10.5/epan/dissectors/packet-ax25-kiss.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ax25-kiss.h 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for AX.25 KISS protocol dissection * Copyright 2010,2012 R.W. Stearn * - * $Id: packet-ax25-kiss.h 48848 2013-04-14 18:55:28Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ax25-nol3.c wireshark-1.10.6/epan/dissectors/packet-ax25-nol3.c --- wireshark-1.10.5/epan/dissectors/packet-ax25-nol3.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ax25-nol3.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for Amateur Packet Radio protocol dissection * Copyright 2007,2008,2009,2010,2012 R.W. Stearn * - * $Id: packet-ax25-nol3.c 48282 2013-03-13 21:14:20Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ax4000.c wireshark-1.10.6/epan/dissectors/packet-ax4000.c --- wireshark-1.10.5/epan/dissectors/packet-ax4000.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ax4000.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Spirent AX/4000 Test Block dissection * Copyright 2004, SEKINE Hideki * - * $Id: packet-ax4000.c 48293 2013-03-14 07:37:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ayiya.c wireshark-1.10.6/epan/dissectors/packet-ayiya.c --- wireshark-1.10.5/epan/dissectors/packet-ayiya.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ayiya.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Anything in Anything protocol * Copyright 2008, Jelmer Vernooij * - * $Id: packet-ayiya.c 48293 2013-03-14 07:37:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-babel.c wireshark-1.10.6/epan/dissectors/packet-babel.c --- wireshark-1.10.5/epan/dissectors/packet-babel.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-babel.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Babel dissection (RFC 6126) * Copyright 2011 by Juliusz Chroboczek * - * $Id: packet-babel.c 48293 2013-03-14 07:37:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bacapp.c wireshark-1.10.6/epan/dissectors/packet-bacapp.c --- wireshark-1.10.5/epan/dissectors/packet-bacapp.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bacapp.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * Enhanced by Felix Kraemer, 2010, , * Sauter-Cumulus GmbH, Freiburg * - * $Id: packet-bacapp.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bacapp.h wireshark-1.10.6/epan/dissectors/packet-bacapp.h --- wireshark-1.10.5/epan/dissectors/packet-bacapp.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bacapp.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-bacapp.h * by fkraemer, SAUTER * - * $Id: packet-bacapp.h 47800 2013-02-21 15:32:29Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bacnet.c wireshark-1.10.6/epan/dissectors/packet-bacnet.c --- wireshark-1.10.5/epan/dissectors/packet-bacnet.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bacnet.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2001, Hartmut Mueller , FH Dortmund * Enhanced by Steve Karg, 2005, * - * $Id: packet-bacnet.c 48293 2013-03-14 07:37:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-banana.c wireshark-1.10.6/epan/dissectors/packet-banana.c --- wireshark-1.10.5/epan/dissectors/packet-banana.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-banana.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the Twisted Banana serialization protocol dissection * Copyright 2009, Gerald Combs * - * $Id: packet-banana.c 48293 2013-03-14 07:37:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-batadv.c wireshark-1.10.6/epan/dissectors/packet-batadv.c --- wireshark-1.10.5/epan/dissectors/packet-batadv.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-batadv.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for B.A.T.M.A.N. Advanced dissection * Copyright 2008-2010 Sven Eckelmann * - * $Id: packet-batadv.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bat.c wireshark-1.10.6/epan/dissectors/packet-bat.c --- wireshark-1.10.5/epan/dissectors/packet-bat.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bat.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for B.A.T.M.A.N. Layer 3 dissection * Copyright 2008-2010 Sven Eckelmann * - * $Id: packet-bat.c 48622 2013-03-28 16:02:41Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bctp.c wireshark-1.10.6/epan/dissectors/packet-bctp.c --- wireshark-1.10.5/epan/dissectors/packet-bctp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bctp.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * * (c) 2007, Luis E. Garcia Ontanon * - * $Id: packet-bctp.c 48293 2013-03-14 07:37:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-beep.c wireshark-1.10.6/epan/dissectors/packet-beep.c --- wireshark-1.10.5/epan/dissectors/packet-beep.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-beep.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-beep.c * Routines for BEEP packet disassembly * - * $Id: packet-beep.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Copyright (c) 2000 by Richard Sharpe * Modified 2001 Darren New for BEEP. diff -Nru wireshark-1.10.5/epan/dissectors/packet-ber.c wireshark-1.10.6/epan/dissectors/packet-ber.c --- wireshark-1.10.5/epan/dissectors/packet-ber.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ber.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Helpers for ASN.1/BER dissection * Ronnie Sahlberg (C) 2004 * - * $Id: packet-ber.c 48944 2013-04-20 21:20:00Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ber.h wireshark-1.10.6/epan/dissectors/packet-ber.h --- wireshark-1.10.5/epan/dissectors/packet-ber.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ber.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Helpers for ASN.1/BER dissection * Ronnie Sahlberg (C) 2004 * - * $Id: packet-ber.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bfcp.c wireshark-1.10.6/epan/dissectors/packet-bfcp.c --- wireshark-1.10.5/epan/dissectors/packet-bfcp.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bfcp.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * Updated with attribute dissection * Copyright 2012, Anders Broman * - * $Id: packet-bfcp.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bfd.c wireshark-1.10.6/epan/dissectors/packet-bfd.c --- wireshark-1.10.5/epan/dissectors/packet-bfd.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bfd.c 2014-03-07 18:07:12.000000000 +0000 @@ -13,7 +13,7 @@ * - support for MPLS-TP BFD Proactive CV Message Format as per RFC 6428 * - includes decoding support for Section MEP-ID, LSP MEP-ID, PW MEP-ID * - * $Id: packet-bfd.c 48293 2013-03-14 07:37:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bfd.h wireshark-1.10.6/epan/dissectors/packet-bfd.h --- wireshark-1.10.5/epan/dissectors/packet-bfd.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bfd.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-bfd.h * - * $Id: packet-bfd.h 46084 2012-11-19 20:13:57Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bgp.c wireshark-1.10.6/epan/dissectors/packet-bgp.c --- wireshark-1.10.5/epan/dissectors/packet-bgp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bgp.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for BGP packet dissection. * Copyright 1999, Jun-ichiro itojun Hagino * - * $Id: packet-bgp.c 48685 2013-04-01 15:29:49Z jake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bitcoin.c wireshark-1.10.6/epan/dissectors/packet-bitcoin.c --- wireshark-1.10.5/epan/dissectors/packet-bitcoin.c 2013-12-18 13:21:13.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bitcoin.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * * See https://en.bitcoin.it/wiki/Protocol_specification * - * $Id: packet-bitcoin.c 54217 2013-12-18 13:15:13Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bittorrent.c wireshark-1.10.6/epan/dissectors/packet-bittorrent.c --- wireshark-1.10.5/epan/dissectors/packet-bittorrent.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bittorrent.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for bittorrent packet dissection * Copyright (C) 2004 Jelmer Vernooij * - * $Id: packet-bittorrent.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bjnp.c wireshark-1.10.6/epan/dissectors/packet-bjnp.c --- wireshark-1.10.5/epan/dissectors/packet-bjnp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bjnp.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2009, Stig Bjorlykke * - * $Id: packet-bjnp.c 48319 2013-03-15 16:39:30Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bluetooth-hci.h wireshark-1.10.6/epan/dissectors/packet-bluetooth-hci.h --- wireshark-1.10.5/epan/dissectors/packet-bluetooth-hci.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bluetooth-hci.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-bluetooth-hci.h * - * $Id: packet-bluetooth-hci.h 47655 2013-02-14 15:29:25Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bmc.c wireshark-1.10.6/epan/dissectors/packet-bmc.c --- wireshark-1.10.5/epan/dissectors/packet-bmc.c 2013-08-19 11:31:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bmc.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Broadcast/Multicast Control dissection * Copyright 2011, Neil Piercy * - * $Id: packet-bmc.c 51425 2013-08-19 11:25:35Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bofl.c wireshark-1.10.6/epan/dissectors/packet-bofl.c --- wireshark-1.10.5/epan/dissectors/packet-bofl.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bofl.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Wellfleet BOFL dissection * Author: Endoh Akira (endoh@netmarks.co.jp) * - * $Id: packet-bofl.c 48293 2013-03-14 07:37:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bootparams.c wireshark-1.10.6/epan/dissectors/packet-bootparams.c --- wireshark-1.10.5/epan/dissectors/packet-bootparams.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bootparams.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-bootparams.c * Routines for bootparams dissection * - * $Id: packet-bootparams.c 48319 2013-03-15 16:39:30Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bootp.c wireshark-1.10.6/epan/dissectors/packet-bootp.c --- wireshark-1.10.5/epan/dissectors/packet-bootp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bootp.c 2014-03-07 18:07:12.000000000 +0000 @@ -17,7 +17,7 @@ * * Copyright 2012, Jerome LAFORGE * - * $Id: packet-bootp.c 48355 2013-03-17 16:48:47Z etxrab $ + * $Id$ * * The information used comes from: * RFC 951: Bootstrap Protocol diff -Nru wireshark-1.10.5/epan/dissectors/packet-bpdu.c wireshark-1.10.6/epan/dissectors/packet-bpdu.c --- wireshark-1.10.5/epan/dissectors/packet-bpdu.c 2013-09-09 18:34:31.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bpdu.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-bpdu.c * Routines for BPDU (Spanning Tree Protocol) disassembly * - * $Id: packet-bpdu.c 51874 2013-09-09 18:28:56Z gerald $ + * $Id$ * * Copyright 1999 Christophe Tronche * diff -Nru wireshark-1.10.5/epan/dissectors/packet-bpq.c wireshark-1.10.6/epan/dissectors/packet-bpq.c --- wireshark-1.10.5/epan/dissectors/packet-bpq.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bpq.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for Amateur Packet Radio protocol dissection * Copyright 2005,2006,2007,2008,2009,2010,2012 R.W. Stearn * - * $Id: packet-bpq.c 48310 2013-03-15 04:52:42Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bpq.h wireshark-1.10.6/epan/dissectors/packet-bpq.h --- wireshark-1.10.5/epan/dissectors/packet-bpq.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bpq.h 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for Amateur Packet Radio protocol dissection * Copyright 2005,2006,2007,2008,2009,2010,2012 R.W. Stearn * - * $Id: packet-bpq.h 48848 2013-04-14 18:55:28Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-brdwlk.c wireshark-1.10.6/epan/dissectors/packet-brdwlk.c --- wireshark-1.10.5/epan/dissectors/packet-brdwlk.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-brdwlk.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for decoding MDS Port Analyzer Adapter (FC in Eth) Header * Copyright 2001, Dinesh G Dutt * - * $Id: packet-brdwlk.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-brp.c wireshark-1.10.6/epan/dissectors/packet-brp.c --- wireshark-1.10.5/epan/dissectors/packet-brp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-brp.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-brp.c * - * $Id: packet-brp.c 48310 2013-03-15 04:52:42Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bssap.c wireshark-1.10.6/epan/dissectors/packet-bssap.c --- wireshark-1.10.5/epan/dissectors/packet-bssap.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bssap.c 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Added BSSAP+ according to ETSI TS 129 018 V6.3.0 (2005-3GPP TS 29.018 version 6.3.0 Release 6) * Copyright 2006, Anders Broman * - * $Id: packet-bssap.c 48310 2013-03-15 04:52:42Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bssap.h wireshark-1.10.6/epan/dissectors/packet-bssap.h --- wireshark-1.10.5/epan/dissectors/packet-bssap.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bssap.h 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ * Copyright 2003, Michael Lum * In association with Telos Technology Inc. * - * $Id: packet-bssap.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bssgp.c wireshark-1.10.6/epan/dissectors/packet-bssgp.c --- wireshark-1.10.5/epan/dissectors/packet-bssgp.c 2013-12-06 07:20:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bssgp.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Base Station Subsystem GPRS Protocol dissection * Copyright 2000, Susanne Edlund * - * $Id: packet-bssgp.c 53803 2013-12-06 07:14:45Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bssgp.h wireshark-1.10.6/epan/dissectors/packet-bssgp.h --- wireshark-1.10.5/epan/dissectors/packet-bssgp.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bssgp.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Base Station Subsystem GPRS Protocol dissection * Copyright 2006, Anders Broman * - * $Id: packet-bssgp.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-btamp.c wireshark-1.10.6/epan/dissectors/packet-btamp.c --- wireshark-1.10.5/epan/dissectors/packet-btamp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-btamp.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2009, Kovarththanan Rajaratnam * - * $Id: packet-btamp.c 48661 2013-03-30 21:47:27Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-btatt.c wireshark-1.10.6/epan/dissectors/packet-btatt.c --- wireshark-1.10.5/epan/dissectors/packet-btatt.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-btatt.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2012, Allan M. Madsen * - * $Id: packet-btatt.c 48661 2013-03-30 21:47:27Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-btavctp.c wireshark-1.10.6/epan/dissectors/packet-btavctp.c --- wireshark-1.10.5/epan/dissectors/packet-btavctp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-btavctp.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2012, Michal Labedzki for Tieto Corporation * - * $Id: packet-btavctp.c 48661 2013-03-30 21:47:27Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-btavctp.h wireshark-1.10.6/epan/dissectors/packet-btavctp.h --- wireshark-1.10.5/epan/dissectors/packet-btavctp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-btavctp.h 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2012, Michal Labedzki for Tieto Corporation * - * $Id: packet-btavctp.h 47809 2013-02-21 21:35:19Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-btavdtp.c wireshark-1.10.6/epan/dissectors/packet-btavdtp.c --- wireshark-1.10.5/epan/dissectors/packet-btavdtp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-btavdtp.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2012, Michal Labedzki for Tieto Corporation * - * $Id: packet-btavdtp.c 48710 2013-04-02 21:13:02Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-btavdtp.h wireshark-1.10.6/epan/dissectors/packet-btavdtp.h --- wireshark-1.10.5/epan/dissectors/packet-btavdtp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-btavdtp.h 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2012, Michal Labedzki for Tieto Corporation * - * $Id: packet-btavdtp.h 45921 2012-11-05 11:42:10Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-btavrcp.c wireshark-1.10.6/epan/dissectors/packet-btavrcp.c --- wireshark-1.10.5/epan/dissectors/packet-btavrcp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-btavrcp.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2012, Michal Labedzki for Tieto Corporation * - * $Id: packet-btavrcp.c 48685 2013-04-01 15:29:49Z jake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-btbnep.c wireshark-1.10.6/epan/dissectors/packet-btbnep.c --- wireshark-1.10.5/epan/dissectors/packet-btbnep.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-btbnep.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2012, Michal Labedzki for Tieto Corporation * - * $Id: packet-btbnep.c 48661 2013-03-30 21:47:27Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bt-dht.c wireshark-1.10.6/epan/dissectors/packet-bt-dht.c --- wireshark-1.10.5/epan/dissectors/packet-bt-dht.c 2013-06-04 19:52:54.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bt-dht.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for BT-DHT dissection * Copyright 2011, Xiao Xiangquan * - * $Id: packet-bt-dht.c 49772 2013-06-04 19:33:48Z martink $ + * $Id$ * * A plugin for BT-DHT packet: * diff -Nru wireshark-1.10.5/epan/dissectors/packet-bthci_acl.c wireshark-1.10.6/epan/dissectors/packet-bthci_acl.c --- wireshark-1.10.5/epan/dissectors/packet-bthci_acl.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bthci_acl.c 2014-03-07 18:07:12.000000000 +0000 @@ -8,7 +8,7 @@ * Refactored for wireshark checkin * Ronnie Sahlberg 2006 * - * $Id: packet-bthci_acl.c 48661 2013-03-30 21:47:27Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bthci_acl.h wireshark-1.10.6/epan/dissectors/packet-bthci_acl.h --- wireshark-1.10.5/epan/dissectors/packet-bthci_acl.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bthci_acl.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-bthci_acl.h * - * $Id: packet-bthci_acl.h 48660 2013-03-30 21:43:18Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bthci_cmd.c wireshark-1.10.6/epan/dissectors/packet-bthci_cmd.c --- wireshark-1.10.5/epan/dissectors/packet-bthci_cmd.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bthci_cmd.c 2014-03-07 18:07:12.000000000 +0000 @@ -11,7 +11,7 @@ * Updated to HCI specification 3.0+HS & 4.0 * Allan M. Madsen 2012 * - * $Id: packet-bthci_cmd.c 48661 2013-03-30 21:47:27Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bthci_evt.c wireshark-1.10.6/epan/dissectors/packet-bthci_evt.c --- wireshark-1.10.5/epan/dissectors/packet-bthci_evt.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bthci_evt.c 2014-03-07 18:07:12.000000000 +0000 @@ -11,7 +11,7 @@ * Updated to HCI specification 3.0+HS & 4.0 * Allan M. Madsen 2012 * - * $Id: packet-bthci_evt.c 48661 2013-03-30 21:47:27Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bthci_sco.c wireshark-1.10.6/epan/dissectors/packet-bthci_sco.c --- wireshark-1.10.5/epan/dissectors/packet-bthci_sco.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bthci_sco.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * Refactored for wireshark checkin * Ronnie Sahlberg 2006 * - * $Id: packet-bthci_sco.c 48661 2013-03-30 21:47:27Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bthcrp.c wireshark-1.10.6/epan/dissectors/packet-bthcrp.c --- wireshark-1.10.5/epan/dissectors/packet-bthcrp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bthcrp.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2013, Michal Labedzki for Tieto Corporation * - * $Id: packet-bthcrp.c 48661 2013-03-30 21:47:27Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bthfp.c wireshark-1.10.6/epan/dissectors/packet-bthfp.c --- wireshark-1.10.5/epan/dissectors/packet-bthfp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bthfp.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * Refactored for wireshark checkin * Ronnie Sahlberg 2006 * - * $Id: packet-bthfp.c 45422 2012-10-09 10:36:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bthid.c wireshark-1.10.6/epan/dissectors/packet-bthid.c --- wireshark-1.10.5/epan/dissectors/packet-bthid.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bthid.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2012, Michal Labedzki for Tieto Corporation * - * $Id: packet-bthid.c 48661 2013-03-30 21:47:27Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-btl2cap.c wireshark-1.10.6/epan/dissectors/packet-btl2cap.c --- wireshark-1.10.5/epan/dissectors/packet-btl2cap.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-btl2cap.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * Refactored for wireshark checkin * Ronnie Sahlberg 2006 * - * $Id: packet-btl2cap.c 48661 2013-03-30 21:47:27Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-btl2cap.h wireshark-1.10.6/epan/dissectors/packet-btl2cap.h --- wireshark-1.10.5/epan/dissectors/packet-btl2cap.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-btl2cap.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-btl2cap.h * - * $Id: packet-btl2cap.h 48660 2013-03-30 21:43:18Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-btmcap.c wireshark-1.10.6/epan/dissectors/packet-btmcap.c --- wireshark-1.10.5/epan/dissectors/packet-btmcap.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-btmcap.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 2013, Michal Labedzki for Tieto Corporation * - * $Id: packet-btmcap.c 48661 2013-03-30 21:47:27Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-btobex.c wireshark-1.10.6/epan/dissectors/packet-btobex.c --- wireshark-1.10.5/epan/dissectors/packet-btobex.c 2013-06-30 16:45:29.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-btobex.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2010, Allan M. Madsen * Copyright 2013, Michal Labedzki for Tieto Corporation * - * $Id: packet-btobex.c 50259 2013-06-30 16:38:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bt-oui.c wireshark-1.10.6/epan/dissectors/packet-bt-oui.c --- wireshark-1.10.5/epan/dissectors/packet-bt-oui.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bt-oui.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2012 intel Corp. * Written by Andrei Emeltchenko at intel dot com * - * $Id: packet-bt-oui.c 48414 2013-03-19 13:51:52Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-btrfcomm.c wireshark-1.10.6/epan/dissectors/packet-btrfcomm.c --- wireshark-1.10.5/epan/dissectors/packet-btrfcomm.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-btrfcomm.c 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ * Refactored for wireshark checkin * Ronnie Sahlberg 2006 * - * $Id: packet-btrfcomm.c 48663 2013-03-30 22:00:43Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-btrfcomm.h wireshark-1.10.6/epan/dissectors/packet-btrfcomm.h --- wireshark-1.10.5/epan/dissectors/packet-btrfcomm.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-btrfcomm.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-btrfcomm.h * - * $Id: packet-btrfcomm.h 47632 2013-02-11 15:04:53Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-btsap.c wireshark-1.10.6/epan/dissectors/packet-btsap.c --- wireshark-1.10.5/epan/dissectors/packet-btsap.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-btsap.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2012, Michal Labedzki for Tieto Corporation * - * $Id: packet-btsap.c 48661 2013-03-30 21:47:27Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-btsdp.c wireshark-1.10.6/epan/dissectors/packet-btsdp.c --- wireshark-1.10.5/epan/dissectors/packet-btsdp.c 2013-11-01 17:12:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-btsdp.c 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ * - dissect profile specific attributes * - fix service recognize * - * $Id: packet-btsdp.c 53020 2013-11-01 16:24:42Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -4230,7 +4230,7 @@ }, { &hf_did_vendor_id_usb_forum, { "Vendor ID", "btsdp.service.did.vendor_id", - FT_UINT16, BASE_HEX, &ext_usb_vendors_vals, 0, + FT_UINT16, BASE_HEX | BASE_EXT_STRING, &ext_usb_vendors_vals, 0, NULL, HFILL } }, { &hf_did_product_id, @@ -4700,7 +4700,7 @@ }, { &hf_sdp_protocol_psm, { "L2CAP PSM", "btsdp.protocol.psm", - FT_UINT16, BASE_DEC_HEX, &ext_psm_vals, 0, + FT_UINT16, BASE_DEC_HEX|BASE_EXT_STRING, &ext_psm_vals, 0, NULL, HFILL } }, { &hf_sdp_protocol_channel, diff -Nru wireshark-1.10.5/epan/dissectors/packet-btsdp.h wireshark-1.10.6/epan/dissectors/packet-btsdp.h --- wireshark-1.10.5/epan/dissectors/packet-btsdp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-btsdp.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-btsdp.h * - * $Id: packet-btsdp.h 48640 2013-03-29 17:25:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-btsmp.c wireshark-1.10.6/epan/dissectors/packet-btsmp.c --- wireshark-1.10.5/epan/dissectors/packet-btsmp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-btsmp.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2012, Allan M. Madsen * - * $Id: packet-btsmp.c 48661 2013-03-30 21:47:27Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bt-utp.c wireshark-1.10.6/epan/dissectors/packet-bt-utp.c --- wireshark-1.10.5/epan/dissectors/packet-bt-utp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bt-utp.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for BT-UTP dissection * Copyright 2011, Xiao Xiangquan * - * $Id: packet-bt-utp.c 47761 2013-02-20 02:15:20Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bvlc.c wireshark-1.10.6/epan/dissectors/packet-bvlc.c --- wireshark-1.10.5/epan/dissectors/packet-bvlc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bvlc.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for BACnet/IP (BVLL, BVLC) dissection * Copyright 2001, Hartmut Mueller , FH Dortmund * - * $Id: packet-bvlc.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-bzr.c wireshark-1.10.6/epan/dissectors/packet-bzr.c --- wireshark-1.10.5/epan/dissectors/packet-bzr.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-bzr.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * * http://doc.bazaar.canonical.com/developers/network-protocol.html * - * $Id: packet-bzr.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-c1222.c wireshark-1.10.6/epan/dissectors/packet-c1222.c --- wireshark-1.10.5/epan/dissectors/packet-c1222.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-c1222.c 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for ANSI C12.22 packet dissection * Copyright 2010, Edward J. Beroset, edward.j.beroset@us.elster.com * - * $Id: packet-c1222.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-c1222.h wireshark-1.10.6/epan/dissectors/packet-c1222.h --- wireshark-1.10.5/epan/dissectors/packet-c1222.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-c1222.h 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for ANSI C12.22 packet dissection * Copyright 2010, Edward J. Beroset, edward.j.beroset@us.elster.com * - * $Id: packet-c1222.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-calcappprotocol.c wireshark-1.10.6/epan/dissectors/packet-calcappprotocol.c --- wireshark-1.10.5/epan/dissectors/packet-calcappprotocol.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-calcappprotocol.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright 2006 by Thomas Dreibholz * - * $Id: packet-calcappprotocol.c 48313 2013-03-15 06:26:47Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-camel.c wireshark-1.10.6/epan/dissectors/packet-camel.c --- wireshark-1.10.5/epan/dissectors/packet-camel.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-camel.c 2014-03-07 18:07:12.000000000 +0000 @@ -16,7 +16,7 @@ * Updated to 3GPP TS 29.078 version 7.3.0 Release 7 (2006-06) * Built from the gsm-map dissector Copyright 2004, Anders Broman * - * $Id: packet-camel.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-camel.h wireshark-1.10.6/epan/dissectors/packet-camel.h --- wireshark-1.10.5/epan/dissectors/packet-camel.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-camel.h 2014-03-07 18:07:12.000000000 +0000 @@ -12,7 +12,7 @@ * Copyright 2005, Olivier Jacques * Built from the gsm-map dissector Copyright 2004, Anders Broman * - * $Id: packet-camel.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-canopen.c wireshark-1.10.6/epan/dissectors/packet-canopen.c --- wireshark-1.10.5/epan/dissectors/packet-canopen.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-canopen.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for CANopen dissection * Copyright 2011, Yegor Yefremov * - * $Id: packet-canopen.c 48313 2013-03-15 06:26:47Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-capwap.c wireshark-1.10.6/epan/dissectors/packet-capwap.c --- wireshark-1.10.5/epan/dissectors/packet-capwap.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-capwap.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for CAPWAP dissection (RFC 5415 / RFC5416) * Copyright 2009, Alexis La Goutte * - * $Id: packet-capwap.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -241,6 +241,9 @@ static int hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_a = -1; static int hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_b = -1; +static int hf_capwap_data_keep_alive = -1; +static int hf_capwap_data_keep_alive_length = -1; + static int hf_msg_fragments = -1; static int hf_msg_fragment = -1; static int hf_msg_fragment_overlap = -1; @@ -381,6 +384,9 @@ { 24, "Clear Configuration Response" }, { 25, "Station Configuration Request" }, { 26, "Station Configuration Response" }, + /* RFC5416 : Section 3 : IEEE 802.11 Specific CAPWAP Control Messages */ + { 3398913, "IEEE 802.11 WLAN Configuration Request" }, + { 3398914, "IEEE 802.11 WLAN Configuration Response" }, { 0, NULL } }; /* ************************************************************************* */ @@ -1177,6 +1183,34 @@ /* Returns the number of bytes consumed by this option. */ static int +dissect_capwap_data_keep_alive(tvbuff_t *tvb, packet_info *pinfo, proto_tree *capwap_data_tree, guint offset) +{ + guint16 len; + guint plen = 0, offset_end; + proto_item *ti; + proto_tree *capwap_data_keep_alive_tree; + + ti = proto_tree_add_item(capwap_data_tree, hf_capwap_data_keep_alive, tvb, offset, tvb_reported_length(tvb), ENC_NA); + capwap_data_keep_alive_tree = proto_item_add_subtree(ti, ett_capwap); + + ti = proto_tree_add_item(capwap_data_keep_alive_tree, hf_capwap_data_keep_alive_length, tvb, offset, 2, ENC_BIG_ENDIAN); + len = tvb_get_ntohs(tvb, offset); + if (len != tvb_reported_length(tvb)) + expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_WARN, "Invalid Keep Alive length"); + + plen += 2; + + offset_end = tvb_reported_length(tvb); + + while (offset+plen < offset_end) { + plen += dissect_capwap_message_element_type(tvb, capwap_data_keep_alive_tree, offset+plen); + } + + return plen; +} + +/* Returns the number of bytes consumed by this option. */ +static int dissect_capwap_control_header(tvbuff_t *tvb, proto_tree *capwap_control_tree, guint offset, packet_info *pinfo) { guint plen = 0; @@ -1192,9 +1226,9 @@ capwap_control_msg_type_tree = proto_item_add_subtree(ti_flag, ett_capwap); proto_tree_add_item(capwap_control_msg_type_tree, hf_capwap_control_header_msg_type_enterprise_nbr, tvb, offset, 3, ENC_BIG_ENDIAN); - proto_tree_add_item(capwap_control_msg_type_tree, hf_capwap_control_header_msg_type_enterprise_specific, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(capwap_control_msg_type_tree, hf_capwap_control_header_msg_type_enterprise_specific, tvb, offset, 4, ENC_BIG_ENDIAN); - col_append_fstr(pinfo->cinfo, COL_INFO, " - %s",val_to_str(tvb_get_guint8(tvb, offset+3),message_type,"Unknown Message Type (0x%02x)")); + col_append_fstr(pinfo->cinfo, COL_INFO, " - %s",val_to_str(tvb_get_ntohl(tvb, offset),message_type,"Unknown Message Type (0x%x)")); plen += 4; /* Sequence 8 bits */ @@ -1257,8 +1291,12 @@ *fragment_is = ((flags & 0x80) == 0x80) ? TRUE : FALSE; *fragment_more = ((flags &0x40) == 0x40) ? FALSE : TRUE; - /* Type of Payload (for CAPWAP Data Packet) */ - *payload_type = tvb_get_bits8(tvb, (offset+plen)*8+15,1); + /* Type of Payload (for CAPWAP Data Packet), use 0xff for Keep-Alive */ + if (flags &0x08 /* data channel Keep-Alive packet */) { + col_append_str(pinfo->cinfo, COL_INFO, " Keep-Alive"); + *payload_type = 0xff; + } else + *payload_type = tvb_get_bits8(tvb, (offset+plen)*8+15,1); plen += 3; @@ -1521,7 +1559,13 @@ if (payload_type == 0) { /* IEEE 802.3 Frame */ call_dissector(ieee8023_handle, next_tvb, pinfo, tree); - } else { + } + else if (payload_type == 0xff) { + /* CAPWAP Keep-Alive Payload */ + offset += dissect_capwap_data_keep_alive(next_tvb, pinfo, capwap_data_tree, 0); + } + else + { switch (payload_wbid) { case 0: /* Reserved - Cisco seems to use this instead of 1 */ /* It seems that just calling ieee80211_handle is not @@ -1539,8 +1583,7 @@ } } pinfo->fragmented = save_fragmented; -} - + } void proto_register_capwap_control(void) @@ -1700,7 +1743,7 @@ NULL, HFILL }}, { &hf_capwap_control_header_msg_type_enterprise_specific, { "Message Type (Enterprise Specific)", "capwap.control.header.message_type.enterprise_specific", - FT_UINT8, BASE_DEC, VALS(message_type), 0x00, + FT_UINT32, BASE_DEC, VALS(message_type), 0x00, NULL, HFILL }}, { &hf_capwap_control_header_seq_number, { "Sequence Number", "capwap.control.header.sequence_number", @@ -2172,10 +2215,18 @@ FT_BOOLEAN, 4, TFS(&tfs_true_false), 0x0002, NULL, HFILL }}, { &hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_b, - { "Radio Type 802.11g", "capwap.control.message_element.ieee80211_wtp_info_radio.radio_type_b", + { "Radio Type 802.11b", "capwap.control.message_element.ieee80211_wtp_info_radio.radio_type_b", FT_BOOLEAN, 4, TFS(&tfs_true_false), 0x0001, NULL, HFILL }}, + /* Data Channel Keep-Alive entries */ + { & hf_capwap_data_keep_alive, + { "Keep-Alive", "capwap.keep_alive", FT_NONE, BASE_NONE, + NULL, 0x00, NULL, HFILL } }, + { & hf_capwap_data_keep_alive_length, + { "Message Element Length", "capwap.keep_alive.length", FT_UINT16, BASE_DEC, + NULL, 0x00, NULL, HFILL } }, + /* Fragment entries */ { &hf_msg_fragments, { "Message fragments", "capwap.fragments", FT_NONE, BASE_NONE, diff -Nru wireshark-1.10.5/epan/dissectors/packet-cast.c wireshark-1.10.6/epan/dissectors/packet-cast.c --- wireshark-1.10.5/epan/dissectors/packet-cast.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cast.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Dissector for the CAST Client Control Protocol * (The "D-Channel"-Protocol for Cisco Systems' IP-Phones) * - * $Id: packet-cast.c 48313 2013-03-15 06:26:47Z etxrab $ + * $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/epan/dissectors/packet-catapult-dct2000.c wireshark-1.10.6/epan/dissectors/packet-catapult-dct2000.c --- wireshark-1.10.5/epan/dissectors/packet-catapult-dct2000.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-catapult-dct2000.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-catapult-dct2000.c * Routines for Catapult DCT2000 packet stub header disassembly * - * $Id: packet-catapult-dct2000.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ccsds.c wireshark-1.10.6/epan/dissectors/packet-ccsds.c --- wireshark-1.10.5/epan/dissectors/packet-ccsds.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ccsds.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2000, Scott Hovis scott.hovis@ums.msfc.nasa.gov * Enhanced 2008, Matt Dunkle Matthew.L.Dunkle@nasa.gov * - * $Id: packet-ccsds.c 47389 2013-01-31 17:55:31Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cdp.c wireshark-1.10.6/epan/dissectors/packet-cdp.c --- wireshark-1.10.5/epan/dissectors/packet-cdp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cdp.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the disassembly of the "Cisco Discovery Protocol" * (c) Copyright Hannes R. Boehm * - * $Id: packet-cdp.c 48313 2013-03-15 06:26:47Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cdt.c wireshark-1.10.6/epan/dissectors/packet-cdt.c --- wireshark-1.10.5/epan/dissectors/packet-cdt.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cdt.c 2014-03-07 18:07:12.000000000 +0000 @@ -12,7 +12,7 @@ * * Copyright 2005, Stig Bjorlykke , Thales Norway AS * - * $Id: packet-cdt.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cdt.h wireshark-1.10.6/epan/dissectors/packet-cdt.h --- wireshark-1.10.5/epan/dissectors/packet-cdt.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cdt.h 2014-03-07 18:07:12.000000000 +0000 @@ -12,7 +12,7 @@ * * Copyright 2005, Stig Bjorlykke , Thales Norway AS * - * $Id: packet-cdt.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cell_broadcast.c wireshark-1.10.6/epan/dissectors/packet-cell_broadcast.c --- wireshark-1.10.5/epan/dissectors/packet-cell_broadcast.c 2013-08-19 11:31:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cell_broadcast.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2011, Mike Morrin * - * $Id: packet-cell_broadcast.c 51425 2013-08-19 11:25:35Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -39,6 +39,8 @@ #include "packet-gsm_map.h" #include "packet-gsm_sms.h" +#include "packet-cell_broadcast.h" + #define GSM_CBS_PAGE_SIZE 88 const value_string message_id_values[] = { @@ -166,7 +168,7 @@ &addresses_reassembly_table_functions); } -guint16 dissect_cbs_serial_number(tvbuff_t *tvb, proto_tree *tree, guint16 offset) +guint dissect_cbs_serial_number(tvbuff_t *tvb, proto_tree *tree, guint offset) { guint16 serial_number = tvb_get_ntohs(tvb, offset) ; proto_item *item; @@ -178,11 +180,11 @@ proto_tree_add_item(subtree, hf_gsm_cbs_geographic_scope, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_cbs_message_code, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_cbs_update_number, tvb, offset, 2, ENC_BIG_ENDIAN); - offset +=2; + offset += 2; return offset; } -guint16 dissect_cbs_message_identifier(tvbuff_t *tvb, proto_tree *tree, guint16 offset) +guint dissect_cbs_message_identifier(tvbuff_t *tvb, proto_tree *tree, guint offset) { guint16 msg_id; const char *msg_id_string = NULL; @@ -245,10 +247,11 @@ } } proto_tree_add_uint_format_value(tree, hf_gsm_cbs_message_identifier, tvb, offset, 2, msg_id, "%s (%d)", msg_id_string, msg_id); - return 2; + offset += 2; + return offset; } -tvbuff_t * dissect_cbs_data(guint8 sms_encoding, tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint16 offset ) +tvbuff_t * dissect_cbs_data(guint8 sms_encoding, tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint offset ) { tvbuff_t * tvb_out = NULL; guint8 out_len; @@ -328,9 +331,9 @@ cbs_page_tree = proto_item_add_subtree(cbs_page_item, ett_gsm_cbs_page); serial_number = tvb_get_ntohs(tvb, offset); - offset += dissect_cbs_serial_number(tvb, cbs_page_tree, offset); + offset = dissect_cbs_serial_number(tvb, cbs_page_tree, offset); message_id = tvb_get_ntohs(tvb, offset); - offset += dissect_cbs_message_identifier(tvb, cbs_page_tree, offset); + offset = dissect_cbs_message_identifier(tvb, cbs_page_tree, offset); sms_encoding = dissect_cbs_data_coding_scheme(tvb, pinfo, cbs_page_tree, offset++); total_pages = tvb_get_guint8(tvb, offset); current_page = (total_pages & 0xF0) >> 4; @@ -388,7 +391,7 @@ guint32 len; proto_item *cbs_item = NULL, *cbs_item2 = NULL; proto_tree *cbs_tree = NULL, *cbs_subtree = NULL; - guint16 msg_len; + guint msg_len; tvbuff_t * cbs_msg_tvb = NULL; len = tvb_length(tvb); diff -Nru wireshark-1.10.5/epan/dissectors/packet-cell_broadcast.h wireshark-1.10.6/epan/dissectors/packet-cell_broadcast.h --- wireshark-1.10.5/epan/dissectors/packet-cell_broadcast.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cell_broadcast.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-cell_broadcast.h * - * $Id: packet-cell_broadcast.h 47177 2013-01-20 17:14:24Z pascal $ + * $Id$ * * Copyright 2011, Mike Morrin , * @@ -33,8 +33,10 @@ * @param tvb * @param tree * @param offset + * + * @return the offset after the Message Identifier */ -void dissect_cbs_message_identifier(tvbuff_t *tvb, proto_tree *tree, guint16 offset); +guint dissect_cbs_message_identifier(tvbuff_t *tvb, proto_tree *tree, guint offset); /** @@ -43,8 +45,10 @@ * @param tvb * @param tree * @param offset + * + * @return the offset after the Serial Number */ -void dissect_cbs_serial_number(tvbuff_t *tvb, proto_tree *tree, guint16 offset); +guint dissect_cbs_serial_number(tvbuff_t *tvb, proto_tree *tree, guint offset); /** @@ -54,11 +58,11 @@ * @param pinfo * @param tree */ -guint16 dissect_umts_cell_broadcast_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); +void dissect_umts_cell_broadcast_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); /** * Dissects CB Data */ -tvbuff_t * dissect_cbs_data(guint8 sms_encoding, tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint16 offset); +tvbuff_t * dissect_cbs_data(guint8 sms_encoding, tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint offset); #endif /* PACKET_CELL_BROADCAST_H */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-cfm.c wireshark-1.10.6/epan/dissectors/packet-cfm.c --- wireshark-1.10.5/epan/dissectors/packet-cfm.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cfm.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2011, Peter Nahas * Copyright 2012, Wim Leflere * - * $Id: packet-cfm.c 48334 2013-03-15 22:40:15Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cgmp.c wireshark-1.10.6/epan/dissectors/packet-cgmp.c --- wireshark-1.10.5/epan/dissectors/packet-cgmp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cgmp.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-cgmp.c * Routines for the disassembly of the Cisco Group Management Protocol * - * $Id: packet-cgmp.c 48313 2013-03-15 06:26:47Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-charging_ase.c wireshark-1.10.6/epan/dissectors/packet-charging_ase.c --- wireshark-1.10.5/epan/dissectors/packet-charging_ase.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-charging_ase.c 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ /* packet-charging_ase-template.c * Copyright 2009 , Anders Broman * - * $Id: packet-charging_ase.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-charging_ase.h wireshark-1.10.6/epan/dissectors/packet-charging_ase.h --- wireshark-1.10.5/epan/dissectors/packet-charging_ase.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-charging_ase.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ /* packet-charging_ase-template.h * Copyright 2009, Anders Broman * - * $Id: packet-charging_ase.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-chdlc.c wireshark-1.10.6/epan/dissectors/packet-chdlc.c --- wireshark-1.10.5/epan/dissectors/packet-chdlc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-chdlc.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-chdlc.c * Routines for Cisco HDLC packet disassembly * - * $Id: packet-chdlc.c 48313 2013-03-15 06:26:47Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-chdlc.h wireshark-1.10.6/epan/dissectors/packet-chdlc.h --- wireshark-1.10.5/epan/dissectors/packet-chdlc.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-chdlc.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-chdlc.h * - * $Id: packet-chdlc.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cigi.c wireshark-1.10.6/epan/dissectors/packet-cigi.c --- wireshark-1.10.5/epan/dissectors/packet-cigi.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cigi.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * CIGI - http://cigi.sourceforge.net/ * Copyright (c) 2005 The Boeing Company * - * $Id: packet-cigi.c 48334 2013-03-15 22:40:15Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cimd.c wireshark-1.10.6/epan/dissectors/packet-cimd.c --- wireshark-1.10.5/epan/dissectors/packet-cimd.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cimd.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * Copyright : 2005 Viorel Suman , Lucian Piros * In association with Avalanche Mobile BV, http://www.avmob.com * - * $Id: packet-cimd.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Refer to the AUTHORS file or the AUTHORS section in the man page * for contacting the author(s) of this file. diff -Nru wireshark-1.10.5/epan/dissectors/packet-cimetrics.c wireshark-1.10.6/epan/dissectors/packet-cimetrics.c --- wireshark-1.10.5/epan/dissectors/packet-cimetrics.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cimetrics.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Cimetrics LLC OUI dissection * Copyright 2008 Steve Karg Alabama * - * $Id: packet-cimetrics.c 48313 2013-03-15 06:26:47Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cip.c wireshark-1.10.6/epan/dissectors/packet-cip.c --- wireshark-1.10.5/epan/dissectors/packet-cip.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cip.c 2014-03-07 18:07:12.000000000 +0000 @@ -17,7 +17,7 @@ * Heuristic object support for common services * Michael Mann * Copyright 2011 * - * $Id: packet-cip.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cip.h wireshark-1.10.6/epan/dissectors/packet-cip.h --- wireshark-1.10.5/epan/dissectors/packet-cip.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cip.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ * Added support for Connection Configuration Object * ryan wamsley * Copyright 2007 * - * $Id: packet-cip.h 46020 2012-11-13 13:14:48Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cipmotion.c wireshark-1.10.6/epan/dissectors/packet-cipmotion.c --- wireshark-1.10.5/epan/dissectors/packet-cipmotion.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cipmotion.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * Copyright 2006-2007 * Benjamin M. Stocks * - * $Id: packet-cipmotion.c 48313 2013-03-15 06:26:47Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cipsafety.c wireshark-1.10.6/epan/dissectors/packet-cipsafety.c --- wireshark-1.10.5/epan/dissectors/packet-cipsafety.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cipsafety.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * Copyright 2011 * Michael Mann * - * $Id: packet-cipsafety.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cipsafety.h wireshark-1.10.6/epan/dissectors/packet-cipsafety.h --- wireshark-1.10.5/epan/dissectors/packet-cipsafety.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cipsafety.h 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * Copyright 2011 * Michael Mann * - * $Id: packet-cipsafety.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cisco-erspan.c wireshark-1.10.6/epan/dissectors/packet-cisco-erspan.c --- wireshark-1.10.5/epan/dissectors/packet-cisco-erspan.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cisco-erspan.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-erspan.c * Routines for the disassembly of Cisco's ERSPAN protocol * - * $Id: packet-cisco-erspan.c 47965 2013-03-01 05:29:12Z cmaynard $ + * $Id$ * * Copyright 2005 Joerg Mayer (see AUTHORS file) * Updates for newer versions by Jason Masker diff -Nru wireshark-1.10.5/epan/dissectors/packet-cisco-oui.c wireshark-1.10.6/epan/dissectors/packet-cisco-oui.c --- wireshark-1.10.5/epan/dissectors/packet-cisco-oui.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cisco-oui.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-cisco-oui.c * Register an LLC dissector table for Cisco's OUI 00:00:0c * - * $Id: packet-cisco-oui.c 48313 2013-03-15 06:26:47Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cisco-sm.c wireshark-1.10.6/epan/dissectors/packet-cisco-sm.c --- wireshark-1.10.5/epan/dissectors/packet-cisco-sm.c 2013-04-22 21:38:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cisco-sm.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Cisco Session Management Protocol dissection * Copyright 2004, Duncan Sargeant * - * $Id: packet-cisco-sm.c 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cisco-wids.c wireshark-1.10.6/epan/dissectors/packet-cisco-wids.c --- wireshark-1.10.5/epan/dissectors/packet-cisco-wids.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cisco-wids.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for dissecting wireless ids packets sent from a Cisco * access point to the WLSE (or whatever) * - * $Id: packet-cisco-wids.c 47924 2013-02-27 22:43:54Z guy $ + * $Id$ * * Copyright 2006 Joerg Mayer (see AUTHORS file) * diff -Nru wireshark-1.10.5/epan/dissectors/packet-classicstun.c wireshark-1.10.6/epan/dissectors/packet-classicstun.c --- wireshark-1.10.5/epan/dissectors/packet-classicstun.c 2013-04-22 21:38:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-classicstun.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Simple Traversal of UDP Through NAT dissection * Copyright 2003, Shiang-Ming Huang * - * $Id: packet-classicstun.c 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-clearcase.c wireshark-1.10.6/epan/dissectors/packet-clearcase.c --- wireshark-1.10.5/epan/dissectors/packet-clearcase.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-clearcase.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-clearcase.c * Routines for ClearCase NFS dissection * - * $Id: packet-clearcase.c 48313 2013-03-15 06:26:47Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-clearcase.h wireshark-1.10.6/epan/dissectors/packet-clearcase.h --- wireshark-1.10.5/epan/dissectors/packet-clearcase.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-clearcase.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-clearcase.h * - * $Id: packet-clearcase.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-clip.c wireshark-1.10.6/epan/dissectors/packet-clip.c --- wireshark-1.10.5/epan/dissectors/packet-clip.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-clip.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-clip.c * Routines for clip packet disassembly * - * $Id: packet-clip.c 48313 2013-03-15 06:26:47Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-clip.h wireshark-1.10.6/epan/dissectors/packet-clip.h --- wireshark-1.10.5/epan/dissectors/packet-clip.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-clip.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-clip.h * - * $Id: packet-clip.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-clique-rm.c wireshark-1.10.6/epan/dissectors/packet-clique-rm.c --- wireshark-1.10.5/epan/dissectors/packet-clique-rm.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-clique-rm.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2007, Collabora Ltd. * @author: Sjoerd Simons * - * $Id: packet-clique-rm.c 48313 2013-03-15 06:26:47Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-clnp.c wireshark-1.10.6/epan/dissectors/packet-clnp.c --- wireshark-1.10.5/epan/dissectors/packet-clnp.c 2013-05-04 08:26:21.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-clnp.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-clnp.c * Routines for ISO/OSI network protocol packet disassembly * - * $Id: packet-clnp.c 49159 2013-05-04 08:20:32Z alagoutte $ + * $Id$ * Laurent Deniel * Ralf Schneider * diff -Nru wireshark-1.10.5/epan/dissectors/packet-cmip.c wireshark-1.10.6/epan/dissectors/packet-cmip.c --- wireshark-1.10.5/epan/dissectors/packet-cmip.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cmip.c 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.711 CMIP packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-cmip.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cmip.h wireshark-1.10.6/epan/dissectors/packet-cmip.h --- wireshark-1.10.5/epan/dissectors/packet-cmip.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cmip.h 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.711 CMIP packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-cmip.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cmp.c wireshark-1.10.6/epan/dissectors/packet-cmp.c --- wireshark-1.10.5/epan/dissectors/packet-cmp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cmp.c 2014-03-07 18:07:12.000000000 +0000 @@ -13,7 +13,7 @@ * Updated to RFC4210 CMPv2 and associated "Transport Protocols for CMP" draft * Martin Peylo 2008 * - * $Id: packet-cmp.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cmp.h wireshark-1.10.6/epan/dissectors/packet-cmp.h --- wireshark-1.10.5/epan/dissectors/packet-cmp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cmp.h 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for RFC2510 Certificate Management Protocol packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-cmp.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cmpp.c wireshark-1.10.6/epan/dissectors/packet-cmpp.c --- wireshark-1.10.5/epan/dissectors/packet-cmpp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cmpp.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for China Mobile Point to Point dissection * Copyright 2007, Andy Chu * - * $Id: packet-cmpp.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cms.c wireshark-1.10.6/epan/dissectors/packet-cms.c --- wireshark-1.10.5/epan/dissectors/packet-cms.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cms.c 2014-03-07 18:07:12.000000000 +0000 @@ -11,7 +11,7 @@ * Ronnie Sahlberg 2004 * Stig Bjorlykke 2010 * - * $Id: packet-cms.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cms.h wireshark-1.10.6/epan/dissectors/packet-cms.h --- wireshark-1.10.5/epan/dissectors/packet-cms.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cms.h 2014-03-07 18:07:12.000000000 +0000 @@ -11,7 +11,7 @@ * Ronnie Sahlberg 2004 * Stig Bjorlykke 2010 * - * $Id: packet-cms.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cnip.c wireshark-1.10.6/epan/dissectors/packet-cnip.c --- wireshark-1.10.5/epan/dissectors/packet-cnip.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cnip.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Daniel Willmann * (c) 2011 Daniel Willmann * - * $Id: packet-cnip.c 48334 2013-03-15 22:40:15Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-coap.c wireshark-1.10.6/epan/dissectors/packet-coap.c --- wireshark-1.10.5/epan/dissectors/packet-coap.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-coap.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * draft-ietf-core-link-format-06.txt * Shoichi Sakane * - * $Id: packet-coap.c 48471 2013-03-22 00:12:44Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-collectd.c wireshark-1.10.6/epan/dissectors/packet-collectd.c --- wireshark-1.10.5/epan/dissectors/packet-collectd.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-collectd.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2008 Bruno Premont * Copyright 2009 Florian Forster * - * $Id: packet-collectd.c 48334 2013-03-15 22:40:15Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-componentstatus.c wireshark-1.10.6/epan/dissectors/packet-componentstatus.c --- wireshark-1.10.5/epan/dissectors/packet-componentstatus.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-componentstatus.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 2006 by Thomas Dreibholz * - * $Id: packet-componentstatus.c 48355 2013-03-17 16:48:47Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cops.c wireshark-1.10.6/epan/dissectors/packet-cops.c --- wireshark-1.10.5/epan/dissectors/packet-cops.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cops.c 2014-03-07 18:07:12.000000000 +0000 @@ -20,7 +20,7 @@ * * Implemented in wireshark at April 7-8, 2004 * - * $Id: packet-cops.c 48319 2013-03-15 16:39:30Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-coseventcomm.c wireshark-1.10.6/epan/dissectors/packet-coseventcomm.c --- wireshark-1.10.5/epan/dissectors/packet-coseventcomm.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-coseventcomm.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-coseventcomm.c * - * $Id: packet-coseventcomm.c 46765 2012-12-26 10:28:03Z guy $ + * $Id$ * * Routines for IDL dissection * diff -Nru wireshark-1.10.5/epan/dissectors/packet-cosine.c wireshark-1.10.6/epan/dissectors/packet-cosine.c --- wireshark-1.10.5/epan/dissectors/packet-cosine.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cosine.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-cosine.c * Routines for decoding CoSine IPNOS L2 debug output * - * $Id: packet-cosine.c 48319 2013-03-15 16:39:30Z etxrab $ + * $Id$ * * Motonori Shindo * diff -Nru wireshark-1.10.5/epan/dissectors/packet-cosnaming.c wireshark-1.10.6/epan/dissectors/packet-cosnaming.c --- wireshark-1.10.5/epan/dissectors/packet-cosnaming.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cosnaming.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-cosnaming.c * - * $Id: packet-cosnaming.c 47160 2013-01-19 10:54:09Z jake $ + * $Id$ * * Routines for IDL dissection * diff -Nru wireshark-1.10.5/epan/dissectors/packet-cpfi.c wireshark-1.10.6/epan/dissectors/packet-cpfi.c --- wireshark-1.10.5/epan/dissectors/packet-cpfi.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cpfi.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright 2003, Dave Sclarsky * - * $Id: packet-cpfi.c 48319 2013-03-15 16:39:30Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cpha.c wireshark-1.10.6/epan/dissectors/packet-cpha.c --- wireshark-1.10.5/epan/dissectors/packet-cpha.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cpha.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the Check Point High-Availability Protocol (CPHAP) * Copyright 2002, Yaniv Kaul * - * $Id: packet-cpha.c 48334 2013-03-15 22:40:15Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-credssp.c wireshark-1.10.6/epan/dissectors/packet-credssp.c --- wireshark-1.10.5/epan/dissectors/packet-credssp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-credssp.c 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for CredSSP (Credential Security Support Provider) packet dissection * Graeme Lunt 2011 * - * $Id: packet-credssp.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-credssp.h wireshark-1.10.6/epan/dissectors/packet-credssp.h --- wireshark-1.10.5/epan/dissectors/packet-credssp.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-credssp.h 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for CredSSP (Credential Security Support Provider) packet dissection * Graeme Lunt 2011 * - * $Id: packet-credssp.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-crmf.c wireshark-1.10.6/epan/dissectors/packet-crmf.c --- wireshark-1.10.5/epan/dissectors/packet-crmf.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-crmf.c 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for RFC2511 Certificate Request Message Format packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-crmf.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-crmf.h wireshark-1.10.6/epan/dissectors/packet-crmf.h --- wireshark-1.10.5/epan/dissectors/packet-crmf.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-crmf.h 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for RFC2511 Certificate Request Message Format packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-crmf.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-csm-encaps.c wireshark-1.10.6/epan/dissectors/packet-csm-encaps.c --- wireshark-1.10.5/epan/dissectors/packet-csm-encaps.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-csm-encaps.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-csm-encaps.c * Routines for CSM_ENCAPS dissection * Copyright 2005, Angelo Bannack - * $Id: packet-csm-encaps.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-csn1.c wireshark-1.10.6/epan/dissectors/packet-csn1.c --- wireshark-1.10.5/epan/dissectors/packet-csn1.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-csn1.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * with the gracious authorization of STE * Copyright (c) 2011 ST-Ericsson * - * $Id: packet-csn1.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-csn1.h wireshark-1.10.6/epan/dissectors/packet-csn1.h --- wireshark-1.10.5/epan/dissectors/packet-csn1.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-csn1.h 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * with the gracious authorization of STE * Copyright (c) 2011 ST-Ericsson * - * $Id: packet-csn1.h 46753 2012-12-26 06:16:39Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ctdb.c wireshark-1.10.6/epan/dissectors/packet-ctdb.c --- wireshark-1.10.5/epan/dissectors/packet-ctdb.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ctdb.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for CTDB (Cluster TDB) dissection * Copyright 2007, Ronnie Sahlberg * - * $Id: packet-ctdb.c 48338 2013-03-16 08:52:09Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-cups.c wireshark-1.10.6/epan/dissectors/packet-cups.c --- wireshark-1.10.5/epan/dissectors/packet-cups.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-cups.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * Charles Levert * Copyright 2001 Charles Levert * -* $Id: packet-cups.c 48338 2013-03-16 08:52:09Z etxrab $ +* $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/epan/dissectors/packet-daap.c wireshark-1.10.6/epan/dissectors/packet-daap.c --- wireshark-1.10.5/epan/dissectors/packet-daap.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-daap.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Digital Audio Access Protocol dissection * Copyright 2004, Kelly Byrd * - * $Id: packet-daap.c 48338 2013-03-16 08:52:09Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dap.c wireshark-1.10.6/epan/dissectors/packet-dap.c --- wireshark-1.10.5/epan/dissectors/packet-dap.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dap.c 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.511 (X.500 Directory Asbtract Service) and X.519 DAP packet dissection * Graeme Lunt 2005 * - * $Id: packet-dap.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dap.h wireshark-1.10.6/epan/dissectors/packet-dap.h --- wireshark-1.10.5/epan/dissectors/packet-dap.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dap.h 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.511 (X.500 Directory Access Protocol) packet dissection * Graeme Lunt 2005 * - * $Id: packet-dap.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-data.c wireshark-1.10.6/epan/dissectors/packet-data.c --- wireshark-1.10.5/epan/dissectors/packet-data.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-data.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for raw data (default case) * Gilbert Ramirez * - * $Id: packet-data.c 48338 2013-03-16 08:52:09Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-data.h wireshark-1.10.6/epan/dissectors/packet-data.h --- wireshark-1.10.5/epan/dissectors/packet-data.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-data.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-data.h * - * $Id: packet-data.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-daytime.c wireshark-1.10.6/epan/dissectors/packet-daytime.c --- wireshark-1.10.5/epan/dissectors/packet-daytime.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-daytime.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Daytime Protocol (RFC 867) packet dissection * Copyright 2006, Stephen Fisher (see AUTHORS file) * - * $Id: packet-daytime.c 48338 2013-03-16 08:52:09Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-db-lsp.c wireshark-1.10.6/epan/dissectors/packet-db-lsp.c --- wireshark-1.10.5/epan/dissectors/packet-db-lsp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-db-lsp.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2010, Stig Bjorlykke * - * $Id: packet-db-lsp.c 48338 2013-03-16 08:52:09Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dbus.c wireshark-1.10.6/epan/dissectors/packet-dbus.c --- wireshark-1.10.5/epan/dissectors/packet-dbus.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dbus.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for D-Bus dissection * Copyright 2012, Jakub Zawadzki * - * $Id: packet-dbus.c 48685 2013-04-01 15:29:49Z jake $ + * $Id$ * * Protocol specification available at http://dbus.freedesktop.org/doc/dbus-specification.html * diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcc.c wireshark-1.10.6/epan/dissectors/packet-dcc.c --- wireshark-1.10.5/epan/dissectors/packet-dcc.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcc.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 1999, Nathan Neulinger * - * $Id: packet-dcc.c 48338 2013-03-16 08:52:09Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcc.h wireshark-1.10.6/epan/dissectors/packet-dcc.h --- wireshark-1.10.5/epan/dissectors/packet-dcc.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcc.h 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 1999, Nathan Neulinger * - * $Id: packet-dcc.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dccp.c wireshark-1.10.6/epan/dissectors/packet-dccp.c --- wireshark-1.10.5/epan/dissectors/packet-dccp.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dccp.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * * Francesco Fondelli * - * $Id: packet-dccp.c 48338 2013-03-16 08:52:09Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dccp.h wireshark-1.10.6/epan/dissectors/packet-dccp.h --- wireshark-1.10.5/epan/dissectors/packet-dccp.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dccp.h 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * * Francesco Fondelli * - * $Id: packet-dccp.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * template taken from packet-udp.c * diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-atsvc.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-atsvc.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-atsvc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-atsvc.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-atsvc.c 45017 2012-09-20 02:03:38Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-atsvc.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-atsvc.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-atsvc.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-atsvc.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-atsvc.h 34718 2010-10-30 16:29:23Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-bossvr.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-bossvr.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-bossvr.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-bossvr.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/bosserver/bbos_ncs_interface.idl * - * $Id: packet-dcerpc-bossvr.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-browser.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-browser.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-browser.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-browser.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DCERPC Browser packet disassembly * Copyright 2001, Ronnie Sahlberg * - * $Id: packet-dcerpc-browser.c 48023 2013-03-02 22:54:39Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-browser.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-browser.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-browser.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-browser.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DCERPC Browser packet disassembly * Copyright 2002, Ronnie Sahlberg * - * $Id: packet-dcerpc-browser.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-budb.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-budb.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-budb.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-budb.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * Routines for BUDB packet disassembly * ronnie sahlberg 2005 * - * $Id: packet-dcerpc-budb.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-budb.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-budb.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-budb.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-budb.h 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ /* packet-dcerpc-budb.h * Routines for BUDB packet disassembly * - * $Id: packet-dcerpc-budb.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-butc.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-butc.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-butc.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-butc.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ /* packet-dcerpc-butc.c * Routines for BUTC packet disassembly * - * $Id: packet-dcerpc-butc.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-butc.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-butc.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-butc.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-butc.h 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ /* packet-dcerpc-butc.h * Routines for BUTC packet disassembly * - * $Id: packet-dcerpc-butc.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc.c wireshark-1.10.6/epan/dissectors/packet-dcerpc.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc.c 2013-10-29 23:01:22.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2003, Tim Potter * Copyright 2010, Julien Kerihuel * - * $Id: packet-dcerpc.c 52974 2013-10-29 22:55:21Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-cds_clerkserver.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-cds_clerkserver.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-cds_clerkserver.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-cds_clerkserver.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/directory.tar.gz directory/cds/stubs/cds_clerkserver.idl * - * $Id: packet-dcerpc-cds_clerkserver.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-cds_solicit.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-cds_solicit.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-cds_solicit.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-cds_solicit.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/directory.tar.gz directory/cds/stubs/cds_solicit.idl * - * $Id: packet-dcerpc-cds_solicit.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-conv.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-conv.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-conv.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-conv.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for dcerpc conv dissection * Copyright 2001, Todd Sabin * - * $Id: packet-dcerpc-conv.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-cprpc_server.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-cprpc_server.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-cprpc_server.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-cprpc_server.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/directory.tar.gz directory/cds/stubs/cprpc_server.idl * - * $Id: packet-dcerpc-cprpc_server.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-dce122.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-dce122.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-dce122.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-dce122.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2002, Jaime Fournier * This information is based off the released idl files from opengroup. * - * $Id: packet-dcerpc-dce122.c 47813 2013-02-22 01:34:53Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-dce122.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-dce122.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-dce122.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-dce122.h 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2002, Jaime Fournier * This information is based off the released idl files from opengroup. * - * $Id: packet-dcerpc-dce122.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-dcom.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-dcom.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-dcom.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-dcom.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-dcerpc-dcom.h * - * $Id: packet-dcerpc-dcom.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-dfs.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-dfs.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-dfs.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-dfs.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-dfs.c 45017 2012-09-20 02:03:38Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-dfs.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-dfs.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-dfs.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-dfs.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-dfs.h 34718 2010-10-30 16:29:23Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-dnsserver.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-dnsserver.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-dnsserver.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-dnsserver.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-dnsserver.c 48023 2013-03-02 22:54:39Z pascal $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-dnsserver.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-dnsserver.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-dnsserver.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-dnsserver.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-dnsserver.h 34718 2010-10-30 16:29:23Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-drsuapi.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-drsuapi.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-drsuapi.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-drsuapi.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * Routines for DRSUAPI packet disassembly * ronnie sahlberg 2005 * - * $Id: packet-dcerpc-drsuapi.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-drsuapi.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-drsuapi.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-drsuapi.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-drsuapi.h 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ /* packet-dcerpc-drsuapi.h * Routines for DRSUAPI packet disassembly * - * $Id: packet-dcerpc-drsuapi.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-dssetup.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-dssetup.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-dssetup.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-dssetup.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-dssetup.c 45017 2012-09-20 02:03:38Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-dssetup.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-dssetup.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-dssetup.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-dssetup.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-dssetup.h 34718 2010-10-30 16:29:23Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-dtsprovider.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-dtsprovider.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-dtsprovider.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-dtsprovider.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/time.tar.gz time/service/dtsprovider.idl * - * $Id: packet-dcerpc-dtsprovider.c 47389 2013-01-31 17:55:31Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-dtsstime_req.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-dtsstime_req.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-dtsstime_req.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-dtsstime_req.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/time.tar.gz time/service/dtsstime_req.idl * - * $Id: packet-dcerpc-dtsstime_req.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-efs.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-efs.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-efs.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-efs.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-efs.c 45017 2012-09-20 02:03:38Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-efs.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-efs.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-efs.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-efs.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-efs.h 34718 2010-10-30 16:29:23Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-epm.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-epm.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-epm.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-epm.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for dcerpc endpoint mapper dissection * Copyright 2001, Todd Sabin * - * $Id: packet-dcerpc-epm.c 48023 2013-03-02 22:54:39Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-eventlog.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-eventlog.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-eventlog.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-eventlog.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-eventlog.c 45017 2012-09-20 02:03:38Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-eventlog.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-eventlog.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-eventlog.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-eventlog.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-eventlog.h 34718 2010-10-30 16:29:23Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-fileexp.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-fileexp.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-fileexp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-fileexp.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/fsint/afs4int.idl * - * $Id: packet-dcerpc-fileexp.c 48023 2013-03-02 22:54:39Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-fldb.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-fldb.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-fldb.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-fldb.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/flserver/fldb_proc.idl * - * $Id: packet-dcerpc-fldb.c 48023 2013-03-02 22:54:39Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-frsapi.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-frsapi.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-frsapi.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-frsapi.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the frs API (File Replication Service) MSRPC interface * Copyright 2004 Jean-Baptiste Marchand * - * $Id: packet-dcerpc-frsapi.c 47310 2013-01-26 21:42:36Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-frsapi.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-frsapi.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-frsapi.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-frsapi.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the frs API (File Replication Service) MSRPC interface * Copyright 2004 Jean-Baptiste Marchand * - * $Id: packet-dcerpc-frsapi.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-frsrpc.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-frsrpc.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-frsrpc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-frsrpc.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-frsrpc.c 48023 2013-03-02 22:54:39Z pascal $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-frsrpc.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-frsrpc.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-frsrpc.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-frsrpc.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-frsrpc.h 44323 2012-08-08 03:28:02Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-frstrans.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-frstrans.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-frstrans.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-frstrans.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-frstrans.c 45017 2012-09-20 02:03:38Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-frstrans.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-frstrans.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-frstrans.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-frstrans.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-frstrans.h 39850 2011-11-15 15:16:37Z wmeier $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-ftserver.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-ftserver.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-ftserver.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-ftserver.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tgz file/ftserver/ftserver_proc.idl * - * $Id: packet-dcerpc-ftserver.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc.h wireshark-1.10.6/epan/dissectors/packet-dcerpc.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright 2001, Todd Sabin * Copyright 2003, Tim Potter * - * $Id: packet-dcerpc.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-icl_rpc.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-icl_rpc.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-icl_rpc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-icl_rpc.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz icl_rpc.idl * - * $Id: packet-dcerpc-icl_rpc.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-initshutdown.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-initshutdown.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-initshutdown.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-initshutdown.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-initshutdown.c 45017 2012-09-20 02:03:38Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-initshutdown.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-initshutdown.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-initshutdown.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-initshutdown.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-initshutdown.h 34718 2010-10-30 16:29:23Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-krb5rpc.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-krb5rpc.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-krb5rpc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-krb5rpc.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/krb5rpc.idl * - * $Id: packet-dcerpc-krb5rpc.c 47389 2013-01-31 17:55:31Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-llb.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-llb.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-llb.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-llb.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/admin.tar.gz ./admin/dced/idl/llb.idl * - * $Id: packet-dcerpc-llb.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-lsa.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-lsa.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-lsa.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-lsa.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-lsa.c 45017 2012-09-20 02:03:38Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-lsa.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-lsa.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-lsa.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-lsa.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-lsa.h 34718 2010-10-30 16:29:23Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-mapi.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-mapi.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-mapi.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-mapi.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-mapi.c 45017 2012-09-20 02:03:38Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-mapi.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-mapi.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-mapi.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-mapi.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-mapi.h 34718 2010-10-30 16:29:23Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-messenger.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-messenger.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-messenger.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-messenger.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for SMB \PIPE\msgsvc packet disassembly * Copyright 2003 Ronnie Sahlberg * - * $Id: packet-dcerpc-messenger.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-mgmt.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-mgmt.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-mgmt.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-mgmt.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2001, Todd Sabin * Copyright 2011, Matthieu Patou * - * $Id: packet-dcerpc-mgmt.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-misc.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-misc.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-misc.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-misc.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-misc.h 44323 2012-08-08 03:28:02Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-ndr.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-ndr.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-ndr.c 2013-10-29 23:01:22.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-ndr.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DCERPC NDR dissection * Copyright 2001, Todd Sabin * - * $Id: packet-dcerpc-ndr.c 52974 2013-10-29 22:55:21Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-netlogon.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-netlogon.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-netlogon.c 2013-08-19 11:31:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-netlogon.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2001,2003 Tim Potter * 2002 structure and command dissectors by Ronnie Sahlberg * - * $Id: packet-dcerpc-netlogon.c 51425 2013-08-19 11:25:35Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-netlogon.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-netlogon.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-netlogon.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-netlogon.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for SMB \PIPE\NETLOGON packet disassembly * Copyright 2001,2003 Tim Potter * - * $Id: packet-dcerpc-netlogon.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-nspi.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-nspi.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-nspi.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-nspi.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-nspi.c 45017 2012-09-20 02:03:38Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-nspi.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-nspi.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-nspi.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-nspi.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-nspi.h 34718 2010-10-30 16:29:23Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-nt.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-nt.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-nt.c 2013-10-29 23:01:22.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-nt.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * Copyright 2001-2003, Tim Potter * Copyright 2011, Matthieu Patou * - * $Id: packet-dcerpc-nt.c 52974 2013-10-29 22:55:21Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-nt.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-nt.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-nt.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-nt.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DCERPC over SMB packet disassembly * Copyright 2001-2003 Tim Potter * - * $Id: packet-dcerpc-nt.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-pnp.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-pnp.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-pnp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-pnp.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the pnp (Plug and Play) MSRPC interface * Copyright 2005 Jean-Baptiste Marchand * - * $Id: packet-dcerpc-pnp.c 47310 2013-01-26 21:42:36Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-pnp.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-pnp.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-pnp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-pnp.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the pnp (Plug and Play) MSRPC interface * Copyright 2005 Jean-Baptiste Marchand * - * $Id: packet-dcerpc-pnp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rdaclif.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rdaclif.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rdaclif.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rdaclif.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz ../security/idl/rdaclif.idl * - * $Id: packet-dcerpc-rdaclif.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rep_proc.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rep_proc.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rep_proc.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rep_proc.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tgz file/fsint/rep_proc.idl * - * $Id: packet-dcerpc-rep_proc.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rfr.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rfr.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rfr.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rfr.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-rfr.c 45017 2012-09-20 02:03:38Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rfr.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-rfr.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rfr.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rfr.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-rfr.h 34718 2010-10-30 16:29:23Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-roverride.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-roverride.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-roverride.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-roverride.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/roverride.idl * - * $Id: packet-dcerpc-roverride.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rpriv.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rpriv.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rpriv.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rpriv.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rpriv.idl * - * $Id: packet-dcerpc-rpriv.c 47389 2013-01-31 17:55:31Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rras.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rras.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rras.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rras.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the rras (Routing and Remote Access service) MSRPC interface * Copyright 2005 Jean-Baptiste Marchand * - * $Id: packet-dcerpc-rras.c 47310 2013-01-26 21:42:36Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rras.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-rras.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rras.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rras.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the rras (Routing and Remote Access service) MSRPC interface * Copyright 2005 Jean-Baptiste Marchand * - * $Id: packet-dcerpc-rras.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_acct.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_acct.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_acct.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_acct.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_acct.idl * - * $Id: packet-dcerpc-rs_acct.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_attr.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_attr.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_attr.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_attr.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_attr.idl * - * $Id: packet-dcerpc-rs_attr.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_attr_schema.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_attr_schema.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_attr_schema.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_attr_schema.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_attr_schema.idl * - * $Id: packet-dcerpc-rs_attr_schema.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_bind.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_bind.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_bind.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_bind.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_bind.idl * - * $Id: packet-dcerpc-rs_bind.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rsec_login.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rsec_login.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rsec_login.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rsec_login.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rsec_login.idl * - * $Id: packet-dcerpc-rsec_login.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_misc.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_misc.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_misc.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_misc.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_misc.idl * - * $Id: packet-dcerpc-rs_misc.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_pgo.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_pgo.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_pgo.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_pgo.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_pgo.idl * - * $Id: packet-dcerpc-rs_pgo.c 48947 2013-04-21 08:09:12Z jmayer $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_plcy.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_plcy.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_plcy.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_plcy.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz rs_plcy.idl * - * $Id: packet-dcerpc-rs_plcy.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_prop_acct.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_prop_acct.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_prop_acct.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_prop_acct.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz bubasics/rs_prop_acct.idl * - * $Id: packet-dcerpc-rs_prop_acct.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_prop_acl.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_prop_acl.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_prop_acl.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_prop_acl.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_prop_acl.idl * - * $Id: packet-dcerpc-rs_prop_acl.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_prop_attr.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_prop_attr.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_prop_attr.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_prop_attr.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_prop_attr.idl * - * $Id: packet-dcerpc-rs_prop_attr.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_prop_pgo.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_prop_pgo.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_prop_pgo.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_prop_pgo.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_prop_pgo.idl * - * $Id: packet-dcerpc-rs_prop_pgo.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_prop_plcy.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_prop_plcy.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_prop_plcy.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_prop_plcy.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_prop_plcy.idl * - * $Id: packet-dcerpc-rs_prop_plcy.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_pwd_mgmt.idl * - * $Id: packet-dcerpc-rs_pwd_mgmt.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_repadm.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_repadm.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_repadm.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_repadm.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_repadm.idl * - * $Id: packet-dcerpc-rs_repadm.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_replist.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_replist.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_replist.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_replist.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_repadm.idl * - * $Id: packet-dcerpc-rs_replist.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_repmgr.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_repmgr.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_repmgr.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_repmgr.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_repmgr.idl * - * $Id: packet-dcerpc-rs_repmgr.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_unix.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_unix.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-rs_unix.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-rs_unix.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_unix.idl * - * $Id: packet-dcerpc-rs_unix.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-samr.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-samr.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-samr.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-samr.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-samr.c 48023 2013-03-02 22:54:39Z pascal $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-samr.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-samr.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-samr.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-samr.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-samr.h 34718 2010-10-30 16:29:23Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-secidmap.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-secidmap.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-secidmap.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-secidmap.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rsecidmap.idl * - * $Id: packet-dcerpc-secidmap.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-spoolss.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-spoolss.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-spoolss.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-spoolss.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for SMB \PIPE\spoolss packet disassembly * Copyright 2001-2003, Tim Potter * - * $Id: packet-dcerpc-spoolss.c 48023 2013-03-02 22:54:39Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-spoolss.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-spoolss.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-spoolss.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-spoolss.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for SMB \PIPE\spoolss packet disassembly * Copyright 2001, Tim Potter * - * $Id: packet-dcerpc-spoolss.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-srvsvc.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-srvsvc.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-srvsvc.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-srvsvc.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-srvsvc.c 48023 2013-03-02 22:54:39Z pascal $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-srvsvc.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-srvsvc.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-srvsvc.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-srvsvc.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-srvsvc.h 34718 2010-10-30 16:29:23Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-svcctl.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-svcctl.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-svcctl.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-svcctl.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2003, Ronnie Sahlberg, added function dissectors * Copyright 2010, Brett Kuskie * - * $Id: packet-dcerpc-svcctl.c 48023 2013-03-02 22:54:39Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-svcctl.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-svcctl.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-svcctl.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-svcctl.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for SMB \PIPE\svcctl packet disassembly * Copyright 2003, Tim Potter * - * $Id: packet-dcerpc-svcctl.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-tapi.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-tapi.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-tapi.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-tapi.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DCERPC TAPI packet disassembly * Copyright 2002, Ronnie Sahlberg * - * $Id: packet-dcerpc-tapi.c 48023 2013-03-02 22:54:39Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-tapi.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-tapi.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-tapi.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-tapi.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DCERPC TAPI packet disassembly * Copyright 2002, Ronnie Sahlberg * - * $Id: packet-dcerpc-tapi.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-tkn4int.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-tkn4int.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-tkn4int.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-tkn4int.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/fsint/tkn4int.idl * - * $Id: packet-dcerpc-tkn4int.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-trksvr.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-trksvr.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-trksvr.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-trksvr.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DCERPC Distributed Link tracking Server packet disassembly * Copyright 2003, Ronnie Sahlberg * - * $Id: packet-dcerpc-trksvr.c 47389 2013-01-31 17:55:31Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-ubikdisk.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-ubikdisk.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-ubikdisk.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-ubikdisk.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/ncsubik/ubikdisk_proc.idl * - * $Id: packet-dcerpc-ubikdisk.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-ubikvote.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-ubikvote.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-ubikvote.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-ubikvote.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/ncsubik/ubikvote_proc.idl * - * $Id: packet-dcerpc-ubikvote.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-update.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-update.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-update.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-update.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/update/update.idl * - * $Id: packet-dcerpc-update.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-winreg.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-winreg.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-winreg.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-winreg.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-winreg.c 45017 2012-09-20 02:03:38Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-winreg.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-winreg.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-winreg.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-winreg.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-winreg.h 34718 2010-10-30 16:29:23Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-wkssvc.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-wkssvc.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-wkssvc.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-wkssvc.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-wkssvc.c 45017 2012-09-20 02:03:38Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-wkssvc.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-wkssvc.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-wkssvc.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-wkssvc.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-wkssvc.h 34718 2010-10-30 16:29:23Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-wzcsvc.c wireshark-1.10.6/epan/dissectors/packet-dcerpc-wzcsvc.c --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-wzcsvc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-wzcsvc.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-wzcsvc.c 45017 2012-09-20 02:03:38Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcerpc-wzcsvc.h wireshark-1.10.6/epan/dissectors/packet-dcerpc-wzcsvc.h --- wireshark-1.10.5/epan/dissectors/packet-dcerpc-wzcsvc.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcerpc-wzcsvc.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl - $Id: packet-dcerpc-wzcsvc.h 34718 2010-10-30 16:29:23Z morriss $ + $Id$ */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcm.c wireshark-1.10.6/epan/dissectors/packet-dcm.c --- wireshark-1.10.5/epan/dissectors/packet-dcm.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcm.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ * http://medical.nema.org/dicom/2008 * DICOM Part 8: Network Communication Support for Message Exchange * - * $Id: packet-dcm.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcm.h wireshark-1.10.6/epan/dissectors/packet-dcm.h --- wireshark-1.10.5/epan/dissectors/packet-dcm.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcm.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-dcm.h * - * $Id: packet-dcm.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * Routines for DICOM packet dissection * Copyright 2009, David Aggeler * diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcom.c wireshark-1.10.6/epan/dissectors/packet-dcom.c --- wireshark-1.10.5/epan/dissectors/packet-dcom.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcom.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-dcom.c * Routines for DCOM generics * - * $Id: packet-dcom.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcom-dispatch.c wireshark-1.10.6/epan/dissectors/packet-dcom-dispatch.c --- wireshark-1.10.5/epan/dissectors/packet-dcom-dispatch.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcom-dispatch.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-dcom-dispatch.c * Routines for DCOM IDispatch * - * $Id: packet-dcom-dispatch.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcom-dispatch.h wireshark-1.10.6/epan/dissectors/packet-dcom-dispatch.h --- wireshark-1.10.5/epan/dissectors/packet-dcom-dispatch.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcom-dispatch.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-dcom-dispatch.h * Routines for DCOM IDispatch * - * $Id: packet-dcom-dispatch.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcom.h wireshark-1.10.6/epan/dissectors/packet-dcom.h --- wireshark-1.10.5/epan/dissectors/packet-dcom.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcom.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-dcom.h * Routines for DCOM generics * - * $Id: packet-dcom.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcom-oxid.c wireshark-1.10.6/epan/dissectors/packet-dcom-oxid.c --- wireshark-1.10.5/epan/dissectors/packet-dcom-oxid.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcom-oxid.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DCOM OXID Resolver * Copyright 2001, Todd Sabin * - * $Id: packet-dcom-oxid.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcom-remact.c wireshark-1.10.6/epan/dissectors/packet-dcom-remact.c --- wireshark-1.10.5/epan/dissectors/packet-dcom-remact.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcom-remact.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DCOM Remote Activation * Copyright 2001, Todd Sabin * - * $Id: packet-dcom-remact.c 48344 2013-03-16 20:22:54Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcom-remunkn.c wireshark-1.10.6/epan/dissectors/packet-dcom-remunkn.c --- wireshark-1.10.5/epan/dissectors/packet-dcom-remunkn.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcom-remunkn.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the IRemUnknown interface * Copyright 2004, Jelmer Vernooij * - * $Id: packet-dcom-remunkn.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcom-sysact.c wireshark-1.10.6/epan/dissectors/packet-dcom-sysact.c --- wireshark-1.10.5/epan/dissectors/packet-dcom-sysact.c 2013-07-17 22:26:25.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcom-sysact.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2004, Jelmer Vernooij * Copyright 2012, Litao Gao * - * $Id: packet-dcom-sysact.c 50710 2013-07-17 22:20:12Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dcp-etsi.c wireshark-1.10.6/epan/dissectors/packet-dcp-etsi.c --- wireshark-1.10.5/epan/dissectors/packet-dcp-etsi.c 2013-06-06 20:11:06.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dcp-etsi.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ETSI Distribution & Communication Protocol * Copyright 2006, British Broadcasting Corporation * - * $Id: packet-dcp-etsi.c 49819 2013-06-06 20:04:34Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ddtp.c wireshark-1.10.6/epan/dissectors/packet-ddtp.c --- wireshark-1.10.5/epan/dissectors/packet-ddtp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ddtp.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * see http://ddt.sourceforge.net/ * Olivier Abad * - * $Id: packet-ddtp.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ddtp.h wireshark-1.10.6/epan/dissectors/packet-ddtp.h --- wireshark-1.10.5/epan/dissectors/packet-ddtp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ddtp.h 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * see http://ddt.sourceforge.net/ * Olivier Abad * - * $Id: packet-ddtp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dec-bpdu.c wireshark-1.10.6/epan/dissectors/packet-dec-bpdu.c --- wireshark-1.10.5/epan/dissectors/packet-dec-bpdu.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dec-bpdu.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-dec-bpdu.c * Routines for DEC BPDU (DEC Spanning Tree Protocol) disassembly * - * $Id: packet-dec-bpdu.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * Copyright 2001 Paul Ionescu * diff -Nru wireshark-1.10.5/epan/dissectors/packet-dec-dnart.c wireshark-1.10.6/epan/dissectors/packet-dec-dnart.c --- wireshark-1.10.5/epan/dissectors/packet-dec-dnart.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dec-dnart.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * Copyright 2003-2005 Fred Hoekstra, Philips Medical Systems. * (fred.hoekstra@philips.com) * - * $Id: packet-dec-dnart.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * Use was made of the following documentation: * diff -Nru wireshark-1.10.5/epan/dissectors/packet-dect.c wireshark-1.10.6/epan/dissectors/packet-dect.c --- wireshark-1.10.5/epan/dissectors/packet-dect.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dect.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Dissector for the Digital Enhanced Cordless Telecommunications * protocol. * - * $Id: packet-dect.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * Copyright 2008-2009: * - Andreas Schuler diff -Nru wireshark-1.10.5/epan/dissectors/packet-dhcp-failover.c wireshark-1.10.6/epan/dissectors/packet-dhcp-failover.c --- wireshark-1.10.5/epan/dissectors/packet-dhcp-failover.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dhcp-failover.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ISC DHCP Server failover protocol dissection * Copyright 2004, M. Ortega y Strupp * - * $Id: packet-dhcp-failover.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dhcpv6.c wireshark-1.10.6/epan/dissectors/packet-dhcpv6.c --- wireshark-1.10.5/epan/dissectors/packet-dhcpv6.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dhcpv6.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ * Tony Lindstrom * Copyright 2012, Jerome LAFORGE * - * $Id: packet-dhcpv6.c 48965 2013-04-22 17:28:16Z alagoutte $ + * $Id$ * * The information used comes from: * RFC3315.txt (DHCPv6) diff -Nru wireshark-1.10.5/epan/dissectors/packet-diameter_3gpp.c wireshark-1.10.6/epan/dissectors/packet-diameter_3gpp.c --- wireshark-1.10.5/epan/dissectors/packet-diameter_3gpp.c 2013-07-17 20:08:21.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-diameter_3gpp.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for dissecting 3GPP OctetSting AVP:s * Copyright 2008, Anders Broman * - * $Id: packet-diameter_3gpp.c 50704 2013-07-17 19:24:28Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-diameter.c wireshark-1.10.6/epan/dissectors/packet-diameter.c --- wireshark-1.10.5/epan/dissectors/packet-diameter.c 2013-07-19 13:58:19.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-diameter.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-diameter.c * Routines for Diameter packet disassembly * - * $Id: packet-diameter.c 50738 2013-07-19 13:52:41Z morriss $ + * $Id$ * * Copyright (c) 2001 by David Frascone * Copyright (c) 2007 by Luis E. Garcia Ontanon diff -Nru wireshark-1.10.5/epan/dissectors/packet-diameter.h wireshark-1.10.6/epan/dissectors/packet-diameter.h --- wireshark-1.10.5/epan/dissectors/packet-diameter.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-diameter.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * packet-diameter.h * * Definitions for Diameter packet disassembly - * $Id: packet-diameter.h 46554 2012-12-16 02:13:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-diffserv-mpls-common.c wireshark-1.10.6/epan/dissectors/packet-diffserv-mpls-common.c --- wireshark-1.10.5/epan/dissectors/packet-diffserv-mpls-common.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-diffserv-mpls-common.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the common part of Diffserv MPLS signaling protocols * Author: Endoh Akira (endoh@netmarks.co.jp) * - * $Id: packet-diffserv-mpls-common.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-diffserv-mpls-common.h wireshark-1.10.6/epan/dissectors/packet-diffserv-mpls-common.h --- wireshark-1.10.5/epan/dissectors/packet-diffserv-mpls-common.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-diffserv-mpls-common.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the common part of Diffserv MPLS signaling protocols * Author: Endoh Akira (endoh@netmarks.co.jp) * - * $Id: packet-diffserv-mpls-common.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dis.c wireshark-1.10.6/epan/dissectors/packet-dis.c --- wireshark-1.10.5/epan/dissectors/packet-dis.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dis.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2005, Scientific Research Corporation * Initial implementation by Jeremy Ouellette * - * $Id: packet-dis.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dis-enums.c wireshark-1.10.6/epan/dissectors/packet-dis-enums.c --- wireshark-1.10.5/epan/dissectors/packet-dis-enums.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dis-enums.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2005, Scientific Research Corporation * Initial implementation by Jeremy Ouellette * - * $Id: packet-dis-enums.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dis-enums.h wireshark-1.10.6/epan/dissectors/packet-dis-enums.h --- wireshark-1.10.5/epan/dissectors/packet-dis-enums.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dis-enums.h 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2005, Scientific Research Corporation * Initial implementation by Jeremy Ouellette * - * $Id: packet-dis-enums.h 46660 2012-12-21 09:29:46Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dis-fields.c wireshark-1.10.6/epan/dissectors/packet-dis-fields.c --- wireshark-1.10.5/epan/dissectors/packet-dis-fields.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dis-fields.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2005, Scientific Research Corporation * Initial implementation by Jeremy Ouellette * - * $Id: packet-dis-fields.c 48343 2013-03-16 20:00:03Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dis-fields.h wireshark-1.10.6/epan/dissectors/packet-dis-fields.h --- wireshark-1.10.5/epan/dissectors/packet-dis-fields.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dis-fields.h 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2005, Scientific Research Corporation * Initial implementation by Jeremy Ouellette * - * $Id: packet-dis-fields.h 47119 2013-01-16 17:27:03Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-disp.c wireshark-1.10.6/epan/dissectors/packet-disp.c --- wireshark-1.10.5/epan/dissectors/packet-disp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-disp.c 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.525 (X.500 Directory Shadow Asbtract Service) and X.519 DISP packet dissection * Graeme Lunt 2005 * - * $Id: packet-disp.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dis-pdus.c wireshark-1.10.6/epan/dissectors/packet-dis-pdus.c --- wireshark-1.10.5/epan/dissectors/packet-dis-pdus.c 2013-07-08 21:21:23.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dis-pdus.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2005, Scientific Research Corporation * Initial implementation by Jeremy Ouellette * - * $Id: packet-dis-pdus.c 50451 2013-07-08 21:15:37Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dis-pdus.h wireshark-1.10.6/epan/dissectors/packet-dis-pdus.h --- wireshark-1.10.5/epan/dissectors/packet-dis-pdus.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dis-pdus.h 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2005, Scientific Research Corporation * Initial implementation by Jeremy Ouellette * - * $Id: packet-dis-pdus.h 47119 2013-01-16 17:27:03Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-disp.h wireshark-1.10.6/epan/dissectors/packet-disp.h --- wireshark-1.10.5/epan/dissectors/packet-disp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-disp.h 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.525 (X.400 Message Transfer) packet dissection * Graeme Lunt 2005 * - * $Id: packet-disp.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-distcc.c wireshark-1.10.6/epan/dissectors/packet-distcc.c --- wireshark-1.10.5/epan/dissectors/packet-distcc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-distcc.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2003, Brad Hards * Copyright 2003, Ronnie Sahlberg, added TCP desegmentation. * - * $Id: packet-distcc.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dlm3.c wireshark-1.10.6/epan/dissectors/packet-dlm3.c --- wireshark-1.10.5/epan/dissectors/packet-dlm3.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dlm3.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for dlm3 dissection * Copyright 2007, Masatake YAMATO * - * $Id: packet-dlm3.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dlsw.c wireshark-1.10.6/epan/dissectors/packet-dlsw.c --- wireshark-1.10.5/epan/dissectors/packet-dlsw.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dlsw.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DLSw packet dissection (Data Link Switching) * Copyright 2001, Paul Ionescu * - * $Id: packet-dlsw.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dmp.c wireshark-1.10.6/epan/dissectors/packet-dmp.c --- wireshark-1.10.5/epan/dissectors/packet-dmp.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dmp.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ * * Copyright 2006, Stig Bjorlykke , Thales Norway AS * - * $Id: packet-dmp.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dmx.c wireshark-1.10.6/epan/dissectors/packet-dmx.c --- wireshark-1.10.5/epan/dissectors/packet-dmx.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dmx.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-dmx.c * DMX packet disassembly. * - * $Id: packet-dmx.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * This dissector is written by * diff -Nru wireshark-1.10.5/epan/dissectors/packet-dmx-chan.c wireshark-1.10.6/epan/dissectors/packet-dmx-chan.c --- wireshark-1.10.5/epan/dissectors/packet-dmx-chan.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dmx-chan.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-dmx-chan.c * DMX Channel Data packet disassembly. * - * $Id: packet-dmx-chan.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * This dissector is written by * @@ -87,6 +87,7 @@ row_count = (length / global_disp_col_count) + ((length % global_disp_col_count) == 0 ? 0 : 1); for (r = 0; r < row_count;r++) { + ep_strbuf_truncate(chan_str, 0); for (c = 0;(c < global_disp_col_count) && (((r * global_disp_col_count) + c) < length);c++) { if ((global_disp_col_count >= 2) && ((c % (global_disp_col_count / 2)) == 0)) { ep_strbuf_append(chan_str, " "); diff -Nru wireshark-1.10.5/epan/dissectors/packet-dmx-sip.c wireshark-1.10.6/epan/dissectors/packet-dmx-sip.c --- wireshark-1.10.5/epan/dissectors/packet-dmx-sip.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dmx-sip.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-dmx-sip.c * DMX SIP packet disassembly. * - * $Id: packet-dmx-sip.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * This dissector is written by * diff -Nru wireshark-1.10.5/epan/dissectors/packet-dmx-test.c wireshark-1.10.6/epan/dissectors/packet-dmx-test.c --- wireshark-1.10.5/epan/dissectors/packet-dmx-test.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dmx-test.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-dmx-test.c * DMX Test packet disassembly. * - * $Id: packet-dmx-test.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * This dissector is written by * diff -Nru wireshark-1.10.5/epan/dissectors/packet-dmx-text.c wireshark-1.10.6/epan/dissectors/packet-dmx-text.c --- wireshark-1.10.5/epan/dissectors/packet-dmx-text.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dmx-text.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-dmx-text.c * DMX Text packet disassembly. * - * $Id: packet-dmx-text.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * This dissector is written by * diff -Nru wireshark-1.10.5/epan/dissectors/packet-dnp.c wireshark-1.10.6/epan/dissectors/packet-dnp.c --- wireshark-1.10.5/epan/dissectors/packet-dnp.c 2013-12-13 21:58:08.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dnp.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ * * Major updates: tcp and application layer defragmentation, more object dissections by Graham Bloice * - * $Id: packet-dnp.c 54070 2013-12-13 21:47:00Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dns.c wireshark-1.10.6/epan/dissectors/packet-dns.c --- wireshark-1.10.5/epan/dissectors/packet-dns.c 2013-10-29 23:01:22.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dns.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DNS packet disassembly * Copyright 2004, Nicolas DICHTEL - 6WIND - * - * $Id: packet-dns.c 52974 2013-10-29 22:55:21Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dns.h wireshark-1.10.6/epan/dissectors/packet-dns.h --- wireshark-1.10.5/epan/dissectors/packet-dns.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dns.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for packet disassembly structures and routines used both by * DNS and NBNS. * - * $Id: packet-dns.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dop.c wireshark-1.10.6/epan/dissectors/packet-dop.c --- wireshark-1.10.5/epan/dissectors/packet-dop.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dop.c 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.501 (DSA Operational Attributes) packet dissection * Graeme Lunt 2005 * - * $Id: packet-dop.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dop.h wireshark-1.10.6/epan/dissectors/packet-dop.h --- wireshark-1.10.5/epan/dissectors/packet-dop.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dop.h 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.501 (DSA Operational Attributes) packet dissection * Graeme Lunt 2005 * - * $Id: packet-dop.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dplay.c wireshark-1.10.6/epan/dissectors/packet-dplay.c --- wireshark-1.10.5/epan/dissectors/packet-dplay.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dplay.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * This is a dissector for the DirectPlay protocol. * Copyright 2006 - 2008 by Kai Blin * - * $Id: packet-dplay.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dpnss.c wireshark-1.10.6/epan/dissectors/packet-dpnss.c --- wireshark-1.10.5/epan/dissectors/packet-dpnss.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dpnss.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * * Supplementary string parameter table and testing by Tomas Muehlhoff. * - * $Id: packet-dpnss.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dpnss-link.c wireshark-1.10.6/epan/dissectors/packet-dpnss-link.c --- wireshark-1.10.5/epan/dissectors/packet-dpnss-link.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dpnss-link.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DPNSS/DASS2 link layer dissection * Copyright 2009, Rolf Fiedler * - * $Id: packet-dpnss-link.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-drda.c wireshark-1.10.6/epan/dissectors/packet-drda.c --- wireshark-1.10.5/epan/dissectors/packet-drda.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-drda.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * metatech * - * $Id: packet-drda.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dsi.c wireshark-1.10.6/epan/dissectors/packet-dsi.c --- wireshark-1.10.5/epan/dissectors/packet-dsi.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dsi.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for dsi packet dissection * Copyright 2001, Randy McEoin * - * $Id: packet-dsi.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -342,7 +342,8 @@ sign_ofs = tvb_get_ntohs(tvb, ofs); proto_tree_add_text(tree, tvb, ofs, 2, "Signature offset: %d", sign_ofs); - sign_ofs += offset; + if (sign_ofs) + sign_ofs += offset; if ((flag & AFPSRVRINFO_TCPIP)) { ofs += 2; @@ -365,12 +366,15 @@ } } - ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_MACHOFF); - if (ofs) + ofs = tvb_get_ntohs(tvb, offset +AFPSTATUS_MACHOFF); + if (ofs) { + ofs += offset; proto_tree_add_item(tree, hf_dsi_server_type, tvb, ofs, 1, ENC_ASCII|ENC_NA); + } - ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_VERSOFF); + ofs = tvb_get_ntohs(tvb, offset +AFPSTATUS_VERSOFF); if (ofs) { + ofs += offset; nbe = tvb_get_guint8(tvb, ofs); ti = proto_tree_add_text(tree, tvb, ofs, 1, "Version list: %d", nbe); ofs++; @@ -382,8 +386,9 @@ } } - ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_UAMSOFF); + ofs = tvb_get_ntohs(tvb, offset +AFPSTATUS_UAMSOFF); if (ofs) { + ofs += offset; nbe = tvb_get_guint8(tvb, ofs); ti = proto_tree_add_text(tree, tvb, ofs, 1, "UAMS list: %d", nbe); ofs++; @@ -395,9 +400,11 @@ } } - ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_ICONOFF); - if (ofs) + ofs = tvb_get_ntohs(tvb, offset +AFPSTATUS_ICONOFF); + if (ofs) { + ofs += offset; proto_tree_add_item(tree, hf_dsi_server_icon, tvb, ofs, 256, ENC_NA); + } if (sign_ofs) { proto_tree_add_item(tree, hf_dsi_server_signature, tvb, sign_ofs, 16, ENC_NA); diff -Nru wireshark-1.10.5/epan/dissectors/packet-dsp.c wireshark-1.10.6/epan/dissectors/packet-dsp.c --- wireshark-1.10.5/epan/dissectors/packet-dsp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dsp.c 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.518 (X.500 Distributed Operations) packet dissection * Graeme Lunt 2005 * - * $Id: packet-dsp.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dsp.h wireshark-1.10.6/epan/dissectors/packet-dsp.h --- wireshark-1.10.5/epan/dissectors/packet-dsp.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dsp.h 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.511 (X.500 Directory Access Protocol) packet dissection * Graeme Lunt 2005 * - * $Id: packet-dsp.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dtcp-ip.c wireshark-1.10.6/epan/dissectors/packet-dtcp-ip.c --- wireshark-1.10.5/epan/dissectors/packet-dtcp-ip.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dtcp-ip.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 2012, Martin Kaiser * - * $Id: packet-dtcp-ip.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dtls.c wireshark-1.10.6/epan/dissectors/packet-dtls.c --- wireshark-1.10.5/epan/dissectors/packet-dtls.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dtls.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright (c) 2006, Authesserre Samuel * Copyright (c) 2007, Mikael Magnusson * - * $Id: packet-dtls.c 48916 2013-04-18 19:19:38Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dtn.c wireshark-1.10.6/epan/dissectors/packet-dtn.c --- wireshark-1.10.5/epan/dissectors/packet-dtn.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dtn.c 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ * names of its contributors may be used to endorse or promote products * derived from this software without specific prior written permission. * - * $Id: packet-dtn.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dtn.h wireshark-1.10.6/epan/dissectors/packet-dtn.h --- wireshark-1.10.5/epan/dissectors/packet-dtn.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dtn.h 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ * names of its contributors may be used to endorse or promote products * derived from this software without specific prior written permission. * - * $Id: packet-dtn.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dtp.c wireshark-1.10.6/epan/dissectors/packet-dtp.c --- wireshark-1.10.5/epan/dissectors/packet-dtp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dtp.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-dtp.c * Routines for the disassembly for Cisco Dynamic Trunking Protocol * - * $Id: packet-dtp.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dtpt.c wireshark-1.10.6/epan/dissectors/packet-dtpt.c --- wireshark-1.10.5/epan/dissectors/packet-dtpt.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dtpt.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * Uwe Girlich * http://www.synce.org/moin/ProtocolDocumentation/DesktopPassThrough * - * $Id: packet-dtpt.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dua.c wireshark-1.10.6/epan/dissectors/packet-dua.c --- wireshark-1.10.5/epan/dissectors/packet-dua.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dua.c 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ * * Copyright 2005, Michael Tuexen * - * $Id: packet-dua.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dvb-ait.c wireshark-1.10.6/epan/dissectors/packet-dvb-ait.c --- wireshark-1.10.5/epan/dissectors/packet-dvb-ait.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dvb-ait.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DVB Application Information Table (AIT) dissection * Copyright 2012-2013, Martin Kaiser * - * $Id: packet-dvb-ait.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dvb-bat.c wireshark-1.10.6/epan/dissectors/packet-dvb-bat.c --- wireshark-1.10.5/epan/dissectors/packet-dvb-bat.c 2013-12-16 20:32:09.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dvb-bat.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DVB (ETSI EN 300 468) Bouquet Association Table (BAT) dissection * Copyright 2012, Guy Martin * - * $Id: packet-dvb-bat.c 54154 2013-12-16 20:26:35Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dvbci.c wireshark-1.10.6/epan/dissectors/packet-dvbci.c --- wireshark-1.10.5/epan/dissectors/packet-dvbci.c 2013-12-16 20:32:09.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dvbci.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DVB-CI (Common Interface) dissection * Copyright 2011-2013, Martin Kaiser * - * $Id: packet-dvbci.c 54154 2013-12-16 20:26:35Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -5305,7 +5305,7 @@ FT_UINT8, BASE_HEX, NULL, 0x08, NULL, HFILL } }, { &hf_dvbci_uri_rct, - { "Redistribution control trigger (RCT)", "dvb-ci.cc.uri.ict", + { "Redistribution control trigger (RCT)", "dvb-ci.cc.uri.rct", FT_UINT8, BASE_HEX, NULL, 0x04, NULL, HFILL } }, { &hf_dvbci_cc_key_register, diff -Nru wireshark-1.10.5/epan/dissectors/packet-dvb-data-mpe.c wireshark-1.10.6/epan/dissectors/packet-dvb-data-mpe.c --- wireshark-1.10.5/epan/dissectors/packet-dvb-data-mpe.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dvb-data-mpe.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DVB-DATA (ETSI EN 301 192) MultiProtocol Encapsulation * Copyright 2012, Guy Martin * - * $Id: packet-dvb-data-mpe.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dvb-eit.c wireshark-1.10.6/epan/dissectors/packet-dvb-eit.c --- wireshark-1.10.5/epan/dissectors/packet-dvb-eit.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dvb-eit.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DVB (ETSI EN 300 468) Event Information Table (EIT) dissection * Copyright 2012, Guy Martin * - * $Id: packet-dvb-eit.c 48706 2013-04-02 19:04:25Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dvb-ipdc.c wireshark-1.10.6/epan/dissectors/packet-dvb-ipdc.c --- wireshark-1.10.5/epan/dissectors/packet-dvb-ipdc.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dvb-ipdc.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ETSI IP Datacast ESG Bootstrap parsing * Copyright 2009 by Holger Hans Peter Freyther * - * $Id: packet-dvb-ipdc.c 48341 2013-03-16 16:25:41Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dvb-nit.c wireshark-1.10.6/epan/dissectors/packet-dvb-nit.c --- wireshark-1.10.5/epan/dissectors/packet-dvb-nit.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dvb-nit.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DVB (ETSI EN 300 468) Network Information Table (NIT) dissection * Copyright 2012, Guy Martin * - * $Id: packet-dvb-nit.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dvb-s2-bb.c wireshark-1.10.6/epan/dissectors/packet-dvb-s2-bb.c --- wireshark-1.10.5/epan/dissectors/packet-dvb-s2-bb.c 2013-10-29 22:10:51.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dvb-s2-bb.c 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ * * Copyright 2012, Tobias Rutz * - * $Id: packet-dvb-s2-bb.c 52970 2013-10-29 21:58:59Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dvb-sdt.c wireshark-1.10.6/epan/dissectors/packet-dvb-sdt.c --- wireshark-1.10.5/epan/dissectors/packet-dvb-sdt.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dvb-sdt.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DVB (ETSI EN 300 468) Servide Description Table (SDT) dissection * Copyright 2012, Guy Martin * - * $Id: packet-dvb-sdt.c 48891 2013-04-17 01:40:25Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dvb-tdt.c wireshark-1.10.6/epan/dissectors/packet-dvb-tdt.c --- wireshark-1.10.5/epan/dissectors/packet-dvb-tdt.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dvb-tdt.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DVB (ETSI EN 300 468) Time and Date Table (TDT) dissection * Copyright 2012, Guy Martin * - * $Id: packet-dvb-tdt.c 48891 2013-04-17 01:40:25Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dvb-tot.c wireshark-1.10.6/epan/dissectors/packet-dvb-tot.c --- wireshark-1.10.5/epan/dissectors/packet-dvb-tot.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dvb-tot.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DVB (ETSI EN 300 468) Time Offset Table (TOT) dissection * Copyright 2012, Guy Martin * - * $Id: packet-dvb-tot.c 48890 2013-04-17 01:36:07Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dvmrp.c wireshark-1.10.6/epan/dissectors/packet-dvmrp.c --- wireshark-1.10.5/epan/dissectors/packet-dvmrp.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dvmrp.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-dvmrp.c 2001 Ronnie Sahlberg * Routines for IGMP/DVMRP packet disassembly * - * $Id: packet-dvmrp.c 48710 2013-04-02 21:13:02Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-dvmrp.h wireshark-1.10.6/epan/dissectors/packet-dvmrp.h --- wireshark-1.10.5/epan/dissectors/packet-dvmrp.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-dvmrp.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-dvmrp.h 2001 Ronnie Sahlberg * Declarations of routines for IGMP/DVMRP packet disassembly * - * $Id: packet-dvmrp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-e100.c wireshark-1.10.6/epan/dissectors/packet-e100.c --- wireshark-1.10.5/epan/dissectors/packet-e100.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-e100.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-e100.c * Routines for Arbor Networks E100 packet encapsulation disassembly * - * $Id: packet-e100.c 48344 2013-03-16 20:22:54Z etxrab $ + * $Id$ * * Copyright (c) 2009 by Bradley Higgins * diff -Nru wireshark-1.10.5/epan/dissectors/packet-e164.c wireshark-1.10.6/epan/dissectors/packet-e164.c --- wireshark-1.10.5/epan/dissectors/packet-e164.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-e164.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * to many dissectors. * Copyright 2004, Anders Broman * - * $Id: packet-e164.c 48714 2013-04-02 21:56:40Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-e164.h wireshark-1.10.6/epan/dissectors/packet-e164.h --- wireshark-1.10.5/epan/dissectors/packet-e164.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-e164.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * E164 tables * Copyright 2004, Anders Broman * - * $Id: packet-e164.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-e212.c wireshark-1.10.6/epan/dissectors/packet-e212.c --- wireshark-1.10.5/epan/dissectors/packet-e212.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-e212.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * to many dissectors. * Copyright 2006, Anders Broman * - * $Id: packet-e212.c 48793 2013-04-08 20:25:09Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-e212.h wireshark-1.10.6/epan/dissectors/packet-e212.h --- wireshark-1.10.5/epan/dissectors/packet-e212.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-e212.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * E212 tables * Copyright 2006, Anders Broman * - * $Id: packet-e212.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-eap.c wireshark-1.10.6/epan/dissectors/packet-eap.c --- wireshark-1.10.5/epan/dissectors/packet-eap.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-eap.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for EAP Extensible Authentication Protocol dissection * RFC 2284, RFC 3748 * - * $Id: packet-eap.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-eapol.c wireshark-1.10.6/epan/dissectors/packet-eapol.c --- wireshark-1.10.5/epan/dissectors/packet-eapol.c 2013-05-20 16:49:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-eapol.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * (From IEEE Draft P802.1X/D11; is there a later draft, or a * final standard? If so, check it.) * - * $Id: packet-eapol.c 49441 2013-05-20 16:43:26Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-echo.c wireshark-1.10.6/epan/dissectors/packet-echo.c --- wireshark-1.10.5/epan/dissectors/packet-echo.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-echo.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * * Laurent Deniel * - * $Id: packet-echo.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ecp-oui.c wireshark-1.10.6/epan/dissectors/packet-ecp-oui.c --- wireshark-1.10.5/epan/dissectors/packet-ecp-oui.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ecp-oui.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * Mijo Safradin * Copyright 2011,2012 IBM Corp. * - * $Id: packet-ecp-oui.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-edonkey.c wireshark-1.10.6/epan/dissectors/packet-edonkey.c --- wireshark-1.10.5/epan/dissectors/packet-edonkey.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-edonkey.c 2014-03-07 18:07:12.000000000 +0000 @@ -12,7 +12,7 @@ * Modified and added on the basis of information and names from the eMule 0.50 source code * found at http://www.emule-project.net * - * $Id: packet-edonkey.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-edonkey.h wireshark-1.10.6/epan/dissectors/packet-edonkey.h --- wireshark-1.10.5/epan/dissectors/packet-edonkey.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-edonkey.h 2014-03-07 18:07:12.000000000 +0000 @@ -11,7 +11,7 @@ * Kademlia dissector based on source code inspection of aMule 2.1.3 and eMule 0.48a * Modified and added on the basis of information and names from the eMule 0.49a source code * - * $Id: packet-edonkey.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-egd.c wireshark-1.10.6/epan/dissectors/packet-egd.c --- wireshark-1.10.5/epan/dissectors/packet-egd.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-egd.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * Copyright 2008 * 29 July 2008 -- ryan wamsley * - * $Id: packet-egd.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ehdlc.c wireshark-1.10.6/epan/dissectors/packet-ehdlc.c --- wireshark-1.10.5/epan/dissectors/packet-ehdlc.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ehdlc.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for packet dissection of Ericsson HDLC as used in A-bis over IP * Copyright 2010-2012 by Harald Welte * - * $Id: packet-ehdlc.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * This code is based on pure educational guesses while looking at protocol * traces, as there is no publicly available protocol description by Ericsson. diff -Nru wireshark-1.10.5/epan/dissectors/packet-ehs.c wireshark-1.10.6/epan/dissectors/packet-ehs.c --- wireshark-1.10.5/epan/dissectors/packet-ehs.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ehs.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2000, Scott Hovis scott.hovis@ums.msfc.nasa.gov * Enhanced 2008, Matt Dunkle Matthew.L.Dunkle@nasa.gov * - * $Id: packet-ehs.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-eigrp.c wireshark-1.10.6/epan/dissectors/packet-eigrp.c --- wireshark-1.10.5/epan/dissectors/packet-eigrp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-eigrp.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * Copyright 2009, Jochen Bartl * - * $Id: packet-eigrp.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-eiss.c wireshark-1.10.6/epan/dissectors/packet-eiss.c --- wireshark-1.10.5/epan/dissectors/packet-eiss.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-eiss.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for ETV-AM EISS (OC-SP-ETV-AM1.0-I05) * Copyright 2012, Weston Schmidt * - * $Id: packet-eiss.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-elcom.c wireshark-1.10.6/epan/dissectors/packet-elcom.c --- wireshark-1.10.5/epan/dissectors/packet-elcom.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-elcom.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for elcom packet dissection * Copyright 2008, 2011 juha.takala@iki.fi (Juha Takala) * - * $Id: packet-elcom.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-enc.c wireshark-1.10.6/epan/dissectors/packet-enc.c --- wireshark-1.10.5/epan/dissectors/packet-enc.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-enc.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * * Copyright (c) 2003 Markus Friedl. All rights reserved. * - * $Id: packet-enc.c 47850 2013-02-24 09:38:22Z darkjames $ + * $Id$ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff -Nru wireshark-1.10.5/epan/dissectors/packet-enc.h wireshark-1.10.6/epan/dissectors/packet-enc.h --- wireshark-1.10.5/epan/dissectors/packet-enc.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-enc.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-enc.h * - * $Id: packet-enc.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-enip.c wireshark-1.10.6/epan/dissectors/packet-enip.c --- wireshark-1.10.5/epan/dissectors/packet-enip.c 2013-10-29 21:46:26.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-enip.c 2014-03-07 18:07:12.000000000 +0000 @@ -14,7 +14,7 @@ * Michael Mann * Copyright 2011 * - * $Id: packet-enip.c 52968 2013-10-29 21:40:26Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-enip.h wireshark-1.10.6/epan/dissectors/packet-enip.h --- wireshark-1.10.5/epan/dissectors/packet-enip.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-enip.h 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * Jan Bartels, Siempelkamp Maschinen- und Anlagenbau GmbH & Co. KG * Copyright 2007 * - * $Id: packet-enip.h 48729 2013-04-04 14:34:26Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-enrp.c wireshark-1.10.6/epan/dissectors/packet-enrp.c --- wireshark-1.10.5/epan/dissectors/packet-enrp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-enrp.c 2014-03-07 18:07:12.000000000 +0000 @@ -16,7 +16,7 @@ * Copyright 2004, 2005, 2006, 2007 Michael Tuexen * Copyright 2008 Thomas Dreibholz * - * $Id: packet-enrp.c 48710 2013-04-02 21:13:02Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-enttec.c wireshark-1.10.6/epan/dissectors/packet-enttec.c --- wireshark-1.10.5/epan/dissectors/packet-enttec.c 2013-04-22 21:38:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-enttec.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-enttec.c * Routines for ENTTEC packet disassembly * - * $Id: packet-enttec.c 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Copyright (c) 2003,2004 by Erwin Rol * diff -Nru wireshark-1.10.5/epan/dissectors/packet-epl.c wireshark-1.10.6/epan/dissectors/packet-epl.c --- wireshark-1.10.5/epan/dissectors/packet-epl.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-epl.c 2014-03-07 18:07:12.000000000 +0000 @@ -14,7 +14,7 @@ * http://www.systec-electronic.com * - Daniel Krueger * - * $Id: packet-epl.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * A dissector for: * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/epan/dissectors/packet-epl_v1.c wireshark-1.10.6/epan/dissectors/packet-epl_v1.c --- wireshark-1.10.5/epan/dissectors/packet-epl_v1.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-epl_v1.c 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * - David Buechi * * - * $Id: packet-epl_v1.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * A dissector for: * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/epan/dissectors/packet-epmd.c wireshark-1.10.6/epan/dissectors/packet-epmd.c --- wireshark-1.10.5/epan/dissectors/packet-epmd.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-epmd.c 2014-03-07 18:07:12.000000000 +0000 @@ -8,7 +8,7 @@ * * (c) 2007 Joost Yervante Damad * - * $Id: packet-epmd.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-epmd.h wireshark-1.10.6/epan/dissectors/packet-epmd.h --- wireshark-1.10.5/epan/dissectors/packet-epmd.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-epmd.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-epmd.h * Definitions for EPMD (Erlang Port Mapper Daemon) messages * - * $Id: packet-epmd.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/epan/dissectors/packet-erf.c wireshark-1.10.6/epan/dissectors/packet-erf.c --- wireshark-1.10.5/epan/dissectors/packet-erf.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-erf.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-erf.c * Routines for ERF encapsulation dissection * - * $Id: packet-erf.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-erldp.c wireshark-1.10.6/epan/dissectors/packet-erldp.c --- wireshark-1.10.5/epan/dissectors/packet-erldp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-erldp.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * * 2010 Tomas Kukosa * - * $Id: packet-erldp.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-esio.c wireshark-1.10.6/epan/dissectors/packet-esio.c --- wireshark-1.10.5/epan/dissectors/packet-esio.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-esio.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Ether-S-I/O dissection (from Saia Burgess Controls AG ) * Copyright 2010, Christian Durrer * - * $Id: packet-esio.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-esis.c wireshark-1.10.6/epan/dissectors/packet-esis.c --- wireshark-1.10.5/epan/dissectors/packet-esis.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-esis.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ISO/OSI End System to Intermediate System * Routing Exchange Protocol ISO 9542. * - * $Id: packet-esis.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * Ralf Schneider * * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/epan/dissectors/packet-esis.h wireshark-1.10.6/epan/dissectors/packet-esis.h --- wireshark-1.10.5/epan/dissectors/packet-esis.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-esis.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-esis.h * Defines and such for ESIS protocol decode. * - * $Id: packet-esis.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * Ralf Schneider * * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/epan/dissectors/packet-ess.c wireshark-1.10.6/epan/dissectors/packet-ess.c --- wireshark-1.10.5/epan/dissectors/packet-ess.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ess.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,11 +7,12 @@ #line 1 "../../asn1/ess/packet-ess-template.c" /* packet-ess.c - * Routines for RFC5035 Extended Security Services packet dissection + * Routines for RFC 2634 and RFC 5035 Extended Security Services packet + * dissection * Ronnie Sahlberg 2004 * Stig Bjorlykke 2010 * - * $Id: packet-ess.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -143,7 +144,7 @@ static int hf_ess_serialNumber = -1; /* CertificateSerialNumber */ /*--- End of included file: packet-ess-hf.c ---*/ -#line 64 "../../asn1/ess/packet-ess-template.c" +#line 65 "../../asn1/ess/packet-ess-template.c" /*--- Included file: packet-ess-val.h ---*/ @@ -167,7 +168,7 @@ #define id_sha256 "2.16.840.1.101.3.4.2.1" /*--- End of included file: packet-ess-val.h ---*/ -#line 66 "../../asn1/ess/packet-ess-template.c" +#line 67 "../../asn1/ess/packet-ess-template.c" /* Initialize the subtree pointers */ @@ -206,7 +207,7 @@ static gint ett_ess_IssuerSerial = -1; /*--- End of included file: packet-ess-ett.c ---*/ -#line 69 "../../asn1/ess/packet-ess-template.c" +#line 70 "../../asn1/ess/packet-ess-template.c" static const char *object_identifier_id; @@ -261,7 +262,7 @@ guint i; tree = proto_item_add_subtree (actx->created_item, ett_Category_attributes); - value = tvb_get_ephemeral_string (tvb, 0, tvb_length (tvb)); + value = (guint8 *)ep_tvb_memdup (tvb, 0, tvb_length (tvb)); for (i = 0; i < num_ess_category_attributes; i++) { ess_category_attributes_t *u = &(ess_category_attributes[i]); @@ -1124,7 +1125,7 @@ /*--- End of included file: packet-ess-fn.c ---*/ -#line 140 "../../asn1/ess/packet-ess-template.c" +#line 141 "../../asn1/ess/packet-ess-template.c" /*--- proto_register_ess ----------------------------------------------*/ void proto_register_ess(void) { @@ -1422,7 +1423,7 @@ "CertificateSerialNumber", HFILL }}, /*--- End of included file: packet-ess-hfarr.c ---*/ -#line 153 "../../asn1/ess/packet-ess-template.c" +#line 154 "../../asn1/ess/packet-ess-template.c" }; /* List of subtrees */ @@ -1464,7 +1465,7 @@ &ett_ess_IssuerSerial, /*--- End of included file: packet-ess-ettarr.c ---*/ -#line 159 "../../asn1/ess/packet-ess-template.c" +#line 160 "../../asn1/ess/packet-ess-template.c" }; static uat_field_t attributes_flds[] = { @@ -1531,6 +1532,6 @@ /*--- End of included file: packet-ess-dis-tab.c ---*/ -#line 204 "../../asn1/ess/packet-ess-template.c" +#line 205 "../../asn1/ess/packet-ess-template.c" } diff -Nru wireshark-1.10.5/epan/dissectors/packet-ess.h wireshark-1.10.6/epan/dissectors/packet-ess.h --- wireshark-1.10.5/epan/dissectors/packet-ess.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ess.h 2014-03-07 18:07:12.000000000 +0000 @@ -11,7 +11,7 @@ * Ronnie Sahlberg 2004 * Stig Bjorlykke 2010 * - * $Id: packet-ess.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-etch.c wireshark-1.10.6/epan/dissectors/packet-etch.c --- wireshark-1.10.5/epan/dissectors/packet-etch.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-etch.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * * Copyright (c) 2010, Holger Grandy, BMW Car IT GmbH (holger.grandy@bmw-carit.de) * - * $Id: packet-etch.c 48919 2013-04-18 19:45:22Z eapache $ + * $Id$ * * Apache Etch Protocol dissector * http://incubator.apache.org/etch/ diff -Nru wireshark-1.10.5/epan/dissectors/packet-eth.c wireshark-1.10.6/epan/dissectors/packet-eth.c --- wireshark-1.10.5/epan/dissectors/packet-eth.c 2013-10-29 23:01:22.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-eth.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-eth.c * Routines for ethernet packet disassembly * - * $Id: packet-eth.c 52974 2013-10-29 22:55:21Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-etherip.c wireshark-1.10.6/epan/dissectors/packet-etherip.c --- wireshark-1.10.5/epan/dissectors/packet-etherip.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-etherip.c 2014-03-07 18:07:12.000000000 +0000 @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: packet-etherip.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ */ #include "config.h" diff -Nru wireshark-1.10.5/epan/dissectors/packet-ethertype.c wireshark-1.10.6/epan/dissectors/packet-ethertype.c --- wireshark-1.10.5/epan/dissectors/packet-ethertype.c 2013-10-29 23:01:22.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ethertype.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * payloads (i.e., payloads when there could be an Ethernet trailer and * possibly an FCS). * - * $Id: packet-ethertype.c 52974 2013-10-29 22:55:21Z gerald $ + * $Id$ * * Gilbert Ramirez * diff -Nru wireshark-1.10.5/epan/dissectors/packet-eth.h wireshark-1.10.6/epan/dissectors/packet-eth.h --- wireshark-1.10.5/epan/dissectors/packet-eth.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-eth.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-eth.h * - * $Id: packet-eth.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-etsi_card_app_toolkit.c wireshark-1.10.6/epan/dissectors/packet-etsi_card_app_toolkit.c --- wireshark-1.10.5/epan/dissectors/packet-etsi_card_app_toolkit.c 2013-05-14 21:54:32.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-etsi_card_app_toolkit.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * 3GPP TS 31.111 v9.7.0 (Release 9 / 2012-03) * Copyright 2010-2011 by Harald Welte * - * $Id: packet-etsi_card_app_toolkit.c 49307 2013-05-14 21:33:25Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-etv.c wireshark-1.10.6/epan/dissectors/packet-etv.c --- wireshark-1.10.5/epan/dissectors/packet-etv.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-etv.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for ETV-AM from OC-SP-ETV-AM1.0-IO5 * Copyright 2012, Weston Schmidt * - * $Id: packet-etv.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-evrc.c wireshark-1.10.6/epan/dissectors/packet-evrc.c --- wireshark-1.10.5/epan/dissectors/packet-evrc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-evrc.c 2014-03-07 18:07:12.000000000 +0000 @@ -16,7 +16,7 @@ * RFC 4788 http://www.ietf.org/rfc/rfc4788.txt?number=4788 * RFC 5188 http://www.ietf.org/rfc/rfc5188.txt?number=5188 * - * $Id: packet-evrc.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-exec.c wireshark-1.10.6/epan/dissectors/packet-exec.c --- wireshark-1.10.5/epan/dissectors/packet-exec.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-exec.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for exec (rexec) dissection * Copyright 2006, Stephen Fisher (see AUTHORS file) * - * $Id: packet-exec.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-extreme.c wireshark-1.10.6/epan/dissectors/packet-extreme.c --- wireshark-1.10.5/epan/dissectors/packet-extreme.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-extreme.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the disassembly of Extreme Networks specific * protocols (EDP/ESRP/EAPS(including ESL)/ELSM) * - * $Id: packet-extreme.c 48347 2013-03-17 09:11:21Z etxrab $ + * $Id$ * * Copyright 2005 Joerg Mayer (see AUTHORS file) * diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcbls.h wireshark-1.10.6/epan/dissectors/packet-fcbls.h --- wireshark-1.10.5/epan/dissectors/packet-fcbls.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcbls.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Fibre Channel Basic Link Services header * Copyright 2001, Dinesh G Dutt * - * $Id: packet-fcbls.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fc.c wireshark-1.10.6/epan/dissectors/packet-fc.c --- wireshark-1.10.5/epan/dissectors/packet-fc.c 2013-05-09 15:16:22.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fc.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2003 Ronnie Sahlberg, exchange first/last matching and * tap listener and misc updates * - * $Id: packet-fc.c 49216 2013-05-09 14:58:20Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcct.c wireshark-1.10.6/epan/dissectors/packet-fcct.c --- wireshark-1.10.5/epan/dissectors/packet-fcct.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcct.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for FC Common Transport Protocol (used by GS3 services) * Copyright 2001, Dinesh G Dutt * - * $Id: packet-fcct.c 47389 2013-01-31 17:55:31Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcct.h wireshark-1.10.6/epan/dissectors/packet-fcct.h --- wireshark-1.10.5/epan/dissectors/packet-fcct.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcct.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-fcct.h * - * $Id: packet-fcct.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcdns.c wireshark-1.10.6/epan/dissectors/packet-fcdns.c --- wireshark-1.10.5/epan/dissectors/packet-fcdns.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcdns.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for FC distributed Name Server (dNS) * Copyright 2001, Dinesh G Dutt * - * $Id: packet-fcdns.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcdns.h wireshark-1.10.6/epan/dissectors/packet-fcdns.h --- wireshark-1.10.5/epan/dissectors/packet-fcdns.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcdns.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-fcdns.h * - * $Id: packet-fcdns.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcels.c wireshark-1.10.6/epan/dissectors/packet-fcels.c --- wireshark-1.10.5/epan/dissectors/packet-fcels.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcels.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for FC Extended Link Services * Copyright 2001, Dinesh G Dutt * - * $Id: packet-fcels.c 48399 2013-03-18 20:44:36Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcels.h wireshark-1.10.6/epan/dissectors/packet-fcels.h --- wireshark-1.10.5/epan/dissectors/packet-fcels.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcels.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Fibre Channel Extended Link Services Definitions (ddutt@cisco.com) * Copyright 2001, Dinesh G Dutt * - * $Id: packet-fcels.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcfcs.c wireshark-1.10.6/epan/dissectors/packet-fcfcs.c --- wireshark-1.10.5/epan/dissectors/packet-fcfcs.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcfcs.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for FC Fabric Configuration Server * Copyright 2001, Dinesh G Dutt * - * $Id: packet-fcfcs.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcfcs.h wireshark-1.10.6/epan/dissectors/packet-fcfcs.h --- wireshark-1.10.5/epan/dissectors/packet-fcfcs.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcfcs.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-fcfcs.h * - * $Id: packet-fcfcs.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcfzs.c wireshark-1.10.6/epan/dissectors/packet-fcfzs.c --- wireshark-1.10.5/epan/dissectors/packet-fcfzs.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcfzs.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for FC Fabric Zone Server * Copyright 2001, Dinesh G Dutt * - * $Id: packet-fcfzs.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcfzs.h wireshark-1.10.6/epan/dissectors/packet-fcfzs.h --- wireshark-1.10.5/epan/dissectors/packet-fcfzs.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcfzs.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-fcfzs.h * - * $Id: packet-fcfzs.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcgi.c wireshark-1.10.6/epan/dissectors/packet-fcgi.c --- wireshark-1.10.5/epan/dissectors/packet-fcgi.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcgi.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for FastCGI dissection * Copyright 2010, Tom Hughes * - * $Id: packet-fcgi.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fc.h wireshark-1.10.6/epan/dissectors/packet-fc.h --- wireshark-1.10.5/epan/dissectors/packet-fc.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fc.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Basic Fibre Channel Header definitions * Copyright 2002 Dinesh G Dutt (ddutt@cisco.com) * - * $Id: packet-fc.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcip.c wireshark-1.10.6/epan/dissectors/packet-fcip.c --- wireshark-1.10.5/epan/dissectors/packet-fcip.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcip.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * RFC 3821, RFC 3643 * Copyright 2001, Dinesh G Dutt (ddutt@cisco.com) * - * $Id: packet-fcip.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fclctl.c wireshark-1.10.6/epan/dissectors/packet-fclctl.c --- wireshark-1.10.5/epan/dissectors/packet-fclctl.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fclctl.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for FC Link Control Frames * Copyright 2001, Dinesh G Dutt * - * $Id: packet-fclctl.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fclctl.h wireshark-1.10.6/epan/dissectors/packet-fclctl.h --- wireshark-1.10.5/epan/dissectors/packet-fclctl.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fclctl.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Fibre Channel Link Control definitions * Copyright 2001 Dinesh G Dutt (ddutt@cisco.com) * - * $Id: packet-fclctl.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcoe.c wireshark-1.10.6/epan/dissectors/packet-fcoe.c --- wireshark-1.10.5/epan/dissectors/packet-fcoe.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcoe.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for FCoE dissection - Fibre Channel over Ethernet * Copyright (c) 2006 Nuova Systems, Inc. (jre@nuovasystems.com) * - * $Id: packet-fcoe.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcoib.c wireshark-1.10.6/epan/dissectors/packet-fcoib.c --- wireshark-1.10.5/epan/dissectors/packet-fcoib.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcoib.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for FCoIB dissection - Fibre Channel over Infiniband * Copyright (c) 2010 Mellanox Technologies Ltd. (slavak@mellanox.co.il) * - * $Id: packet-fcoib.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcp.c wireshark-1.10.6/epan/dissectors/packet-fcp.c --- wireshark-1.10.5/epan/dissectors/packet-fcp.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcp.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Fibre Channel Protocol for SCSI (FCP) * Copyright 2001, Dinesh G Dutt * - * $Id: packet-fcp.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcp.h wireshark-1.10.6/epan/dissectors/packet-fcp.h --- wireshark-1.10.5/epan/dissectors/packet-fcp.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcp.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Fibre Channel SCSI (FCP) Protocol definitions * Copyright 2001 Dinesh G Dutt (ddutt@cisco.com) * - * $Id: packet-fcp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcsb3.c wireshark-1.10.6/epan/dissectors/packet-fcsb3.c --- wireshark-1.10.5/epan/dissectors/packet-fcsb3.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcsb3.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * This decoder is for FC-SB3 version 1.4 * Copyright 2003, Dinesh G Dutt * - * $Id: packet-fcsb3.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcsb3.h wireshark-1.10.6/epan/dissectors/packet-fcsb3.h --- wireshark-1.10.5/epan/dissectors/packet-fcsb3.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcsb3.h 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * This decoder is for FC-SB3 version 1.4 * Copyright 2003 Dinesh G Dutt (ddutt@cisco.com) * - * $Id: packet-fcsb3.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcsp.c wireshark-1.10.6/epan/dissectors/packet-fcsp.c --- wireshark-1.10.5/epan/dissectors/packet-fcsp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcsp.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * This decoder is for FC-SP version 1.1 * Copyright 2003, Dinesh G Dutt * - * $Id: packet-fcsp.c 47775 2013-02-20 20:41:33Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcswils.c wireshark-1.10.6/epan/dissectors/packet-fcswils.c --- wireshark-1.10.5/epan/dissectors/packet-fcswils.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcswils.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for FC Inter-switch link services * Copyright 2001, Dinesh G Dutt * - * $Id: packet-fcswils.c 48412 2013-03-19 04:54:30Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fcswils.h wireshark-1.10.6/epan/dissectors/packet-fcswils.h --- wireshark-1.10.5/epan/dissectors/packet-fcswils.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fcswils.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Fibre Channel Switch InterLink Services Definitions * Copyright 2001 Dinesh G Dutt (ddutt@cisco.com) * - * $Id: packet-fcswils.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fddi.c wireshark-1.10.6/epan/dissectors/packet-fddi.c --- wireshark-1.10.5/epan/dissectors/packet-fddi.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fddi.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ * * Laurent Deniel * - * $Id: packet-fddi.c 45721 2012-10-22 18:14:54Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fddi.h wireshark-1.10.6/epan/dissectors/packet-fddi.h --- wireshark-1.10.5/epan/dissectors/packet-fddi.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fddi.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-fddi.h * - * $Id: packet-fddi.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fefd.c wireshark-1.10.6/epan/dissectors/packet-fefd.c --- wireshark-1.10.5/epan/dissectors/packet-fefd.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fefd.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-fefd.c * Routines for the disassembly of the "Far End Failure Detection" * - * $Id: packet-fefd.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ff.c wireshark-1.10.6/epan/dissectors/packet-ff.c --- wireshark-1.10.5/epan/dissectors/packet-ff.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ff.c 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * * (c) Copyright 2008, Yukiyo Akisada * - * $Id: packet-ff.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ff.h wireshark-1.10.6/epan/dissectors/packet-ff.h --- wireshark-1.10.5/epan/dissectors/packet-ff.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ff.h 2014-03-07 18:07:12.000000000 +0000 @@ -6,7 +6,7 @@ * * (c) Copyright 2008, Yukiyo Akisada * - * $Id: packet-ff.h 46347 2012-12-03 17:28:43Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fip.c wireshark-1.10.6/epan/dissectors/packet-fip.c --- wireshark-1.10.5/epan/dissectors/packet-fip.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fip.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for FIP dissection - FCoE Initialization Protocol * Copyright (c) 2008 Cisco Systems, Inc. (jeykholt@cisco.com) * - * $Id: packet-fip.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fix.c wireshark-1.10.6/epan/dissectors/packet-fix.c --- wireshark-1.10.5/epan/dissectors/packet-fix.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fix.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Financial Information eXchange (FIX) Protocol dissection * Copyright 2000, PC Drew * - * $Id: packet-fix.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fix.h wireshark-1.10.6/epan/dissectors/packet-fix.h --- wireshark-1.10.5/epan/dissectors/packet-fix.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fix.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * This file is autogenerated * Look fix/README for more information how to generate this file * - * $Id: packet-fix.h 47178 2013-01-20 18:32:23Z alagoutte $ + * $Id$ * */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-flexnet.c wireshark-1.10.6/epan/dissectors/packet-flexnet.c --- wireshark-1.10.5/epan/dissectors/packet-flexnet.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-flexnet.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for Amateur Packet Radio protocol dissection * Copyright 2005,2006,2007,2008,2009,2010,2012 R.W. Stearn * - * $Id: packet-flexnet.c 47751 2013-02-19 23:17:07Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-flip.c wireshark-1.10.6/epan/dissectors/packet-flip.c --- wireshark-1.10.5/epan/dissectors/packet-flip.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-flip.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2009, Juha Siltanen * - * $Id: packet-flip.c 46292 2012-11-29 20:15:37Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fmp.c wireshark-1.10.6/epan/dissectors/packet-fmp.c --- wireshark-1.10.5/epan/dissectors/packet-fmp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fmp.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-fmp.c * Routines for fmp dissection * - * $Id: packet-fmp.c 48400 2013-03-18 21:16:23Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fmp.h wireshark-1.10.6/epan/dissectors/packet-fmp.h --- wireshark-1.10.5/epan/dissectors/packet-fmp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fmp.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-fmp.h * Defines for fmp dissection * - * $Id: packet-fmp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fmp_notify.c wireshark-1.10.6/epan/dissectors/packet-fmp_notify.c --- wireshark-1.10.5/epan/dissectors/packet-fmp_notify.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fmp_notify.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-fmp_notify.c * Routines for fmp dissection * - * $Id: packet-fmp_notify.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fmtp.c wireshark-1.10.6/epan/dissectors/packet-fmtp.c --- wireshark-1.10.5/epan/dissectors/packet-fmtp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fmtp.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ * * Copyright 2011, Christophe Paletou * - * $Id: packet-fmtp.c 47918 2013-02-27 16:18:16Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-force10-oui.c wireshark-1.10.6/epan/dissectors/packet-force10-oui.c --- wireshark-1.10.5/epan/dissectors/packet-force10-oui.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-force10-oui.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-force10-oui.c * - * $Id: packet-force10-oui.c 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-forces.c wireshark-1.10.6/epan/dissectors/packet-forces.c --- wireshark-1.10.5/epan/dissectors/packet-forces.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-forces.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for dissecting IETF ForCES protocol layer messages.Now support the following TML types:TCP+UDP,SCTP. * Copyright 2009, NDSC & Zhejiang Gongshang University,Fenggen Jia * - * $Id: packet-forces.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-foundry.c wireshark-1.10.6/epan/dissectors/packet-foundry.c --- wireshark-1.10.5/epan/dissectors/packet-foundry.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-foundry.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the disassembly of Foundry LLC messages (currently * Foundry Discovery Protocol - FDP only) * - * $Id: packet-foundry.c 45632 2012-10-18 15:55:52Z cmaynard $ + * $Id$ * * Copyright 2012 Joerg Mayer (see AUTHORS file) * diff -Nru wireshark-1.10.5/epan/dissectors/packet-fp_hint.c wireshark-1.10.6/epan/dissectors/packet-fp_hint.c --- wireshark-1.10.5/epan/dissectors/packet-fp_hint.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fp_hint.c 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* Routines for UMTS FP Hint protocol disassembly * - * $Id: packet-fp_hint.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fractalgeneratorprotocol.c wireshark-1.10.6/epan/dissectors/packet-fractalgeneratorprotocol.c --- wireshark-1.10.5/epan/dissectors/packet-fractalgeneratorprotocol.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fractalgeneratorprotocol.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright 2006 by Thomas Dreibholz * - * $Id: packet-fractalgeneratorprotocol.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-frame.c wireshark-1.10.6/epan/dissectors/packet-frame.c --- wireshark-1.10.5/epan/dissectors/packet-frame.c 2013-06-04 02:46:12.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-frame.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * * Top-most dissector. Decides dissector based on Wiretap Encapsulation Type. * - * $Id: packet-frame.c 49746 2013-06-04 02:28:03Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-frame.h wireshark-1.10.6/epan/dissectors/packet-frame.h --- wireshark-1.10.5/epan/dissectors/packet-frame.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-frame.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * * Top-most dissector. Decides dissector based on Wiretap Encapsulation Type. * - * $Id: packet-frame.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fr.c wireshark-1.10.6/epan/dissectors/packet-fr.c --- wireshark-1.10.5/epan/dissectors/packet-fr.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fr.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2001, Paul Ionescu * - * $Id: packet-fr.c 46644 2012-12-20 21:18:26Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fr.h wireshark-1.10.6/epan/dissectors/packet-fr.h --- wireshark-1.10.5/epan/dissectors/packet-fr.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fr.h 2014-03-07 18:07:12.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-fr.h * - * $Id: packet-fr.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ftam.c wireshark-1.10.6/epan/dissectors/packet-ftam.c --- wireshark-1.10.5/epan/dissectors/packet-ftam.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ftam.c 2014-03-07 18:07:12.000000000 +0000 @@ -15,7 +15,7 @@ * * Anders Broman and Ronnie Sahlberg 2005 - 2006 * - * $Id: packet-ftam.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ftam.h wireshark-1.10.6/epan/dissectors/packet-ftam.h --- wireshark-1.10.5/epan/dissectors/packet-ftam.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ftam.h 2014-03-07 18:07:12.000000000 +0000 @@ -15,7 +15,7 @@ * * Anders Broman and Ronnie Sahlberg 2005 * - * $Id: packet-ftam.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ftp.c wireshark-1.10.6/epan/dissectors/packet-ftp.c --- wireshark-1.10.5/epan/dissectors/packet-ftp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ftp.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 1999, Richard Sharpe * Copyright 2001, Juan Toledo (Passive FTP) * - * $Id: packet-ftp.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-fw1.c wireshark-1.10.6/epan/dissectors/packet-fw1.c --- wireshark-1.10.5/epan/dissectors/packet-fw1.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-fw1.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Ethernet header disassembly of FW1 "monitor" files * Copyright 2002,2003, Alfred Koebler * - * $Id: packet-fw1.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Alfred Koebler diff -Nru wireshark-1.10.5/epan/dissectors/packet-g723.c wireshark-1.10.6/epan/dissectors/packet-g723.c --- wireshark-1.10.5/epan/dissectors/packet-g723.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-g723.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for G.723 dissection * Copyright 2005, Anders Broman * - * $Id: packet-g723.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gadu-gadu.c wireshark-1.10.6/epan/dissectors/packet-gadu-gadu.c --- wireshark-1.10.5/epan/dissectors/packet-gadu-gadu.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gadu-gadu.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Gadu-Gadu dissection * Copyright 2011,2012, Jakub Zawadzki * - * $Id: packet-gadu-gadu.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Protocol documentation available at http://toxygen.net/libgadu/protocol/ * diff -Nru wireshark-1.10.5/epan/dissectors/packet-gdsdb.c wireshark-1.10.6/epan/dissectors/packet-gdsdb.c --- wireshark-1.10.5/epan/dissectors/packet-gdsdb.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gdsdb.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Firebird/Interbase dissection * Copyright 2007, Moshe van der Sterre * - * $Id: packet-gdsdb.c 47459 2013-02-03 22:29:48Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gearman.c wireshark-1.10.6/epan/dissectors/packet-gearman.c --- wireshark-1.10.5/epan/dissectors/packet-gearman.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gearman.c 2014-03-07 18:07:12.000000000 +0000 @@ -7,7 +7,7 @@ * ---------------- * http://gearman.org/index.php?id=protocol * - * $Id: packet-gearman.c 48732 2013-04-04 15:33:14Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ged125.c wireshark-1.10.6/epan/dissectors/packet-ged125.c --- wireshark-1.10.5/epan/dissectors/packet-ged125.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ged125.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * Assistance was provided by the following: * Paul Antinori * - * $Id: packet-ged125.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gift.c wireshark-1.10.6/epan/dissectors/packet-gift.c --- wireshark-1.10.5/epan/dissectors/packet-gift.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gift.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * * See http://www.giftproject.org/ * - * $Id: packet-gift.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-giop.c wireshark-1.10.6/epan/dissectors/packet-giop.c --- wireshark-1.10.5/epan/dissectors/packet-giop.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-giop.c 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ * Frank Singleton * Trevor Shepherd * - * $Id: packet-giop.c 48399 2013-03-18 20:44:36Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -5085,12 +5085,12 @@ { &hf_giop_char_data, { "char data", "giop.char_data", - FT_UINT32, BASE_DEC, &giop_code_set_vals_ext, 0x0, NULL, HFILL } + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &giop_code_set_vals_ext, 0x0, NULL, HFILL } }, { &hf_giop_wchar_data, { "wchar data", "giop.wchar_data", - FT_UINT32, BASE_DEC, &giop_code_set_vals_ext, 0x0, NULL, HFILL } + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &giop_code_set_vals_ext, 0x0, NULL, HFILL } }, { &hf_giop_IIOP_tag, diff -Nru wireshark-1.10.5/epan/dissectors/packet-giop.h wireshark-1.10.6/epan/dissectors/packet-giop.h --- wireshark-1.10.5/epan/dissectors/packet-giop.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-giop.h 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * * Based on CORBAv2.4.2 Chapter 15 GIOP Description. * - * $Id: packet-giop.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-git.c wireshark-1.10.6/epan/dissectors/packet-git.c --- wireshark-1.10.5/epan/dissectors/packet-git.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-git.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * RFC 1939 * Copyright 2010, Jelmer Vernooij * - * $Id: packet-git.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-glbp.c wireshark-1.10.6/epan/dissectors/packet-glbp.c --- wireshark-1.10.5/epan/dissectors/packet-glbp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-glbp.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * * Cisco's GLBP: Gateway Load Balancing Protocol * - * $Id: packet-glbp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Copyright 2007 Joerg Mayer (see AUTHORS file) * diff -Nru wireshark-1.10.5/epan/dissectors/packet-gluster_cli.c wireshark-1.10.6/epan/dissectors/packet-gluster_cli.c --- wireshark-1.10.5/epan/dissectors/packet-gluster_cli.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gluster_cli.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Gluster CLI dissection * Copyright 2012, Niels de Vos * - * $Id: packet-gluster_cli.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-glusterd.c wireshark-1.10.6/epan/dissectors/packet-glusterd.c --- wireshark-1.10.5/epan/dissectors/packet-glusterd.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-glusterd.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * With contributions from: * Shreedhara LG * - * $Id: packet-glusterd.c 47891 2013-02-26 01:06:19Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-glusterfs.c wireshark-1.10.6/epan/dissectors/packet-glusterfs.c --- wireshark-1.10.5/epan/dissectors/packet-glusterfs.c 2013-09-22 16:48:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-glusterfs.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for GlusterFS dissection * Copyright 2012, Niels de Vos * - * $Id: packet-glusterfs.c 52173 2013-09-22 16:42:21Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-glusterfs_hndsk.c wireshark-1.10.6/epan/dissectors/packet-glusterfs_hndsk.c --- wireshark-1.10.5/epan/dissectors/packet-glusterfs_hndsk.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-glusterfs_hndsk.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for GlusterFS Handshake dissection * Copyright 2012, Niels de Vos * - * $Id: packet-glusterfs_hndsk.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gluster.h wireshark-1.10.6/epan/dissectors/packet-gluster.h --- wireshark-1.10.5/epan/dissectors/packet-gluster.h 2013-09-22 16:48:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gluster.h 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * With contributions from: * Shreedhara LG * - * $Id: packet-gluster.h 52173 2013-09-22 16:42:21Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gluster_pmap.c wireshark-1.10.6/epan/dissectors/packet-gluster_pmap.c --- wireshark-1.10.5/epan/dissectors/packet-gluster_pmap.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gluster_pmap.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Gluster Portmapper and Gluster DUMP dissection * Copyright 2012, Niels de Vos * - * $Id: packet-gluster_pmap.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gmhdr.c wireshark-1.10.6/epan/dissectors/packet-gmhdr.c --- wireshark-1.10.5/epan/dissectors/packet-gmhdr.c 2013-12-13 23:12:45.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gmhdr.c 2014-03-07 18:07:12.000000000 +0000 @@ -4,7 +4,7 @@ * Dissector for Gigamon Header and Trailer * Copyright Gigamon 2010 * - * $Id: packet-gmhdr.c 54076 2013-12-13 22:49:30Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gmr1_bcch.c wireshark-1.10.6/epan/dissectors/packet-gmr1_bcch.c --- wireshark-1.10.5/epan/dissectors/packet-gmr1_bcch.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gmr1_bcch.c 2014-03-07 18:07:12.000000000 +0000 @@ -8,7 +8,7 @@ * [2] ETSI TS 101 376-4-8 V2.2.1 - GMPRS-1 04.008 * [3] ETSI TS 101 376-4-8 V3.1.1 - GMR-1 3G 44.008 * - * $Id: packet-gmr1_bcch.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gmr1_common.c wireshark-1.10.6/epan/dissectors/packet-gmr1_common.c --- wireshark-1.10.5/epan/dissectors/packet-gmr1_common.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gmr1_common.c 2014-03-07 18:07:12.000000000 +0000 @@ -11,7 +11,7 @@ * [5] ETSI TS 101 376-4-12 V3.2.1 - GMR-1 3G 44.060 * [6] ETSI TS 101 376-5-6 V1.3.1 - GMR-1 05.008 * - * $Id: packet-gmr1_common.c 48407 2013-03-18 22:21:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gmr1_common.h wireshark-1.10.6/epan/dissectors/packet-gmr1_common.h --- wireshark-1.10.5/epan/dissectors/packet-gmr1_common.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gmr1_common.h 2014-03-07 18:07:12.000000000 +0000 @@ -11,7 +11,7 @@ * [5] ETSI TS 101 376-4-12 V3.2.1 - GMR-1 3G 44.060 * [6] ETSI TS 101 376-5-6 V1.3.1 - GMR-1 05.008 * - * $Id: packet-gmr1_common.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gmr1_dtap.c wireshark-1.10.6/epan/dissectors/packet-gmr1_dtap.c --- wireshark-1.10.5/epan/dissectors/packet-gmr1_dtap.c 2013-08-15 04:32:55.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gmr1_dtap.c 2014-03-07 18:07:12.000000000 +0000 @@ -8,7 +8,7 @@ * [2] ETSI TS 101 376-4-8 V2.2.1 - GMPRS-1 04.008 * [3] ETSI TS 101 376-4-8 V3.1.1 - GMR-1 3G 44.008 * - * $Id: packet-gmr1_dtap.c 51370 2013-08-15 03:52:19Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gmr1_rach.c wireshark-1.10.6/epan/dissectors/packet-gmr1_rach.c --- wireshark-1.10.5/epan/dissectors/packet-gmr1_rach.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gmr1_rach.c 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * * Especially [1] 10.1.8 * - * $Id: packet-gmr1_rach.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gmr1_rr.c wireshark-1.10.6/epan/dissectors/packet-gmr1_rr.c --- wireshark-1.10.5/epan/dissectors/packet-gmr1_rr.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gmr1_rr.c 2014-03-07 18:07:12.000000000 +0000 @@ -11,7 +11,7 @@ * [5] ETSI TS 101 376-4-12 V3.2.1 - GMR-1 3G 44.060 * [6] ETSI TS 101 376-5-6 V1.3.1 - GMR-1 05.008 * - * $Id: packet-gmr1_rr.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gmrp.c wireshark-1.10.6/epan/dissectors/packet-gmrp.c --- wireshark-1.10.5/epan/dissectors/packet-gmrp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gmrp.c 2014-03-07 18:07:12.000000000 +0000 @@ -5,7 +5,7 @@ * Based on the code from packet-gvrp.c (GVRP) from * Kevin Shi Copyright 2000 * - * $Id: packet-gmrp.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gnm.c wireshark-1.10.6/epan/dissectors/packet-gnm.c --- wireshark-1.10.5/epan/dissectors/packet-gnm.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gnm.c 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for GENERIC NETWORK INFORMATION MODEL Data dissection * * Copyright 2005 , Anders Broman - * $Id: packet-gnm.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gnm.h wireshark-1.10.6/epan/dissectors/packet-gnm.h --- wireshark-1.10.5/epan/dissectors/packet-gnm.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gnm.h 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for GENERIC NETWORK INFORMATION MODEL Data dissection * * Copyright 2005 , Anders Broman - * $Id: packet-gnm.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gnutella.c wireshark-1.10.6/epan/dissectors/packet-gnutella.c --- wireshark-1.10.5/epan/dissectors/packet-gnutella.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gnutella.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for gnutella dissection * Copyright 2001, B. Johannessen * - * $Id: packet-gnutella.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gnutella.h wireshark-1.10.6/epan/dissectors/packet-gnutella.h --- wireshark-1.10.5/epan/dissectors/packet-gnutella.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gnutella.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Declarations for gnutella dissection * Copyright 2001, B. Johannessen * - * $Id: packet-gnutella.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-goose.c wireshark-1.10.6/epan/dissectors/packet-goose.c --- wireshark-1.10.5/epan/dissectors/packet-goose.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-goose.c 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for IEC 61850 GOOSE packet dissection * Martin Lutz 2008 * - * $Id: packet-goose.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gopher.c wireshark-1.10.6/epan/dissectors/packet-gopher.c --- wireshark-1.10.5/epan/dissectors/packet-gopher.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gopher.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for RFC 1436 Gopher protocol dissection * Copyright 2010, Gerald Combs * - * $Id: packet-gopher.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gpef.c wireshark-1.10.6/epan/dissectors/packet-gpef.c --- wireshark-1.10.5/epan/dissectors/packet-gpef.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gpef.c 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ * Described in Microsoft document MS-GPEF.pdf * Copyright 2008, Ronnie Sahlberg * - * $Id: packet-gpef.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gprscdr.c wireshark-1.10.6/epan/dissectors/packet-gprscdr.c --- wireshark-1.10.5/epan/dissectors/packet-gprscdr.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gprscdr.c 2014-03-07 18:07:12.000000000 +0000 @@ -9,7 +9,7 @@ /* packet-gprscdr-template.c * Copyright 2011 , Anders Broman * - * $Id: packet-gprscdr.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gprscdr.h wireshark-1.10.6/epan/dissectors/packet-gprscdr.h --- wireshark-1.10.5/epan/dissectors/packet-gprscdr.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gprscdr.h 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for gprscdr packet dissection * Copyright 2011, Anders Broman * - * $Id: packet-gprscdr.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gprs-llc.c wireshark-1.10.6/epan/dissectors/packet-gprs-llc.c --- wireshark-1.10.5/epan/dissectors/packet-gprs-llc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gprs-llc.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Logical Link Control GPRS dissection ETSI 4.64(TS 101 351 V8.7.0) * Copyright 2000, Josef Korelus * - * $Id: packet-gprs-llc.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gre.c wireshark-1.10.6/epan/dissectors/packet-gre.c --- wireshark-1.10.5/epan/dissectors/packet-gre.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gre.c 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the Generic Routing Encapsulation (GRE) protocol * Brad Robel-Forrest * - * $Id: packet-gre.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gre.h wireshark-1.10.6/epan/dissectors/packet-gre.h --- wireshark-1.10.5/epan/dissectors/packet-gre.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gre.h 2014-03-07 18:07:12.000000000 +0000 @@ -2,7 +2,7 @@ * Routines and data exported by the dissection code for the * Generic Routing Encapsulation (GRE) protocol * - * $Id: packet-gre.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_abis_om2000.c wireshark-1.10.6/epan/dissectors/packet-gsm_abis_om2000.c --- wireshark-1.10.5/epan/dissectors/packet-gsm_abis_om2000.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_abis_om2000.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for packet dissection of Ericsson A-bis OML (OM 2000) * Copyright 2010-2012 by Harald Welte * - * $Id: packet-gsm_abis_om2000.c 48595 2013-03-27 20:21:19Z cmaynard $ + * $Id$ * * This dissector is not 100% complete, i.e. there are a number of FIXMEs * indicating where portions of the protocol are not dissected completely. diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_abis_oml.c wireshark-1.10.6/epan/dissectors/packet-gsm_abis_oml.c --- wireshark-1.10.5/epan/dissectors/packet-gsm_abis_oml.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_abis_oml.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2009 by Holger Hans Peter Freyther * based on A-bis OML code in OpenBSC * - * $Id: packet-gsm_abis_oml.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_a_bssmap.c wireshark-1.10.6/epan/dissectors/packet-gsm_a_bssmap.c --- wireshark-1.10.5/epan/dissectors/packet-gsm_a_bssmap.c 2013-12-19 17:37:26.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_a_bssmap.c 2014-03-07 18:07:13.000000000 +0000 @@ -17,7 +17,7 @@ * 3GPP TS 48.008 version 8.4.0 Release 8 * 3GPP TS 48.008 version 9.8.0 Release 9 * - * $Id: packet-gsm_a_bssmap.c 54252 2013-12-19 17:31:09Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_a_common.c wireshark-1.10.6/epan/dissectors/packet-gsm_a_common.c --- wireshark-1.10.5/epan/dissectors/packet-gsm_a_common.c 2013-08-30 17:49:25.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_a_common.c 2014-03-07 18:07:13.000000000 +0000 @@ -6,7 +6,7 @@ * * Split from packet-gsm_a.c by Neil Piercy * - * $Id: packet-gsm_a_common.c 51601 2013-08-30 17:43:07Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_a_common.h wireshark-1.10.6/epan/dissectors/packet-gsm_a_common.h --- wireshark-1.10.5/epan/dissectors/packet-gsm_a_common.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_a_common.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-gsm_a_common.h * - * $Id: packet-gsm_a_common.h 48862 2013-04-15 21:52:59Z pascal $ + * $Id$ * * Reference [3] * Mobile radio interface Layer 3 specification; diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_a_dtap.c wireshark-1.10.6/epan/dissectors/packet-gsm_a_dtap.c --- wireshark-1.10.5/epan/dissectors/packet-gsm_a_dtap.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_a_dtap.c 2014-03-07 18:07:13.000000000 +0000 @@ -78,7 +78,7 @@ * Stage 3 * (3GPP TS 24.008 version 11.6.0 Release 11) * - * $Id: packet-gsm_a_dtap.c 48751 2013-04-05 20:50:24Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_a_gm.c wireshark-1.10.6/epan/dissectors/packet-gsm_a_gm.c --- wireshark-1.10.5/epan/dissectors/packet-gsm_a_gm.c 2013-08-30 17:49:25.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_a_gm.c 2014-03-07 18:07:13.000000000 +0000 @@ -47,7 +47,7 @@ * Stage 3 * (3GPP TS 24.008 version 11.6.0 Release 11) * - * $Id: packet-gsm_a_gm.c 51601 2013-08-30 17:43:07Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_a_rp.c wireshark-1.10.6/epan/dissectors/packet-gsm_a_rp.c --- wireshark-1.10.5/epan/dissectors/packet-gsm_a_rp.c 2013-05-22 21:16:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_a_rp.c 2014-03-07 18:07:13.000000000 +0000 @@ -11,7 +11,7 @@ * support on mobile radio interface * (3GPP TS 24.011 version 4.1.1 Release 4) * - * $Id: packet-gsm_a_rp.c 49526 2013-05-22 20:59:04Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_a_rr.c wireshark-1.10.6/epan/dissectors/packet-gsm_a_rr.c --- wireshark-1.10.5/epan/dissectors/packet-gsm_a_rr.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_a_rr.c 2014-03-07 18:07:13.000000000 +0000 @@ -23,7 +23,7 @@ * (GSM 04.18 version 8.4.1 Release 1999) * (3GPP TS 04.18 version 8.26.0 Release 1999) * - * $Id: packet-gsm_a_rr.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_bsslap.c wireshark-1.10.6/epan/dissectors/packet-gsm_bsslap.c --- wireshark-1.10.5/epan/dissectors/packet-gsm_bsslap.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_bsslap.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Location Services (LCS) Serving Mobile Location Centre - Base Station System (SMLC-BSS) dissection * Copyright 2008, Anders Broman * - * $Id: packet-gsm_bsslap.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_bssmap_le.c wireshark-1.10.6/epan/dissectors/packet-gsm_bssmap_le.c --- wireshark-1.10.5/epan/dissectors/packet-gsm_bssmap_le.c 2013-12-19 17:37:26.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_bssmap_le.c 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * * 3GPP TS 49.031 version v7.4.0 (2009-09) * - * $Id: packet-gsm_bssmap_le.c 54252 2013-12-19 17:31:09Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_cbch.c wireshark-1.10.6/epan/dissectors/packet-gsm_cbch.c --- wireshark-1.10.5/epan/dissectors/packet-gsm_cbch.c 2013-06-02 00:12:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_cbch.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2011, Mike Morrin * - * $Id: packet-gsm_cbch.c 49687 2013-06-02 00:06:01Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_ipa.c wireshark-1.10.6/epan/dissectors/packet-gsm_ipa.c --- wireshark-1.10.5/epan/dissectors/packet-gsm_ipa.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_ipa.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2009 by Harald Welte * Copyright 2009, 2010 by Holger Hans Peter Freyther * - * $Id: packet-gsm_ipa.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_map.c wireshark-1.10.6/epan/dissectors/packet-gsm_map.c --- wireshark-1.10.5/epan/dissectors/packet-gsm_map.c 2013-12-13 20:37:23.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_map.c 2014-03-07 18:07:13.000000000 +0000 @@ -25,7 +25,7 @@ * Felix Fei * and Michael Lum * - * $Id: packet-gsm_map.c 54059 2013-12-13 20:31:28Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_map.h wireshark-1.10.6/epan/dissectors/packet-gsm_map.h --- wireshark-1.10.5/epan/dissectors/packet-gsm_map.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_map.h 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for GSM MAP packet dissection * Copyright 2004 - 2006, Anders Broman * - * $Id: packet-gsm_map.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_rlcmac.c wireshark-1.10.6/epan/dissectors/packet-gsm_rlcmac.c --- wireshark-1.10.5/epan/dissectors/packet-gsm_rlcmac.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_rlcmac.c 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * with the gracious authorization of STE * Copyright (c) 2011 ST-Ericsson * - * $Id: packet-gsm_rlcmac.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_rlcmac.h wireshark-1.10.6/epan/dissectors/packet-gsm_rlcmac.h --- wireshark-1.10.5/epan/dissectors/packet-gsm_rlcmac.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_rlcmac.h 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * with the gracious authorization of STE * Copyright (c) 2011 ST-Ericsson * - * $Id: packet-gsm_rlcmac.h 46301 2012-11-30 09:42:58Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_sim.c wireshark-1.10.6/epan/dissectors/packet-gsm_sim.c --- wireshark-1.10.5/epan/dissectors/packet-gsm_sim.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_sim.c 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * 3GPP TS 31.102 * Copyright 2010-2011 by Harald Welte * - * $Id: packet-gsm_sim.c 48611 2013-03-28 14:04:23Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_sms.c wireshark-1.10.6/epan/dissectors/packet-gsm_sms.c --- wireshark-1.10.5/epan/dissectors/packet-gsm_sms.c 2013-12-19 17:37:26.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_sms.c 2014-03-07 18:07:13.000000000 +0000 @@ -14,7 +14,7 @@ * Header field support for TPDU Parameters added by * Abhik Sarkar. * - * $Id: packet-gsm_sms.c 54252 2013-12-19 17:31:09Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_sms.h wireshark-1.10.6/epan/dissectors/packet-gsm_sms.h --- wireshark-1.10.5/epan/dissectors/packet-gsm_sms.h 2013-12-17 10:52:30.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_sms.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-gsm_sms.h * - * $Id: packet-gsm_sms.h 54172 2013-12-17 10:46:09Z pascal $ + * $Id$ * * Copyright 2004, Michael Lum , * In association with Telos Technology Inc. diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_sms_ud.c wireshark-1.10.6/epan/dissectors/packet-gsm_sms_ud.c --- wireshark-1.10.5/epan/dissectors/packet-gsm_sms_ud.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_sms_ud.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-gsm_sms_ud.c * Routines for GSM SMS TP-UD (GSM 03.40) dissection * - * $Id: packet-gsm_sms_ud.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Refer to the AUTHORS file or the AUTHORS section in the man page * for contacting the author(s) of this file. diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsmtap.c wireshark-1.10.6/epan/dissectors/packet-gsmtap.c --- wireshark-1.10.5/epan/dissectors/packet-gsmtap.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsmtap.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * (C) 2008-2013 by Harald Welte * (C) 2011 by Holger Hans Peter Freyther * - * $Id: packet-gsmtap.c 48848 2013-04-14 18:55:28Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gsm_um.c wireshark-1.10.6/epan/dissectors/packet-gsm_um.c --- wireshark-1.10.5/epan/dissectors/packet-gsm_um.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gsm_um.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for GSM Um packet disassembly * Duncan Salerno * - * $Id: packet-gsm_um.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gssapi.c wireshark-1.10.6/epan/dissectors/packet-gssapi.c --- wireshark-1.10.5/epan/dissectors/packet-gssapi.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gssapi.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2002, Richard Sharpe Added a few * bits and pieces ... * - * $Id: packet-gssapi.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gssapi.h wireshark-1.10.6/epan/dissectors/packet-gssapi.h --- wireshark-1.10.5/epan/dissectors/packet-gssapi.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gssapi.h 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Dissector for GSS-API tokens as described in rfc2078, section 3.1 * Copyright 2002, Tim Potter * - * $Id: packet-gssapi.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gtp.c wireshark-1.10.6/epan/dissectors/packet-gtp.c --- wireshark-1.10.5/epan/dissectors/packet-gtp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gtp.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-gtp.c * - * $Id: packet-gtp.c 48873 2013-04-16 05:42:17Z etxrab $ + * $Id$ * * Routines for GTP dissection * Copyright 2001, Michal Melerowicz @@ -3939,7 +3939,7 @@ ext_tree_quint = proto_item_add_subtree(te_quint, ett_gtp_quint); - proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 16, "RAND: %s", tvb_bytes_to_str(tvb, offset, 16)); + proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 16, "RAND: %s", tvb_bytes_to_str(tvb, offset + q_offset, 16)); q_offset = q_offset + 16; xres_len = tvb_get_guint8(tvb, offset + q_offset); proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 1, "XRES length: %u", xres_len); diff -Nru wireshark-1.10.5/epan/dissectors/packet-gtp.h wireshark-1.10.6/epan/dissectors/packet-gtp.h --- wireshark-1.10.5/epan/dissectors/packet-gtp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gtp.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-gtp.h * - * $Id: packet-gtp.h 46537 2012-12-14 11:27:38Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gtpv2.c wireshark-1.10.6/epan/dissectors/packet-gtpv2.c --- wireshark-1.10.5/epan/dissectors/packet-gtpv2.c 2013-09-09 19:11:59.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gtpv2.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for GTPv2 dissection * Copyright 2009 - 2012, Anders Broman * - * $Id: packet-gtpv2.c 51875 2013-09-09 18:52:33Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gtpv2.h wireshark-1.10.6/epan/dissectors/packet-gtpv2.h --- wireshark-1.10.5/epan/dissectors/packet-gtpv2.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gtpv2.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-gtpv2.h * - * $Id: packet-gtpv2.h 45834 2012-10-30 06:28:59Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gvcp.c wireshark-1.10.6/epan/dissectors/packet-gvcp.c --- wireshark-1.10.5/epan/dissectors/packet-gvcp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gvcp.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for gvcp (GigEVision Control Protocol) dissection * Copyright 2010, Adrian Daerr * - * $Id: packet-gvcp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-gvrp.c wireshark-1.10.6/epan/dissectors/packet-gvrp.c --- wireshark-1.10.5/epan/dissectors/packet-gvrp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-gvrp.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for GVRP (GARP VLAN Registration Protocol) dissection * Copyright 2000, Kevin Shi * - * $Id: packet-gvrp.c 47751 2013-02-19 23:17:07Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h1.c wireshark-1.10.6/epan/dissectors/packet-h1.c --- wireshark-1.10.5/epan/dissectors/packet-h1.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h1.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Sinec H1 packet disassembly * Gerrit Gehnen * - * $Id: packet-h1.c 47751 2013-02-19 23:17:07Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h221_nonstd.c wireshark-1.10.6/epan/dissectors/packet-h221_nonstd.c --- wireshark-1.10.5/epan/dissectors/packet-h221_nonstd.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h221_nonstd.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-h221_nonstd.c * Routines for H.221 nonstandard parameters disassembly * - * $Id: packet-h221_nonstd.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h223.c wireshark-1.10.6/epan/dissectors/packet-h223.c --- wireshark-1.10.5/epan/dissectors/packet-h223.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h223.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for H.223 packet dissection * Copyright (c) 2004-5 MX Telecom Ltd * - * $Id: packet-h223.c 48396 2013-03-18 19:47:33Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h223.h wireshark-1.10.6/epan/dissectors/packet-h223.h --- wireshark-1.10.5/epan/dissectors/packet-h223.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h223.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,4 +1,4 @@ -/* $Id: packet-h223.h 43536 2012-06-28 22:56:06Z darkjames $ +/* $Id$ * * Routines for H.223 packet dissection * 2004 Richard van der Hoff diff -Nru wireshark-1.10.5/epan/dissectors/packet-h225.c wireshark-1.10.6/epan/dissectors/packet-h225.c --- wireshark-1.10.5/epan/dissectors/packet-h225.c 2013-10-29 22:38:53.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h225.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for h225 packet dissection * Copyright 2005, Anders Broman * - * $Id: packet-h225.c 52973 2013-10-29 22:19:18Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h225.h wireshark-1.10.6/epan/dissectors/packet-h225.h --- wireshark-1.10.5/epan/dissectors/packet-h225.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h225.h 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for h225 packet dissection * Copyright 2005, Anders Broman * - * $Id: packet-h225.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h235.c wireshark-1.10.6/epan/dissectors/packet-h235.c --- wireshark-1.10.5/epan/dissectors/packet-h235.c 2013-07-17 01:50:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h235.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for H.235 packet dissection * 2004 Tomas Kukosa * - * $Id: packet-h235.c 50688 2013-07-17 01:34:46Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h235.h wireshark-1.10.6/epan/dissectors/packet-h235.h --- wireshark-1.10.5/epan/dissectors/packet-h235.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h235.h 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for H.235 packet dissection * 2004 Tomas Kukosa * - * $Id: packet-h235.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h245.c wireshark-1.10.6/epan/dissectors/packet-h245.c --- wireshark-1.10.5/epan/dissectors/packet-h245.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h245.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for h245 packet dissection * Copyright 2004, Anders Broman * - * $Id: packet-h245.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h245.h wireshark-1.10.6/epan/dissectors/packet-h245.h --- wireshark-1.10.5/epan/dissectors/packet-h245.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h245.h 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for h245 packet dissection * Copyright 2005, Anders Broman * - * $Id: packet-h245.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h248_10.c wireshark-1.10.6/epan/dissectors/packet-h248_10.c --- wireshark-1.10.5/epan/dissectors/packet-h248_10.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h248_10.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * packet-h248_10.c * - * $Id: packet-h248_10.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * H.248.10 * Gateway control protocol: Media gateway diff -Nru wireshark-1.10.5/epan/dissectors/packet-h248_2.c wireshark-1.10.6/epan/dissectors/packet-h248_2.c --- wireshark-1.10.5/epan/dissectors/packet-h248_2.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h248_2.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * packet-h248_2.c * - * $Id: packet-h248_2.c 47448 2013-02-02 17:40:52Z wmeier $ + * $Id$ * * H.248.2 * Gateway control protocol: Facsimile, text conversation and call discrimination packages diff -Nru wireshark-1.10.5/epan/dissectors/packet-h248_3gpp.c wireshark-1.10.6/epan/dissectors/packet-h248_3gpp.c --- wireshark-1.10.5/epan/dissectors/packet-h248_3gpp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h248_3gpp.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * * (c) 2006, Luis E. Garcia Ontanon * - * $Id: packet-h248_3gpp.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h248_7.c wireshark-1.10.6/epan/dissectors/packet-h248_7.c --- wireshark-1.10.5/epan/dissectors/packet-h248_7.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h248_7.c 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * * (c) 2007, Luis E. Garcia Ontanon * - * $Id: packet-h248_7.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h248_annex_c.c wireshark-1.10.6/epan/dissectors/packet-h248_annex_c.c --- wireshark-1.10.5/epan/dissectors/packet-h248_annex_c.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h248_annex_c.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * * (c) 2006, Luis E. Garcia Ontanon * - * $Id: packet-h248_annex_c.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h248_annex_e.c wireshark-1.10.6/epan/dissectors/packet-h248_annex_e.c --- wireshark-1.10.5/epan/dissectors/packet-h248_annex_e.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h248_annex_e.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * * (c) 2006, Luis E. Garcia Ontanon * - * $Id: packet-h248_annex_e.c 47524 2013-02-06 19:04:24Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h248.c wireshark-1.10.6/epan/dissectors/packet-h248.c --- wireshark-1.10.5/epan/dissectors/packet-h248.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h248.c 2014-03-07 18:07:13.000000000 +0000 @@ -13,7 +13,7 @@ * * Luis Ontanon 2005 - Context and Transaction Tracing * - * $Id: packet-h248.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h248.h wireshark-1.10.6/epan/dissectors/packet-h248.h --- wireshark-1.10.5/epan/dissectors/packet-h248.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h248.h 2014-03-07 18:07:13.000000000 +0000 @@ -12,7 +12,7 @@ * Ronnie Sahlberg 2004 * Luis Ontanon 2005 * - * $Id: packet-h248.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h248_q1950.c wireshark-1.10.6/epan/dissectors/packet-h248_q1950.c --- wireshark-1.10.5/epan/dissectors/packet-h248_q1950.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h248_q1950.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * * (c) 2006, Anders Broman * - * $Id: packet-h248_q1950.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h261.c wireshark-1.10.6/epan/dissectors/packet-h261.c --- wireshark-1.10.5/epan/dissectors/packet-h261.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h261.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * * Routines for ITU-T Recommendation H.261 dissection * - * $Id: packet-h261.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Copyright 2000, Philips Electronics N.V. * Andreas Sikkema diff -Nru wireshark-1.10.5/epan/dissectors/packet-h263.c wireshark-1.10.6/epan/dissectors/packet-h263.c --- wireshark-1.10.5/epan/dissectors/packet-h263.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h263.c 2014-03-07 18:07:13.000000000 +0000 @@ -8,7 +8,7 @@ * Copyright 2008 Richard van der Hoff, MX Telecom * * - * $Id: packet-h263.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h263.h wireshark-1.10.6/epan/dissectors/packet-h263.h --- wireshark-1.10.5/epan/dissectors/packet-h263.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h263.h 2014-03-07 18:07:13.000000000 +0000 @@ -8,7 +8,7 @@ * Copyright 2008 Richard van der Hoff, MX Telecom * * - * $Id: packet-h263.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h263p.c wireshark-1.10.6/epan/dissectors/packet-h263p.c --- wireshark-1.10.5/epan/dissectors/packet-h263p.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h263p.c 2014-03-07 18:07:13.000000000 +0000 @@ -8,7 +8,7 @@ * Copyright 2008 Richard van der Hoff, MX Telecom * * - * $Id: packet-h263p.c 47389 2013-01-31 17:55:31Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h264.c wireshark-1.10.6/epan/dissectors/packet-h264.c --- wireshark-1.10.5/epan/dissectors/packet-h264.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h264.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for H.264 dissection * Copyright 2007 - 2009, Anders Broman * - * $Id: packet-h264.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -1450,7 +1450,7 @@ } } */ - proto_tree_add_text(tree, tvb, offset, -1, "[Not decoded yet]"); + proto_tree_add_text(tree, tvb, bit_offset>>3, -1, "[Not decoded yet]"); return -1; } @@ -1786,7 +1786,7 @@ case H264_SEQ_PAR_SET: /* 7 Sequence parameter set*/ offset = dissect_h264_seq_parameter_set_rbsp(h264_nal_tree, tvb, pinfo, offset); /* A bit ugly */ - if (tvb_length_remaining(tvb, offset) > 0) { + if ((offset != -1) && (tvb_length_remaining(tvb, offset) > 0)) { /* In this case length = offset as we start from zero */ proto_item_set_len(item, offset/*Length */); item = proto_tree_add_item(tree, hf_h264_nal_unit, tvb, offset, -1, ENC_NA); diff -Nru wireshark-1.10.5/epan/dissectors/packet-h264.h wireshark-1.10.6/epan/dissectors/packet-h264.h --- wireshark-1.10.5/epan/dissectors/packet-h264.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h264.h 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for H.264 dissection * Copyright 2007, Anders Broman * - * $Id: packet-h264.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h282.c wireshark-1.10.6/epan/dissectors/packet-h282.c --- wireshark-1.10.5/epan/dissectors/packet-h282.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h282.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for H.282 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-h282.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h283.c wireshark-1.10.6/epan/dissectors/packet-h283.c --- wireshark-1.10.5/epan/dissectors/packet-h283.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h283.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for H.283 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-h283.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h323.c wireshark-1.10.6/epan/dissectors/packet-h323.c --- wireshark-1.10.5/epan/dissectors/packet-h323.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h323.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for H.323 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-h323.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h323.h wireshark-1.10.6/epan/dissectors/packet-h323.h --- wireshark-1.10.5/epan/dissectors/packet-h323.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h323.h 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for H.235 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-h323.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h450.c wireshark-1.10.6/epan/dissectors/packet-h450.c --- wireshark-1.10.5/epan/dissectors/packet-h450.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h450.c 2014-03-07 18:07:13.000000000 +0000 @@ -12,7 +12,7 @@ * 2003 Graeme Reid (graeme.reid@norwoodsystems.com) * Copyright 2005, Anders Broman * - * $Id: packet-h450.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h450-ros.c wireshark-1.10.6/epan/dissectors/packet-h450-ros.c --- wireshark-1.10.5/epan/dissectors/packet-h450-ros.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h450-ros.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for H.450 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-h450-ros.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h450-ros.h wireshark-1.10.6/epan/dissectors/packet-h450-ros.h --- wireshark-1.10.5/epan/dissectors/packet-h450-ros.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h450-ros.h 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for H.450 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-h450-ros.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h460.c wireshark-1.10.6/epan/dissectors/packet-h460.c --- wireshark-1.10.5/epan/dissectors/packet-h460.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h460.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for H.460.x packet dissection * 2007 Tomas Kukosa * - * $Id: packet-h460.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-h501.c wireshark-1.10.6/epan/dissectors/packet-h501.c --- wireshark-1.10.5/epan/dissectors/packet-h501.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-h501.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for H.501 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-h501.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hartip.c wireshark-1.10.6/epan/dissectors/packet-hartip.c --- wireshark-1.10.5/epan/dissectors/packet-hartip.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hartip.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for HART-IP packet dissection * Copyright 2012, Bill Schiller * - * $Id: packet-hartip.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hazelcast.c wireshark-1.10.6/epan/dissectors/packet-hazelcast.c --- wireshark-1.10.5/epan/dissectors/packet-hazelcast.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hazelcast.c 2014-03-07 18:07:13.000000000 +0000 @@ -8,7 +8,7 @@ * reversed from this code: * http://code.google.com/p/hazelcast/source/browse/branches/1.9.4/hazelcast/src/main/java/com/hazelcast/nio/Packet.java * - * $Id: packet-hazelcast.c 48685 2013-04-01 15:29:49Z jake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hci_h1.c wireshark-1.10.6/epan/dissectors/packet-hci_h1.c --- wireshark-1.10.5/epan/dissectors/packet-hci_h1.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hci_h1.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-hci_h1.c * Routines for the Bluetooth HCI h1 dissection * - * $Id: packet-hci_h1.c 48414 2013-03-19 13:51:52Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hci_h4.c wireshark-1.10.6/epan/dissectors/packet-hci_h4.c --- wireshark-1.10.5/epan/dissectors/packet-hci_h4.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hci_h4.c 2014-03-07 18:07:13.000000000 +0000 @@ -7,7 +7,7 @@ * Refactored for wireshark checkin * Ronnie Sahlberg 2006 * - * $Id: packet-hci_h4.c 48414 2013-03-19 13:51:52Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hci_usb.c wireshark-1.10.6/epan/dissectors/packet-hci_usb.c --- wireshark-1.10.5/epan/dissectors/packet-hci_usb.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hci_usb.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2012, Michal Labedzki for Tieto Corporation * - * $Id: packet-hci_usb.c 48605 2013-03-28 03:06:30Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hclnfsd.c wireshark-1.10.6/epan/dissectors/packet-hclnfsd.c --- wireshark-1.10.5/epan/dissectors/packet-hclnfsd.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hclnfsd.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for hclnfsd (Hummingbird NFS Daemon) dissection * Copyright 2001, Mike Frisch * - * $Id: packet-hclnfsd.c 48934 2013-04-19 18:16:50Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hclnfsd.h wireshark-1.10.6/epan/dissectors/packet-hclnfsd.h --- wireshark-1.10.5/epan/dissectors/packet-hclnfsd.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hclnfsd.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-hclnfsd.h * - * $Id: packet-hclnfsd.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hdcp2.c wireshark-1.10.6/epan/dissectors/packet-hdcp2.c --- wireshark-1.10.5/epan/dissectors/packet-hdcp2.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hdcp2.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for HDCP2 dissection * Copyright 2011-2012, Martin Kaiser * - * $Id: packet-hdcp2.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hdcp.c wireshark-1.10.6/epan/dissectors/packet-hdcp.c --- wireshark-1.10.5/epan/dissectors/packet-hdcp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hdcp.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for HDCP dissection * Copyright 2011-2012, Martin Kaiser * - * $Id: packet-hdcp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hdcp.h wireshark-1.10.6/epan/dissectors/packet-hdcp.h --- wireshark-1.10.5/epan/dissectors/packet-hdcp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hdcp.h 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for HDCP dissection * Copyright 2011-2012, Martin Kaiser * - * $Id: packet-hdcp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hdfs.c wireshark-1.10.6/epan/dissectors/packet-hdfs.c --- wireshark-1.10.5/epan/dissectors/packet-hdfs.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hdfs.c 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Allison Obourn * - * $Id: packet-hdfs.c 47389 2013-01-31 17:55:31Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hdfsdata.c wireshark-1.10.6/epan/dissectors/packet-hdfsdata.c --- wireshark-1.10.5/epan/dissectors/packet-hdfsdata.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hdfsdata.c 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Allison Obourn * - * $Id: packet-hdfsdata.c 48159 2013-03-07 02:04:41Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-HI2Operations.c wireshark-1.10.6/epan/dissectors/packet-HI2Operations.c --- wireshark-1.10.5/epan/dissectors/packet-HI2Operations.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-HI2Operations.c 2014-03-07 18:07:12.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for HI2 (ETSI TS 101 671 V3.5.1 (2009-11)) * Erwin van Eijk 2010 * - * $Id: packet-HI2Operations.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hip.c wireshark-1.10.6/epan/dissectors/packet-hip.c --- wireshark-1.10.5/epan/dissectors/packet-hip.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hip.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions and routines for HIP control packet disassembly * Samu Varjonen * - * $Id: packet-hip.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Based on dissector originally created by * Jeff Ahrenholz diff -Nru wireshark-1.10.5/epan/dissectors/packet-hnbap.c wireshark-1.10.6/epan/dissectors/packet-hnbap.c --- wireshark-1.10.5/epan/dissectors/packet-hnbap.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hnbap.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for UMTS Node B Application Part(HNBAP) packet dissection * Copyright 2010 Neil Piercy, ip.access Limited * - * $Id: packet-hnbap.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-homeplug-av.c wireshark-1.10.6/epan/dissectors/packet-homeplug-av.c --- wireshark-1.10.5/epan/dissectors/packet-homeplug-av.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-homeplug-av.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2011, Florian Fainelli * - * $Id: packet-homeplug-av.c 48659 2013-03-30 19:16:51Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-homeplug.c wireshark-1.10.6/epan/dissectors/packet-homeplug.c --- wireshark-1.10.5/epan/dissectors/packet-homeplug.c 2013-12-19 17:37:26.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-homeplug.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2006, Sebastien Tandel * Copyright 2009, Luca Ceresoli * - * $Id: packet-homeplug.c 54252 2013-12-19 17:31:09Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hp-erm.c wireshark-1.10.6/epan/dissectors/packet-hp-erm.c --- wireshark-1.10.5/epan/dissectors/packet-hp-erm.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hp-erm.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the disassembly of HP ProCurve encapsulated remote mirroring frames * (Adapted from packet-cisco-erspan.c and packet-vlan.c) * - * $Id: packet-hp-erm.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Copyright 2010 2012 William Meier , * Zdravko Velinov diff -Nru wireshark-1.10.5/epan/dissectors/packet-hpext.c wireshark-1.10.6/epan/dissectors/packet-hpext.c --- wireshark-1.10.5/epan/dissectors/packet-hpext.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hpext.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for HP extended IEEE 802.2 LLC layer * Jochen Friedrich * - * $Id: packet-hpext.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hpext.h wireshark-1.10.6/epan/dissectors/packet-hpext.h --- wireshark-1.10.5/epan/dissectors/packet-hpext.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hpext.h 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for HP extended IEEE 802.2 LLC layer * Jochen Friedrich * - * $Id: packet-hpext.h 19812 2006-11-05 18:26:21Z jake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hpfeeds.c wireshark-1.10.6/epan/dissectors/packet-hpfeeds.c --- wireshark-1.10.5/epan/dissectors/packet-hpfeeds.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hpfeeds.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Honeypot Protocol Feeds packet disassembly * Copyright 2013, Sebastiano DI PAOLA - * - * $Id: packet-hpfeeds.c 48832 2013-04-12 16:27:20Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hpsw.c wireshark-1.10.6/epan/dissectors/packet-hpsw.c --- wireshark-1.10.5/epan/dissectors/packet-hpsw.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hpsw.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for HP Switch Config protocol * Charlie Lenahan * - * $Id: packet-hpsw.c 48512 2013-03-23 17:16:02Z jake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hpteam.c wireshark-1.10.6/epan/dissectors/packet-hpteam.c --- wireshark-1.10.5/epan/dissectors/packet-hpteam.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hpteam.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for HP Teaming heartbeat dissection * Copyright 2009, Nathan Hartwell * - * $Id: packet-hpteam.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hsr.c wireshark-1.10.6/epan/dissectors/packet-hsr.c --- wireshark-1.10.5/epan/dissectors/packet-hsr.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hsr.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for HSR dissection (IEC62439 Part 3) * Copyright 2009, Florian Reichert * - * $Id: packet-hsr.c 47751 2013-02-19 23:17:07Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hsrp.c wireshark-1.10.6/epan/dissectors/packet-hsrp.c --- wireshark-1.10.5/epan/dissectors/packet-hsrp.c 2013-05-06 23:24:19.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hsrp.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * * Heikki Vatiainen * - * $Id: packet-hsrp.c 49189 2013-05-06 23:18:02Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hsr-prp-supervision.c wireshark-1.10.6/epan/dissectors/packet-hsr-prp-supervision.c --- wireshark-1.10.5/epan/dissectors/packet-hsr-prp-supervision.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hsr-prp-supervision.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2009, Florian Reichert * Copyright 2011, Martin Renold * - * $Id: packet-hsr-prp-supervision.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-http.c wireshark-1.10.6/epan/dissectors/packet-http.c --- wireshark-1.10.5/epan/dissectors/packet-http.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-http.c 2014-03-07 18:07:13.000000000 +0000 @@ -9,7 +9,7 @@ * Copyright 2002, Tim Potter * Copyright 1999, Andrew Tridgell * - * $Id: packet-http.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-http.h wireshark-1.10.6/epan/dissectors/packet-http.h --- wireshark-1.10.5/epan/dissectors/packet-http.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-http.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-http.h * - * $Id: packet-http.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-hyperscsi.c wireshark-1.10.6/epan/dissectors/packet-hyperscsi.c --- wireshark-1.10.5/epan/dissectors/packet-hyperscsi.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-hyperscsi.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-hyperscsi.c * Routines for dissassembly of the Hyper SCSI protocol. * - * $Id: packet-hyperscsi.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-i2c.c wireshark-1.10.6/epan/dissectors/packet-i2c.c --- wireshark-1.10.5/epan/dissectors/packet-i2c.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-i2c.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * * Pigeon Point Systems * - * $Id: packet-i2c.c 48848 2013-04-14 18:55:28Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-i2c.h wireshark-1.10.6/epan/dissectors/packet-i2c.h --- wireshark-1.10.5/epan/dissectors/packet-i2c.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-i2c.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-i2c.h * - * $Id: packet-i2c.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-iana-oui.c wireshark-1.10.6/epan/dissectors/packet-iana-oui.c --- wireshark-1.10.5/epan/dissectors/packet-iana-oui.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-iana-oui.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-iana-oui.c * Register an LLC dissector table for the IANA's OUI 00:00:5e * - * $Id: packet-iana-oui.c 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-iapp.c wireshark-1.10.6/epan/dissectors/packet-iapp.c --- wireshark-1.10.5/epan/dissectors/packet-iapp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-iapp.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for IAPP dissection * Copyright 2002, Alfred Arnold * - * $Id: packet-iapp.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-iax2.c wireshark-1.10.6/epan/dissectors/packet-iax2.c --- wireshark-1.10.5/epan/dissectors/packet-iax2.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-iax2.c 2014-03-07 18:07:13.000000000 +0000 @@ -9,7 +9,7 @@ * http://www.asterisk.org for more information; see RFC 5456 for the * protocol. * - * $Id: packet-iax2.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-iax2.h wireshark-1.10.6/epan/dissectors/packet-iax2.h --- wireshark-1.10.5/epan/dissectors/packet-iax2.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-iax2.h 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright (C) 2003, Digium * Mark Spencer * - * $Id: packet-iax2.h 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-icap.c wireshark-1.10.6/epan/dissectors/packet-icap.c --- wireshark-1.10.5/epan/dissectors/packet-icap.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-icap.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * * Srishylam Simharajan simha@netapp.com * - * $Id: packet-icap.c 47389 2013-01-31 17:55:31Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-icep.c wireshark-1.10.6/epan/dissectors/packet-icep.c --- wireshark-1.10.5/epan/dissectors/packet-icep.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-icep.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2004 _FF_ * Francesco Fondelli * - * $Id: packet-icep.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-icmp.c wireshark-1.10.6/epan/dissectors/packet-icmp.c --- wireshark-1.10.5/epan/dissectors/packet-icmp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-icmp.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-icmp.c * Routines for ICMP - Internet Control Message Protocol * - * $Id: packet-icmp.c 48563 2013-03-26 18:08:05Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-icmp.h wireshark-1.10.6/epan/dissectors/packet-icmp.h --- wireshark-1.10.5/epan/dissectors/packet-icmp.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-icmp.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-icmp.h * Definitions for ICMP: http://tools.ietf.org/html/rfc792. * - * $Id: packet-icmp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-icmpv6.c wireshark-1.10.6/epan/dissectors/packet-icmpv6.c --- wireshark-1.10.5/epan/dissectors/packet-icmpv6.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-icmpv6.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-icmpv6.c * Routines for ICMPv6 packet disassembly * - * $Id: packet-icmpv6.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-icp.c wireshark-1.10.6/epan/dissectors/packet-icp.c --- wireshark-1.10.5/epan/dissectors/packet-icp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-icp.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * By Peter Torvals * Copyright 1999 Peter Torvals * - * $Id: packet-icp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-icq.c wireshark-1.10.6/epan/dissectors/packet-icq.c --- wireshark-1.10.5/epan/dissectors/packet-icq.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-icq.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-icq.c * Routines for ICQ packet disassembly * - * $Id: packet-icq.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-idmp.c wireshark-1.10.6/epan/dissectors/packet-idmp.c --- wireshark-1.10.5/epan/dissectors/packet-idmp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-idmp.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.519 Internet Directly Mapped Procotol (IDMP) packet dissection * Graeme Lunt 2010 * - * $Id: packet-idmp.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-idmp.h wireshark-1.10.6/epan/dissectors/packet-idmp.h --- wireshark-1.10.5/epan/dissectors/packet-idmp.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-idmp.h 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.519 Internet Directly Mapped Protocol (IDMP) packet dissection * Graeme Lunt 2010 * - * $Id: packet-idmp.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-idp.c wireshark-1.10.6/epan/dissectors/packet-idp.c --- wireshark-1.10.5/epan/dissectors/packet-idp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-idp.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for XNS IDP * Based on the Netware IPX dissector by Gilbert Ramirez * - * $Id: packet-idp.c 47389 2013-01-31 17:55:31Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-idp.h wireshark-1.10.6/epan/dissectors/packet-idp.h --- wireshark-1.10.5/epan/dissectors/packet-idp.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-idp.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-idp.h * Declarations for XNS IDP * - * $Id: packet-idp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-iec104.c wireshark-1.10.6/epan/dissectors/packet-iec104.c --- wireshark-1.10.5/epan/dissectors/packet-iec104.c 2013-10-23 13:41:24.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-iec104.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for IEC-60870-5-104 (iec104) Protocol disassembly * * - * $Id: packet-iec104.c 52786 2013-10-23 13:35:18Z mmann $ + * $Id$ * * Copyright (c) 2008 by Joan Ramio * Joan is a masculine catalan name. Search the Internet for Joan Pujol (alias Garbo). diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee17221.c wireshark-1.10.6/epan/dissectors/packet-ieee17221.c --- wireshark-1.10.5/epan/dissectors/packet-ieee17221.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee17221.c 2014-03-07 18:07:13.000000000 +0000 @@ -6,7 +6,7 @@ * * Copyright 2011, Andy Lucas * - * $Id: packet-ieee17221.c 47645 2013-02-12 21:26:47Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee1722.c wireshark-1.10.6/epan/dissectors/packet-ieee1722.c --- wireshark-1.10.5/epan/dissectors/packet-ieee1722.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee1722.c 2014-03-07 18:07:13.000000000 +0000 @@ -6,7 +6,7 @@ * * Copyright 2011, Thomas Bottom * - * $Id: packet-ieee1722.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee80211-airopeek.c wireshark-1.10.6/epan/dissectors/packet-ieee80211-airopeek.c --- wireshark-1.10.5/epan/dissectors/packet-ieee80211-airopeek.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee80211-airopeek.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ieee80211-airopeek.c * Routines for pre-V9 WildPackets AiroPeek header dissection * - * $Id: packet-ieee80211-airopeek.c 47664 2013-02-15 00:34:05Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee80211.c wireshark-1.10.6/epan/dissectors/packet-ieee80211.c --- wireshark-1.10.5/epan/dissectors/packet-ieee80211.c 2013-12-13 23:12:45.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee80211.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Wireless LAN (IEEE 802.11) dissection * Copyright 2000, Axis Communications AB * - * $Id: packet-ieee80211.c 54076 2013-12-13 22:49:30Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee80211.h wireshark-1.10.6/epan/dissectors/packet-ieee80211.h --- wireshark-1.10.5/epan/dissectors/packet-ieee80211.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee80211.h 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2000, Axis Communications AB * Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com * - * $Id: packet-ieee80211.h 48308 2013-03-15 01:31:53Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee80211-netmon.c wireshark-1.10.6/epan/dissectors/packet-ieee80211-netmon.c --- wireshark-1.10.5/epan/dissectors/packet-ieee80211-netmon.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee80211-netmon.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * packet-ieee80211-netmon.c * Decode packets with a Network Monitor 802.11 radio header * - * $Id: packet-ieee80211-netmon.c 47389 2013-01-31 17:55:31Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee80211-prism.c wireshark-1.10.6/epan/dissectors/packet-ieee80211-prism.c --- wireshark-1.10.5/epan/dissectors/packet-ieee80211-prism.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee80211-prism.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ieee80211-prism.c * Routines for Prism monitoring mode header dissection * - * $Id: packet-ieee80211-prism.c 48355 2013-03-17 16:48:47Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee80211-radio.c wireshark-1.10.6/epan/dissectors/packet-ieee80211-radio.c --- wireshark-1.10.5/epan/dissectors/packet-ieee80211-radio.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee80211-radio.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ieee80211-radio.c * Routines for pseudo 802.11 header dissection * - * $Id: packet-ieee80211-radio.c 47665 2013-02-15 00:43:04Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee80211-radiotap.c wireshark-1.10.6/epan/dissectors/packet-ieee80211-radiotap.c --- wireshark-1.10.5/epan/dissectors/packet-ieee80211-radiotap.c 2013-09-09 18:34:31.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee80211-radiotap.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * packet-ieee80211-radiotap.c * Decode packets with a Radiotap header * - * $Id: packet-ieee80211-radiotap.c 51874 2013-09-09 18:28:56Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee80211-radiotap-defs.h wireshark-1.10.6/epan/dissectors/packet-ieee80211-radiotap-defs.h --- wireshark-1.10.5/epan/dissectors/packet-ieee80211-radiotap-defs.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee80211-radiotap-defs.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /*- * Copyright (c) 2003, 2004 David Young. All rights reserved. * - * $Id: packet-ieee80211-radiotap-defs.h 44985 2012-09-18 20:46:05Z alagoutte $ + * $Id$ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee80211-radiotap.h wireshark-1.10.6/epan/dissectors/packet-ieee80211-radiotap.h --- wireshark-1.10.5/epan/dissectors/packet-ieee80211-radiotap.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee80211-radiotap.h 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * packet-ieee80211-radiotap.h * Declarations for packet-ieee80211-radiotap.c * - * $Id: packet-ieee80211-radiotap.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee80211-radiotap-iter.c wireshark-1.10.6/epan/dissectors/packet-ieee80211-radiotap-iter.c --- wireshark-1.10.5/epan/dissectors/packet-ieee80211-radiotap-iter.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee80211-radiotap-iter.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2007 Andy Green * Copyright 2009 Johannes Berg * - * $Id: packet-ieee80211-radiotap-iter.c 47813 2013-02-22 01:34:53Z cmaynard $ + * $Id$ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee80211-radiotap-iter.h wireshark-1.10.6/epan/dissectors/packet-ieee80211-radiotap-iter.h --- wireshark-1.10.5/epan/dissectors/packet-ieee80211-radiotap-iter.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee80211-radiotap-iter.h 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2007 Andy Green * Copyright 2009 Johannes Berg * - * $Id: packet-ieee80211-radiotap-iter.h 42380 2012-05-02 04:03:49Z guy $ + * $Id$ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee80211-wlancap.c wireshark-1.10.6/epan/dissectors/packet-ieee80211-wlancap.c --- wireshark-1.10.5/epan/dissectors/packet-ieee80211-wlancap.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee80211-wlancap.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ieee80211-wlancap.c * Routines for AVS linux-wlan monitoring mode header dissection * - * $Id: packet-ieee80211-wlancap.c 47899 2013-02-26 04:42:26Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee802154.c wireshark-1.10.6/epan/dissectors/packet-ieee802154.c --- wireshark-1.10.5/epan/dissectors/packet-ieee802154.c 2013-10-29 21:46:26.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee802154.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ieee802154.c * - * $Id: packet-ieee802154.c 52968 2013-10-29 21:40:26Z gerald $ + * $Id$ * * Auxiliary Security Header support and * option to force TI CC24xx FCS format diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee802154.h wireshark-1.10.6/epan/dissectors/packet-ieee802154.h --- wireshark-1.10.5/epan/dissectors/packet-ieee802154.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee802154.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ieee802154.h * - * $Id: packet-ieee802154.h 44723 2012-09-01 11:54:16Z etxrab $ + * $Id$ * * IEEE 802.15.4 Dissectors for Wireshark * By Owen Kirby diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee8021ah.c wireshark-1.10.6/epan/dissectors/packet-ieee8021ah.c --- wireshark-1.10.5/epan/dissectors/packet-ieee8021ah.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee8021ah.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ieee8021ah.c * Routines for 802.1ah ethernet header disassembly * - * $Id: packet-ieee8021ah.c 47389 2013-01-31 17:55:31Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee8021ah.h wireshark-1.10.6/epan/dissectors/packet-ieee8021ah.h --- wireshark-1.10.5/epan/dissectors/packet-ieee8021ah.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee8021ah.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ieee8021ah.h * - * $Id: packet-ieee8021ah.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee8023.c wireshark-1.10.6/epan/dissectors/packet-ieee8023.c --- wireshark-1.10.5/epan/dissectors/packet-ieee8023.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee8023.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ieee8023.c * Routine for dissecting 802.3 (as opposed to D/I/X Ethernet) packets. * - * $Id: packet-ieee8023.c 47947 2013-02-28 18:13:41Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee8023.h wireshark-1.10.6/epan/dissectors/packet-ieee8023.h --- wireshark-1.10.5/epan/dissectors/packet-ieee8023.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee8023.h 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Declaration of routine for dissecting 802.3 (as opposed to D/I/X Ethernet) * packets. * - * $Id: packet-ieee8023.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee802a.c wireshark-1.10.6/epan/dissectors/packet-ieee802a.c --- wireshark-1.10.5/epan/dissectors/packet-ieee802a.c 2013-07-17 01:50:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee802a.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ieee802a.c * Routines for IEEE 802a * - * $Id: packet-ieee802a.c 50688 2013-07-17 01:34:46Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -85,6 +85,7 @@ tvbuff_t *next_tvb; const gchar *manuf; guint8 oui[3]; + guint32 oui32; guint16 pid; oui_info_t *oui_info; dissector_table_t subdissector_table; @@ -99,6 +100,7 @@ } tvb_memcpy(tvb, oui, 0, 3); + oui32 = oui[0] << 16 | oui[1] << 8 | oui[2]; manuf = get_manuf_name_if_known(oui); pid = tvb_get_ntohs(tvb, 3); @@ -109,7 +111,7 @@ } if (tree) { proto_tree_add_uint_format_value(ieee802a_tree, hf_ieee802a_oui, - tvb, 0, 3, oui[0] << 16 | oui[1] << 8 | oui[2], "%s (%s)", + tvb, 0, 3, oui32, "%s (%s)", bytes_to_str_punct(oui, 3, ':'), manuf ? manuf : "Unknown"); } @@ -118,7 +120,7 @@ */ if (oui_info_table != NULL && (oui_info = (oui_info_t *)g_hash_table_lookup(oui_info_table, - GUINT_TO_POINTER(oui))) != NULL) { + GUINT_TO_POINTER(oui32))) != NULL) { /* * Yes - use it. */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-ieee802a.h wireshark-1.10.6/epan/dissectors/packet-ieee802a.h --- wireshark-1.10.5/epan/dissectors/packet-ieee802a.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ieee802a.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ieee802a.h * - * $Id: packet-ieee802a.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ifcp.c wireshark-1.10.6/epan/dissectors/packet-ifcp.c --- wireshark-1.10.5/epan/dissectors/packet-ifcp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ifcp.c 2014-03-07 18:07:13.000000000 +0000 @@ -9,7 +9,7 @@ * Significantly based on packet-fcip.c by * Copyright 2001, Dinesh G Dutt (ddutt@cisco.com) * - * $Id: packet-ifcp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-igap.c wireshark-1.10.6/epan/dissectors/packet-igap.c --- wireshark-1.10.5/epan/dissectors/packet-igap.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-igap.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for IGMP/IGAP packet disassembly * 2003, Endoh Akria (see AUTHORS for email) * - * $Id: packet-igap.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-igap.h wireshark-1.10.6/epan/dissectors/packet-igap.h --- wireshark-1.10.5/epan/dissectors/packet-igap.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-igap.h 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Declarations of routines for IGMP/IGAP packet disassembly * 2003, Endoh Akira * - * $Id: packet-igap.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-igmp.c wireshark-1.10.6/epan/dissectors/packet-igmp.c --- wireshark-1.10.5/epan/dissectors/packet-igmp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-igmp.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * 2007 Thomas Morin * * - * $Id: packet-igmp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-igmp.h wireshark-1.10.6/epan/dissectors/packet-igmp.h --- wireshark-1.10.5/epan/dissectors/packet-igmp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-igmp.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-igmp.h 2001 Ronnie Sahlberg * Declarations of routines for IGMP packet disassembly * - * $Id: packet-igmp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-igrp.c wireshark-1.10.6/epan/dissectors/packet-igrp.c --- wireshark-1.10.5/epan/dissectors/packet-igrp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-igrp.c 2014-03-07 18:07:13.000000000 +0000 @@ -6,7 +6,7 @@ * * http://www.cisco.com/en/US/tech/tk365/technologies_white_paper09186a00800c8ae1.shtml * - * $Id: packet-igrp.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-image-gif.c wireshark-1.10.6/epan/dissectors/packet-image-gif.c --- wireshark-1.10.5/epan/dissectors/packet-image-gif.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-image-gif.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for image/gif media dissection * Copyright 2003, 2004, Olivier Biot. * - * $Id: packet-image-gif.c 47389 2013-01-31 17:55:31Z wmeier $ + * $Id$ * * Refer to the AUTHORS file or the AUTHORS section in the man page * for contacting the author(s) of this file. diff -Nru wireshark-1.10.5/epan/dissectors/packet-image-jfif.c wireshark-1.10.6/epan/dissectors/packet-image-jfif.c --- wireshark-1.10.5/epan/dissectors/packet-image-jfif.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-image-jfif.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for JFIF image/jpeg media dissection * Copyright 2004, Olivier Biot. * - * $Id: packet-image-jfif.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Refer to the AUTHORS file or the AUTHORS section in the man page * for contacting the author(s) of this file. diff -Nru wireshark-1.10.5/epan/dissectors/packet-image-png.c wireshark-1.10.6/epan/dissectors/packet-image-png.c --- wireshark-1.10.5/epan/dissectors/packet-image-png.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-image-png.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * * Routines for PNG (Portable Network Graphics) image file dissection * - * $Id: packet-image-png.c 48710 2013-04-02 21:13:02Z cmaynard $ + * $Id$ * * Copyright 2006 Ronnie Sahlberg * diff -Nru wireshark-1.10.5/epan/dissectors/packet-imap.c wireshark-1.10.6/epan/dissectors/packet-imap.c --- wireshark-1.10.5/epan/dissectors/packet-imap.c 2013-07-17 22:26:25.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-imap.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for imap packet dissection * Copyright 1999, Richard Sharpe * - * $Id: packet-imap.c 50710 2013-07-17 22:20:12Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-imf.c wireshark-1.10.6/epan/dissectors/packet-imf.c --- wireshark-1.10.5/epan/dissectors/packet-imf.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-imf.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-imf.c * Routines for Internet Message Format (IMF) packet disassembly * - * $Id: packet-imf.c 48400 2013-03-18 21:16:23Z etxrab $ + * $Id$ * * Copyright (c) 2007 by Graeme Lunt * diff -Nru wireshark-1.10.5/epan/dissectors/packet-imf.h wireshark-1.10.6/epan/dissectors/packet-imf.h --- wireshark-1.10.5/epan/dissectors/packet-imf.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-imf.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-imf.h * Routines for Internet Message Format (IMF) packet disassembly * - * $Id: packet-imf.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Copyright (c) 2007 by Graeme Lunt * diff -Nru wireshark-1.10.5/epan/dissectors/packet-inap.c wireshark-1.10.6/epan/dissectors/packet-inap.c --- wireshark-1.10.5/epan/dissectors/packet-inap.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-inap.c 2014-03-07 18:07:13.000000000 +0000 @@ -11,7 +11,7 @@ * Copyright 2004, Tim Endean * Built from the gsm-map dissector Copyright 2004, Anders Broman * - * $Id: packet-inap.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * Wireshark - Network traffic analyzer * By Gerald Combs * Copyright 1998 Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-inap.h wireshark-1.10.6/epan/dissectors/packet-inap.h --- wireshark-1.10.5/epan/dissectors/packet-inap.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-inap.h 2014-03-07 18:07:13.000000000 +0000 @@ -8,7 +8,7 @@ #line 1 "../../asn1/inap/packet-inap-template.h" /* packet-inap.h * - * $Id: packet-inap.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Copyright 2004, Tim Endean * diff -Nru wireshark-1.10.5/epan/dissectors/packet-infiniband.c wireshark-1.10.6/epan/dissectors/packet-infiniband.c --- wireshark-1.10.5/epan/dissectors/packet-infiniband.c 2013-04-22 21:38:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-infiniband.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Infiniband/ERF Dissection * Copyright 2008 Endace Technology Limited * - * $Id: packet-infiniband.c 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-infiniband.h wireshark-1.10.6/epan/dissectors/packet-infiniband.h --- wireshark-1.10.5/epan/dissectors/packet-infiniband.h 2013-04-22 21:38:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-infiniband.h 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Infiniband/ERF Dissection * Copyright 2008 Endace Technology Limited * - * $Id: packet-infiniband.h 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-infiniband_sdp.c wireshark-1.10.6/epan/dissectors/packet-infiniband_sdp.c --- wireshark-1.10.5/epan/dissectors/packet-infiniband_sdp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-infiniband_sdp.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2010, Mellanox Technologies Ltd. * Code by Amir Vadai and Slava Koyfman. * - * $Id: packet-infiniband_sdp.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-interlink.c wireshark-1.10.6/epan/dissectors/packet-interlink.c --- wireshark-1.10.5/epan/dissectors/packet-interlink.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-interlink.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * By Uwe Girlich * Copyright 2010 Uwe Girlich * - * $Id: packet-interlink.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipars.c wireshark-1.10.6/epan/dissectors/packet-ipars.c --- wireshark-1.10.5/epan/dissectors/packet-ipars.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipars.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for IPARS/ALC (International Passenger Airline Reservation System/Airline Link Control) WAN protocol dissection * Copyright 2007, Fulko Hew, SITA INC Canada, Inc. * - * $Id: packet-ipars.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ip.c wireshark-1.10.6/epan/dissectors/packet-ip.c --- wireshark-1.10.5/epan/dissectors/packet-ip.c 2013-07-17 22:26:25.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ip.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ip.c * Routines for IP and miscellaneous IP protocol packet disassembly * - * $Id: packet-ip.c 50710 2013-07-17 22:20:12Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -72,7 +72,7 @@ static gboolean ip_summary_in_tree = TRUE; /* Perform IP checksum */ -static gboolean ip_check_checksum = TRUE; +static gboolean ip_check_checksum = FALSE; /* Assume TSO and correct zero-length IP packets */ static gboolean ip_tso_supported = TRUE; diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipdc.c wireshark-1.10.6/epan/dissectors/packet-ipdc.c --- wireshark-1.10.5/epan/dissectors/packet-ipdc.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipdc.c 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * * Using IPDC spec 0.20.2 * - * $Id: packet-ipdc.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipfc.c wireshark-1.10.6/epan/dissectors/packet-ipfc.c --- wireshark-1.10.5/epan/dissectors/packet-ipfc.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipfc.c 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * See RFC 2625. * Copyright 2001, Dinesh G Dutt * - * $Id: packet-ipfc.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipfc.h wireshark-1.10.6/epan/dissectors/packet-ipfc.h --- wireshark-1.10.5/epan/dissectors/packet-ipfc.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipfc.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ipfc.h * - * $Id: packet-ipfc.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ip.h wireshark-1.10.6/epan/dissectors/packet-ip.h --- wireshark-1.10.5/epan/dissectors/packet-ip.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ip.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ip.h * Definitions for IP packet disassembly structures and routines * - * $Id: packet-ip.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipmi-app.c wireshark-1.10.6/epan/dissectors/packet-ipmi-app.c --- wireshark-1.10.5/epan/dissectors/packet-ipmi-app.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipmi-app.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Sub-dissectors for IPMI messages (netFn=Application) * Copyright 2007-2008, Alexey Neyman, Pigeon Point Systems * - * $Id: packet-ipmi-app.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipmi-bridge.c wireshark-1.10.6/epan/dissectors/packet-ipmi-bridge.c --- wireshark-1.10.5/epan/dissectors/packet-ipmi-bridge.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipmi-bridge.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Sub-dissectors for IPMI messages (netFn=Bridge) * Copyright 2007-2008, Alexey Neyman, Pigeon Point Systems * - * $Id: packet-ipmi-bridge.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipmi.c wireshark-1.10.6/epan/dissectors/packet-ipmi.c --- wireshark-1.10.5/epan/dissectors/packet-ipmi.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipmi.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for IPMI dissection * Copyright 2002-2008, Alexey Neyman, Pigeon Point Systems * - * $Id: packet-ipmi.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipmi-chassis.c wireshark-1.10.6/epan/dissectors/packet-ipmi-chassis.c --- wireshark-1.10.5/epan/dissectors/packet-ipmi-chassis.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipmi-chassis.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Sub-dissectors for IPMI messages (netFn=Chassis) * Copyright 2007-2008, Alexey Neyman, Pigeon Point Systems * - * $Id: packet-ipmi-chassis.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipmi.h wireshark-1.10.6/epan/dissectors/packet-ipmi.h --- wireshark-1.10.5/epan/dissectors/packet-ipmi.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipmi.h 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for IPMI dissection * Copyright 2002-2008, Alexey Neyman, Pigeon Point Systems * - * $Id: packet-ipmi.h 25951 2008-08-07 19:33:40Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipmi-picmg.c wireshark-1.10.6/epan/dissectors/packet-ipmi-picmg.c --- wireshark-1.10.5/epan/dissectors/packet-ipmi-picmg.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipmi-picmg.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Sub-dissectors for IPMI messages (netFn=Group, defining body = PICMG) * Copyright 2007-2008, Alexey Neyman, Pigeon Point Systems * - * $Id: packet-ipmi-picmg.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipmi-pps.c wireshark-1.10.6/epan/dissectors/packet-ipmi-pps.c --- wireshark-1.10.5/epan/dissectors/packet-ipmi-pps.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipmi-pps.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Sub-dissectors for IPMI messages (netFn=OEM/Group, defining body = PPS) * Copyright 2007-2008, Alexey Neyman, Pigeon Point Systems * - * $Id: packet-ipmi-pps.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipmi-se.c wireshark-1.10.6/epan/dissectors/packet-ipmi-se.c --- wireshark-1.10.5/epan/dissectors/packet-ipmi-se.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipmi-se.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Sub-dissectors for IPMI messages (netFn=Sensor/Event) * Copyright 2007-2008, Alexey Neyman, Pigeon Point Systems * - * $Id: packet-ipmi-se.c 47389 2013-01-31 17:55:31Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipmi-session.c wireshark-1.10.6/epan/dissectors/packet-ipmi-session.c --- wireshark-1.10.5/epan/dissectors/packet-ipmi-session.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipmi-session.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2007-2008, Alexey Neyman, Pigeon Point Systems * Copyright Duncan Laurie * - * $Id: packet-ipmi-session.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipmi-storage.c wireshark-1.10.6/epan/dissectors/packet-ipmi-storage.c --- wireshark-1.10.5/epan/dissectors/packet-ipmi-storage.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipmi-storage.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Sub-dissectors for IPMI messages (netFn=Storage) * Copyright 2007-2008, Alexey Neyman, Pigeon Point Systems * - * $Id: packet-ipmi-storage.c 47389 2013-01-31 17:55:31Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipmi-transport.c wireshark-1.10.6/epan/dissectors/packet-ipmi-transport.c --- wireshark-1.10.5/epan/dissectors/packet-ipmi-transport.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipmi-transport.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Sub-dissectors for IPMI messages (netFn=Transport) * Copyright 2007-2008, Alexey Neyman, Pigeon Point Systems * - * $Id: packet-ipmi-transport.c 47389 2013-01-31 17:55:31Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipmi-update.c wireshark-1.10.6/epan/dissectors/packet-ipmi-update.c --- wireshark-1.10.5/epan/dissectors/packet-ipmi-update.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipmi-update.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Sub-dissectors for IPMI messages (netFn=Firmware Update, PPS-specific) * Copyright 2007-2008, Alexey Neyman, Pigeon Point Systems * - * $Id: packet-ipmi-update.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipnet.c wireshark-1.10.6/epan/dissectors/packet-ipnet.c --- wireshark-1.10.5/epan/dissectors/packet-ipnet.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipnet.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ipnet.c * Routines for decoding Solaris IPNET packet disassembly * - * $Id: packet-ipnet.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipoib.c wireshark-1.10.6/epan/dissectors/packet-ipoib.c --- wireshark-1.10.5/epan/dissectors/packet-ipoib.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipoib.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for decoding IP over InfiniBand (IPoIB) packet disassembly * See: http://tools.ietf.org/html/rfc4391#section-6 * - * $Id: packet-ipoib.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipp.c wireshark-1.10.6/epan/dissectors/packet-ipp.c --- wireshark-1.10.5/epan/dissectors/packet-ipp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipp.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * * Guy Harris * - * $Id: packet-ipp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipsec.c wireshark-1.10.6/epan/dissectors/packet-ipsec.c --- wireshark-1.10.5/epan/dissectors/packet-ipsec.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipsec.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ipsec.c * Routines for IPsec/IPComp packet disassembly * - * $Id: packet-ipsec.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipsec.h wireshark-1.10.6/epan/dissectors/packet-ipsec.h --- wireshark-1.10.5/epan/dissectors/packet-ipsec.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipsec.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ipsec.h * - * $Id: packet-ipsec.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipsec-tcp.c wireshark-1.10.6/epan/dissectors/packet-ipsec-tcp.c --- wireshark-1.10.5/epan/dissectors/packet-ipsec-tcp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipsec-tcp.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the disassembly of the proprietary Cisco IPSEC in * TCP encapsulation protocol * - * $Id: packet-ipsec-tcp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Copyright 2007 Joerg Mayer (see AUTHORS file) * diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipsec-udp.c wireshark-1.10.6/epan/dissectors/packet-ipsec-udp.c --- wireshark-1.10.5/epan/dissectors/packet-ipsec-udp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipsec-udp.c 2014-03-07 18:07:13.000000000 +0000 @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: packet-ipsec-udp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ */ #include "config.h" diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipsi-ctl.c wireshark-1.10.6/epan/dissectors/packet-ipsi-ctl.c --- wireshark-1.10.5/epan/dissectors/packet-ipsi-ctl.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipsi-ctl.c 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright 2008, Randy McEoin * - * $Id: packet-ipsi-ctl.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipv6.c wireshark-1.10.6/epan/dissectors/packet-ipv6.c --- wireshark-1.10.5/epan/dissectors/packet-ipv6.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipv6.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ipv6.c * Routines for IPv6 packet disassembly * - * $Id: packet-ipv6.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipv6.h wireshark-1.10.6/epan/dissectors/packet-ipv6.h --- wireshark-1.10.5/epan/dissectors/packet-ipv6.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipv6.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ipv6.h * Definitions for IPv6 packet disassembly * - * $Id: packet-ipv6.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipvs-syncd.c wireshark-1.10.6/epan/dissectors/packet-ipvs-syncd.c --- wireshark-1.10.5/epan/dissectors/packet-ipvs-syncd.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipvs-syncd.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ipvs-syncd.c 2001 Ronnie Sahlberg * Routines for IGMP packet disassembly * - * $Id: packet-ipvs-syncd.c 45588 2012-10-16 17:36:22Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipx.c wireshark-1.10.6/epan/dissectors/packet-ipx.c --- wireshark-1.10.5/epan/dissectors/packet-ipx.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipx.c 2014-03-07 18:07:13.000000000 +0000 @@ -6,7 +6,7 @@ * Portions Copyright (c) 2000-2002 by Gilbert Ramirez. * Portions Copyright (c) Novell, Inc. 2002-2003 * - * $Id: packet-ipx.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipx.h wireshark-1.10.6/epan/dissectors/packet-ipx.h --- wireshark-1.10.5/epan/dissectors/packet-ipx.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipx.h 2014-03-07 18:07:13.000000000 +0000 @@ -6,7 +6,7 @@ * Portions Copyright (c) by Gilbert Ramirez 2000-2002 * Portions Copyright (c) Novell, Inc. 2002-2003 * - * $Id: packet-ipx.h 48412 2013-03-19 04:54:30Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ipxwan.c wireshark-1.10.6/epan/dissectors/packet-ipxwan.c --- wireshark-1.10.5/epan/dissectors/packet-ipxwan.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ipxwan.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ipxwan.c * Routines for NetWare IPX WAN Protocol * - * $Id: packet-ipxwan.c 45572 2012-10-16 03:07:06Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-irc.c wireshark-1.10.6/epan/dissectors/packet-irc.c --- wireshark-1.10.5/epan/dissectors/packet-irc.c 2013-11-01 17:12:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-irc.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-irc.c * - * $Id: packet-irc.c 53020 2013-11-01 16:24:42Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-isakmp.c wireshark-1.10.6/epan/dissectors/packet-isakmp.c --- wireshark-1.10.5/epan/dissectors/packet-isakmp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isakmp.c 2014-03-07 18:07:13.000000000 +0000 @@ -14,7 +14,7 @@ * 04/2009 Added routines for decryption of IKEv2 Encrypted Payload * Naoyoshi Ueda * - * $Id: packet-isakmp.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-isakmp.h wireshark-1.10.6/epan/dissectors/packet-isakmp.h --- wireshark-1.10.5/epan/dissectors/packet-isakmp.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isakmp.h 2014-03-07 18:07:13.000000000 +0000 @@ -8,7 +8,7 @@ * (draft-ietf-ipsec-ikev2-17.txt) * Shoichi Sakane * - * $Id: packet-isakmp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-iscsi.c wireshark-1.10.6/epan/dissectors/packet-iscsi.c --- wireshark-1.10.5/epan/dissectors/packet-iscsi.c 2013-12-13 23:12:45.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-iscsi.c 2014-03-07 18:07:13.000000000 +0000 @@ -11,7 +11,7 @@ * Copyright 2001, Eurologic and Mark Burton * 2004 Request/Response matching and Service Response Time: ronnie sahlberg * - * $Id: packet-iscsi.c 54076 2013-12-13 22:49:30Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-isdn.c wireshark-1.10.6/epan/dissectors/packet-isdn.c --- wireshark-1.10.5/epan/dissectors/packet-isdn.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isdn.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-isdn.c * Routines for ISDN packet disassembly * - * $Id: packet-isdn.c 46292 2012-11-29 20:15:37Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-isdn-sup.c wireshark-1.10.6/epan/dissectors/packet-isdn-sup.c --- wireshark-1.10.5/epan/dissectors/packet-isdn-sup.c 2013-09-09 19:11:59.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isdn-sup.c 2014-03-07 18:07:13.000000000 +0000 @@ -11,7 +11,7 @@ * supplementary services * Copyright 2013, Anders Broman * - * $Id: packet-isdn-sup.c 51875 2013-09-09 18:52:33Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-isis.c wireshark-1.10.6/epan/dissectors/packet-isis.c --- wireshark-1.10.5/epan/dissectors/packet-isis.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isis.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ISO/OSI network and transport protocol packet disassembly, core * bits. * - * $Id: packet-isis.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * Stuart Stanley * * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/epan/dissectors/packet-isis-clv.c wireshark-1.10.6/epan/dissectors/packet-isis-clv.c --- wireshark-1.10.5/epan/dissectors/packet-isis-clv.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isis-clv.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-isis-clv.c * Common CLV decode routines. * - * $Id: packet-isis-clv.c 46745 2012-12-25 22:39:11Z guy $ + * $Id$ * Stuart Stanley * * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/epan/dissectors/packet-isis-clv.h wireshark-1.10.6/epan/dissectors/packet-isis-clv.h --- wireshark-1.10.5/epan/dissectors/packet-isis-clv.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isis-clv.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-isis-clv.h * Declares for common clv decoding functions. * - * $Id: packet-isis-clv.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * Stuart Stanley * * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/epan/dissectors/packet-isis.h wireshark-1.10.6/epan/dissectors/packet-isis.h --- wireshark-1.10.5/epan/dissectors/packet-isis.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isis.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-isis.h * Defines and such for core isis protcol decode. * - * $Id: packet-isis.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * Stuart Stanley * * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/epan/dissectors/packet-isis-hello.c wireshark-1.10.6/epan/dissectors/packet-isis-hello.c --- wireshark-1.10.5/epan/dissectors/packet-isis-hello.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isis-hello.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-isis-hello.c * Routines for decoding isis hello packets and their CLVs * - * $Id: packet-isis-hello.c 47891 2013-02-26 01:06:19Z wmeier $ + * $Id$ * Stuart Stanley * * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/epan/dissectors/packet-isis-hello.h wireshark-1.10.6/epan/dissectors/packet-isis-hello.h --- wireshark-1.10.5/epan/dissectors/packet-isis-hello.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isis-hello.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-isis-hello.h * Declares for hello handling inside isis. * - * $Id: packet-isis-hello.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * Stuart Stanley * * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/epan/dissectors/packet-isis-lsp.c wireshark-1.10.6/epan/dissectors/packet-isis-lsp.c --- wireshark-1.10.5/epan/dissectors/packet-isis-lsp.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isis-lsp.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-isis-lsp.c * Routines for decoding isis lsp packets and their CLVs * - * $Id: packet-isis-lsp.c 47321 2013-01-28 06:46:21Z jake $ + * $Id$ * Stuart Stanley * * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/epan/dissectors/packet-isis-lsp.h wireshark-1.10.6/epan/dissectors/packet-isis-lsp.h --- wireshark-1.10.5/epan/dissectors/packet-isis-lsp.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isis-lsp.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-isis-lsp.h * Defines and such for LSP and their CLV decodes * - * $Id: packet-isis-lsp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * Stuart Stanley * * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/epan/dissectors/packet-isis-snp.c wireshark-1.10.6/epan/dissectors/packet-isis-snp.c --- wireshark-1.10.5/epan/dissectors/packet-isis-snp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isis-snp.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-isis-snp.c * Routines for decoding isis complete & partial SNP and their payload * - * $Id: packet-isis-snp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * Stuart Stanley * * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/epan/dissectors/packet-isis-snp.h wireshark-1.10.6/epan/dissectors/packet-isis-snp.h --- wireshark-1.10.5/epan/dissectors/packet-isis-snp.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isis-snp.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-isis-snp.h * Defines and such for CSNP, PSNP, and their payloads * - * $Id: packet-isis-snp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * Stuart Stanley * * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/epan/dissectors/packet-isl.c wireshark-1.10.6/epan/dissectors/packet-isl.c --- wireshark-1.10.5/epan/dissectors/packet-isl.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isl.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-isl.c * Routines for Cisco ISL Ethernet header disassembly * - * $Id: packet-isl.c 47924 2013-02-27 22:43:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-isl.h wireshark-1.10.6/epan/dissectors/packet-isl.h --- wireshark-1.10.5/epan/dissectors/packet-isl.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isl.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-isl.h * - * $Id: packet-isl.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ismacryp.c wireshark-1.10.6/epan/dissectors/packet-ismacryp.c --- wireshark-1.10.5/epan/dissectors/packet-ismacryp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ismacryp.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * David Castleford, Orange Labs / France Telecom R&D * March 2009 * - * $Id: packet-ismacryp.c 47391 2013-01-31 18:35:06Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ismp.c wireshark-1.10.6/epan/dissectors/packet-ismp.c --- wireshark-1.10.5/epan/dissectors/packet-ismp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ismp.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Enterasys Networks Home: http://www.enterasys.com/ * Copyright 2003, Joshua Craig Douglas * - * $Id: packet-ismp.c 47391 2013-01-31 18:35:06Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-isns.c wireshark-1.10.6/epan/dissectors/packet-isns.c --- wireshark-1.10.5/epan/dissectors/packet-isns.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isns.c 2014-03-07 18:07:13.000000000 +0000 @@ -8,7 +8,7 @@ * (c) 2004 Ronnie Sahlberg updates * (c) 2004 Ming Zhang updates * - * $Id: packet-isns.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-iso7816.c wireshark-1.10.6/epan/dissectors/packet-iso7816.c --- wireshark-1.10.5/epan/dissectors/packet-iso7816.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-iso7816.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for packet dissection of generic ISO 7816 smart card messages * Copyright 2012-2013 by Martin Kaiser * - * $Id: packet-iso7816.c 48396 2013-03-18 19:47:33Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-isup.c wireshark-1.10.6/epan/dissectors/packet-isup.c --- wireshark-1.10.5/epan/dissectors/packet-isup.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isup.c 2014-03-07 18:07:13.000000000 +0000 @@ -11,7 +11,7 @@ * * Copyright 2004-2005, Anders Broman * - * $Id: packet-isup.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-isup.h wireshark-1.10.6/epan/dissectors/packet-isup.h --- wireshark-1.10.5/epan/dissectors/packet-isup.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-isup.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-isup.h * - * $Id: packet-isup.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Copyright 2003, Michael Lum , * In association with Telos Technology Inc. diff -Nru wireshark-1.10.5/epan/dissectors/packet-itdm.c wireshark-1.10.6/epan/dissectors/packet-itdm.c --- wireshark-1.10.5/epan/dissectors/packet-itdm.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-itdm.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 2008, Dan Gora * - * $Id: packet-itdm.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-iua.c wireshark-1.10.6/epan/dissectors/packet-iua.c --- wireshark-1.10.5/epan/dissectors/packet-iua.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-iua.c 2014-03-07 18:07:13.000000000 +0000 @@ -8,7 +8,7 @@ * * Copyright 2002, Michael Tuexen * - * $Id: packet-iua.c 45478 2012-10-11 19:39:32Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-iuup.c wireshark-1.10.6/epan/dissectors/packet-iuup.c --- wireshark-1.10.5/epan/dissectors/packet-iuup.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-iuup.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * * (c) 2005 Luis E. Garcia Ontanon * - * $Id: packet-iuup.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-iwarp-ddp-rdmap.c wireshark-1.10.6/epan/dissectors/packet-iwarp-ddp-rdmap.c --- wireshark-1.10.5/epan/dissectors/packet-iwarp-ddp-rdmap.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-iwarp-ddp-rdmap.c 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * Copyright 2008, Yves Geissbuehler * Copyright 2008, Philip Frey * - * $Id: packet-iwarp-ddp-rdmap.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-iwarp-mpa.c wireshark-1.10.6/epan/dissectors/packet-iwarp-mpa.c --- wireshark-1.10.5/epan/dissectors/packet-iwarp-mpa.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-iwarp-mpa.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2008, Yves Geissbuehler * Copyright 2008, Philip Frey * - * $Id: packet-iwarp-mpa.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ixiatrailer.c wireshark-1.10.6/epan/dissectors/packet-ixiatrailer.c --- wireshark-1.10.5/epan/dissectors/packet-ixiatrailer.c 2013-05-20 21:52:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ixiatrailer.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * Dissector for Ixia Network Visibility Solutions trailer * Copyright Ixia 2012 * - * $Id: packet-ixiatrailer.c 49462 2013-05-20 21:46:36Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ixveriwave.c wireshark-1.10.6/epan/dissectors/packet-ixveriwave.c --- wireshark-1.10.5/epan/dissectors/packet-ixveriwave.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ixveriwave.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ixveriwave-common.c * Routines for calling the right protocol for the ethertype. * - * $Id: packet-ixveriwave.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Tom Cook * diff -Nru wireshark-1.10.5/epan/dissectors/packet-jmirror.c wireshark-1.10.6/epan/dissectors/packet-jmirror.c --- wireshark-1.10.5/epan/dissectors/packet-jmirror.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-jmirror.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2009 Wayne Brassem * 2012 Wayne Brassem - Correction to support IPv6 over PPP * - * $Id: packet-jmirror.c 47751 2013-02-19 23:17:07Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-jpeg.c wireshark-1.10.6/epan/dissectors/packet-jpeg.c --- wireshark-1.10.5/epan/dissectors/packet-jpeg.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-jpeg.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * * Routines for RFC 2435 JPEG dissection * - * $Id: packet-jpeg.c 46014 2012-11-12 22:36:09Z pascal $ + * $Id$ * * Copyright 2006 * Erwin Rol diff -Nru wireshark-1.10.5/epan/dissectors/packet-json.c wireshark-1.10.6/epan/dissectors/packet-json.c --- wireshark-1.10.5/epan/dissectors/packet-json.c 2013-08-15 04:32:55.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-json.c 2014-03-07 18:07:13.000000000 +0000 @@ -6,7 +6,7 @@ * * Copyright 2010, Jakub Zawadzki * - * $Id: packet-json.c 51370 2013-08-15 03:52:19Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-juniper.c wireshark-1.10.6/epan/dissectors/packet-juniper.c --- wireshark-1.10.5/epan/dissectors/packet-juniper.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-juniper.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Juniper Networks, Inc. packet disassembly * Copyright 2005 Hannes Gredler * - * $Id: packet-juniper.c 48494 2013-03-23 02:42:12Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-jxta.c wireshark-1.10.6/epan/dissectors/packet-jxta.c --- wireshark-1.10.5/epan/dissectors/packet-jxta.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-jxta.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * packet-imap.c, Copyright 1999, Richard Sharpe * Copied from packet-pop.c, packet-jabber.c, packet-udp.c, packet-http.c * - * $Id: packet-jxta.c 48426 2013-03-19 20:00:52Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-jxta.h wireshark-1.10.6/epan/dissectors/packet-jxta.h --- wireshark-1.10.5/epan/dissectors/packet-jxta.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-jxta.h 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * packet-imap.c, Copyright 1999, Richard Sharpe * Copied from packet-pop.c, packet-jabber.c, packet-udp.c, packet-http.c * - * $Id: packet-jxta.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-k12.c wireshark-1.10.6/epan/dissectors/packet-k12.c --- wireshark-1.10.5/epan/dissectors/packet-k12.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-k12.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * * Luis E. Garcia Ontanon * -* $Id: packet-k12.c 49721 2013-06-03 17:44:22Z gerald $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-kadm5.c wireshark-1.10.6/epan/dissectors/packet-kadm5.c --- wireshark-1.10.5/epan/dissectors/packet-kadm5.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-kadm5.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-kadm5.c * Routines for kadm5 dissection * - * $Id: packet-kadm5.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-kdp.c wireshark-1.10.6/epan/dissectors/packet-kdp.c --- wireshark-1.10.5/epan/dissectors/packet-kdp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-kdp.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-kdp.c * Routines for KDP (Kontiki Delivery Protocol) packet disassembly * - * $Id: packet-kdp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Copyright (c) 2008 by Kontiki Inc. * Wade Hennessey diff -Nru wireshark-1.10.5/epan/dissectors/packet-kdsp.c wireshark-1.10.6/epan/dissectors/packet-kdsp.c --- wireshark-1.10.5/epan/dissectors/packet-kdsp.c 2013-07-17 22:26:25.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-kdsp.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * By Kyle Feuz * Copyright 2011 Kyle Feuz * - * $Id: packet-kdsp.c 50710 2013-07-17 22:20:12Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-kerberos4.c wireshark-1.10.6/epan/dissectors/packet-kerberos4.c --- wireshark-1.10.5/epan/dissectors/packet-kerberos4.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-kerberos4.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * * Ronnie Sahlberg 2004 * - * $Id: packet-kerberos4.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-kerberos.c wireshark-1.10.6/epan/dissectors/packet-kerberos.c --- wireshark-1.10.5/epan/dissectors/packet-kerberos.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-kerberos.c 2014-03-07 18:07:13.000000000 +0000 @@ -28,7 +28,7 @@ * in Heimdal: * http://loka.it.su.se/source/xref/heimdal/heimdal/lib/asn1/k5.asn1 * - * $Id: packet-kerberos.c 48400 2013-03-18 21:16:23Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-kerberos.h wireshark-1.10.6/epan/dissectors/packet-kerberos.h --- wireshark-1.10.5/epan/dissectors/packet-kerberos.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-kerberos.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-kerberos.h * - * $Id: packet-kerberos.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-kingfisher.c wireshark-1.10.6/epan/dissectors/packet-kingfisher.c --- wireshark-1.10.5/epan/dissectors/packet-kingfisher.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-kingfisher.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for kingfisher packet dissection * By Rob Casey 2007 * - * $Id: packet-kingfisher.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-kink.c wireshark-1.10.6/epan/dissectors/packet-kink.c --- wireshark-1.10.5/epan/dissectors/packet-kink.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-kink.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 2004, Takeshi Nakashima * - * $Id: packet-kink.c 47908 2013-02-27 03:35:04Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-kismet.c wireshark-1.10.6/epan/dissectors/packet-kismet.c --- wireshark-1.10.5/epan/dissectors/packet-kismet.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-kismet.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for kismet packet dissection * Copyright 2006, Krzysztof Burghardt * - * $Id: packet-kismet.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-klm.c wireshark-1.10.6/epan/dissectors/packet-klm.c --- wireshark-1.10.5/epan/dissectors/packet-klm.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-klm.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-klm.c 2001 Ronnie Sahlberg * Routines for klm dissection * - * $Id: packet-klm.c 48934 2013-04-19 18:16:50Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-klm.h wireshark-1.10.6/epan/dissectors/packet-klm.h --- wireshark-1.10.5/epan/dissectors/packet-klm.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-klm.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-klm.h 2001 Ronnie Sahlberg * - * $Id: packet-klm.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-knet.c wireshark-1.10.6/epan/dissectors/packet-knet.c --- wireshark-1.10.5/epan/dissectors/packet-knet.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-knet.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Kari Vatjus-Anttila * Ville Saarinen * - * $Id: packet-knet.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-kpasswd.c wireshark-1.10.6/epan/dissectors/packet-kpasswd.c --- wireshark-1.10.5/epan/dissectors/packet-kpasswd.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-kpasswd.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * * See RFC 3244 * - * $Id: packet-kpasswd.c 45776 2012-10-24 19:32:59Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-l1-events.c wireshark-1.10.6/epan/dissectors/packet-l1-events.c --- wireshark-1.10.5/epan/dissectors/packet-l1-events.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-l1-events.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * * (C) Rolf Fiedler 2008, based on packet-text-media.c by Olivier Biot, 2004. * - * $Id: packet-l1-events.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Refer to the AUTHORS file or the AUTHORS section in the man page * for contacting the author(s) of this file. diff -Nru wireshark-1.10.5/epan/dissectors/packet-l2tp.c wireshark-1.10.6/epan/dissectors/packet-l2tp.c --- wireshark-1.10.5/epan/dissectors/packet-l2tp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-l2tp.c 2014-03-07 18:07:13.000000000 +0000 @@ -6,7 +6,7 @@ * Laurent Cazalet * Thomas Parvais * - * $Id: packet-l2tp.c 48400 2013-03-18 21:16:23Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lanforge.c wireshark-1.10.6/epan/dissectors/packet-lanforge.c --- wireshark-1.10.5/epan/dissectors/packet-lanforge.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lanforge.c 2014-03-07 18:07:13.000000000 +0000 @@ -6,7 +6,7 @@ * Based on pktgen dissectory by: * Francesco Fondelli * - * $Id: packet-lanforge.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lapb.c wireshark-1.10.6/epan/dissectors/packet-lapb.c --- wireshark-1.10.5/epan/dissectors/packet-lapb.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lapb.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for lapb frame disassembly * Olivier Abad * - * $Id: packet-lapb.c 48097 2013-03-05 20:50:25Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lapbether.c wireshark-1.10.6/epan/dissectors/packet-lapbether.c --- wireshark-1.10.5/epan/dissectors/packet-lapbether.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lapbether.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Richard Sharpe based on the lapb module by * Olivier Abad * - * $Id: packet-lapbether.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lapd.c wireshark-1.10.6/epan/dissectors/packet-lapd.c --- wireshark-1.10.5/epan/dissectors/packet-lapd.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lapd.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for LAPD frame disassembly * Gilbert Ramirez * - * $Id: packet-lapd.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lapdm.c wireshark-1.10.6/epan/dissectors/packet-lapdm.c --- wireshark-1.10.5/epan/dissectors/packet-lapdm.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lapdm.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for LAPDm frame disassembly * Duncan Salerno * - * $Id: packet-lapdm.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-laplink.c wireshark-1.10.6/epan/dissectors/packet-laplink.c --- wireshark-1.10.5/epan/dissectors/packet-laplink.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-laplink.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for laplink dissection * Copyright 2003, Brad Hards * - * $Id: packet-laplink.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lapsat.c wireshark-1.10.6/epan/dissectors/packet-lapsat.c --- wireshark-1.10.5/epan/dissectors/packet-lapsat.c 2013-08-19 11:31:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lapsat.c 2014-03-07 18:07:13.000000000 +0000 @@ -12,7 +12,7 @@ * References: * [1] ETSI TS 101 376-4-6 V1.2.1 - GMR-1 04.006 * - * $Id: packet-lapsat.c 51425 2013-08-19 11:25:35Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lcsap.c wireshark-1.10.6/epan/dissectors/packet-lcsap.c --- wireshark-1.10.5/epan/dissectors/packet-lcsap.c 2013-08-15 04:32:55.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lcsap.c 2014-03-07 18:07:13.000000000 +0000 @@ -11,7 +11,7 @@ * * Copyright (c) 2011 by Spenser Sheng * - * $Id: packet-lcsap.c 51374 2013-08-15 03:57:10Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lcsap.h wireshark-1.10.6/epan/dissectors/packet-lcsap.h --- wireshark-1.10.5/epan/dissectors/packet-lcsap.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lcsap.h 2014-03-07 18:07:13.000000000 +0000 @@ -11,7 +11,7 @@ * * Copyright (c) 2011 by Spenser Sheng * - * $Id: packet-lcsap.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ldap.c wireshark-1.10.6/epan/dissectors/packet-ldap.c --- wireshark-1.10.5/epan/dissectors/packet-ldap.c 2013-09-01 12:42:29.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ldap.c 2014-03-07 18:07:13.000000000 +0000 @@ -11,7 +11,7 @@ * * See RFC 1777 (LDAP v2), RFC 4511 (LDAP v3), and RFC 2222 (SASL). * - * $Id: packet-ldap.c 51623 2013-09-01 12:36:18Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ldap.h wireshark-1.10.6/epan/dissectors/packet-ldap.h --- wireshark-1.10.5/epan/dissectors/packet-ldap.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ldap.h 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for ros packet dissection * Copyright 2005, Anders Broman * - * $Id: packet-ldap.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ldp.c wireshark-1.10.6/epan/dissectors/packet-ldp.c --- wireshark-1.10.5/epan/dissectors/packet-ldp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ldp.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ldp.c * Routines for LDP (RFC 3036) packet disassembly * - * $Id: packet-ldp.c 48685 2013-04-01 15:29:49Z jake $ + * $Id$ * * Copyright (c) November 2000 by Richard Sharpe * diff -Nru wireshark-1.10.5/epan/dissectors/packet-ldp.h wireshark-1.10.6/epan/dissectors/packet-ldp.h --- wireshark-1.10.5/epan/dissectors/packet-ldp.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ldp.h 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Declarations of exported routines from LDP dissector * Copyright 2004, Carlos Pignataro * - * $Id: packet-ldp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ldss.c wireshark-1.10.6/epan/dissectors/packet-ldss.c --- wireshark-1.10.5/epan/dissectors/packet-ldss.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ldss.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2009, Vasantha Crabb * and Chris Adams * - * $Id: packet-ldss.c 48400 2013-03-18 21:16:23Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lge_monitor.c wireshark-1.10.6/epan/dissectors/packet-lge_monitor.c --- wireshark-1.10.5/epan/dissectors/packet-lge_monitor.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lge_monitor.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for LGE Monitor packet dissection * Copyright 2006, Anders Broman * - * $Id: packet-lge_monitor.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-linx.c wireshark-1.10.6/epan/dissectors/packet-linx.c --- wireshark-1.10.5/epan/dissectors/packet-linx.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-linx.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2006, Martin Peylo * - * $Id: packet-linx.c 47391 2013-01-31 18:35:06Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lisp.c wireshark-1.10.6/epan/dissectors/packet-lisp.c --- wireshark-1.10.5/epan/dissectors/packet-lisp.c 2013-07-17 22:26:25.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lisp.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Locator/ID Separation Protocol (LISP) Control Message dissection * Copyright 2011, Lorand Jakab * - * $Id: packet-lisp.c 50710 2013-07-17 22:20:12Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lisp-data.c wireshark-1.10.6/epan/dissectors/packet-lisp-data.c --- wireshark-1.10.5/epan/dissectors/packet-lisp-data.c 2013-05-06 23:45:35.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lisp-data.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for LISP Data Message dissection * Copyright 2010, Lorand Jakab * - * $Id: packet-lisp-data.c 49190 2013-05-06 23:31:24Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-llc.c wireshark-1.10.6/epan/dissectors/packet-llc.c --- wireshark-1.10.5/epan/dissectors/packet-llc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-llc.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for IEEE 802.2 LLC layer * Gilbert Ramirez * - * $Id: packet-llc.c 48783 2013-04-07 18:56:35Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-llc.h wireshark-1.10.6/epan/dissectors/packet-llc.h --- wireshark-1.10.5/epan/dissectors/packet-llc.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-llc.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-llc.h * - * $Id: packet-llc.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lldp.c wireshark-1.10.6/epan/dissectors/packet-lldp.c --- wireshark-1.10.5/epan/dissectors/packet-lldp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lldp.c 2014-03-07 18:07:13.000000000 +0000 @@ -6,7 +6,7 @@ * July 2005 * Modified by: Brian Bogora * - * $Id: packet-lldp.c 46075 2012-11-18 17:52:55Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lldp.h wireshark-1.10.6/epan/dissectors/packet-lldp.h --- wireshark-1.10.5/epan/dissectors/packet-lldp.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lldp.h 2014-03-07 18:07:13.000000000 +0000 @@ -6,7 +6,7 @@ * July 2005 * Modified by: Brian Bogora * - * $Id: packet-lldp.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-llrp.c wireshark-1.10.6/epan/dissectors/packet-llrp.c --- wireshark-1.10.5/epan/dissectors/packet-llrp.c 2013-07-17 20:08:21.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-llrp.c 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * * http://www.gs1.org/gsmp/kc/epcglobal/llrp * - * $Id: packet-llrp.c 50704 2013-07-17 19:24:28Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-llt.c wireshark-1.10.6/epan/dissectors/packet-llt.c --- wireshark-1.10.5/epan/dissectors/packet-llt.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-llt.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Veritas Low Latency Transport (LLT) dissection * Copyright 2006, Stephen Fisher (see AUTHORS file) * - * $Id: packet-llt.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lmi.c wireshark-1.10.6/epan/dissectors/packet-lmi.c --- wireshark-1.10.5/epan/dissectors/packet-lmi.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lmi.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Frame Relay Local Management Interface (LMI) disassembly * Copyright 2001, Jeffrey C. Foster * - * $Id: packet-lmi.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lmp.c wireshark-1.10.6/epan/dissectors/packet-lmp.c --- wireshark-1.10.5/epan/dissectors/packet-lmp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lmp.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * * (c) Copyright Ashok Narayanan * - * $Id: packet-lmp.c 48299 2013-03-14 18:58:42Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-logotypecertextn.c wireshark-1.10.6/epan/dissectors/packet-logotypecertextn.c --- wireshark-1.10.5/epan/dissectors/packet-logotypecertextn.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-logotypecertextn.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for RFC3709 Logotype Certificate Extensions packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-logotypecertextn.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-logotypecertextn.h wireshark-1.10.6/epan/dissectors/packet-logotypecertextn.h --- wireshark-1.10.5/epan/dissectors/packet-logotypecertextn.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-logotypecertextn.h 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for RFC3907 Logotype Certificate Extensions packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-logotypecertextn.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lon.c wireshark-1.10.6/epan/dissectors/packet-lon.c --- wireshark-1.10.5/epan/dissectors/packet-lon.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lon.c 2014-03-07 18:07:13.000000000 +0000 @@ -7,7 +7,7 @@ * Honorine_KEMGNE_NGUIFFO from * http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4704 * - * $Id: packet-lon.c 47391 2013-01-31 18:35:06Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-loop.c wireshark-1.10.6/epan/dissectors/packet-loop.c --- wireshark-1.10.5/epan/dissectors/packet-loop.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-loop.c 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * * http://stuff.mit.edu/people/jhawk/ctp.html * - * $Id: packet-loop.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lpd.c wireshark-1.10.6/epan/dissectors/packet-lpd.c --- wireshark-1.10.5/epan/dissectors/packet-lpd.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lpd.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for LPR and LPRng packet disassembly * Gilbert Ramirez * - * $Id: packet-lpd.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lppa.c wireshark-1.10.6/epan/dissectors/packet-lppa.c --- wireshark-1.10.5/epan/dissectors/packet-lppa.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lppa.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for 3GPP LTE Positioning Protocol A (LLPa) packet dissection * Copyright 2011, Pascal Quantin * - * $Id: packet-lppa.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lpp.c wireshark-1.10.6/epan/dissectors/packet-lpp.c --- wireshark-1.10.5/epan/dissectors/packet-lpp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lpp.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for 3GPP LTE Positioning Protocol (LLP) packet dissection * Copyright 2011-2013 Pascal Quantin * - * $Id: packet-lpp.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lppe.c wireshark-1.10.6/epan/dissectors/packet-lppe.c --- wireshark-1.10.5/epan/dissectors/packet-lppe.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lppe.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for LPP Extensions (LLPe) packet dissection * Copyright 2012, Pascal Quantin * - * $Id: packet-lppe.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lpp.h wireshark-1.10.6/epan/dissectors/packet-lpp.h --- wireshark-1.10.5/epan/dissectors/packet-lpp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lpp.h 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for 3GPP LTE Positioning Protocol (LLP) packet dissection * Copyright 2011, Pascal Quantin * - * $Id: packet-lpp.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lsc.c wireshark-1.10.6/epan/dissectors/packet-lsc.c --- wireshark-1.10.5/epan/dissectors/packet-lsc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lsc.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Pegasus LSC packet disassembly * Copyright 2006, Sean Sheedy * - * $Id: packet-lsc.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lte-rrc.c wireshark-1.10.6/epan/dissectors/packet-lte-rrc.c --- wireshark-1.10.5/epan/dissectors/packet-lte-rrc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lte-rrc.c 2014-03-07 18:07:13.000000000 +0000 @@ -13,7 +13,7 @@ * Copyright 2008, Vincent Helfre * Copyright 2009-2013, Pascal Quantin * - * $Id: packet-lte-rrc.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lte-rrc.h wireshark-1.10.6/epan/dissectors/packet-lte-rrc.h --- wireshark-1.10.5/epan/dissectors/packet-lte-rrc.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lte-rrc.h 2014-03-07 18:07:13.000000000 +0000 @@ -9,7 +9,7 @@ /* packet-llc-rrc-template.h * Copyright 2009, Anders Broman * - * $Id: packet-lte-rrc.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ltp.c wireshark-1.10.6/epan/dissectors/packet-ltp.c --- wireshark-1.10.5/epan/dissectors/packet-ltp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ltp.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for LTP dissection * Copyright 2009, Mithun Roy * - * $Id: packet-ltp.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-lwapp.c wireshark-1.10.6/epan/dissectors/packet-lwapp.c --- wireshark-1.10.5/epan/dissectors/packet-lwapp.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lwapp.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for LWAPP encapsulated packet disassembly * draft-ohara-capwap-lwapp-N (the current draft is 0) * - * $Id: packet-lwapp.c 47391 2013-01-31 18:35:06Z wmeier $ + * $Id$ * * Copyright (c) 2003 by David Frascone * diff -Nru wireshark-1.10.5/epan/dissectors/packet-lwres.c wireshark-1.10.6/epan/dissectors/packet-lwres.c --- wireshark-1.10.5/epan/dissectors/packet-lwres.c 2013-04-22 21:38:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-lwres.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-lwres.c * Routines for light weight reslover (lwres, part of BIND9) packet disassembly * - * $Id: packet-lwres.c 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Copyright (c) 2003 by Oleg Terletsky * diff -Nru wireshark-1.10.5/epan/dissectors/packet-m2pa.c wireshark-1.10.6/epan/dissectors/packet-m2pa.c --- wireshark-1.10.5/epan/dissectors/packet-m2pa.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-m2pa.c 2014-03-07 18:07:13.000000000 +0000 @@ -8,7 +8,7 @@ * Copyright 2001, 2002, Jeff Morriss , * updated by Michael Tuexen * - * $Id: packet-m2pa.c 46292 2012-11-29 20:15:37Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-m2tp.c wireshark-1.10.6/epan/dissectors/packet-m2tp.c --- wireshark-1.10.5/epan/dissectors/packet-m2tp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-m2tp.c 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright 2001, Heinz Prantner * - * $Id: packet-m2tp.c 48710 2013-04-02 21:13:02Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-m2ua.c wireshark-1.10.6/epan/dissectors/packet-m2ua.c --- wireshark-1.10.5/epan/dissectors/packet-m2ua.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-m2ua.c 2014-03-07 18:07:13.000000000 +0000 @@ -6,7 +6,7 @@ * * Copyright 2002, Michael Tuexen * - * $Id: packet-m2ua.c 46292 2012-11-29 20:15:37Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-m3ap.c wireshark-1.10.6/epan/dissectors/packet-m3ap.c --- wireshark-1.10.5/epan/dissectors/packet-m3ap.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-m3ap.c 2014-03-07 18:07:13.000000000 +0000 @@ -9,7 +9,7 @@ /* packet-m3ap.c * Routines for M3 Application Protocol packet dissection * - * $Id: packet-m3ap.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-m3ua.c wireshark-1.10.6/epan/dissectors/packet-m3ua.c --- wireshark-1.10.5/epan/dissectors/packet-m3ua.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-m3ua.c 2014-03-07 18:07:13.000000000 +0000 @@ -9,7 +9,7 @@ * * Copyright 2000, 2001, 2002, 2003, 2004 Michael Tuexen * - * $Id: packet-m3ua.c 48425 2013-03-19 19:28:57Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include "packet-mtp3.h" #include "packet-sccp.h" #include "packet-frame.h" @@ -1160,12 +1160,14 @@ guint16 ulp_length; tvbuff_t *payload_tvb; proto_item *item, *gen_item; - mtp3_tap_rec_t* mtp3_tap = ep_new0(mtp3_tap_rec_t); + mtp3_tap_rec_t* mtp3_tap; proto_tree *q708_tree; gint heuristic_standard; guint8 si; guint32 opc, dpc; + mtp3_tap = wmem_new0(pinfo->pool, mtp3_tap_rec_t); + si = tvb_get_guint8(parameter_tvb, DATA_SI_OFFSET); ulp_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH - DATA_HDR_LENGTH; payload_tvb = tvb_new_subset(parameter_tvb, DATA_ULP_OFFSET, ulp_length, ulp_length); diff -Nru wireshark-1.10.5/epan/dissectors/packet-maap.c wireshark-1.10.6/epan/dissectors/packet-maap.c --- wireshark-1.10.5/epan/dissectors/packet-maap.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-maap.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for 802.3 MAC Address Allocation Protocol defined by IEEE1722 * Copyright 2012, Jason Damori, Biamp Systems * - * $Id: packet-maap.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-maccontrol.c wireshark-1.10.6/epan/dissectors/packet-maccontrol.c --- wireshark-1.10.5/epan/dissectors/packet-maccontrol.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-maccontrol.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-maccontrol.c * Routines for MAC Control ethernet header disassembly * - * $Id: packet-maccontrol.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mac-lte.c wireshark-1.10.6/epan/dissectors/packet-mac-lte.c --- wireshark-1.10.5/epan/dissectors/packet-mac-lte.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mac-lte.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * * Martin Mathieson * - * $Id: packet-mac-lte.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mac-lte-framed.c wireshark-1.10.6/epan/dissectors/packet-mac-lte-framed.c --- wireshark-1.10.5/epan/dissectors/packet-mac-lte-framed.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mac-lte-framed.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * * Martin Mathieson * - * $Id: packet-mac-lte-framed.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mac-lte.h wireshark-1.10.6/epan/dissectors/packet-mac-lte.h --- wireshark-1.10.5/epan/dissectors/packet-mac-lte.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mac-lte.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-mac-lte.h * * Martin Mathieson - * $Id: packet-mac-lte.h 48859 2013-04-15 20:56:49Z martinm $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mactelnet.c wireshark-1.10.6/epan/dissectors/packet-mactelnet.c --- wireshark-1.10.5/epan/dissectors/packet-mactelnet.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mactelnet.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for MAC-Telnet dissection * Copyright 2010, Haakon Nessjoen * - * $Id: packet-mactelnet.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-manolito.c wireshark-1.10.6/epan/dissectors/packet-manolito.c --- wireshark-1.10.5/epan/dissectors/packet-manolito.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-manolito.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * * Official home page: http://openlito.sourceforge.net/ * - * $Id: packet-manolito.c 48425 2013-03-19 19:28:57Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mbtcp.c wireshark-1.10.6/epan/dissectors/packet-mbtcp.c --- wireshark-1.10.5/epan/dissectors/packet-mbtcp.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mbtcp.c 2014-03-07 18:07:13.000000000 +0000 @@ -49,7 +49,7 @@ * H = 16-bit CRC * ***************************************************************************************************** - * $Id: packet-mbtcp.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -819,10 +819,6 @@ guint16 diagnostic_code; modbus_request_info_t *request_info; - /* Don't need to do anything if there's no tree */ - if (tree == NULL) - return tvb_length(tvb); - len = tvb_length_remaining(tvb, 0); /* If the packet is zero-length, we should not attempt to dissect any further */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-mbtcp.h wireshark-1.10.6/epan/dissectors/packet-mbtcp.h --- wireshark-1.10.5/epan/dissectors/packet-mbtcp.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mbtcp.h 2014-03-07 18:07:13.000000000 +0000 @@ -7,7 +7,7 @@ * * See http://www.modbus.org/ for information on Modbus/TCP. * - * $Id: packet-mbtcp.h 45793 2012-10-26 02:15:20Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mdshdr.c wireshark-1.10.6/epan/dissectors/packet-mdshdr.c --- wireshark-1.10.5/epan/dissectors/packet-mdshdr.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mdshdr.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for dissection of Cisco MDS Switch Internal Header * Copyright 2001, Dinesh G Dutt * - * $Id: packet-mdshdr.c 47241 2013-01-24 01:39:59Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-media.c wireshark-1.10.6/epan/dissectors/packet-media.c --- wireshark-1.10.5/epan/dissectors/packet-media.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-media.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * * (C) Olivier Biot, 2004 * - * $Id: packet-media.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Refer to the AUTHORS file or the AUTHORS section in the man page * for contacting the author(s) of this file. diff -Nru wireshark-1.10.5/epan/dissectors/packet-megaco.c wireshark-1.10.6/epan/dissectors/packet-megaco.c --- wireshark-1.10.5/epan/dissectors/packet-megaco.c 2013-05-09 15:48:05.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-megaco.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for megaco packet disassembly * RFC 3015 * -* $Id: packet-megaco.c 49218 2013-05-09 15:22:30Z martink $ +* $Id$ * * Christian Falckenberg, 2002/10/17 * Copyright (c) 2002 by Christian Falckenberg diff -Nru wireshark-1.10.5/epan/dissectors/packet-memcache.c wireshark-1.10.6/epan/dissectors/packet-memcache.c --- wireshark-1.10.5/epan/dissectors/packet-memcache.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-memcache.c 2014-03-07 18:07:13.000000000 +0000 @@ -9,7 +9,7 @@ * * Copyright 2009, Rama Chitta * - * $Id: packet-memcache.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mesh.c wireshark-1.10.6/epan/dissectors/packet-mesh.c --- wireshark-1.10.5/epan/dissectors/packet-mesh.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mesh.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Javier Cardona * Copyright 2007, Marvell Semiconductors Inc. * - * $Id: packet-mesh.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-meta.c wireshark-1.10.6/epan/dissectors/packet-meta.c --- wireshark-1.10.5/epan/dissectors/packet-meta.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-meta.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* Routines for 'Metadata' disassembly * - * $Id: packet-meta.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mgcp.c wireshark-1.10.6/epan/dissectors/packet-mgcp.c --- wireshark-1.10.5/epan/dissectors/packet-mgcp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mgcp.c 2014-03-07 18:07:13.000000000 +0000 @@ -9,7 +9,7 @@ * Laboratories, Inc., http://www.PacketCable.com/ * www.iana.org/assignments/mgcp-localconnectionoptions * - * $Id: packet-mgcp.c 48260 2013-03-12 06:41:00Z etxrab $ + * $Id$ * * Copyright (c) 2000 by Ed Warnicke * Copyright (c) 2004 by Thomas Anders diff -Nru wireshark-1.10.5/epan/dissectors/packet-mgcp.h wireshark-1.10.6/epan/dissectors/packet-mgcp.h --- wireshark-1.10.5/epan/dissectors/packet-mgcp.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mgcp.h 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for mgcp packet disassembly * RFC 2705 * - * $Id: packet-mgcp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Copyright (c) 2000 by Ed Warnicke * diff -Nru wireshark-1.10.5/epan/dissectors/packet-mih.c wireshark-1.10.6/epan/dissectors/packet-mih.c --- wireshark-1.10.5/epan/dissectors/packet-mih.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mih.c 2014-03-07 18:07:13.000000000 +0000 @@ -9,7 +9,7 @@ * * Copyright 2012, Alton MacDonald * - * $Id: packet-mih.c 48848 2013-04-14 18:55:28Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mikey.c wireshark-1.10.6/epan/dissectors/packet-mikey.c --- wireshark-1.10.5/epan/dissectors/packet-mikey.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mikey.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Multimedia Internet KEYing dissection * Copyright 2007, Mikael Magnusson * - * $Id: packet-mikey.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mim.c wireshark-1.10.6/epan/dissectors/packet-mim.c --- wireshark-1.10.5/epan/dissectors/packet-mim.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mim.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for analyzing Cisco FabricPath MiM packets * Copyright 2011, Leonard Tracy * - * $Id: packet-mim.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mime-encap.c wireshark-1.10.6/epan/dissectors/packet-mime-encap.c --- wireshark-1.10.5/epan/dissectors/packet-mime-encap.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mime-encap.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-mime-encap.c * - * $Id: packet-mime-encap.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-miop.c wireshark-1.10.6/epan/dissectors/packet-miop.c --- wireshark-1.10.5/epan/dissectors/packet-miop.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-miop.c 2014-03-07 18:07:13.000000000 +0000 @@ -8,7 +8,7 @@ * Chapter 29: Unreliable Multicast Inter-ORB Protocol (MIOP) * http://www.omg.org/technology/documents/specialized_corba.htm * - * $Id: packet-miop.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mip6.c wireshark-1.10.6/epan/dissectors/packet-mip6.c --- wireshark-1.10.5/epan/dissectors/packet-mip6.c 2013-07-22 22:37:29.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mip6.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-mip6.c * - * $Id: packet-mip6.c 50802 2013-07-22 22:03:07Z gerald $ + * $Id$ * * Definitions and Routines for Mobile IPv6 dissection (RFC 3775) * Copyright 2003 Oy L M Ericsson Ab diff -Nru wireshark-1.10.5/epan/dissectors/packet-mip.c wireshark-1.10.6/epan/dissectors/packet-mip.c --- wireshark-1.10.5/epan/dissectors/packet-mip.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mip.c 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * Copyright 2009, Ohuchi Munenori * Copyright 2010, Yi Ren * - * $Id: packet-mip.c 48897 2013-04-17 19:36:49Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mms.c wireshark-1.10.6/epan/dissectors/packet-mms.c --- wireshark-1.10.5/epan/dissectors/packet-mms.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mms.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * * Ronnie Sahlberg 2005 * - * $Id: packet-mms.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mmse.c wireshark-1.10.6/epan/dissectors/packet-mmse.c --- wireshark-1.10.5/epan/dissectors/packet-mmse.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mmse.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2001, Tom Uijldert * Copyright 2004, Olivier Biot * - * $Id: packet-mmse.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mms.h wireshark-1.10.6/epan/dissectors/packet-mms.h --- wireshark-1.10.5/epan/dissectors/packet-mms.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mms.h 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for MMS packet dissection * Ronnie Sahlberg 2005 * - * $Id: packet-mms.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mndp.c wireshark-1.10.6/epan/dissectors/packet-mndp.c --- wireshark-1.10.5/epan/dissectors/packet-mndp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mndp.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-mndp.c * Routines for the disassembly of the Mikrotik Neighbor Discovery Protocol * - * $Id: packet-mndp.c 48425 2013-03-19 19:28:57Z etxrab $ + * $Id$ * * Copyright 2011 Joerg Mayer (see AUTHORS file) * diff -Nru wireshark-1.10.5/epan/dissectors/packet-mojito.c wireshark-1.10.6/epan/dissectors/packet-mojito.c --- wireshark-1.10.5/epan/dissectors/packet-mojito.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mojito.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright (c) 2008 by Travis Dawson * - * $Id: packet-mojito.c 47891 2013-02-26 01:06:19Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-moldudp64.c wireshark-1.10.6/epan/dissectors/packet-moldudp64.c --- wireshark-1.10.5/epan/dissectors/packet-moldudp64.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-moldudp64.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * * http://www.nasdaqtrader.com/content/technicalsupport/specifications/dataproducts/moldudp64.pdf * - * $Id: packet-moldudp64.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-moldudp.c wireshark-1.10.6/epan/dissectors/packet-moldudp.c --- wireshark-1.10.5/epan/dissectors/packet-moldudp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-moldudp.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * * http://www.nasdaqtrader.com/content/technicalsupport/specifications/dataproducts/moldudp.pdf * - * $Id: packet-moldudp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mongo.c wireshark-1.10.6/epan/dissectors/packet-mongo.c --- wireshark-1.10.5/epan/dissectors/packet-mongo.c 2013-12-13 21:58:08.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mongo.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2010, Alexis La Goutte * BSON dissection added 2011, Thomas Buchanan * - * $Id: packet-mongo.c 54070 2013-12-13 21:47:00Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mount.c wireshark-1.10.6/epan/dissectors/packet-mount.c --- wireshark-1.10.5/epan/dissectors/packet-mount.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mount.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-mount.c * Routines for mount dissection * - * $Id: packet-mount.c 48934 2013-04-19 18:16:50Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mount.h wireshark-1.10.6/epan/dissectors/packet-mount.h --- wireshark-1.10.5/epan/dissectors/packet-mount.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mount.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,5 +1,5 @@ /* packet-mount.h */ -/* $Id: packet-mount.h 43536 2012-06-28 22:56:06Z darkjames $ +/* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mp2t.c wireshark-1.10.6/epan/dissectors/packet-mp2t.c --- wireshark-1.10.5/epan/dissectors/packet-mp2t.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mp2t.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * * Routines for RFC 2250 MPEG2 (ISO/IEC 13818-1) Transport Stream dissection * - * $Id: packet-mp2t.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Copyright 2006, Erwin Rol * Copyright 2012, Guy Martin diff -Nru wireshark-1.10.5/epan/dissectors/packet-mp4ves.c wireshark-1.10.6/epan/dissectors/packet-mp4ves.c --- wireshark-1.10.5/epan/dissectors/packet-mp4ves.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mp4ves.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for MPEG4 dissection * Copyright 2007-2008, Anders Broman * - * $Id: packet-mp4ves.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mp4ves.h wireshark-1.10.6/epan/dissectors/packet-mp4ves.h --- wireshark-1.10.5/epan/dissectors/packet-mp4ves.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mp4ves.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-mp4ves.h * - * $Id: packet-mp4ves.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Copyright 2008, Anders Broman * diff -Nru wireshark-1.10.5/epan/dissectors/packet-mpeg1.c wireshark-1.10.6/epan/dissectors/packet-mpeg1.c --- wireshark-1.10.5/epan/dissectors/packet-mpeg1.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mpeg1.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * * Routines for RFC 2250 MPEG-1 dissection * - * $Id: packet-mpeg1.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Copyright 2001, * Francisco Javier Cabello Torres, diff -Nru wireshark-1.10.5/epan/dissectors/packet-mpeg-audio.c wireshark-1.10.6/epan/dissectors/packet-mpeg-audio.c --- wireshark-1.10.5/epan/dissectors/packet-mpeg-audio.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mpeg-audio.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Written by Shaun Jackman . * Copyright 2007 Shaun Jackman * - * $Id: packet-mpeg-audio.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mpeg-ca.c wireshark-1.10.6/epan/dissectors/packet-mpeg-ca.c --- wireshark-1.10.5/epan/dissectors/packet-mpeg-ca.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mpeg-ca.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for MPEG2 (ISO/ISO 13818-1) Conditional Access Table (CA) dissection * Copyright 2012, Guy Martin * - * $Id: packet-mpeg-ca.c 48297 2013-03-14 14:42:12Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mpeg-descriptor.c wireshark-1.10.6/epan/dissectors/packet-mpeg-descriptor.c --- wireshark-1.10.5/epan/dissectors/packet-mpeg-descriptor.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mpeg-descriptor.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for MPEG2 (ISO/ISO 13818-1 and co) descriptors * Copyright 2012, Guy Martin * - * $Id: packet-mpeg-descriptor.c 48651 2013-03-30 10:59:30Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mpeg-descriptor.h wireshark-1.10.6/epan/dissectors/packet-mpeg-descriptor.h --- wireshark-1.10.5/epan/dissectors/packet-mpeg-descriptor.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mpeg-descriptor.h 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for MPEG2 (ISO/ISO 13818-1) dissectors * Copyright 2012, Guy Martin * - * $Id: packet-mpeg-descriptor.h 44856 2012-09-10 21:09:34Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mpeg-dsmcc.c wireshark-1.10.6/epan/dissectors/packet-mpeg-dsmcc.c --- wireshark-1.10.5/epan/dissectors/packet-mpeg-dsmcc.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mpeg-dsmcc.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for ISO/IEC 13818-6 DSM-CC * Copyright 2012, Weston Schmidt * - * $Id: packet-mpeg-dsmcc.c 48332 2013-03-15 22:09:51Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mpeg-pat.c wireshark-1.10.6/epan/dissectors/packet-mpeg-pat.c --- wireshark-1.10.5/epan/dissectors/packet-mpeg-pat.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mpeg-pat.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for MPEG2 (ISO/ISO 13818-1) Program Associate Table (PAT) dissection * Copyright 2012, Guy Martin * - * $Id: packet-mpeg-pat.c 48297 2013-03-14 14:42:12Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mpeg-pes.c wireshark-1.10.6/epan/dissectors/packet-mpeg-pes.c --- wireshark-1.10.5/epan/dissectors/packet-mpeg-pes.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mpeg-pes.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * Written by Shaun Jackman . * Copyright 2007 Shaun Jackman * - * $Id: packet-mpeg-pes.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mpeg-pmt.c wireshark-1.10.6/epan/dissectors/packet-mpeg-pmt.c --- wireshark-1.10.5/epan/dissectors/packet-mpeg-pmt.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mpeg-pmt.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for MPEG2 (ISO/ISO 13818-1) Program Map Table (PMT) dissection * Copyright 2012, Guy Martin * - * $Id: packet-mpeg-pmt.c 48737 2013-04-04 18:32:26Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mpeg-sect.c wireshark-1.10.6/epan/dissectors/packet-mpeg-sect.c --- wireshark-1.10.5/epan/dissectors/packet-mpeg-sect.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mpeg-sect.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for MPEG2 (ISO/ISO 13818-1) Section dissection * Copyright 2012, Guy Martin * - * $Id: packet-mpeg-sect.c 48297 2013-03-14 14:42:12Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mpeg-sect.h wireshark-1.10.6/epan/dissectors/packet-mpeg-sect.h --- wireshark-1.10.5/epan/dissectors/packet-mpeg-sect.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mpeg-sect.h 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Declarations of exported routines from mpeg-sect dissector * Copyright 2012, Weston Schmidt * - * $Id: packet-mpeg-sect.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mpls.c wireshark-1.10.6/epan/dissectors/packet-mpls.c --- wireshark-1.10.5/epan/dissectors/packet-mpls.c 2013-05-06 23:24:19.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mpls.c 2014-03-07 18:07:13.000000000 +0000 @@ -29,7 +29,7 @@ * (c) Copyright 2012, Aditya Ambadkar and Diana Chris * - Added preference to select BOS label as flowlabel as per RFC 6391 * - * $Id: packet-mpls.c 49189 2013-05-06 23:18:02Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -802,6 +802,8 @@ mpls_handle = find_dissector("mpls"); dissector_add_uint("ethertype", ETHERTYPE_MPLS, mpls_handle); dissector_add_uint("ethertype", ETHERTYPE_MPLS_MULTI, mpls_handle); + dissector_add_uint("ppp.protocol", PPP_MPLS_UNI, mpls_handle); + dissector_add_uint("ppp.protocol", PPP_MPLS_MULTI, mpls_handle); dissector_add_uint("chdlctype", ETHERTYPE_MPLS, mpls_handle); dissector_add_uint("chdlctype", ETHERTYPE_MPLS_MULTI, mpls_handle); dissector_add_uint("gre.proto", ETHERTYPE_MPLS, mpls_handle); diff -Nru wireshark-1.10.5/epan/dissectors/packet-mpls-echo.c wireshark-1.10.6/epan/dissectors/packet-mpls-echo.c --- wireshark-1.10.5/epan/dissectors/packet-mpls-echo.c 2013-07-17 22:26:25.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mpls-echo.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Multiprotocol Label Switching Echo dissection * Copyright 2004, Carlos Pignataro * - * $Id: packet-mpls-echo.c 50710 2013-07-17 22:20:12Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mpls.h wireshark-1.10.6/epan/dissectors/packet-mpls.h --- wireshark-1.10.5/epan/dissectors/packet-mpls.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mpls.h 2014-03-07 18:07:13.000000000 +0000 @@ -8,7 +8,7 @@ * (c) Copyright 2011, Shobhank Sharma * added MPLS Generic Associated Channel as per RFC 5586 * - * $Id: packet-mpls.h 45703 2012-10-22 02:41:19Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mpls-pm.c wireshark-1.10.6/epan/dissectors/packet-mpls-pm.c --- wireshark-1.10.5/epan/dissectors/packet-mpls-pm.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mpls-pm.c 2014-03-07 18:07:13.000000000 +0000 @@ -7,7 +7,7 @@ * * Francesco Fondelli * - * $Id: packet-mpls-pm.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mpls-psc.c wireshark-1.10.6/epan/dissectors/packet-mpls-psc.c --- wireshark-1.10.5/epan/dissectors/packet-mpls-psc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mpls-psc.c 2014-03-07 18:07:13.000000000 +0000 @@ -7,7 +7,7 @@ * * Francesco Fondelli * - * $Id: packet-mpls-psc.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mplstp-oam.c wireshark-1.10.6/epan/dissectors/packet-mplstp-oam.c --- wireshark-1.10.5/epan/dissectors/packet-mplstp-oam.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mplstp-oam.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-mplstp-oam.c * -* $Id: packet-mplstp-oam.c 48732 2013-04-04 15:33:14Z cmaynard $ +* $Id$ * Routines for MPLS-TP Lock Instruct Protocol : RFC 6435 * MPLS-TP Fault-Management Protocol : RFC 6427 * diff -Nru wireshark-1.10.5/epan/dissectors/packet-mpls-y1711.c wireshark-1.10.6/epan/dissectors/packet-mpls-y1711.c --- wireshark-1.10.5/epan/dissectors/packet-mpls-y1711.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mpls-y1711.c 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * * Francesco Fondelli * - * $Id: packet-mpls-y1711.c 48425 2013-03-19 19:28:57Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mq.c wireshark-1.10.6/epan/dissectors/packet-mq.c --- wireshark-1.10.5/epan/dissectors/packet-mq.c 2013-10-29 22:38:53.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mq.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * * metatech * - * $Id: packet-mq.c 52973 2013-10-29 22:19:18Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mq.h wireshark-1.10.6/epan/dissectors/packet-mq.h --- wireshark-1.10.5/epan/dissectors/packet-mq.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mq.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-mq.h * - * $Id: packet-mq.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mq-pcf.c wireshark-1.10.6/epan/dissectors/packet-mq-pcf.c --- wireshark-1.10.5/epan/dissectors/packet-mq-pcf.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mq-pcf.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * * metatech * - * $Id: packet-mq-pcf.c 48425 2013-03-19 19:28:57Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mrcpv2.c wireshark-1.10.6/epan/dissectors/packet-mrcpv2.c --- wireshark-1.10.5/epan/dissectors/packet-mrcpv2.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mrcpv2.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Media Resource Control Protocol Version 2 (MRCPv2) dissection * Copyright 2012, Zeljko Ancimer * - * $Id: packet-mrcpv2.c 48425 2013-03-19 19:28:57Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mrdisc.c wireshark-1.10.6/epan/dissectors/packet-mrdisc.c --- wireshark-1.10.5/epan/dissectors/packet-mrdisc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mrdisc.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-mrdisc.c 2001 Ronnie Sahlberg * Routines for IGMP/MRDISC packet disassembly * - * $Id: packet-mrdisc.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mrdisc.h wireshark-1.10.6/epan/dissectors/packet-mrdisc.h --- wireshark-1.10.5/epan/dissectors/packet-mrdisc.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mrdisc.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-mrdisc.h 2001 Ronnie Sahlberg * Declarations of routines for IGMP/MRDISC packet disassembly * - * $Id: packet-mrdisc.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mrp-mmrp.c wireshark-1.10.6/epan/dissectors/packet-mrp-mmrp.c --- wireshark-1.10.5/epan/dissectors/packet-mrp-mmrp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mrp-mmrp.c 2014-03-07 18:07:13.000000000 +0000 @@ -7,7 +7,7 @@ * Torrey Atcitty and Craig Gunther * Copyright 2010 * - * $Id: packet-mrp-mmrp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mrp-msrp.c wireshark-1.10.6/epan/dissectors/packet-mrp-msrp.c --- wireshark-1.10.5/epan/dissectors/packet-mrp-msrp.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mrp-msrp.c 2014-03-07 18:07:13.000000000 +0000 @@ -6,7 +6,7 @@ * Based on the code from packet-mmrp.c (MMRP) from * Markus Seehofer Copyright 2001 * - * $Id: packet-mrp-msrp.c 45419 2012-10-09 08:49:40Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mrp-mvrp.c wireshark-1.10.6/epan/dissectors/packet-mrp-mvrp.c --- wireshark-1.10.5/epan/dissectors/packet-mrp-mvrp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mrp-mvrp.c 2014-03-07 18:07:13.000000000 +0000 @@ -7,7 +7,7 @@ * Johannes Jochen * Copyright 2011 * - * $Id: packet-mrp-mvrp.c 45419 2012-10-09 08:49:40Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-msdp.c wireshark-1.10.6/epan/dissectors/packet-msdp.c --- wireshark-1.10.5/epan/dissectors/packet-msdp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-msdp.c 2014-03-07 18:07:13.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 2001, Heikki Vatiainen * - * $Id: packet-msdp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ms-mms.c wireshark-1.10.6/epan/dissectors/packet-ms-mms.c --- wireshark-1.10.5/epan/dissectors/packet-ms-mms.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ms-mms.c 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * Copyright 2005 * Written by Martin Mathieson * - * $Id: packet-ms-mms.c 48913 2013-04-18 19:07:44Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-msnip.c wireshark-1.10.6/epan/dissectors/packet-msnip.c --- wireshark-1.10.5/epan/dissectors/packet-msnip.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-msnip.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-msnip.c 2001 Ronnie Sahlberg * Routines for IGMP/MSNIP packet disassembly * - * $Id: packet-msnip.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-msnip.h wireshark-1.10.6/epan/dissectors/packet-msnip.h --- wireshark-1.10.5/epan/dissectors/packet-msnip.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-msnip.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-msnip.h 2001 Ronnie Sahlberg * Declarations of routines for IGMP/MSNIP packet disassembly * - * $Id: packet-msnip.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-msnlb.c wireshark-1.10.6/epan/dissectors/packet-msnlb.c --- wireshark-1.10.5/epan/dissectors/packet-msnlb.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-msnlb.c 2014-03-07 18:07:13.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-msnlb.c * Routines for MS NLB dissection * - * $Id: packet-msnlb.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-msn-messenger.c wireshark-1.10.6/epan/dissectors/packet-msn-messenger.c --- wireshark-1.10.5/epan/dissectors/packet-msn-messenger.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-msn-messenger.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for MSN Messenger Service packet dissection * Copyright 2003, Chris Waters * - * $Id: packet-msn-messenger.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-msproxy.c wireshark-1.10.6/epan/dissectors/packet-msproxy.c --- wireshark-1.10.5/epan/dissectors/packet-msproxy.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-msproxy.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Microsoft Proxy packet dissection * Copyright 2000, Jeffrey C. Foster * - * $Id: packet-msproxy.c 48954 2013-04-21 19:43:36Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-msrp.c wireshark-1.10.6/epan/dissectors/packet-msrp.c --- wireshark-1.10.5/epan/dissectors/packet-msrp.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-msrp.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Message Session Relay Protocol(MSRP) dissection * Copyright 2005, Anders Broman * - * $Id: packet-msrp.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-msrp.h wireshark-1.10.6/epan/dissectors/packet-msrp.h --- wireshark-1.10.5/epan/dissectors/packet-msrp.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-msrp.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-msrp.h * - * $Id: packet-msrp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mstp.c wireshark-1.10.6/epan/dissectors/packet-mstp.c --- wireshark-1.10.5/epan/dissectors/packet-mstp.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mstp.c 2014-03-07 18:07:13.000000000 +0000 @@ -10,7 +10,7 @@ * provided by the EIA-485 physical layer." See section 9.3 for the * frame format. * - * $Id: packet-mstp.c 46324 2012-12-02 04:49:13Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mstp.h wireshark-1.10.6/epan/dissectors/packet-mstp.h --- wireshark-1.10.5/epan/dissectors/packet-mstp.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mstp.h 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for BACnet MS/TP datalink dissection * Copyright 2008 Steve Karg Alabama * - * $Id: packet-mstp.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mtp2.c wireshark-1.10.6/epan/dissectors/packet-mtp2.c --- wireshark-1.10.5/epan/dissectors/packet-mtp2.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mtp2.c 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright 2001, 2004 Michael Tuexen * - * $Id: packet-mtp2.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mtp3.c wireshark-1.10.6/epan/dissectors/packet-mtp3.c --- wireshark-1.10.5/epan/dissectors/packet-mtp3.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mtp3.c 2014-03-07 18:07:13.000000000 +0000 @@ -14,7 +14,7 @@ * Updated for ANSI, Chinese ITU, and Japan support by * Jeff Morriss * - * $Id: packet-mtp3.c 48425 2013-03-19 19:28:57Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mtp3.h wireshark-1.10.6/epan/dissectors/packet-mtp3.h --- wireshark-1.10.5/epan/dissectors/packet-mtp3.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mtp3.h 2014-03-07 18:07:13.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-mtp3.h * - * $Id: packet-mtp3.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mtp3mg.c wireshark-1.10.6/epan/dissectors/packet-mtp3mg.c --- wireshark-1.10.5/epan/dissectors/packet-mtp3mg.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mtp3mg.c 2014-03-07 18:07:13.000000000 +0000 @@ -14,7 +14,7 @@ * * Copyright 2003, Jeff Morriss * - * $Id: packet-mtp3mg.c 47402 2013-01-31 22:43:04Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-multipart.c wireshark-1.10.6/epan/dissectors/packet-multipart.c --- wireshark-1.10.5/epan/dissectors/packet-multipart.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-multipart.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2004, Anders Broman. * Copyright 2004, Olivier Biot. * - * $Id: packet-multipart.c 48399 2013-03-18 20:44:36Z etxrab $ + * $Id$ * * Refer to the AUTHORS file or the AUTHORS section in the man page * for contacting the author(s) of this file. diff -Nru wireshark-1.10.5/epan/dissectors/packet-mux27010.c wireshark-1.10.6/epan/dissectors/packet-mux27010.c --- wireshark-1.10.5/epan/dissectors/packet-mux27010.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mux27010.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Dissects a variant of 3GPP TS 27.010 multiplexing protocol * Copyright 2011, Hans-Christoph Schemmel * - * $Id: packet-mux27010.c 48685 2013-04-01 15:29:49Z jake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-mysql.c wireshark-1.10.6/epan/dissectors/packet-mysql.c --- wireshark-1.10.5/epan/dissectors/packet-mysql.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-mysql.c 2014-03-07 18:07:13.000000000 +0000 @@ -5,7 +5,7 @@ * * MySQL 4.1+ protocol by Axel Schwenke * - * $Id: packet-mysql.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nasdaq-itch.c wireshark-1.10.6/epan/dissectors/packet-nasdaq-itch.c --- wireshark-1.10.5/epan/dissectors/packet-nasdaq-itch.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nasdaq-itch.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for NASDAQ TotalView-ITCH version 2.00/3.00 (with Chi-X extension) Protocol dissection * Copyright 2007,2008 Didier Gautheron * - * $Id: packet-nasdaq-itch.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nasdaq-soup.c wireshark-1.10.6/epan/dissectors/packet-nasdaq-soup.c --- wireshark-1.10.5/epan/dissectors/packet-nasdaq-soup.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nasdaq-soup.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for NASDAQ SOUP 2.0 Protocol dissection * Copyright 2007,2008 Didier Gautheron * - * $Id: packet-nasdaq-soup.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nas_eps.c wireshark-1.10.6/epan/dissectors/packet-nas_eps.c --- wireshark-1.10.5/epan/dissectors/packet-nas_eps.c 2013-12-19 17:37:26.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nas_eps.c 2014-03-07 18:07:13.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2008 - 2010, Anders Broman * - * $Id: packet-nas_eps.c 54252 2013-12-19 17:31:09Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -254,7 +254,7 @@ { 0x61, "EMM information"}, { 0x62, "Downlink NAS transport"}, { 0x63, "Uplink NAS transport"}, - { 0x64, "CS Service notification"}, + { 0x64, "CS service notification"}, { 0x68, "Downlink generic NAS transport"}, { 0x69, "Uplink generic NAS transport"}, { 0, NULL } @@ -962,7 +962,9 @@ proto_tree_add_item(tree, hf_nas_eps_emm_cause, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; - return curr_offset-offset;} + return curr_offset-offset; +} + /* * 9.9.3.10 EPS attach result */ @@ -1500,9 +1502,9 @@ proto_tree_add_bits_item(tree, hf_nas_eps_spare_bits, tvb, curr_offset<<3, 7, ENC_BIG_ENDIAN); proto_tree_add_bits_item(tree, hf_nas_eps_emm_paging_id, tvb, (curr_offset<<3)+7, 1, ENC_BIG_ENDIAN); - /*curr_offset+=len;*/ + /*curr_offset+=1;*/ - return(len); + return(1); } /* * 9.9.3.26 P-TMSI signature @@ -3156,7 +3158,7 @@ /* Paging identity Paging identity 9.9.3.25A M V 1 */ ELEM_MAND_V(NAS_PDU_TYPE_EMM, DE_EMM_PAGING_ID, NULL); /* 60 CLI CLI 9.9.3.38 O TLV 3-12 */ - ELEM_OPT_TLV(0x60, GSM_A_PDU_TYPE_DTAP, DE_CLD_PARTY_BCD_NUM, " - CLI"); + ELEM_OPT_TLV(0x60, GSM_A_PDU_TYPE_DTAP, DE_CLG_PARTY_BCD_NUM, " - CLI"); /* 61 SS Code SS Code 9.9.3.39 O TV 2 */ ELEM_OPT_TV(0x61, NAS_PDU_TYPE_EMM, DE_EMM_SS_CODE, NULL); /* 62 LCS indicator LCS indicator 9.9.3.40 O TV 2 */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-nat-pmp.c wireshark-1.10.6/epan/dissectors/packet-nat-pmp.c --- wireshark-1.10.5/epan/dissectors/packet-nat-pmp.c 2013-05-20 19:01:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nat-pmp.c 2014-03-07 18:07:13.000000000 +0000 @@ -13,7 +13,7 @@ * Copyright 2012, Michael Mann * * - * $Id: packet-nat-pmp.c 49452 2013-05-20 18:55:04Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nbap.c wireshark-1.10.6/epan/dissectors/packet-nbap.c --- wireshark-1.10.5/epan/dissectors/packet-nbap.c 2013-10-29 18:55:35.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nbap.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for UMTS Node B Application Part(NBAP) packet dissection * Copyright 2005, 2009 Anders Broman * - * $Id: packet-nbap.c 52957 2013-10-29 18:46:43Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nbap.h wireshark-1.10.6/epan/dissectors/packet-nbap.h --- wireshark-1.10.5/epan/dissectors/packet-nbap.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nbap.h 2014-03-07 18:07:14.000000000 +0000 @@ -8,7 +8,7 @@ #line 1 "../../asn1/nbap/packet-nbap-template.h" /* packet-nbap-template.h * - * $Id: packet-nbap.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nbd.c wireshark-1.10.6/epan/dissectors/packet-nbd.c --- wireshark-1.10.5/epan/dissectors/packet-nbd.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nbd.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Ronnie sahlberg 2006 * - * $Id: packet-nbd.c 48400 2013-03-18 21:16:23Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nbipx.c wireshark-1.10.6/epan/dissectors/packet-nbipx.c --- wireshark-1.10.5/epan/dissectors/packet-nbipx.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nbipx.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for NetBIOS over IPX packet disassembly * Gilbert Ramirez * - * $Id: packet-nbipx.c 45572 2012-10-16 03:07:06Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nbns.c wireshark-1.10.6/epan/dissectors/packet-nbns.c --- wireshark-1.10.5/epan/dissectors/packet-nbns.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nbns.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * to when it had only NBNS) * Guy Harris * - * $Id: packet-nbns.c 48333 2013-03-15 22:39:37Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nb_rtpmux.c wireshark-1.10.6/epan/dissectors/packet-nb_rtpmux.c --- wireshark-1.10.5/epan/dissectors/packet-nb_rtpmux.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nb_rtpmux.c 2014-03-07 18:07:13.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for 3GPP RTP Multiplex dissection, 3GPP TS 29.414 * Copyright 2009, ip.access ltd * - * $Id: packet-nb_rtpmux.c 47640 2013-02-12 16:12:03Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ncp2222.c wireshark-1.10.6/epan/dissectors/packet-ncp2222.c --- wireshark-1.10.5/epan/dissectors/packet-ncp2222.c 2013-12-19 19:15:50.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ncp2222.c 2014-03-07 18:09:16.000000000 +0000 @@ -43,26 +43,26 @@ static void ncp_postseq_cleanup(void); /* Endianness macros */ -#define BE 0 -#define LE 1 -#define NO_ENDIANNESS 0 +#define BE 0 +#define LE 1 +#define NO_ENDIANNESS 0 -#define NO_LENGTH -1 +#define NO_LENGTH -1 /* We use this int-pointer as a special flag in ptvc_record's */ static int ptvc_struct_int_storage; -#define PTVC_STRUCT (&ptvc_struct_int_storage) +#define PTVC_STRUCT (&ptvc_struct_int_storage) /* Values used in the count-variable ("var"/"repeat") logic. */ #define NUM_REPEAT_VARS 3 static guint repeat_vars[NUM_REPEAT_VARS]; -#define NO_VAR NUM_REPEAT_VARS -#define NO_REPEAT NUM_REPEAT_VARS +#define NO_VAR NUM_REPEAT_VARS +#define NO_REPEAT NUM_REPEAT_VARS -#define REQ_COND_SIZE_CONSTANT 0 -#define REQ_COND_SIZE_VARIABLE 1 -#define NO_REQ_COND_SIZE 0 +#define REQ_COND_SIZE_CONSTANT 0 +#define REQ_COND_SIZE_VARIABLE 1 +#define NO_REQ_COND_SIZE 0 #define NTREE 0x00020000 @@ -4200,126 +4200,126 @@ /* Request-Condition dfilter records. The NULL pointer is replaced by a pointer to the created dfilter_t. */ static conditional_record req_conds[] = { - { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)", NULL }, - { "ncp.enum_info_name==TRUE", NULL }, - { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)", NULL }, + { "(ncp.ext_info_64_bit_fs == 1) && (ncp.ret_info_mask_fname == 1)", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)", NULL }, { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)", NULL }, - { "ncp.ns_info_mask_max_acc_mask == TRUE", NULL }, - { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_fname == 1)", NULL }, - { "ncp.handle_info_level==0x03", NULL }, - { "ncp.enum_info_auth==TRUE", NULL }, - { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)", NULL }, - { "ncp.ns_info_mask_modify == TRUE", NULL }, - { "ncp.enum_info_lock==TRUE", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)", NULL }, { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)", NULL }, - { "ncp.ext_info_64_bit_fs == 1", NULL }, - { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)", NULL }, - { "ncp.enum_info_account==TRUE", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)", NULL }, - { "ncp.ext_info_mac_finder == 1", NULL }, - { "ncp.info_flags_name == TRUE", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)", NULL }, - { "ncp.sattr_sub!=TRUE", NULL }, { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_fname == 1)", NULL }, - { "ncp.ext_info_dos_name == 1", NULL }, - { "ncp.enum_info_time==TRUE", NULL }, - { "ncp.ns_info_mask_aid == TRUE", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)", NULL }, - { "ncp.ns_info_mask_udate == TRUE", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)", NULL }, { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)", NULL }, - { "ncp.ret_info_mask_fname == 1", NULL }, - { "ncp.info_level_num==0x02", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)", NULL }, - { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)", NULL }, - { "ncp.ns_info_mask_uid == TRUE", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)", NULL }, - { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)", NULL }, + { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)", NULL }, + { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)", NULL }, + { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)", NULL }, + { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)", NULL }, + { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)", NULL }, + { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)", NULL }, + { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)", NULL }, + { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_fname == 1)", NULL }, + { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)", NULL }, { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)", NULL }, - { "ncp.ns_info_mask_atime == TRUE", NULL }, + { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)", NULL }, + { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)", NULL }, + { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)", NULL }, { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)", NULL }, - { "ncp.alloc_reply_lvl2 == FALSE", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)", NULL }, { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)", NULL }, - { "ncp.sattr_sub==TRUE", NULL }, { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)", NULL }, - { "ncp.ext_info_mac_date == 1", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)", NULL }, - { "ncp.dm_info_level == 0x01", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)", NULL }, + { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)", NULL }, + { "ncp.alloc_reply_lvl2 == FALSE", NULL }, + { "ncp.alloc_reply_lvl2 == TRUE", NULL }, + { "ncp.ctrl_flags==0x0000", NULL }, + { "ncp.ctrl_flags==0x0001", NULL }, { "ncp.dm_info_level == 0x00", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)", NULL }, + { "ncp.dm_info_level == 0x01", NULL }, { "ncp.dm_info_level == 0x02", NULL }, - { "ncp.ext_info_update == 1", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)", NULL }, - { "ncp.info_flags_flags == TRUE", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)", NULL }, + { "ncp.enum_info_account==TRUE", NULL }, + { "ncp.enum_info_auth==TRUE", NULL }, + { "ncp.enum_info_lock==TRUE", NULL }, + { "ncp.enum_info_name==TRUE", NULL }, + { "ncp.enum_info_print==TRUE", NULL }, + { "ncp.enum_info_stats==TRUE", NULL }, + { "ncp.enum_info_time==TRUE", NULL }, + { "ncp.enum_info_transport==TRUE", NULL }, + { "ncp.ext_info_64_bit_fs == 1", NULL }, + { "ncp.ext_info_access == 1", NULL }, + { "ncp.ext_info_dos_name == 1", NULL }, + { "ncp.ext_info_effective == 1", NULL }, + { "ncp.ext_info_flush == 1", NULL }, + { "ncp.ext_info_mac_date == 1", NULL }, + { "ncp.ext_info_mac_finder == 1", NULL }, { "ncp.ext_info_parental == 1", NULL }, - { "ncp.handle_info_level==0x04", NULL }, - { "ncp.handle_info_level==0x05", NULL }, - { "ncp.handle_info_level==0x02", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)", NULL }, + { "ncp.ext_info_sibling == 1", NULL }, + { "ncp.ext_info_update == 1", NULL }, { "ncp.handle_info_level==0x00", NULL }, { "ncp.handle_info_level==0x01", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)", NULL }, - { "ncp.ext_info_access == 1", NULL }, - { "ncp.ns_info_mask_owner == TRUE", NULL }, + { "ncp.handle_info_level==0x02", NULL }, + { "ncp.handle_info_level==0x03", NULL }, + { "ncp.handle_info_level==0x04", NULL }, + { "ncp.handle_info_level==0x05", NULL }, + { "ncp.info_flags_flags == TRUE", NULL }, + { "ncp.info_flags_name == TRUE", NULL }, { "ncp.info_flags_security == TRUE", NULL }, - { "ncp.ext_info_sibling == 1", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)", NULL }, - { "ncp.ns_info_mask_cdate == TRUE", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)", NULL }, - { "ncp.enum_info_transport==TRUE", NULL }, - { "ncp.enum_info_stats==TRUE", NULL }, - { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)", NULL }, + { "ncp.info_flags_type == TRUE", NULL }, { "ncp.info_level_num==0x01", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)", NULL }, + { "ncp.info_level_num==0x02", NULL }, + { "ncp.ns_info_mask_acc_date == TRUE", NULL }, { "ncp.ns_info_mask_adate == TRUE", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)", NULL }, - { "(ncp.ext_info_64_bit_fs == 1) && (ncp.ret_info_mask_fname == 1)", NULL }, - { "ncp.ctrl_flags==0x0000", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)", NULL }, + { "ncp.ns_info_mask_aid == TRUE", NULL }, + { "ncp.ns_info_mask_atime == TRUE", NULL }, + { "ncp.ns_info_mask_cdate == TRUE", NULL }, { "ncp.ns_info_mask_ctime == TRUE", NULL }, - { "ncp.ret_info_mask_actual == 1", NULL }, - { "ncp.ext_info_flush == 1", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)", NULL }, - { "ncp.ext_info_effective == 1", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)", NULL }, - { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)", NULL }, - { "ncp.enum_info_print==TRUE", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)", NULL }, - { "ncp.ret_info_mask_logical == 1 && ncp.number_of_data_streams_long > 0", NULL }, { "ncp.ns_info_mask_fatt == TRUE", NULL }, - { "ncp.alloc_reply_lvl2 == TRUE", NULL }, - { "ncp.search_att_sub == FALSE", NULL }, - { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)", NULL }, - { "ncp.ns_info_mask_acc_date == TRUE", NULL }, + { "ncp.ns_info_mask_max_acc_mask == TRUE", NULL }, + { "ncp.ns_info_mask_modify == TRUE", NULL }, + { "ncp.ns_info_mask_owner == TRUE", NULL }, + { "ncp.ns_info_mask_udate == TRUE", NULL }, + { "ncp.ns_info_mask_uid == TRUE", NULL }, { "ncp.ns_info_mask_utime == TRUE", NULL }, - { "(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)", NULL }, - { "(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)", NULL }, - { "ncp.info_flags_type == TRUE", NULL }, - { "ncp.ret_info_mask_ns_attr == 1", NULL }, - { "ncp.volume_request_flags==0x0001", NULL }, - { "ncp.volume_request_flags==0x0000", NULL }, + { "ncp.ret_info_mask_actual == 1", NULL }, { "ncp.ret_info_mask_actual == 1 && ncp.number_of_data_streams_long > 0", NULL }, - { "(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)", NULL }, + { "ncp.ret_info_mask_fname == 1", NULL }, { "ncp.ret_info_mask_id == 1", NULL }, { "ncp.ret_info_mask_logical == 1", NULL }, - { "ncp.ctrl_flags==0x0001", NULL }, + { "ncp.ret_info_mask_logical == 1 && ncp.number_of_data_streams_long > 0", NULL }, + { "ncp.ret_info_mask_ns_attr == 1", NULL }, + { "ncp.sattr_sub!=TRUE", NULL }, + { "ncp.sattr_sub==TRUE", NULL }, + { "ncp.search_att_sub == FALSE", NULL }, + { "ncp.volume_request_flags==0x0000", NULL }, + { "ncp.volume_request_flags==0x0001", NULL }, }; #define NUM_REQ_CONDS 120 #define NO_REQ_COND NUM_REQ_CONDS @@ -8088,7 +8088,7 @@ { &hf_ncp_change_bits, 2, &ncp_change_bits_bitfield, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_reserved2, 2, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_sub_directory, 4, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dos_file_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 105, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dos_file_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 117, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -8322,8 +8322,8 @@ static const ptvc_record ncp_0x1634_reply[] = { { &hf_ncp_items_in_packet, 4, NULL, LE, 0, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_next_volume_number, 4, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_volume_struct, NO_ENDIANNESS, NO_VAR, 0, 114, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_volume_with_name_struct, NO_ENDIANNESS, NO_VAR, 0, 113, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_volume_struct, NO_ENDIANNESS, NO_VAR, 0, 118, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_volume_with_name_struct, NO_ENDIANNESS, NO_VAR, 0, 119, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -8579,10 +8579,10 @@ { &hf_ncp_object_info_rtn_count, 4, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_next_object_id, 4, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_object_id, 4, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_object_type_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 111, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_object_security_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 72, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_object_flags_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 59, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_object_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 17, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_object_type_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 92, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_object_security_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 91, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_object_flags_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 89, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_object_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 90, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -10031,8 +10031,8 @@ }; static const ptvc_record ncp_0x3f_reply[] = { - { PTVC_STRUCT, NO_LENGTH, &struct_directory_instance, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 48, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_instance, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 20, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_directory_instance, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 116, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_instance, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 115, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -10283,53 +10283,53 @@ { &hf_ncp_file_handle, 4, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_open_create_action, 1, &ncp_open_create_action_bitfield, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_reserved, 1, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 55, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 40, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 47, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 96, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 94, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 74, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 90, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 36, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 49, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 18, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 58, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 68, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 85, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 77, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 116, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 95, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 78, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 83, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 45, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 36, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 41, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 40, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 55, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 54, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 57, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 56, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 43, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 42, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 49, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 48, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 39, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 53, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 52, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 45, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 44, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 47, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 46, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 51, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 50, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 34, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 117, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 92, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 118, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 57, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 93, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 61, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 73, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 97, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 51, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 70, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 30, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 111, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 114, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 108, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 82, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 75, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 77, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 80, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 79, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 78, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 74, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -10365,53 +10365,53 @@ static const ptvc_record ncp_0x5703_reply[] = { { PTVC_STRUCT, NO_LENGTH, &struct_search_seq, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_reserved, 1, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 55, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 40, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 47, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 96, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 94, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 74, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 90, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 36, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 49, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 18, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 58, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 68, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 85, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 77, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 116, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 95, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 78, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 83, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 45, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 36, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 41, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 40, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 55, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 54, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 57, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 56, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 43, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 42, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 49, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 48, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 39, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 53, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 52, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 45, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 44, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 47, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 46, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 51, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 50, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 34, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 117, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 92, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 118, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 57, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 93, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 61, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 73, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 97, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 51, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 70, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 30, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 111, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 114, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 108, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 82, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 75, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 77, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 80, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 79, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 78, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 74, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -10467,56 +10467,56 @@ }; static const ptvc_record ncp_0x5706_reply[] = { - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 44, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 65, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 50, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 86, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 69, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 98, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 52, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 41, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 60, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 42, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 101, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 89, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 46, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 1, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 6, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 5, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 21, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 20, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 23, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 7, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 14, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 4, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 18, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 10, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 9, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 12, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 17, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 34, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 117, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_number_of_data_streams_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 92, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 115, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_number_of_data_streams_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 118, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 102, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 57, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 93, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 61, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 73, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 97, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 51, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 70, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 12, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 30, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 111, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 114, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_number_of_data_streams_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 108, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_number_of_data_streams_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 113, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 82, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 75, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 77, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 80, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 79, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 78, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 74, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 73, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -10616,8 +10616,8 @@ }; static const ptvc_record ncp_0x570c_reply[] = { - { PTVC_STRUCT, NO_LENGTH, &struct_reply_lvl_2_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 104, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_reply_lvl_1_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 43, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_reply_lvl_2_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 59, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_reply_lvl_1_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 58, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -10642,41 +10642,41 @@ { &hf_ncp_delete_id, 4, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_volume_id, 4, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_dir_base, 4, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 44, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 65, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 50, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 86, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 69, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 98, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 52, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 41, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 60, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 42, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 101, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 89, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 46, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 21, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 1, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 6, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 5, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 21, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 20, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 23, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 7, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 14, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 4, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 18, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 10, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 9, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 12, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 17, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 34, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 5, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 30, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -10710,19 +10710,19 @@ }; static const ptvc_record ncp_0x5713_reply[] = { - { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 9, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 103, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_date_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 75, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 91, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_owner_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 71, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_date_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 84, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 39, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_update_date_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_update_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 108, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_update_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_access_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 107, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 4, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 103, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 101, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_date_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 100, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_owner_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 104, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_date_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 96, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 98, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 97, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_update_date_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 105, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_update_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 107, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_update_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_access_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 95, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 102, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -10874,41 +10874,41 @@ static const ptvc_record ncp_0x571d_reply[] = { { &hf_ncp_effective_rights, 2, &ncp_effective_rights_bitfield, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 44, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 65, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 50, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 86, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 69, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 98, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 52, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 41, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 60, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 42, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 101, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 89, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 46, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 21, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 1, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 6, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 5, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 21, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 20, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 23, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 7, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 14, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 4, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 18, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 10, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 9, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 12, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 17, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 34, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 5, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 30, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -10935,41 +10935,41 @@ { &hf_ncp_file_handle, 4, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_open_create_action, 1, &ncp_open_create_action_bitfield, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_reserved, 1, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 44, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 65, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 50, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 86, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 69, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 98, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 52, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 41, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 60, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 42, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 101, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 89, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 46, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 21, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 1, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 6, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 5, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 21, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 20, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 23, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 7, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 14, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 4, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 18, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 10, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 9, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 12, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 17, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 34, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 5, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 30, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -10982,12 +10982,12 @@ static const ptvc_record ncp_0x571f_reply[] = { { &hf_ncp_volume_number_long, 4, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_dir_base, 4, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_handle_info_level_0, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 66, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_handle_info_level_1, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 67, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_handle_info_level_2, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 64, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_handle_info_level_3, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 6, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_handle_info_level_4, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 62, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_handle_info_level_5, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 63, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_handle_info_level_0, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 83, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_handle_info_level_1, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 84, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_handle_info_level_2, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 85, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_handle_info_level_3, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 86, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_handle_info_level_4, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 87, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_handle_info_level_5, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 88, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -10995,53 +10995,53 @@ { &hf_ncp_file_handle, 4, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_open_create_action, 1, &ncp_open_create_action_bitfield, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_o_c_ret_flags, 1, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 55, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 40, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 47, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 96, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 94, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 74, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 90, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 36, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 49, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 18, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 58, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 68, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 85, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 77, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 116, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 95, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 78, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 83, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 45, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 36, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 41, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 40, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 55, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 54, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 57, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 56, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 43, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 42, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 49, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 48, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 39, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 53, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 52, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 45, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 44, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 47, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 46, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 51, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 50, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 34, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 117, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 92, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 118, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 57, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 93, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 61, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 73, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 97, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 51, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 70, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 30, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 111, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 114, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 108, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 82, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 75, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 77, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 80, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 79, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 78, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 74, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -11049,53 +11049,53 @@ { &hf_ncp_file_handle, 4, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_open_create_action, 1, &ncp_open_create_action_bitfield, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_o_c_ret_flags, 1, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 55, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 40, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 47, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 96, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 94, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 74, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 90, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 36, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 49, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 18, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 58, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 68, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 85, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 77, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 116, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 95, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 78, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 83, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 45, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 36, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 41, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 40, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 55, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 54, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 57, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 56, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 43, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 42, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 49, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 48, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 39, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 53, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 52, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 45, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 44, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 47, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 46, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 51, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 50, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 34, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 117, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 92, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 118, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 57, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 93, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 61, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 73, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 97, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 51, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 70, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 30, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 111, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 114, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 108, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 82, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 75, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 77, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 80, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 79, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 78, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 74, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -11177,41 +11177,41 @@ { PTVC_STRUCT, NO_LENGTH, &struct_search_seq, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_more_flag, 1, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_info_count, 2, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 44, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 65, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 50, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 86, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 69, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 98, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 52, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 41, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 60, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 42, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 101, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 89, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 46, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 21, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 1, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 6, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 5, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 21, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 20, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 23, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 7, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 14, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 4, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 18, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 10, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 9, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 12, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 17, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 34, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 5, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 30, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -11232,8 +11232,8 @@ { &hf_ncp_sequence_number, 4, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_dir_base, 4, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_scan_items, 4, NULL, LE, 0, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_scan_info_file_name, NO_ENDIANNESS, NO_VAR, 0, 119, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_scan_info_file_no_name, NO_ENDIANNESS, NO_VAR, 0, 88, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_scan_info_file_name, NO_ENDIANNESS, NO_VAR, 0, 61, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_scan_info_file_no_name, NO_ENDIANNESS, NO_VAR, 0, 60, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -11354,54 +11354,54 @@ { &hf_ncp_file_handle, 4, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_open_create_action, 1, &ncp_open_create_action_bitfield, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_reserved, 1, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 55, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 40, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 47, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 96, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 94, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 74, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 90, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 36, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 49, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 18, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 58, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 68, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 85, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 77, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 116, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 95, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 78, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 83, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 45, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 36, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 41, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 40, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 55, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 54, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 57, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 56, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 43, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 42, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 49, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 48, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 39, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 53, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 52, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 45, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 44, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 47, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 46, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 51, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 50, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 34, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 117, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 92, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 118, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 57, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 93, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 61, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 73, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 97, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 51, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 70, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 12, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 30, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 111, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 114, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 108, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 82, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 75, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 77, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 80, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 79, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 78, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 74, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 73, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -11433,54 +11433,54 @@ static const ptvc_record ncp_0x5903_reply[] = { { PTVC_STRUCT, NO_LENGTH, &struct_search_seq, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_reserved, 1, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 55, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 40, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 47, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 96, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 94, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 74, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 90, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 36, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 49, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 18, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 58, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 68, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 85, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 77, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 116, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 95, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 78, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 83, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 45, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 36, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 41, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 40, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 55, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 54, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 57, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 56, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 43, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 42, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 49, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 48, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 39, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 53, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 52, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 45, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 44, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 47, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 46, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 51, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 50, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 34, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 117, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 92, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 118, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 57, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 93, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 61, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 73, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 97, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 51, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 70, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 12, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 30, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 111, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 114, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 108, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 82, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 75, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 77, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 80, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 79, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 78, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 74, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 73, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -11525,54 +11525,54 @@ }; static const ptvc_record ncp_0x5906_reply[] = { - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 44, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 65, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 50, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 86, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 69, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 98, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 52, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 41, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 60, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 42, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 101, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 89, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 46, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 1, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 6, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 5, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 21, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 20, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 23, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 7, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 14, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 4, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 18, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 10, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 9, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 12, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 17, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 34, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 117, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 92, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 118, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 57, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 93, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 61, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 73, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 97, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 51, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 70, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 12, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 30, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 111, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 114, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 108, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 82, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 75, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 77, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 80, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 79, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 78, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 74, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 73, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -11706,42 +11706,42 @@ { &hf_ncp_delete_id, 4, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_volume_id, 4, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_dir_base, 4, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 44, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 65, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 50, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 86, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 69, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 98, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 52, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 41, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 60, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 42, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 101, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 89, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 46, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 21, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 1, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 6, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 5, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 21, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 20, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 23, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 7, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 14, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 4, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 18, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 10, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 9, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 12, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 17, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 34, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 12, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 5, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 73, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 30, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -11767,19 +11767,19 @@ }; static const ptvc_record ncp_0x5913_reply[] = { - { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 9, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 103, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_date_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 75, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 91, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_owner_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 71, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_date_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 84, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 39, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_update_date_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_update_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 108, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_update_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_access_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 107, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 4, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 103, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 101, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_date_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 100, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_owner_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 104, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_date_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 96, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 98, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 97, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_update_date_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 105, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_update_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 107, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_update_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_access_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 95, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 102, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -11865,42 +11865,42 @@ static const ptvc_record ncp_0x591d_reply[] = { { &hf_ncp_effective_rights, 2, &ncp_effective_rights_bitfield, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 44, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 65, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 50, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 86, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 69, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 98, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 52, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 41, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 60, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 42, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 101, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 89, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 46, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 21, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 1, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 6, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 5, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 21, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 20, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 23, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 7, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 14, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 4, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 18, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 10, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 9, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 12, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 17, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 34, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 87, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 5, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 30, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -11929,42 +11929,42 @@ { &hf_ncp_file_handle, 4, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_open_create_action, 1, &ncp_open_create_action_bitfield, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_reserved, 1, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 44, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 65, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 50, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 86, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 69, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 98, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 52, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 41, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 60, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 42, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 101, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 89, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 46, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 21, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 1, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 6, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 5, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 21, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 20, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 23, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 7, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 14, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 4, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 18, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 10, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 9, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 12, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 17, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 34, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 87, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 5, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 30, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -11972,54 +11972,54 @@ { &hf_ncp_file_handle, 4, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_open_create_action, 1, &ncp_open_create_action_bitfield, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_o_c_ret_flags, 1, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 55, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 40, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 47, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 96, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 94, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 74, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 90, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 36, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 49, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 18, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 58, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 68, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 85, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 77, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 116, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 95, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 78, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 83, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 45, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 36, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 41, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 40, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 55, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 54, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 57, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 56, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 43, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 42, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 49, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 48, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 39, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 53, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 52, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 45, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 44, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 47, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 46, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 51, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 50, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 34, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 117, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 92, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 118, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 57, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 93, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 61, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 73, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 97, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 51, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 70, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 12, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 30, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 111, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 114, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 108, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 82, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 75, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 77, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 80, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 79, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 78, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 74, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 73, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -12027,54 +12027,54 @@ { &hf_ncp_file_handle, 4, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_open_create_action, 1, &ncp_open_create_action_bitfield, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_o_c_ret_flags, 1, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 55, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 40, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 47, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 96, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 94, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 74, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 90, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 36, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 49, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 18, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 58, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 68, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 85, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 77, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 116, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 95, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 78, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 83, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 45, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 36, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 41, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 40, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 55, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 54, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 57, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 56, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 43, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 42, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 49, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 48, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 39, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 53, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 52, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 45, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 44, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 47, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 46, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 51, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 50, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 34, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 117, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 92, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 118, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 57, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 93, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 61, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 73, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 97, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 51, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 70, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 12, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 30, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ref_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 111, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_attrib_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 114, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_stream_actual, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 108, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_d_string_logical, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 112, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_update_in_seconds_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 82, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dos_name_16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 75, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_flush_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 77, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_parent_base_id_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 80, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_finder_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 79, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_sibling_count_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_eff_rights_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_mac_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 78, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_last_access_time_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 74, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 73, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -12112,42 +12112,42 @@ { PTVC_STRUCT, NO_LENGTH, &struct_search_seq, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_more_flag, 1, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_info_count, 2, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 44, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 65, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 50, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 86, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 69, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 98, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 110, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 52, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 76, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 41, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 60, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 42, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 101, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 89, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 46, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 21, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 109, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ds_space_alloc, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 1, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 6, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_attributes, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 5, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 21, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_data_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 20, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 23, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_total_stream_size, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 22, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_creation_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 7, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 15, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_modify_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 14, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 4, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_archive_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 3, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 19, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_rights_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 18, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 10, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_dir_entry, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 9, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 12, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ea_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 11, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 17, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_pad_ns_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 16, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 13, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ds_space_alloc_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 24, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_attributes_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 26, NCP_FMT_NONE }, { PTVC_STRUCT, NO_LENGTH, &struct_data_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 34, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 81, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 2, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 8, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 37, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 106, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 99, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 38, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 87, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 5, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_total_stream_size_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 35, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_creation_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 27, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_modify_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_archive_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 25, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_rights_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 33, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dir_entry_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 28, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ea_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 29, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_ns_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 32, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_sz_64bit_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 0, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_file_name16_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 30, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -12326,9 +12326,9 @@ }; static const ptvc_record ncp_0x5a84_reply[] = { - { PTVC_STRUCT, NO_LENGTH, &struct_dm_info_level_0, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 54, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dm_info_level_1, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 53, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_dm_info_level_2, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 56, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dm_info_level_0, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 62, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dm_info_level_1, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 63, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_dm_info_level_2, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 64, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -12747,14 +12747,14 @@ { &hf_ncp_vconsole_rev, 1, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_reserved2, 2, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_items_in_packet, 4, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_net_addr_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 79, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_time_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 23, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_name_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 1, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_lock_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 10, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_print_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 100, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_stats_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 80, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_acctng_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 14, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_auth_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 7, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_net_addr_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 72, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_time_info, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 71, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_name_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 68, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_lock_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 67, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_print_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 69, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_stats_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 70, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_acctng_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 65, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_auth_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 66, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -12942,8 +12942,8 @@ { &hf_ncp_reserved2, 2, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_info_level_num, 1, NULL, LE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, { &hf_ncp_reserved3, 3, NULL, BE, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_vol_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 82, NCP_FMT_NONE }, - { PTVC_STRUCT, NO_LENGTH, &struct_vol_info_struct_2, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 31, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_vol_info_struct, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 93, NCP_FMT_NONE }, + { PTVC_STRUCT, NO_LENGTH, &struct_vol_info_struct_2, NO_ENDIANNESS, NO_VAR, NO_REPEAT, 94, NCP_FMT_NONE }, { NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE } }; @@ -16564,56 +16564,39 @@ }; /* Request Condition Indexes */ -static const int ncp_0x1634_req_cond_indexes[] = { - 113, 114, -1 }; +static const int ncp_0x1634_req_cond_indexes[] = { 118, 119, -1 }; -static const int ncp_0x1720_req_cond_indexes[] = { - 17, 59, 72, 111, -1 }; +static const int ncp_0x1720_req_cond_indexes[] = { 89, 90, 91, 92, -1 }; -static const int ncp_0x3f_req_cond_indexes[] = { - 20, 48, -1 }; +static const int ncp_0x3f_req_cond_indexes[] = { 115, 116, -1 }; -static const int ncp_0x5701_req_cond_indexes[] = { - 0, 2, 8, 13, 16, 18, 22, 27, 30, 32, 33, 34, 36, 37, 38, 40, 45, 47, 49, 51, 55, 57, 58, 61, 68, 70, 73, 74, 77, 78, 81, 83, 85, 90, 92, 93, 94, 95, 96, 97, 99, 106, 109, 112, 116, 117, 118, -1 }; +static const int ncp_0x5701_req_cond_indexes[] = { 24, 25, 26, 27, 28, 29, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 74, 75, 76, 77, 78, 79, 80, 81, 82, 108, 110, 111, 112, 114, -1 }; -static const int ncp_0x5706_req_cond_indexes[] = { - 0, 2, 3, 8, 11, 12, 13, 15, 16, 19, 22, 25, 28, 29, 30, 34, 37, 38, 41, 42, 44, 46, 50, 51, 52, 57, 60, 61, 65, 69, 70, 73, 76, 81, 86, 89, 92, 93, 97, 98, 99, 101, 102, 106, 109, 110, 112, 115, 117, 118, -1 }; +static const int ncp_0x5706_req_cond_indexes[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 31, 32, 33, 34, 35, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 108, 109, 110, 111, 112, 113, 114, -1 }; -static const int ncp_0x570c_req_cond_indexes[] = { - 43, 104, -1 }; +static const int ncp_0x570c_req_cond_indexes[] = { 58, 59, -1 }; -static const int ncp_0x5710_req_cond_indexes[] = { - 0, 2, 3, 5, 8, 11, 13, 15, 19, 21, 25, 28, 29, 34, 37, 38, 41, 42, 44, 46, 50, 52, 60, 65, 69, 76, 81, 86, 89, 98, 99, 101, 106, 109, 110, -1 }; +static const int ncp_0x5710_req_cond_indexes[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1 }; -static const int ncp_0x5713_req_cond_indexes[] = { - 4, 9, 24, 26, 35, 39, 71, 75, 84, 91, 103, 107, 108, -1 }; +static const int ncp_0x5713_req_cond_indexes[] = { 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, -1 }; -static const int ncp_0x571f_req_cond_indexes[] = { - 6, 62, 63, 64, 66, 67, -1 }; +static const int ncp_0x571f_req_cond_indexes[] = { 83, 84, 85, 86, 87, 88, -1 }; -static const int ncp_0x5729_req_cond_indexes[] = { - 88, 119, -1 }; +static const int ncp_0x5729_req_cond_indexes[] = { 60, 61, -1 }; -static const int ncp_0x5901_req_cond_indexes[] = { - 0, 2, 8, 12, 13, 16, 18, 22, 27, 30, 32, 33, 34, 36, 37, 38, 40, 45, 47, 49, 51, 55, 57, 58, 61, 68, 70, 73, 74, 77, 78, 81, 83, 85, 90, 92, 93, 94, 95, 96, 97, 99, 106, 109, 112, 116, 117, 118, -1 }; +static const int ncp_0x5901_req_cond_indexes[] = { 24, 25, 26, 27, 28, 29, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 108, 110, 111, 112, 114, -1 }; -static const int ncp_0x5906_req_cond_indexes[] = { - 0, 2, 3, 8, 11, 12, 13, 15, 16, 19, 22, 25, 28, 29, 30, 34, 37, 38, 41, 42, 44, 46, 50, 51, 52, 57, 60, 61, 65, 69, 70, 73, 76, 81, 86, 89, 92, 93, 97, 98, 99, 101, 106, 109, 110, 112, 117, 118, -1 }; +static const int ncp_0x5906_req_cond_indexes[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 31, 32, 33, 34, 35, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 108, 110, 111, 112, 114, -1 }; -static const int ncp_0x5910_req_cond_indexes[] = { - 0, 2, 3, 5, 8, 11, 12, 13, 15, 19, 21, 25, 28, 29, 34, 37, 38, 41, 42, 44, 46, 50, 52, 60, 65, 69, 76, 81, 86, 89, 98, 99, 101, 106, 109, 110, -1 }; +static const int ncp_0x5910_req_cond_indexes[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 73, -1 }; -static const int ncp_0x591d_req_cond_indexes[] = { - 0, 2, 3, 5, 8, 11, 13, 15, 19, 21, 25, 28, 29, 34, 37, 38, 41, 42, 44, 46, 50, 52, 60, 65, 69, 76, 81, 86, 87, 89, 98, 99, 101, 106, 109, 110, -1 }; +static const int ncp_0x591d_req_cond_indexes[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1 }; -static const int ncp_0x5a84_req_cond_indexes[] = { - 53, 54, 56, -1 }; +static const int ncp_0x5a84_req_cond_indexes[] = { 62, 63, 64, -1 }; -static const int ncp_0x7b10_req_cond_indexes[] = { - 1, 7, 10, 14, 23, 79, 80, 100, -1 }; +static const int ncp_0x7b10_req_cond_indexes[] = { 65, 66, 67, 68, 69, 70, 71, 72, -1 }; -static const int ncp_0x7b22_req_cond_indexes[] = { - 31, 82, -1 }; +static const int ncp_0x7b22_req_cond_indexes[] = { 93, 94, -1 }; /* Info Strings */ static const info_string_t info_str_0x9_req = { @@ -17864,1665 +17847,1665 @@ ", %s" }; -#define SUBFUNC_WITH_LENGTH 0x02 -#define SUBFUNC_NO_LENGTH 0x01 -#define NO_SUBFUNC 0x00 +#define SUBFUNC_WITH_LENGTH 0x02 +#define SUBFUNC_NO_LENGTH 0x01 +#define NO_SUBFUNC 0x00 /* ncp_record structs for packets */ static const ncp_record ncp_packets[] = { - { 0x01, 0x00, NO_SUBFUNC, "File Set Lock", 0 /* sync */, + { 0x01, 0x00, NO_SUBFUNC, "File Set Lock", 0 /* sync */, NULL, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x02, 0x00, NO_SUBFUNC, "File Release Lock", 0 /* sync */, + { 0x02, 0x00, NO_SUBFUNC, "File Release Lock", 0 /* sync */, NULL, NULL, ncp_0x2_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x03, 0x00, NO_SUBFUNC, "Log File Exclusive", 0 /* sync */, + { 0x03, 0x00, NO_SUBFUNC, "Log File Exclusive", 0 /* sync */, ncp_0x3_request, NULL, ncp_0x3_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x04, 0x00, NO_SUBFUNC, "Lock File Set", 0 /* sync */, + { 0x04, 0x00, NO_SUBFUNC, "Lock File Set", 0 /* sync */, ncp_0x4_request, NULL, ncp_0x4_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x05, 0x00, NO_SUBFUNC, "Release File", 0 /* sync */, + { 0x05, 0x00, NO_SUBFUNC, "Release File", 0 /* sync */, ncp_0x5_request, NULL, ncp_0x5_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x06, 0x00, NO_SUBFUNC, "Release File Set", 0 /* sync */, + { 0x06, 0x00, NO_SUBFUNC, "Release File Set", 0 /* sync */, ncp_0x6_request, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x07, 0x00, NO_SUBFUNC, "Clear File", 0 /* sync */, + { 0x07, 0x00, NO_SUBFUNC, "Clear File", 0 /* sync */, ncp_0x5_request, NULL, ncp_0x7_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x08, 0x00, NO_SUBFUNC, "Clear File Set", 0 /* sync */, + { 0x08, 0x00, NO_SUBFUNC, "Clear File Set", 0 /* sync */, ncp_0x6_request, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x09, 0x00, NO_SUBFUNC, "Log Logical Record", 0 /* sync */, + { 0x09, 0x00, NO_SUBFUNC, "Log Logical Record", 0 /* sync */, ncp_0x9_request, NULL, ncp_0x9_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x9_req }, - { 0x0a, 0x00, NO_SUBFUNC, "Lock Logical Record Set", 0 /* sync */, + { 0x0a, 0x00, NO_SUBFUNC, "Lock Logical Record Set", 0 /* sync */, ncp_0xa_request, NULL, ncp_0xa_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x0b, 0x00, NO_SUBFUNC, "Clear Logical Record", 0 /* sync */, + { 0x0b, 0x00, NO_SUBFUNC, "Clear Logical Record", 0 /* sync */, ncp_0xb_request, NULL, ncp_0xb_errors, NULL, NO_REQ_COND_SIZE, &info_str_0xb_req }, - { 0x0c, 0x00, NO_SUBFUNC, "Release Logical Record", 0 /* sync */, + { 0x0c, 0x00, NO_SUBFUNC, "Release Logical Record", 0 /* sync */, ncp_0xb_request, NULL, ncp_0xb_errors, NULL, NO_REQ_COND_SIZE, &info_str_0xc_req }, - { 0x0d, 0x00, NO_SUBFUNC, "Release Logical Record Set", 0 /* sync */, + { 0x0d, 0x00, NO_SUBFUNC, "Release Logical Record Set", 0 /* sync */, ncp_0x6_request, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x0e, 0x00, NO_SUBFUNC, "Clear Logical Record Set", 0 /* sync */, + { 0x0e, 0x00, NO_SUBFUNC, "Clear Logical Record Set", 0 /* sync */, ncp_0x6_request, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x11, 0x00, SUBFUNC_WITH_LENGTH, "Write to Spool File", 1 /* print */, + { 0x11, 0x00, SUBFUNC_WITH_LENGTH, "Write to Spool File", 1 /* print */, ncp_0x1100_request, NULL, ncp_0x1100_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1100_req }, - { 0x11, 0x01, SUBFUNC_WITH_LENGTH, "Close Spool File", 1 /* print */, + { 0x11, 0x01, SUBFUNC_WITH_LENGTH, "Close Spool File", 1 /* print */, ncp_0x1101_request, NULL, ncp_0x1101_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x11, 0x02, SUBFUNC_WITH_LENGTH, "Set Spool File Flags", 1 /* print */, + { 0x11, 0x02, SUBFUNC_WITH_LENGTH, "Set Spool File Flags", 1 /* print */, ncp_0x1102_request, NULL, ncp_0x1102_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x11, 0x03, SUBFUNC_WITH_LENGTH, "Spool A Disk File", 1 /* print */, + { 0x11, 0x03, SUBFUNC_WITH_LENGTH, "Spool A Disk File", 1 /* print */, ncp_0x1103_request, NULL, ncp_0x1101_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1103_req }, - { 0x11, 0x06, SUBFUNC_WITH_LENGTH, "Get Printer Status", 1 /* print */, + { 0x11, 0x06, SUBFUNC_WITH_LENGTH, "Get Printer Status", 1 /* print */, ncp_0x1106_request, ncp_0x1106_reply, ncp_0x1106_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x11, 0x09, SUBFUNC_WITH_LENGTH, "Create Spool File", 1 /* print */, + { 0x11, 0x09, SUBFUNC_WITH_LENGTH, "Create Spool File", 1 /* print */, ncp_0x1103_request, NULL, ncp_0x1109_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1109_req }, - { 0x11, 0x0a, SUBFUNC_WITH_LENGTH, "Get Printer's Queue", 1 /* print */, + { 0x11, 0x0a, SUBFUNC_WITH_LENGTH, "Get Printer's Queue", 1 /* print */, ncp_0x1106_request, ncp_0x110a_reply, ncp_0x110a_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x12, 0x00, NO_SUBFUNC, "Get Volume Info with Number", 2 /* file */, + { 0x12, 0x00, NO_SUBFUNC, "Get Volume Info with Number", 2 /* file */, ncp_0x12_request, ncp_0x12_reply, ncp_0x12_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x12_req }, - { 0x13, 0x00, NO_SUBFUNC, "Get Station Number", 3 /* connection */, + { 0x13, 0x00, NO_SUBFUNC, "Get Station Number", 3 /* connection */, NULL, ncp_0x13_reply, ncp_0x2_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x14, 0x00, NO_SUBFUNC, "Get File Server Date And Time", 4 /* fileserver */, + { 0x14, 0x00, NO_SUBFUNC, "Get File Server Date And Time", 4 /* fileserver */, NULL, ncp_0x14_reply, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x15, 0x00, SUBFUNC_WITH_LENGTH, "Send Broadcast Message", 5 /* message */, + { 0x15, 0x00, SUBFUNC_WITH_LENGTH, "Send Broadcast Message", 5 /* message */, ncp_0x1500_request, ncp_0x1500_reply, ncp_0x1500_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1500_req }, - { 0x15, 0x01, SUBFUNC_WITH_LENGTH, "Get Broadcast Message", 5 /* message */, + { 0x15, 0x01, SUBFUNC_WITH_LENGTH, "Get Broadcast Message", 5 /* message */, NULL, ncp_0x1501_reply, ncp_0x1500_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x15, 0x02, SUBFUNC_WITH_LENGTH, "Disable Broadcasts", 5 /* message */, + { 0x15, 0x02, SUBFUNC_WITH_LENGTH, "Disable Broadcasts", 5 /* message */, NULL, NULL, ncp_0x1502_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x15, 0x03, SUBFUNC_WITH_LENGTH, "Enable Broadcasts", 5 /* message */, + { 0x15, 0x03, SUBFUNC_WITH_LENGTH, "Enable Broadcasts", 5 /* message */, NULL, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x15, 0x09, SUBFUNC_WITH_LENGTH, "Broadcast To Console", 5 /* message */, + { 0x15, 0x09, SUBFUNC_WITH_LENGTH, "Broadcast To Console", 5 /* message */, ncp_0x1501_reply, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1509_req }, - { 0x15, 0x0a, SUBFUNC_WITH_LENGTH, "Send Broadcast Message", 5 /* message */, + { 0x15, 0x0a, SUBFUNC_WITH_LENGTH, "Send Broadcast Message", 5 /* message */, ncp_0x150a_request, ncp_0x150a_reply, ncp_0x1500_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x150a_req }, - { 0x15, 0x0b, SUBFUNC_WITH_LENGTH, "Get Broadcast Message", 5 /* message */, + { 0x15, 0x0b, SUBFUNC_WITH_LENGTH, "Get Broadcast Message", 5 /* message */, NULL, ncp_0x1501_reply, ncp_0x1500_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x15, 0x0c, SUBFUNC_WITH_LENGTH, "Connection Message Control", 5 /* message */, + { 0x15, 0x0c, SUBFUNC_WITH_LENGTH, "Connection Message Control", 5 /* message */, ncp_0x150c_request, NULL, ncp_0x2_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x16, 0x00, SUBFUNC_WITH_LENGTH, "Set Directory Handle", 2 /* file */, + { 0x16, 0x00, SUBFUNC_WITH_LENGTH, "Set Directory Handle", 2 /* file */, ncp_0x1600_request, NULL, ncp_0x1600_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1600_req }, - { 0x16, 0x01, SUBFUNC_WITH_LENGTH, "Get Directory Path", 2 /* file */, + { 0x16, 0x01, SUBFUNC_WITH_LENGTH, "Get Directory Path", 2 /* file */, ncp_0x1601_request, ncp_0x1601_reply, ncp_0x1601_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1601_req }, - { 0x16, 0x02, SUBFUNC_WITH_LENGTH, "Scan Directory Information", 2 /* file */, + { 0x16, 0x02, SUBFUNC_WITH_LENGTH, "Scan Directory Information", 2 /* file */, ncp_0x1602_request, ncp_0x1602_reply, ncp_0x1600_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1602_req }, - { 0x16, 0x03, SUBFUNC_WITH_LENGTH, "Get Effective Directory Rights", 2 /* file */, + { 0x16, 0x03, SUBFUNC_WITH_LENGTH, "Get Effective Directory Rights", 2 /* file */, ncp_0x1603_request, ncp_0x1603_reply, ncp_0x1600_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1603_req }, - { 0x16, 0x04, SUBFUNC_WITH_LENGTH, "Modify Maximum Rights Mask", 2 /* file */, + { 0x16, 0x04, SUBFUNC_WITH_LENGTH, "Modify Maximum Rights Mask", 2 /* file */, ncp_0x1604_request, NULL, ncp_0x1604_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1604_req }, - { 0x16, 0x05, SUBFUNC_WITH_LENGTH, "Get Volume Number", 2 /* file */, + { 0x16, 0x05, SUBFUNC_WITH_LENGTH, "Get Volume Number", 2 /* file */, ncp_0x1605_request, ncp_0x12_request, ncp_0x1605_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1605_req }, - { 0x16, 0x06, SUBFUNC_WITH_LENGTH, "Get Volume Name", 2 /* file */, + { 0x16, 0x06, SUBFUNC_WITH_LENGTH, "Get Volume Name", 2 /* file */, ncp_0x12_request, ncp_0x1605_request, ncp_0x1606_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1606_req }, - { 0x16, 0x0a, SUBFUNC_WITH_LENGTH, "Create Directory", 2 /* file */, + { 0x16, 0x0a, SUBFUNC_WITH_LENGTH, "Create Directory", 2 /* file */, ncp_0x160a_request, NULL, ncp_0x160a_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x160a_req }, - { 0x16, 0x0b, SUBFUNC_WITH_LENGTH, "Delete Directory", 2 /* file */, + { 0x16, 0x0b, SUBFUNC_WITH_LENGTH, "Delete Directory", 2 /* file */, ncp_0x160b_request, NULL, ncp_0x160b_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x160b_req }, - { 0x16, 0x0c, SUBFUNC_WITH_LENGTH, "Scan Directory for Trustees", 2 /* file */, + { 0x16, 0x0c, SUBFUNC_WITH_LENGTH, "Scan Directory for Trustees", 2 /* file */, ncp_0x160c_request, ncp_0x160c_reply, ncp_0x160c_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x160c_req }, - { 0x16, 0x0d, SUBFUNC_WITH_LENGTH, "Add Trustee to Directory", 2 /* file */, + { 0x16, 0x0d, SUBFUNC_WITH_LENGTH, "Add Trustee to Directory", 2 /* file */, ncp_0x160d_request, NULL, ncp_0x160d_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x160d_req }, - { 0x16, 0x0e, SUBFUNC_WITH_LENGTH, "Delete Trustee from Directory", 2 /* file */, + { 0x16, 0x0e, SUBFUNC_WITH_LENGTH, "Delete Trustee from Directory", 2 /* file */, ncp_0x160e_request, NULL, ncp_0x160e_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x160e_req }, - { 0x16, 0x0f, SUBFUNC_WITH_LENGTH, "Rename Directory", 2 /* file */, + { 0x16, 0x0f, SUBFUNC_WITH_LENGTH, "Rename Directory", 2 /* file */, ncp_0x160f_request, NULL, ncp_0x160f_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x160f_req }, - { 0x16, 0x10, SUBFUNC_WITH_LENGTH, "Purge Erased Files", 2 /* file */, + { 0x16, 0x10, SUBFUNC_WITH_LENGTH, "Purge Erased Files", 2 /* file */, NULL, NULL, ncp_0x1610_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x16, 0x11, SUBFUNC_WITH_LENGTH, "Recover Erased File", 2 /* file */, + { 0x16, 0x11, SUBFUNC_WITH_LENGTH, "Recover Erased File", 2 /* file */, ncp_0x1601_request, ncp_0x1611_reply, ncp_0x1611_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1611_req }, - { 0x16, 0x12, SUBFUNC_WITH_LENGTH, "Alloc Permanent Directory Handle", 2 /* file */, + { 0x16, 0x12, SUBFUNC_WITH_LENGTH, "Alloc Permanent Directory Handle", 2 /* file */, ncp_0x1612_request, ncp_0x1612_reply, ncp_0x1612_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1612_req }, - { 0x16, 0x13, SUBFUNC_WITH_LENGTH, "Alloc Temporary Directory Handle", 2 /* file */, + { 0x16, 0x13, SUBFUNC_WITH_LENGTH, "Alloc Temporary Directory Handle", 2 /* file */, ncp_0x1612_request, ncp_0x1612_reply, ncp_0x1613_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1613_req }, - { 0x16, 0x14, SUBFUNC_WITH_LENGTH, "Deallocate Directory Handle", 2 /* file */, + { 0x16, 0x14, SUBFUNC_WITH_LENGTH, "Deallocate Directory Handle", 2 /* file */, ncp_0x1601_request, NULL, ncp_0x1614_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1614_req }, - { 0x16, 0x15, SUBFUNC_WITH_LENGTH, "Get Volume Info with Handle", 2 /* file */, + { 0x16, 0x15, SUBFUNC_WITH_LENGTH, "Get Volume Info with Handle", 2 /* file */, ncp_0x1601_request, ncp_0x12_reply, ncp_0x2_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1615_req }, - { 0x16, 0x16, SUBFUNC_WITH_LENGTH, "Alloc Special Temporary Directory Handle", 2 /* file */, + { 0x16, 0x16, SUBFUNC_WITH_LENGTH, "Alloc Special Temporary Directory Handle", 2 /* file */, ncp_0x1612_request, ncp_0x1612_reply, ncp_0x1612_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1616_req }, - { 0x16, 0x17, SUBFUNC_WITH_LENGTH, "Extract a Base Handle", 2 /* file */, + { 0x16, 0x17, SUBFUNC_WITH_LENGTH, "Extract a Base Handle", 2 /* file */, ncp_0x1601_request, ncp_0x1617_reply, ncp_0x1617_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1617_req }, - { 0x16, 0x18, SUBFUNC_WITH_LENGTH, "Restore an Extracted Base Handle", 2 /* file */, + { 0x16, 0x18, SUBFUNC_WITH_LENGTH, "Restore an Extracted Base Handle", 2 /* file */, ncp_0x1617_reply, ncp_0x1612_reply, ncp_0x1618_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x16, 0x19, SUBFUNC_WITH_LENGTH, "Set Directory Information", 2 /* file */, + { 0x16, 0x19, SUBFUNC_WITH_LENGTH, "Set Directory Information", 2 /* file */, ncp_0x1619_request, NULL, ncp_0x1619_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1619_req }, - { 0x16, 0x1a, SUBFUNC_WITH_LENGTH, "Get Path Name of a Volume-Directory Number Pair", 2 /* file */, + { 0x16, 0x1a, SUBFUNC_WITH_LENGTH, "Get Path Name of a Volume-Directory Number Pair", 2 /* file */, ncp_0x161a_request, ncp_0x1601_reply, ncp_0x161a_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x16, 0x1b, SUBFUNC_WITH_LENGTH, "Scan Salvageable Files", 2 /* file */, + { 0x16, 0x1b, SUBFUNC_WITH_LENGTH, "Scan Salvageable Files", 2 /* file */, ncp_0x161b_request, ncp_0x161b_reply, ncp_0x161b_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x16, 0x1c, SUBFUNC_WITH_LENGTH, "Recover Salvageable File", 2 /* file */, + { 0x16, 0x1c, SUBFUNC_WITH_LENGTH, "Recover Salvageable File", 2 /* file */, ncp_0x161c_request, NULL, ncp_0x161c_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x161c_req }, - { 0x16, 0x1d, SUBFUNC_WITH_LENGTH, "Purge Salvageable File", 2 /* file */, + { 0x16, 0x1d, SUBFUNC_WITH_LENGTH, "Purge Salvageable File", 2 /* file */, ncp_0x161b_request, NULL, ncp_0x161d_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x16, 0x1e, SUBFUNC_WITH_LENGTH, "Scan a Directory", 2 /* file */, + { 0x16, 0x1e, SUBFUNC_WITH_LENGTH, "Scan a Directory", 2 /* file */, ncp_0x161e_request, ncp_0x161e_reply, ncp_0x161d_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x161e_req }, - { 0x16, 0x1f, SUBFUNC_WITH_LENGTH, "Get Directory Entry", 2 /* file */, + { 0x16, 0x1f, SUBFUNC_WITH_LENGTH, "Get Directory Entry", 2 /* file */, ncp_0x1601_request, ncp_0x161f_reply, ncp_0x161f_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x16, 0x20, SUBFUNC_WITH_LENGTH, "Scan Volume's User Disk Restrictions", 2 /* file */, + { 0x16, 0x20, SUBFUNC_WITH_LENGTH, "Scan Volume's User Disk Restrictions", 2 /* file */, ncp_0x1620_request, ncp_0x1620_reply, ncp_0x1620_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x16, 0x21, SUBFUNC_WITH_LENGTH, "Add User Disk Space Restriction", 2 /* file */, + { 0x16, 0x21, SUBFUNC_WITH_LENGTH, "Add User Disk Space Restriction", 2 /* file */, ncp_0x1621_request, NULL, ncp_0x1621_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x16, 0x22, SUBFUNC_WITH_LENGTH, "Remove User Disk Space Restrictions", 2 /* file */, + { 0x16, 0x22, SUBFUNC_WITH_LENGTH, "Remove User Disk Space Restrictions", 2 /* file */, ncp_0x1622_request, NULL, ncp_0x1622_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x16, 0x23, SUBFUNC_WITH_LENGTH, "Get Directory Disk Space Restriction", 2 /* file */, + { 0x16, 0x23, SUBFUNC_WITH_LENGTH, "Get Directory Disk Space Restriction", 2 /* file */, ncp_0x1601_request, ncp_0x1623_reply, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x16, 0x24, SUBFUNC_WITH_LENGTH, "Set Directory Disk Space Restriction", 2 /* file */, + { 0x16, 0x24, SUBFUNC_WITH_LENGTH, "Set Directory Disk Space Restriction", 2 /* file */, ncp_0x1624_request, NULL, ncp_0x1624_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x16, 0x25, SUBFUNC_WITH_LENGTH, "Set Directory Entry Information", 2 /* file */, + { 0x16, 0x25, SUBFUNC_WITH_LENGTH, "Set Directory Entry Information", 2 /* file */, ncp_0x1625_request, NULL, ncp_0x1625_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x16, 0x26, SUBFUNC_WITH_LENGTH, "Scan File or Directory for Extended Trustees", 2 /* file */, + { 0x16, 0x26, SUBFUNC_WITH_LENGTH, "Scan File or Directory for Extended Trustees", 2 /* file */, ncp_0x1626_request, ncp_0x1626_reply, ncp_0x1626_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1626_req }, - { 0x16, 0x27, SUBFUNC_WITH_LENGTH, "Add Extended Trustee to Directory or File", 2 /* file */, + { 0x16, 0x27, SUBFUNC_WITH_LENGTH, "Add Extended Trustee to Directory or File", 2 /* file */, ncp_0x1627_request, NULL, ncp_0x1627_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1627_req }, - { 0x16, 0x28, SUBFUNC_WITH_LENGTH, "Scan Directory Disk Space", 2 /* file */, + { 0x16, 0x28, SUBFUNC_WITH_LENGTH, "Scan Directory Disk Space", 2 /* file */, ncp_0x1628_request, ncp_0x1628_reply, ncp_0x1628_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1628_req }, - { 0x16, 0x29, SUBFUNC_WITH_LENGTH, "Get Object Disk Usage and Restrictions", 2 /* file */, + { 0x16, 0x29, SUBFUNC_WITH_LENGTH, "Get Object Disk Usage and Restrictions", 2 /* file */, ncp_0x1629_request, ncp_0x1629_reply, ncp_0x1629_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x16, 0x2a, SUBFUNC_WITH_LENGTH, "Get Effective Rights for Directory Entry", 2 /* file */, + { 0x16, 0x2a, SUBFUNC_WITH_LENGTH, "Get Effective Rights for Directory Entry", 2 /* file */, ncp_0x1603_request, ncp_0x162a_reply, ncp_0x162a_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x162a_req }, - { 0x16, 0x2b, SUBFUNC_WITH_LENGTH, "Remove Extended Trustee from Dir or File", 2 /* file */, + { 0x16, 0x2b, SUBFUNC_WITH_LENGTH, "Remove Extended Trustee from Dir or File", 2 /* file */, ncp_0x162b_request, NULL, ncp_0x162b_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x162b_req }, - { 0x16, 0x2c, SUBFUNC_WITH_LENGTH, "Get Volume and Purge Information", 2 /* file */, + { 0x16, 0x2c, SUBFUNC_WITH_LENGTH, "Get Volume and Purge Information", 2 /* file */, ncp_0x12_request, ncp_0x162c_reply, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x162c_req }, - { 0x16, 0x2d, SUBFUNC_WITH_LENGTH, "Get Directory Information", 2 /* file */, + { 0x16, 0x2d, SUBFUNC_WITH_LENGTH, "Get Directory Information", 2 /* file */, ncp_0x1601_request, ncp_0x162d_reply, ncp_0x1614_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x16, 0x2e, SUBFUNC_WITH_LENGTH, "Rename Or Move", 2 /* file */, + { 0x16, 0x2e, SUBFUNC_WITH_LENGTH, "Rename Or Move", 2 /* file */, ncp_0x162e_request, NULL, ncp_0x162e_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x162e_req }, - { 0x16, 0x2f, SUBFUNC_WITH_LENGTH, "Get Name Space Information", 2 /* file */, + { 0x16, 0x2f, SUBFUNC_WITH_LENGTH, "Get Name Space Information", 2 /* file */, ncp_0x12_request, ncp_0x162f_reply, ncp_0x162f_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x162f_req }, - { 0x16, 0x30, SUBFUNC_WITH_LENGTH, "Get Name Space Directory Entry", 2 /* file */, + { 0x16, 0x30, SUBFUNC_WITH_LENGTH, "Get Name Space Directory Entry", 2 /* file */, ncp_0x1630_request, ncp_0x1630_reply, ncp_0x1630_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x16, 0x31, SUBFUNC_WITH_LENGTH, "Open Data Stream", 2 /* file */, + { 0x16, 0x31, SUBFUNC_WITH_LENGTH, "Open Data Stream", 2 /* file */, ncp_0x1631_request, ncp_0x1631_reply, ncp_0x1631_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1631_req }, - { 0x16, 0x32, SUBFUNC_WITH_LENGTH, "Get Object Effective Rights for Directory Entry", 2 /* file */, + { 0x16, 0x32, SUBFUNC_WITH_LENGTH, "Get Object Effective Rights for Directory Entry", 2 /* file */, ncp_0x1632_request, ncp_0x1632_reply, ncp_0x1632_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1632_req }, - { 0x16, 0x33, SUBFUNC_WITH_LENGTH, "Get Extended Volume Information", 2 /* file */, + { 0x16, 0x33, SUBFUNC_WITH_LENGTH, "Get Extended Volume Information", 2 /* file */, ncp_0x12_request, ncp_0x1633_reply, ncp_0x1633_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1633_req }, - { 0x16, 0x34, SUBFUNC_WITH_LENGTH, "Get Mount Volume List", 2 /* file */, + { 0x16, 0x34, SUBFUNC_WITH_LENGTH, "Get Mount Volume List", 2 /* file */, ncp_0x1634_request, ncp_0x1634_reply, ncp_0x1629_errors, ncp_0x1634_req_cond_indexes, REQ_COND_SIZE_VARIABLE, NULL }, - { 0x16, 0x35, SUBFUNC_WITH_LENGTH, "Get Volume Capabilities", 2 /* file */, + { 0x16, 0x35, SUBFUNC_WITH_LENGTH, "Get Volume Capabilities", 2 /* file */, ncp_0x1635_request, ncp_0x1635_reply, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x00, SUBFUNC_WITH_LENGTH, "Login User", 3 /* connection */, + { 0x17, 0x00, SUBFUNC_WITH_LENGTH, "Login User", 3 /* connection */, ncp_0x1700_request, NULL, ncp_0x1700_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1700_req }, - { 0x17, 0x01, SUBFUNC_WITH_LENGTH, "Change User Password", 6 /* bindery */, + { 0x17, 0x01, SUBFUNC_WITH_LENGTH, "Change User Password", 6 /* bindery */, ncp_0x1701_request, NULL, ncp_0x1701_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1701_req }, - { 0x17, 0x02, SUBFUNC_WITH_LENGTH, "Get User Connection List", 3 /* connection */, + { 0x17, 0x02, SUBFUNC_WITH_LENGTH, "Get User Connection List", 3 /* connection */, ncp_0x1702_request, ncp_0x1702_reply, ncp_0x1702_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1702_req }, - { 0x17, 0x03, SUBFUNC_WITH_LENGTH, "Get User Number", 6 /* bindery */, + { 0x17, 0x03, SUBFUNC_WITH_LENGTH, "Get User Number", 6 /* bindery */, ncp_0x1702_request, ncp_0x110a_reply, ncp_0x1702_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1703_req }, - { 0x17, 0x05, SUBFUNC_WITH_LENGTH, "Get Station's Logged Info", 3 /* connection */, + { 0x17, 0x05, SUBFUNC_WITH_LENGTH, "Get Station's Logged Info", 3 /* connection */, ncp_0x1705_request, ncp_0x1705_reply, ncp_0x1705_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1705_req }, - { 0x17, 0x07, SUBFUNC_WITH_LENGTH, "Get Group Number", 6 /* bindery */, + { 0x17, 0x07, SUBFUNC_WITH_LENGTH, "Get Group Number", 6 /* bindery */, ncp_0x110a_reply, ncp_0x1707_reply, ncp_0x1707_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x0c, SUBFUNC_WITH_LENGTH, "Verify Serialization", 4 /* fileserver */, + { 0x17, 0x0c, SUBFUNC_WITH_LENGTH, "Verify Serialization", 4 /* fileserver */, ncp_0x170c_request, NULL, ncp_0x2_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x0d, SUBFUNC_WITH_LENGTH, "Log Network Message", 2 /* file */, + { 0x17, 0x0d, SUBFUNC_WITH_LENGTH, "Log Network Message", 2 /* file */, ncp_0x1501_reply, NULL, ncp_0x170d_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x170d_req }, - { 0x17, 0x0e, SUBFUNC_WITH_LENGTH, "Get Disk Utilization", 4 /* fileserver */, + { 0x17, 0x0e, SUBFUNC_WITH_LENGTH, "Get Disk Utilization", 4 /* fileserver */, ncp_0x170e_request, ncp_0x170e_reply, ncp_0x170e_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x0f, SUBFUNC_WITH_LENGTH, "Scan File Information", 2 /* file */, + { 0x17, 0x0f, SUBFUNC_WITH_LENGTH, "Scan File Information", 2 /* file */, ncp_0x170f_request, ncp_0x170f_reply, ncp_0x170f_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x170f_req }, - { 0x17, 0x10, SUBFUNC_WITH_LENGTH, "Set File Information", 2 /* file */, + { 0x17, 0x10, SUBFUNC_WITH_LENGTH, "Set File Information", 2 /* file */, ncp_0x1710_request, NULL, ncp_0x1710_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1710_req }, - { 0x17, 0x11, SUBFUNC_WITH_LENGTH, "Get File Server Information", 4 /* fileserver */, + { 0x17, 0x11, SUBFUNC_WITH_LENGTH, "Get File Server Information", 4 /* fileserver */, NULL, ncp_0x1711_reply, ncp_0x1711_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x12, SUBFUNC_WITH_LENGTH, "Get Network Serial Number", 4 /* fileserver */, + { 0x17, 0x12, SUBFUNC_WITH_LENGTH, "Get Network Serial Number", 4 /* fileserver */, NULL, ncp_0x1712_reply, ncp_0x1711_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x13, SUBFUNC_WITH_LENGTH, "Get Internet Address", 3 /* connection */, + { 0x17, 0x13, SUBFUNC_WITH_LENGTH, "Get Internet Address", 3 /* connection */, ncp_0x1705_request, ncp_0x1713_reply, ncp_0x2_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1713_req }, - { 0x17, 0x14, SUBFUNC_WITH_LENGTH, "Login Object", 3 /* connection */, + { 0x17, 0x14, SUBFUNC_WITH_LENGTH, "Login Object", 3 /* connection */, ncp_0x1714_request, NULL, ncp_0x1714_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1714_req }, - { 0x17, 0x15, SUBFUNC_WITH_LENGTH, "Get Object Connection List", 3 /* connection */, + { 0x17, 0x15, SUBFUNC_WITH_LENGTH, "Get Object Connection List", 3 /* connection */, ncp_0x1715_request, ncp_0x1702_reply, ncp_0x1702_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1715_req }, - { 0x17, 0x16, SUBFUNC_WITH_LENGTH, "Get Station's Logged Info", 3 /* connection */, + { 0x17, 0x16, SUBFUNC_WITH_LENGTH, "Get Station's Logged Info", 3 /* connection */, ncp_0x1705_request, ncp_0x1716_reply, ncp_0x1716_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x17, SUBFUNC_WITH_LENGTH, "Get Login Key", 3 /* connection */, + { 0x17, 0x17, SUBFUNC_WITH_LENGTH, "Get Login Key", 3 /* connection */, NULL, ncp_0x1717_reply, ncp_0x1717_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x18, SUBFUNC_WITH_LENGTH, "Keyed Object Login", 3 /* connection */, + { 0x17, 0x18, SUBFUNC_WITH_LENGTH, "Keyed Object Login", 3 /* connection */, ncp_0x1718_request, NULL, ncp_0x1718_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1718_req }, - { 0x17, 0x1a, SUBFUNC_WITH_LENGTH, "Get Internet Address", 3 /* connection */, + { 0x17, 0x1a, SUBFUNC_WITH_LENGTH, "Get Internet Address", 3 /* connection */, ncp_0x171a_request, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x1b, SUBFUNC_WITH_LENGTH, "Get Object Connection List", 3 /* connection */, + { 0x17, 0x1b, SUBFUNC_WITH_LENGTH, "Get Object Connection List", 3 /* connection */, ncp_0x171b_request, ncp_0x171b_reply, ncp_0x1702_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x171b_req }, - { 0x17, 0x1c, SUBFUNC_WITH_LENGTH, "Get Station's Logged Info", 3 /* connection */, + { 0x17, 0x1c, SUBFUNC_WITH_LENGTH, "Get Station's Logged Info", 3 /* connection */, ncp_0x171c_request, ncp_0x1716_reply, ncp_0x171c_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x1d, SUBFUNC_WITH_LENGTH, "Change Connection State", 3 /* connection */, + { 0x17, 0x1d, SUBFUNC_WITH_LENGTH, "Change Connection State", 3 /* connection */, ncp_0x171d_request, NULL, ncp_0x171d_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x1e, SUBFUNC_WITH_LENGTH, "Set Watchdog Delay Interval", 3 /* connection */, + { 0x17, 0x1e, SUBFUNC_WITH_LENGTH, "Set Watchdog Delay Interval", 3 /* connection */, ncp_0x171e_request, NULL, ncp_0x171e_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x1f, SUBFUNC_WITH_LENGTH, "Get Connection List From Object", 3 /* connection */, + { 0x17, 0x1f, SUBFUNC_WITH_LENGTH, "Get Connection List From Object", 3 /* connection */, ncp_0x171f_request, ncp_0x1702_reply, ncp_0x1702_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x20, SUBFUNC_WITH_LENGTH, "Scan Bindery Object (List)", 6 /* bindery */, + { 0x17, 0x20, SUBFUNC_WITH_LENGTH, "Scan Bindery Object (List)", 6 /* bindery */, ncp_0x1720_request, ncp_0x1720_reply, ncp_0x1720_errors, ncp_0x1720_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x1720_req }, - { 0x17, 0x21, SUBFUNC_WITH_LENGTH, "Generate GUIDs", 3 /* connection */, + { 0x17, 0x21, SUBFUNC_WITH_LENGTH, "Generate GUIDs", 3 /* connection */, ncp_0x1721_request, ncp_0x1721_reply, ncp_0x1721_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x22, SUBFUNC_WITH_LENGTH, "Set Connection Language Encoding", 3 /* connection */, + { 0x17, 0x22, SUBFUNC_WITH_LENGTH, "Set Connection Language Encoding", 3 /* connection */, ncp_0x1722_request, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x32, SUBFUNC_WITH_LENGTH, "Create Bindery Object", 6 /* bindery */, + { 0x17, 0x32, SUBFUNC_WITH_LENGTH, "Create Bindery Object", 6 /* bindery */, ncp_0x1732_request, NULL, ncp_0x1732_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1732_req }, - { 0x17, 0x33, SUBFUNC_WITH_LENGTH, "Delete Bindery Object", 6 /* bindery */, + { 0x17, 0x33, SUBFUNC_WITH_LENGTH, "Delete Bindery Object", 6 /* bindery */, ncp_0x1733_request, NULL, ncp_0x1733_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1733_req }, - { 0x17, 0x34, SUBFUNC_WITH_LENGTH, "Rename Bindery Object", 6 /* bindery */, + { 0x17, 0x34, SUBFUNC_WITH_LENGTH, "Rename Bindery Object", 6 /* bindery */, ncp_0x1734_request, NULL, ncp_0x1734_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1734_req }, - { 0x17, 0x35, SUBFUNC_WITH_LENGTH, "Get Bindery Object ID", 6 /* bindery */, + { 0x17, 0x35, SUBFUNC_WITH_LENGTH, "Get Bindery Object ID", 6 /* bindery */, ncp_0x1733_request, ncp_0x1707_reply, ncp_0x1735_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1735_req }, - { 0x17, 0x36, SUBFUNC_WITH_LENGTH, "Get Bindery Object Name", 6 /* bindery */, + { 0x17, 0x36, SUBFUNC_WITH_LENGTH, "Get Bindery Object Name", 6 /* bindery */, ncp_0x110a_reply, ncp_0x1707_reply, ncp_0x1736_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x37, SUBFUNC_WITH_LENGTH, "Scan Bindery Object", 6 /* bindery */, + { 0x17, 0x37, SUBFUNC_WITH_LENGTH, "Scan Bindery Object", 6 /* bindery */, ncp_0x1737_request, ncp_0x1737_reply, ncp_0x1720_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1737_req }, - { 0x17, 0x38, SUBFUNC_WITH_LENGTH, "Change Bindery Object Security", 6 /* bindery */, + { 0x17, 0x38, SUBFUNC_WITH_LENGTH, "Change Bindery Object Security", 6 /* bindery */, ncp_0x1738_request, NULL, ncp_0x1738_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1738_req }, - { 0x17, 0x39, SUBFUNC_WITH_LENGTH, "Create Property", 6 /* bindery */, + { 0x17, 0x39, SUBFUNC_WITH_LENGTH, "Create Property", 6 /* bindery */, ncp_0x1739_request, NULL, ncp_0x1739_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1739_req }, - { 0x17, 0x3a, SUBFUNC_WITH_LENGTH, "Delete Property", 6 /* bindery */, + { 0x17, 0x3a, SUBFUNC_WITH_LENGTH, "Delete Property", 6 /* bindery */, ncp_0x173a_request, NULL, ncp_0x173a_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x173a_req }, - { 0x17, 0x3b, SUBFUNC_WITH_LENGTH, "Change Property Security", 6 /* bindery */, + { 0x17, 0x3b, SUBFUNC_WITH_LENGTH, "Change Property Security", 6 /* bindery */, ncp_0x173b_request, NULL, ncp_0x173b_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x173b_req }, - { 0x17, 0x3c, SUBFUNC_WITH_LENGTH, "Scan Property", 6 /* bindery */, + { 0x17, 0x3c, SUBFUNC_WITH_LENGTH, "Scan Property", 6 /* bindery */, ncp_0x173c_request, ncp_0x173c_reply, ncp_0x173b_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x173c_req }, - { 0x17, 0x3d, SUBFUNC_WITH_LENGTH, "Read Property Value", 6 /* bindery */, + { 0x17, 0x3d, SUBFUNC_WITH_LENGTH, "Read Property Value", 6 /* bindery */, ncp_0x173d_request, ncp_0x173d_reply, ncp_0x173d_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x173d_req }, - { 0x17, 0x3e, SUBFUNC_WITH_LENGTH, "Write Property Value", 6 /* bindery */, + { 0x17, 0x3e, SUBFUNC_WITH_LENGTH, "Write Property Value", 6 /* bindery */, ncp_0x173e_request, NULL, ncp_0x173e_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x173e_req }, - { 0x17, 0x3f, SUBFUNC_WITH_LENGTH, "Verify Bindery Object Password", 6 /* bindery */, + { 0x17, 0x3f, SUBFUNC_WITH_LENGTH, "Verify Bindery Object Password", 6 /* bindery */, ncp_0x173f_request, NULL, ncp_0x173f_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x173f_req }, - { 0x17, 0x40, SUBFUNC_WITH_LENGTH, "Change Bindery Object Password", 6 /* bindery */, + { 0x17, 0x40, SUBFUNC_WITH_LENGTH, "Change Bindery Object Password", 6 /* bindery */, ncp_0x1740_request, NULL, ncp_0x1740_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1740_req }, - { 0x17, 0x41, SUBFUNC_WITH_LENGTH, "Add Bindery Object To Set", 6 /* bindery */, + { 0x17, 0x41, SUBFUNC_WITH_LENGTH, "Add Bindery Object To Set", 6 /* bindery */, ncp_0x1741_request, NULL, ncp_0x1741_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1741_req }, - { 0x17, 0x42, SUBFUNC_WITH_LENGTH, "Delete Bindery Object From Set", 6 /* bindery */, + { 0x17, 0x42, SUBFUNC_WITH_LENGTH, "Delete Bindery Object From Set", 6 /* bindery */, ncp_0x1741_request, NULL, ncp_0x1742_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1742_req }, - { 0x17, 0x43, SUBFUNC_WITH_LENGTH, "Is Bindery Object In Set", 6 /* bindery */, + { 0x17, 0x43, SUBFUNC_WITH_LENGTH, "Is Bindery Object In Set", 6 /* bindery */, ncp_0x1741_request, NULL, ncp_0x1743_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1743_req }, - { 0x17, 0x44, SUBFUNC_WITH_LENGTH, "Close Bindery", 6 /* bindery */, + { 0x17, 0x44, SUBFUNC_WITH_LENGTH, "Close Bindery", 6 /* bindery */, NULL, NULL, ncp_0x2_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x45, SUBFUNC_WITH_LENGTH, "Open Bindery", 6 /* bindery */, + { 0x17, 0x45, SUBFUNC_WITH_LENGTH, "Open Bindery", 6 /* bindery */, NULL, NULL, ncp_0x2_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x46, SUBFUNC_WITH_LENGTH, "Get Bindery Access Level", 6 /* bindery */, + { 0x17, 0x46, SUBFUNC_WITH_LENGTH, "Get Bindery Access Level", 6 /* bindery */, NULL, ncp_0x1746_reply, ncp_0x1711_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x47, SUBFUNC_WITH_LENGTH, "Scan Bindery Object Trustee Paths", 6 /* bindery */, + { 0x17, 0x47, SUBFUNC_WITH_LENGTH, "Scan Bindery Object Trustee Paths", 6 /* bindery */, ncp_0x1747_request, ncp_0x1747_reply, ncp_0x1747_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x48, SUBFUNC_WITH_LENGTH, "Get Bindery Object Access Level", 6 /* bindery */, + { 0x17, 0x48, SUBFUNC_WITH_LENGTH, "Get Bindery Object Access Level", 6 /* bindery */, ncp_0x110a_reply, ncp_0x1748_reply, ncp_0x1711_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x49, SUBFUNC_WITH_LENGTH, "Is Calling Station a Manager", 6 /* bindery */, + { 0x17, 0x49, SUBFUNC_WITH_LENGTH, "Is Calling Station a Manager", 6 /* bindery */, NULL, NULL, ncp_0x1749_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x4a, SUBFUNC_WITH_LENGTH, "Keyed Verify Password", 6 /* bindery */, + { 0x17, 0x4a, SUBFUNC_WITH_LENGTH, "Keyed Verify Password", 6 /* bindery */, ncp_0x1718_request, NULL, ncp_0x174a_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x174a_req }, - { 0x17, 0x4b, SUBFUNC_WITH_LENGTH, "Keyed Change Password", 6 /* bindery */, + { 0x17, 0x4b, SUBFUNC_WITH_LENGTH, "Keyed Change Password", 6 /* bindery */, ncp_0x174b_request, NULL, ncp_0x174a_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x174b_req }, - { 0x17, 0x4c, SUBFUNC_WITH_LENGTH, "List Relations Of an Object", 6 /* bindery */, + { 0x17, 0x4c, SUBFUNC_WITH_LENGTH, "List Relations Of an Object", 6 /* bindery */, ncp_0x174c_request, ncp_0x174c_reply, ncp_0x174c_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x174c_req }, - { 0x17, 0x64, SUBFUNC_WITH_LENGTH, "Create Queue", 7 /* qms */, + { 0x17, 0x64, SUBFUNC_WITH_LENGTH, "Create Queue", 7 /* qms */, ncp_0x1764_request, ncp_0x1764_reply, ncp_0x1764_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1764_req }, - { 0x17, 0x65, SUBFUNC_WITH_LENGTH, "Destroy Queue", 7 /* qms */, + { 0x17, 0x65, SUBFUNC_WITH_LENGTH, "Destroy Queue", 7 /* qms */, ncp_0x1764_reply, NULL, ncp_0x1765_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x66, SUBFUNC_WITH_LENGTH, "Read Queue Current Status", 7 /* qms */, + { 0x17, 0x66, SUBFUNC_WITH_LENGTH, "Read Queue Current Status", 7 /* qms */, ncp_0x1764_reply, ncp_0x1766_reply, ncp_0x1765_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x67, SUBFUNC_WITH_LENGTH, "Set Queue Current Status", 7 /* qms */, + { 0x17, 0x67, SUBFUNC_WITH_LENGTH, "Set Queue Current Status", 7 /* qms */, ncp_0x1767_request, NULL, ncp_0x1767_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x68, SUBFUNC_WITH_LENGTH, "Create Queue Job And File", 7 /* qms */, + { 0x17, 0x68, SUBFUNC_WITH_LENGTH, "Create Queue Job And File", 7 /* qms */, ncp_0x1768_request, ncp_0x1768_reply, ncp_0x1767_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x69, SUBFUNC_WITH_LENGTH, "Close File And Start Queue Job", 7 /* qms */, + { 0x17, 0x69, SUBFUNC_WITH_LENGTH, "Close File And Start Queue Job", 7 /* qms */, ncp_0x1769_request, NULL, ncp_0x1765_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x6a, SUBFUNC_WITH_LENGTH, "Remove Job From Queue", 7 /* qms */, + { 0x17, 0x6a, SUBFUNC_WITH_LENGTH, "Remove Job From Queue", 7 /* qms */, ncp_0x1769_request, NULL, ncp_0x1765_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x6b, SUBFUNC_WITH_LENGTH, "Get Queue Job List", 7 /* qms */, + { 0x17, 0x6b, SUBFUNC_WITH_LENGTH, "Get Queue Job List", 7 /* qms */, ncp_0x1764_reply, ncp_0x176b_reply, ncp_0x1765_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x6c, SUBFUNC_WITH_LENGTH, "Read Queue Job Entry", 7 /* qms */, + { 0x17, 0x6c, SUBFUNC_WITH_LENGTH, "Read Queue Job Entry", 7 /* qms */, ncp_0x1769_request, ncp_0x176c_reply, ncp_0x1765_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x6d, SUBFUNC_WITH_LENGTH, "Change Queue Job Entry", 7 /* qms */, + { 0x17, 0x6d, SUBFUNC_WITH_LENGTH, "Change Queue Job Entry", 7 /* qms */, ncp_0x176c_reply, NULL, ncp_0x176d_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x6e, SUBFUNC_WITH_LENGTH, "Change Queue Job Position", 7 /* qms */, + { 0x17, 0x6e, SUBFUNC_WITH_LENGTH, "Change Queue Job Position", 7 /* qms */, ncp_0x176e_request, NULL, ncp_0x176e_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x6f, SUBFUNC_WITH_LENGTH, "Attach Queue Server To Queue", 7 /* qms */, + { 0x17, 0x6f, SUBFUNC_WITH_LENGTH, "Attach Queue Server To Queue", 7 /* qms */, ncp_0x1764_reply, NULL, ncp_0x176f_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x70, SUBFUNC_WITH_LENGTH, "Detach Queue Server From Queue", 7 /* qms */, + { 0x17, 0x70, SUBFUNC_WITH_LENGTH, "Detach Queue Server From Queue", 7 /* qms */, ncp_0x1764_reply, NULL, ncp_0x1765_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x71, SUBFUNC_WITH_LENGTH, "Service Queue Job", 7 /* qms */, + { 0x17, 0x71, SUBFUNC_WITH_LENGTH, "Service Queue Job", 7 /* qms */, ncp_0x1771_request, ncp_0x1768_reply, ncp_0x1765_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x72, SUBFUNC_WITH_LENGTH, "Finish Servicing Queue Job", 7 /* qms */, + { 0x17, 0x72, SUBFUNC_WITH_LENGTH, "Finish Servicing Queue Job", 7 /* qms */, ncp_0x1772_request, NULL, ncp_0x1767_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x73, SUBFUNC_WITH_LENGTH, "Abort Servicing Queue Job", 7 /* qms */, + { 0x17, 0x73, SUBFUNC_WITH_LENGTH, "Abort Servicing Queue Job", 7 /* qms */, ncp_0x1769_request, NULL, ncp_0x1773_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x74, SUBFUNC_WITH_LENGTH, "Change To Client Rights", 7 /* qms */, + { 0x17, 0x74, SUBFUNC_WITH_LENGTH, "Change To Client Rights", 7 /* qms */, ncp_0x1769_request, NULL, ncp_0x176d_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x75, SUBFUNC_WITH_LENGTH, "Restore Queue Server Rights", 7 /* qms */, + { 0x17, 0x75, SUBFUNC_WITH_LENGTH, "Restore Queue Server Rights", 7 /* qms */, NULL, NULL, ncp_0x1765_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x76, SUBFUNC_WITH_LENGTH, "Read Queue Server Current Status", 7 /* qms */, + { 0x17, 0x76, SUBFUNC_WITH_LENGTH, "Read Queue Server Current Status", 7 /* qms */, ncp_0x1776_request, ncp_0x1776_reply, ncp_0x1765_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x77, SUBFUNC_WITH_LENGTH, "Set Queue Server Current Status", 7 /* qms */, + { 0x17, 0x77, SUBFUNC_WITH_LENGTH, "Set Queue Server Current Status", 7 /* qms */, ncp_0x1777_request, NULL, ncp_0x1765_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x78, SUBFUNC_WITH_LENGTH, "Get Queue Job File Size", 7 /* qms */, + { 0x17, 0x78, SUBFUNC_WITH_LENGTH, "Get Queue Job File Size", 7 /* qms */, ncp_0x1769_request, ncp_0x1778_reply, ncp_0x1767_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x79, SUBFUNC_WITH_LENGTH, "Create Queue Job And File", 7 /* qms */, + { 0x17, 0x79, SUBFUNC_WITH_LENGTH, "Create Queue Job And File", 7 /* qms */, ncp_0x1779_request, ncp_0x1779_reply, ncp_0x1767_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x7a, SUBFUNC_WITH_LENGTH, "Read Queue Job Entry", 7 /* qms */, + { 0x17, 0x7a, SUBFUNC_WITH_LENGTH, "Read Queue Job Entry", 7 /* qms */, ncp_0x177a_request, ncp_0x177a_reply, ncp_0x1765_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x7b, SUBFUNC_WITH_LENGTH, "Change Queue Job Entry", 7 /* qms */, + { 0x17, 0x7b, SUBFUNC_WITH_LENGTH, "Change Queue Job Entry", 7 /* qms */, ncp_0x1768_request, NULL, ncp_0x177b_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x7c, SUBFUNC_WITH_LENGTH, "Service Queue Job", 7 /* qms */, + { 0x17, 0x7c, SUBFUNC_WITH_LENGTH, "Service Queue Job", 7 /* qms */, ncp_0x177c_request, ncp_0x1779_reply, ncp_0x177c_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x7d, SUBFUNC_WITH_LENGTH, "Read Queue Current Status", 7 /* qms */, + { 0x17, 0x7d, SUBFUNC_WITH_LENGTH, "Read Queue Current Status", 7 /* qms */, ncp_0x1764_reply, ncp_0x177d_reply, ncp_0x1765_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x7e, SUBFUNC_WITH_LENGTH, "Set Queue Current Status", 7 /* qms */, + { 0x17, 0x7e, SUBFUNC_WITH_LENGTH, "Set Queue Current Status", 7 /* qms */, ncp_0x1767_request, NULL, ncp_0x1765_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x7f, SUBFUNC_WITH_LENGTH, "Close File And Start Queue Job", 7 /* qms */, + { 0x17, 0x7f, SUBFUNC_WITH_LENGTH, "Close File And Start Queue Job", 7 /* qms */, ncp_0x177a_request, NULL, ncp_0x1767_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x80, SUBFUNC_WITH_LENGTH, "Remove Job From Queue", 7 /* qms */, + { 0x17, 0x80, SUBFUNC_WITH_LENGTH, "Remove Job From Queue", 7 /* qms */, ncp_0x177a_request, NULL, ncp_0x1765_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x81, SUBFUNC_WITH_LENGTH, "Get Queue Job List", 7 /* qms */, + { 0x17, 0x81, SUBFUNC_WITH_LENGTH, "Get Queue Job List", 7 /* qms */, ncp_0x177a_request, ncp_0x1781_reply, ncp_0x1765_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x82, SUBFUNC_WITH_LENGTH, "Change Job Priority", 7 /* qms */, + { 0x17, 0x82, SUBFUNC_WITH_LENGTH, "Change Job Priority", 7 /* qms */, ncp_0x1782_request, NULL, ncp_0x1765_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x83, SUBFUNC_WITH_LENGTH, "Finish Servicing Queue Job", 7 /* qms */, + { 0x17, 0x83, SUBFUNC_WITH_LENGTH, "Finish Servicing Queue Job", 7 /* qms */, ncp_0x1783_request, NULL, ncp_0x177c_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x84, SUBFUNC_WITH_LENGTH, "Abort Servicing Queue Job", 7 /* qms */, + { 0x17, 0x84, SUBFUNC_WITH_LENGTH, "Abort Servicing Queue Job", 7 /* qms */, ncp_0x177a_request, NULL, ncp_0x1784_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x85, SUBFUNC_WITH_LENGTH, "Change To Client Rights", 7 /* qms */, + { 0x17, 0x85, SUBFUNC_WITH_LENGTH, "Change To Client Rights", 7 /* qms */, ncp_0x177a_request, NULL, ncp_0x176d_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x86, SUBFUNC_WITH_LENGTH, "Read Queue Server Current Status", 7 /* qms */, + { 0x17, 0x86, SUBFUNC_WITH_LENGTH, "Read Queue Server Current Status", 7 /* qms */, ncp_0x1786_request, ncp_0x1776_reply, ncp_0x1765_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x87, SUBFUNC_WITH_LENGTH, "Get Queue Job File Size", 7 /* qms */, + { 0x17, 0x87, SUBFUNC_WITH_LENGTH, "Get Queue Job File Size", 7 /* qms */, ncp_0x177a_request, ncp_0x1787_reply, ncp_0x177c_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x88, SUBFUNC_WITH_LENGTH, "Move Queue Job From Src Q to Dst Q", 7 /* qms */, + { 0x17, 0x88, SUBFUNC_WITH_LENGTH, "Move Queue Job From Src Q to Dst Q", 7 /* qms */, ncp_0x1788_request, ncp_0x1788_reply, ncp_0x1788_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x89, SUBFUNC_WITH_LENGTH, "Get Queue Jobs From Form List", 7 /* qms */, + { 0x17, 0x89, SUBFUNC_WITH_LENGTH, "Get Queue Jobs From Form List", 7 /* qms */, ncp_0x1789_request, ncp_0x1789_reply, ncp_0x1789_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x8a, SUBFUNC_WITH_LENGTH, "Service Queue Job By Form List", 7 /* qms */, + { 0x17, 0x8a, SUBFUNC_WITH_LENGTH, "Service Queue Job By Form List", 7 /* qms */, ncp_0x1789_request, ncp_0x1779_reply, ncp_0x178a_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0x96, SUBFUNC_WITH_LENGTH, "Get Current Account Status", 8 /* accounting */, + { 0x17, 0x96, SUBFUNC_WITH_LENGTH, "Get Current Account Status", 8 /* accounting */, ncp_0x1733_request, ncp_0x1796_reply, ncp_0x1796_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1796_req }, - { 0x17, 0x97, SUBFUNC_WITH_LENGTH, "Submit Account Charge", 8 /* accounting */, + { 0x17, 0x97, SUBFUNC_WITH_LENGTH, "Submit Account Charge", 8 /* accounting */, ncp_0x1797_request, NULL, ncp_0x1797_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1797_req }, - { 0x17, 0x98, SUBFUNC_WITH_LENGTH, "Submit Account Hold", 8 /* accounting */, + { 0x17, 0x98, SUBFUNC_WITH_LENGTH, "Submit Account Hold", 8 /* accounting */, ncp_0x1798_request, NULL, ncp_0x1797_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1798_req }, - { 0x17, 0x99, SUBFUNC_WITH_LENGTH, "Submit Account Note", 8 /* accounting */, + { 0x17, 0x99, SUBFUNC_WITH_LENGTH, "Submit Account Note", 8 /* accounting */, ncp_0x1799_request, NULL, ncp_0x1799_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1799_req }, - { 0x17, 0xc8, SUBFUNC_WITH_LENGTH, "Check Console Privileges", 4 /* fileserver */, + { 0x17, 0xc8, SUBFUNC_WITH_LENGTH, "Check Console Privileges", 4 /* fileserver */, NULL, NULL, ncp_0x17c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xc9, SUBFUNC_WITH_LENGTH, "Get File Server Description Strings", 4 /* fileserver */, + { 0x17, 0xc9, SUBFUNC_WITH_LENGTH, "Get File Server Description Strings", 4 /* fileserver */, NULL, ncp_0x17c9_reply, ncp_0x1711_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xca, SUBFUNC_WITH_LENGTH, "Set File Server Date And Time", 4 /* fileserver */, + { 0x17, 0xca, SUBFUNC_WITH_LENGTH, "Set File Server Date And Time", 4 /* fileserver */, ncp_0x17ca_request, NULL, ncp_0x17c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xcb, SUBFUNC_WITH_LENGTH, "Disable File Server Login", 4 /* fileserver */, + { 0x17, 0xcb, SUBFUNC_WITH_LENGTH, "Disable File Server Login", 4 /* fileserver */, NULL, NULL, ncp_0x17c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xcc, SUBFUNC_WITH_LENGTH, "Enable File Server Login", 4 /* fileserver */, + { 0x17, 0xcc, SUBFUNC_WITH_LENGTH, "Enable File Server Login", 4 /* fileserver */, NULL, NULL, ncp_0x17c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xcd, SUBFUNC_WITH_LENGTH, "Get File Server Login Status", 4 /* fileserver */, + { 0x17, 0xcd, SUBFUNC_WITH_LENGTH, "Get File Server Login Status", 4 /* fileserver */, NULL, ncp_0x17cd_reply, ncp_0x17cd_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xcf, SUBFUNC_WITH_LENGTH, "Disable Transaction Tracking", 4 /* fileserver */, + { 0x17, 0xcf, SUBFUNC_WITH_LENGTH, "Disable Transaction Tracking", 4 /* fileserver */, NULL, NULL, ncp_0x17c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xd0, SUBFUNC_WITH_LENGTH, "Enable Transaction Tracking", 4 /* fileserver */, + { 0x17, 0xd0, SUBFUNC_WITH_LENGTH, "Enable Transaction Tracking", 4 /* fileserver */, NULL, NULL, ncp_0x17c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xd1, SUBFUNC_WITH_LENGTH, "Send Console Broadcast", 4 /* fileserver */, + { 0x17, 0xd1, SUBFUNC_WITH_LENGTH, "Send Console Broadcast", 4 /* fileserver */, ncp_0x17d1_request, NULL, ncp_0x17d1_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x17d1_req }, - { 0x17, 0xd2, SUBFUNC_WITH_LENGTH, "Clear Connection Number", 4 /* fileserver */, + { 0x17, 0xd2, SUBFUNC_WITH_LENGTH, "Clear Connection Number", 4 /* fileserver */, ncp_0x17d2_request, NULL, ncp_0x17d1_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x17d2_req }, - { 0x17, 0xd3, SUBFUNC_WITH_LENGTH, "Down File Server", 4 /* fileserver */, + { 0x17, 0xd3, SUBFUNC_WITH_LENGTH, "Down File Server", 4 /* fileserver */, ncp_0x17d3_request, NULL, ncp_0x17d3_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xd4, SUBFUNC_WITH_LENGTH, "Get File System Statistics", 4 /* fileserver */, + { 0x17, 0xd4, SUBFUNC_WITH_LENGTH, "Get File System Statistics", 4 /* fileserver */, NULL, ncp_0x17d4_reply, ncp_0x17d4_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xd5, SUBFUNC_WITH_LENGTH, "Get Transaction Tracking Statistics", 4 /* fileserver */, + { 0x17, 0xd5, SUBFUNC_WITH_LENGTH, "Get Transaction Tracking Statistics", 4 /* fileserver */, ncp_0x17d5_request, ncp_0x17d5_reply, ncp_0x17d4_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xd6, SUBFUNC_WITH_LENGTH, "Read Disk Cache Statistics", 4 /* fileserver */, + { 0x17, 0xd6, SUBFUNC_WITH_LENGTH, "Read Disk Cache Statistics", 4 /* fileserver */, NULL, ncp_0x17d6_reply, ncp_0x17d4_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xd7, SUBFUNC_WITH_LENGTH, "Get Drive Mapping Table", 4 /* fileserver */, + { 0x17, 0xd7, SUBFUNC_WITH_LENGTH, "Get Drive Mapping Table", 4 /* fileserver */, NULL, ncp_0x17d7_reply, ncp_0x17d4_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xd8, SUBFUNC_WITH_LENGTH, "Read Physical Disk Statistics", 4 /* fileserver */, + { 0x17, 0xd8, SUBFUNC_WITH_LENGTH, "Read Physical Disk Statistics", 4 /* fileserver */, ncp_0x17d8_request, ncp_0x17d8_reply, ncp_0x17d4_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xd9, SUBFUNC_WITH_LENGTH, "Get Disk Channel Statistics", 4 /* fileserver */, + { 0x17, 0xd9, SUBFUNC_WITH_LENGTH, "Get Disk Channel Statistics", 4 /* fileserver */, ncp_0x17d9_request, ncp_0x17d9_reply, ncp_0x17d4_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xdb, SUBFUNC_WITH_LENGTH, "Get Connection's Open Files", 4 /* fileserver */, + { 0x17, 0xdb, SUBFUNC_WITH_LENGTH, "Get Connection's Open Files", 4 /* fileserver */, ncp_0x17db_request, ncp_0x17db_reply, ncp_0x17d4_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xdc, SUBFUNC_WITH_LENGTH, "Get Connection Using A File", 4 /* fileserver */, + { 0x17, 0xdc, SUBFUNC_WITH_LENGTH, "Get Connection Using A File", 4 /* fileserver */, ncp_0x17dc_request, ncp_0x17dc_reply, ncp_0x17d4_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x17dc_req }, - { 0x17, 0xdd, SUBFUNC_WITH_LENGTH, "Get Physical Record Locks By Connection And File", 4 /* fileserver */, + { 0x17, 0xdd, SUBFUNC_WITH_LENGTH, "Get Physical Record Locks By Connection And File", 4 /* fileserver */, ncp_0x17dd_request, ncp_0x17dd_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x17dd_req }, - { 0x17, 0xde, SUBFUNC_WITH_LENGTH, "Get Physical Record Locks By File", 4 /* fileserver */, + { 0x17, 0xde, SUBFUNC_WITH_LENGTH, "Get Physical Record Locks By File", 4 /* fileserver */, ncp_0x17de_request, ncp_0x17de_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x17de_req }, - { 0x17, 0xdf, SUBFUNC_WITH_LENGTH, "Get Logical Records By Connection", 4 /* fileserver */, + { 0x17, 0xdf, SUBFUNC_WITH_LENGTH, "Get Logical Records By Connection", 4 /* fileserver */, ncp_0x17df_request, ncp_0x17df_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xe0, SUBFUNC_WITH_LENGTH, "Get Logical Record Information", 4 /* fileserver */, + { 0x17, 0xe0, SUBFUNC_WITH_LENGTH, "Get Logical Record Information", 4 /* fileserver */, ncp_0x17e0_request, ncp_0x17e0_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x17e0_req }, - { 0x17, 0xe1, SUBFUNC_WITH_LENGTH, "Get Connection's Semaphores", 4 /* fileserver */, + { 0x17, 0xe1, SUBFUNC_WITH_LENGTH, "Get Connection's Semaphores", 4 /* fileserver */, ncp_0x17e1_request, ncp_0x17e1_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xe2, SUBFUNC_WITH_LENGTH, "Get Semaphore Information", 4 /* fileserver */, + { 0x17, 0xe2, SUBFUNC_WITH_LENGTH, "Get Semaphore Information", 4 /* fileserver */, ncp_0x17d5_request, ncp_0x17e2_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x17e2_req }, - { 0x17, 0xe3, SUBFUNC_WITH_LENGTH, "Get LAN Driver Configuration Information", 4 /* fileserver */, + { 0x17, 0xe3, SUBFUNC_WITH_LENGTH, "Get LAN Driver Configuration Information", 4 /* fileserver */, ncp_0x17e3_request, ncp_0x17e3_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xe5, SUBFUNC_WITH_LENGTH, "Get Connection Usage Statistics", 4 /* fileserver */, + { 0x17, 0xe5, SUBFUNC_WITH_LENGTH, "Get Connection Usage Statistics", 4 /* fileserver */, ncp_0x17e5_request, ncp_0x17e5_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xe6, SUBFUNC_WITH_LENGTH, "Get Object's Remaining Disk Space", 4 /* fileserver */, + { 0x17, 0xe6, SUBFUNC_WITH_LENGTH, "Get Object's Remaining Disk Space", 4 /* fileserver */, ncp_0x110a_reply, ncp_0x17e6_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xe7, SUBFUNC_WITH_LENGTH, "Get File Server LAN I/O Statistics", 4 /* fileserver */, + { 0x17, 0xe7, SUBFUNC_WITH_LENGTH, "Get File Server LAN I/O Statistics", 4 /* fileserver */, NULL, ncp_0x17e7_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xe8, SUBFUNC_WITH_LENGTH, "Get File Server Misc Information", 4 /* fileserver */, + { 0x17, 0xe8, SUBFUNC_WITH_LENGTH, "Get File Server Misc Information", 4 /* fileserver */, NULL, ncp_0x17e8_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xe9, SUBFUNC_WITH_LENGTH, "Get Volume Information", 4 /* fileserver */, + { 0x17, 0xe9, SUBFUNC_WITH_LENGTH, "Get Volume Information", 4 /* fileserver */, ncp_0x12_request, ncp_0x17e9_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x17e9_req }, - { 0x17, 0xea, SUBFUNC_WITH_LENGTH, "Get Connection's Task Information", 4 /* fileserver */, + { 0x17, 0xea, SUBFUNC_WITH_LENGTH, "Get Connection's Task Information", 4 /* fileserver */, ncp_0x17e5_request, ncp_0x17ea_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xeb, SUBFUNC_WITH_LENGTH, "Get Connection's Open Files", 4 /* fileserver */, + { 0x17, 0xeb, SUBFUNC_WITH_LENGTH, "Get Connection's Open Files", 4 /* fileserver */, ncp_0x17e1_request, ncp_0x17eb_reply, ncp_0x17d4_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xec, SUBFUNC_WITH_LENGTH, "Get Connection Using A File", 4 /* fileserver */, + { 0x17, 0xec, SUBFUNC_WITH_LENGTH, "Get Connection Using A File", 4 /* fileserver */, ncp_0x17ec_request, ncp_0x17ec_reply, ncp_0x17d4_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xed, SUBFUNC_WITH_LENGTH, "Get Physical Record Locks By Connection And File", 4 /* fileserver */, + { 0x17, 0xed, SUBFUNC_WITH_LENGTH, "Get Physical Record Locks By Connection And File", 4 /* fileserver */, ncp_0x17ed_request, ncp_0x17ed_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xee, SUBFUNC_WITH_LENGTH, "Get Physical Record Locks By File", 4 /* fileserver */, + { 0x17, 0xee, SUBFUNC_WITH_LENGTH, "Get Physical Record Locks By File", 4 /* fileserver */, ncp_0x17ec_request, ncp_0x17ee_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xef, SUBFUNC_WITH_LENGTH, "Get Logical Records By Connection", 4 /* fileserver */, + { 0x17, 0xef, SUBFUNC_WITH_LENGTH, "Get Logical Records By Connection", 4 /* fileserver */, ncp_0x17ef_request, ncp_0x17ef_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xf0, SUBFUNC_WITH_LENGTH, "Get Logical Record Information (old)", 4 /* fileserver */, + { 0x17, 0xf0, SUBFUNC_WITH_LENGTH, "Get Logical Record Information (old)", 4 /* fileserver */, ncp_0x17e0_request, ncp_0x17f0_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xf1, SUBFUNC_WITH_LENGTH, "Get Connection's Semaphores", 4 /* fileserver */, + { 0x17, 0xf1, SUBFUNC_WITH_LENGTH, "Get Connection's Semaphores", 4 /* fileserver */, ncp_0x17e1_request, ncp_0x17f1_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xf2, SUBFUNC_WITH_LENGTH, "Get Semaphore Information", 4 /* fileserver */, + { 0x17, 0xf2, SUBFUNC_WITH_LENGTH, "Get Semaphore Information", 4 /* fileserver */, ncp_0x17d5_request, ncp_0x17f2_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x17f2_req }, - { 0x17, 0xf3, SUBFUNC_WITH_LENGTH, "Map Directory Number to Path", 2 /* file */, + { 0x17, 0xf3, SUBFUNC_WITH_LENGTH, "Map Directory Number to Path", 2 /* file */, ncp_0x17f3_request, ncp_0x1601_reply, ncp_0x17f3_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x17, 0xf4, SUBFUNC_WITH_LENGTH, "Convert Path to Dir Entry", 2 /* file */, + { 0x17, 0xf4, SUBFUNC_WITH_LENGTH, "Convert Path to Dir Entry", 2 /* file */, ncp_0x1603_request, ncp_0x17f4_reply, ncp_0x17dd_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x17f4_req }, - { 0x17, 0xfd, SUBFUNC_WITH_LENGTH, "Send Console Broadcast", 4 /* fileserver */, + { 0x17, 0xfd, SUBFUNC_WITH_LENGTH, "Send Console Broadcast", 4 /* fileserver */, ncp_0x17fd_request, NULL, ncp_0x17d1_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x17fd_req }, - { 0x17, 0xfe, SUBFUNC_WITH_LENGTH, "Clear Connection Number", 4 /* fileserver */, + { 0x17, 0xfe, SUBFUNC_WITH_LENGTH, "Clear Connection Number", 4 /* fileserver */, ncp_0x17fe_request, NULL, ncp_0x17d1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x18, 0x00, NO_SUBFUNC, "End of Job", 3 /* connection */, + { 0x18, 0x00, NO_SUBFUNC, "End of Job", 3 /* connection */, NULL, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x19, 0x00, NO_SUBFUNC, "Logout", 3 /* connection */, + { 0x19, 0x00, NO_SUBFUNC, "Logout", 3 /* connection */, NULL, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x1a, 0x00, NO_SUBFUNC, "Log Physical Record", 0 /* sync */, + { 0x1a, 0x00, NO_SUBFUNC, "Log Physical Record", 0 /* sync */, ncp_0x1a_request, NULL, ncp_0x1a_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1a_req }, - { 0x1b, 0x00, NO_SUBFUNC, "Lock Physical Record Set", 0 /* sync */, + { 0x1b, 0x00, NO_SUBFUNC, "Lock Physical Record Set", 0 /* sync */, ncp_0x1b_request, NULL, ncp_0x1a_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x1c, 0x00, NO_SUBFUNC, "Release Physical Record", 0 /* sync */, + { 0x1c, 0x00, NO_SUBFUNC, "Release Physical Record", 0 /* sync */, ncp_0x1c_request, NULL, ncp_0x1c_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1c_req }, - { 0x1d, 0x00, NO_SUBFUNC, "Release Physical Record Set", 0 /* sync */, + { 0x1d, 0x00, NO_SUBFUNC, "Release Physical Record Set", 0 /* sync */, ncp_0x6_request, NULL, ncp_0x1c_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x1e, 0x00, NO_SUBFUNC, "Clear Physical Record", 0 /* sync */, + { 0x1e, 0x00, NO_SUBFUNC, "Clear Physical Record", 0 /* sync */, ncp_0x1e_request, NULL, ncp_0x1e_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x1e_req }, - { 0x1f, 0x00, NO_SUBFUNC, "Clear Physical Record Set", 0 /* sync */, + { 0x1f, 0x00, NO_SUBFUNC, "Clear Physical Record Set", 0 /* sync */, ncp_0x6_request, NULL, ncp_0x1c_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x20, 0x00, SUBFUNC_NO_LENGTH, "Open Semaphore", 0 /* sync */, + { 0x20, 0x00, SUBFUNC_NO_LENGTH, "Open Semaphore", 0 /* sync */, ncp_0x2000_request, ncp_0x2000_reply, ncp_0x2000_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x2000_req }, - { 0x20, 0x01, SUBFUNC_NO_LENGTH, "Examine Semaphore", 0 /* sync */, + { 0x20, 0x01, SUBFUNC_NO_LENGTH, "Examine Semaphore", 0 /* sync */, ncp_0x2001_request, ncp_0x2001_reply, ncp_0x2000_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x20, 0x02, SUBFUNC_NO_LENGTH, "Wait On Semaphore", 0 /* sync */, + { 0x20, 0x02, SUBFUNC_NO_LENGTH, "Wait On Semaphore", 0 /* sync */, ncp_0x2002_request, NULL, ncp_0x2000_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x20, 0x03, SUBFUNC_NO_LENGTH, "Signal Semaphore", 0 /* sync */, + { 0x20, 0x03, SUBFUNC_NO_LENGTH, "Signal Semaphore", 0 /* sync */, ncp_0x2001_request, NULL, ncp_0x2000_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x20, 0x04, SUBFUNC_NO_LENGTH, "Close Semaphore", 0 /* sync */, + { 0x20, 0x04, SUBFUNC_NO_LENGTH, "Close Semaphore", 0 /* sync */, ncp_0x2001_request, NULL, ncp_0x2000_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x21, 0x00, NO_SUBFUNC, "Negotiate Buffer Size", 3 /* connection */, + { 0x21, 0x00, NO_SUBFUNC, "Negotiate Buffer Size", 3 /* connection */, ncp_0x21_request, ncp_0x21_request, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x22, 0x00, SUBFUNC_NO_LENGTH, "TTS Is Available", 9 /* tts */, + { 0x22, 0x00, SUBFUNC_NO_LENGTH, "TTS Is Available", 9 /* tts */, NULL, NULL, ncp_0x2200_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x22, 0x01, SUBFUNC_NO_LENGTH, "TTS Begin Transaction", 9 /* tts */, + { 0x22, 0x01, SUBFUNC_NO_LENGTH, "TTS Begin Transaction", 9 /* tts */, NULL, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x22, 0x02, SUBFUNC_NO_LENGTH, "TTS End Transaction", 9 /* tts */, + { 0x22, 0x02, SUBFUNC_NO_LENGTH, "TTS End Transaction", 9 /* tts */, NULL, ncp_0x2202_reply, ncp_0x2202_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x22, 0x03, SUBFUNC_NO_LENGTH, "TTS Abort Transaction", 9 /* tts */, + { 0x22, 0x03, SUBFUNC_NO_LENGTH, "TTS Abort Transaction", 9 /* tts */, NULL, NULL, ncp_0x2203_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x22, 0x04, SUBFUNC_NO_LENGTH, "TTS Transaction Status", 9 /* tts */, + { 0x22, 0x04, SUBFUNC_NO_LENGTH, "TTS Transaction Status", 9 /* tts */, ncp_0x2202_reply, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x22, 0x05, SUBFUNC_NO_LENGTH, "TTS Get Application Thresholds", 9 /* tts */, + { 0x22, 0x05, SUBFUNC_NO_LENGTH, "TTS Get Application Thresholds", 9 /* tts */, NULL, ncp_0x2205_reply, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x22, 0x06, SUBFUNC_NO_LENGTH, "TTS Set Application Thresholds", 9 /* tts */, + { 0x22, 0x06, SUBFUNC_NO_LENGTH, "TTS Set Application Thresholds", 9 /* tts */, ncp_0x2205_reply, NULL, ncp_0x1711_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x22, 0x07, SUBFUNC_NO_LENGTH, "TTS Get Workstation Thresholds", 9 /* tts */, + { 0x22, 0x07, SUBFUNC_NO_LENGTH, "TTS Get Workstation Thresholds", 9 /* tts */, NULL, ncp_0x2205_reply, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x22, 0x08, SUBFUNC_NO_LENGTH, "TTS Set Workstation Thresholds", 9 /* tts */, + { 0x22, 0x08, SUBFUNC_NO_LENGTH, "TTS Set Workstation Thresholds", 9 /* tts */, ncp_0x2205_reply, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x22, 0x09, SUBFUNC_NO_LENGTH, "TTS Get Transaction Bits", 9 /* tts */, + { 0x22, 0x09, SUBFUNC_NO_LENGTH, "TTS Get Transaction Bits", 9 /* tts */, NULL, ncp_0x2209_reply, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x22, 0x0a, SUBFUNC_NO_LENGTH, "TTS Set Transaction Bits", 9 /* tts */, + { 0x22, 0x0a, SUBFUNC_NO_LENGTH, "TTS Set Transaction Bits", 9 /* tts */, ncp_0x2209_reply, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x23, 0x01, SUBFUNC_WITH_LENGTH, "AFP Create Directory", 10 /* afp */, + { 0x23, 0x01, SUBFUNC_WITH_LENGTH, "AFP Create Directory", 10 /* afp */, ncp_0x2301_request, ncp_0x2301_reply, ncp_0x2301_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x2301_req }, - { 0x23, 0x02, SUBFUNC_WITH_LENGTH, "AFP Create File", 10 /* afp */, + { 0x23, 0x02, SUBFUNC_WITH_LENGTH, "AFP Create File", 10 /* afp */, ncp_0x2302_request, ncp_0x2301_reply, ncp_0x2302_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x2302_req }, - { 0x23, 0x03, SUBFUNC_WITH_LENGTH, "AFP Delete", 10 /* afp */, + { 0x23, 0x03, SUBFUNC_WITH_LENGTH, "AFP Delete", 10 /* afp */, ncp_0x2303_request, NULL, ncp_0x2303_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x2303_req }, - { 0x23, 0x04, SUBFUNC_WITH_LENGTH, "AFP Get Entry ID From Name", 10 /* afp */, + { 0x23, 0x04, SUBFUNC_WITH_LENGTH, "AFP Get Entry ID From Name", 10 /* afp */, ncp_0x2303_request, ncp_0x2304_reply, ncp_0x2304_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x2304_req }, - { 0x23, 0x05, SUBFUNC_WITH_LENGTH, "AFP Get File Information", 10 /* afp */, + { 0x23, 0x05, SUBFUNC_WITH_LENGTH, "AFP Get File Information", 10 /* afp */, ncp_0x2305_request, ncp_0x2305_reply, ncp_0x2304_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x2305_req }, - { 0x23, 0x06, SUBFUNC_WITH_LENGTH, "AFP Get Entry ID From NetWare Handle", 10 /* afp */, + { 0x23, 0x06, SUBFUNC_WITH_LENGTH, "AFP Get Entry ID From NetWare Handle", 10 /* afp */, ncp_0x2306_request, ncp_0x2306_reply, ncp_0x2306_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x23, 0x07, SUBFUNC_WITH_LENGTH, "AFP Rename", 10 /* afp */, + { 0x23, 0x07, SUBFUNC_WITH_LENGTH, "AFP Rename", 10 /* afp */, ncp_0x2307_request, NULL, ncp_0x2307_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x2307_req }, - { 0x23, 0x08, SUBFUNC_WITH_LENGTH, "AFP Open File Fork", 10 /* afp */, + { 0x23, 0x08, SUBFUNC_WITH_LENGTH, "AFP Open File Fork", 10 /* afp */, ncp_0x2308_request, ncp_0x2308_reply, ncp_0x2308_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x2308_req }, - { 0x23, 0x09, SUBFUNC_WITH_LENGTH, "AFP Set File Information", 10 /* afp */, + { 0x23, 0x09, SUBFUNC_WITH_LENGTH, "AFP Set File Information", 10 /* afp */, ncp_0x2309_request, NULL, ncp_0x2309_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x2309_req }, - { 0x23, 0x0a, SUBFUNC_WITH_LENGTH, "AFP Scan File Information", 10 /* afp */, + { 0x23, 0x0a, SUBFUNC_WITH_LENGTH, "AFP Scan File Information", 10 /* afp */, ncp_0x230a_request, ncp_0x230a_reply, ncp_0x230a_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x230a_req }, - { 0x23, 0x0b, SUBFUNC_WITH_LENGTH, "AFP Alloc Temporary Directory Handle", 10 /* afp */, + { 0x23, 0x0b, SUBFUNC_WITH_LENGTH, "AFP Alloc Temporary Directory Handle", 10 /* afp */, ncp_0x230b_request, ncp_0x1612_reply, ncp_0x230b_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x230b_req }, - { 0x23, 0x0c, SUBFUNC_WITH_LENGTH, "AFP Get Entry ID From Path Name", 10 /* afp */, + { 0x23, 0x0c, SUBFUNC_WITH_LENGTH, "AFP Get Entry ID From Path Name", 10 /* afp */, ncp_0x1603_request, ncp_0x230c_reply, ncp_0x230c_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x230c_req }, - { 0x23, 0x0d, SUBFUNC_WITH_LENGTH, "AFP 2.0 Create Directory", 10 /* afp */, + { 0x23, 0x0d, SUBFUNC_WITH_LENGTH, "AFP 2.0 Create Directory", 10 /* afp */, ncp_0x230d_request, ncp_0x2301_reply, ncp_0x230d_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x230d_req }, - { 0x23, 0x0e, SUBFUNC_WITH_LENGTH, "AFP 2.0 Create File", 10 /* afp */, + { 0x23, 0x0e, SUBFUNC_WITH_LENGTH, "AFP 2.0 Create File", 10 /* afp */, ncp_0x230e_request, ncp_0x2301_reply, ncp_0x230e_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x230e_req }, - { 0x23, 0x0f, SUBFUNC_WITH_LENGTH, "AFP 2.0 Get File Or Directory Information", 10 /* afp */, + { 0x23, 0x0f, SUBFUNC_WITH_LENGTH, "AFP 2.0 Get File Or Directory Information", 10 /* afp */, ncp_0x2305_request, ncp_0x230f_reply, ncp_0x2304_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x230f_req }, - { 0x23, 0x10, SUBFUNC_WITH_LENGTH, "AFP 2.0 Set File Information", 10 /* afp */, + { 0x23, 0x10, SUBFUNC_WITH_LENGTH, "AFP 2.0 Set File Information", 10 /* afp */, ncp_0x2310_request, NULL, ncp_0x2309_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x2310_req }, - { 0x23, 0x11, SUBFUNC_WITH_LENGTH, "AFP 2.0 Scan File Information", 10 /* afp */, + { 0x23, 0x11, SUBFUNC_WITH_LENGTH, "AFP 2.0 Scan File Information", 10 /* afp */, ncp_0x230a_request, ncp_0x2311_reply, ncp_0x230a_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x2311_req }, - { 0x23, 0x12, SUBFUNC_WITH_LENGTH, "AFP Get DOS Name From Entry ID", 10 /* afp */, + { 0x23, 0x12, SUBFUNC_WITH_LENGTH, "AFP Get DOS Name From Entry ID", 10 /* afp */, ncp_0x2312_request, ncp_0x1601_reply, ncp_0x2312_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x23, 0x13, SUBFUNC_WITH_LENGTH, "AFP Get Macintosh Info On Deleted File", 10 /* afp */, + { 0x23, 0x13, SUBFUNC_WITH_LENGTH, "AFP Get Macintosh Info On Deleted File", 10 /* afp */, ncp_0x2313_request, ncp_0x2313_reply, ncp_0x2313_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x24, 0x00, SUBFUNC_WITH_LENGTH, "Get NCP Extension Information", 11 /* extension */, + { 0x24, 0x00, SUBFUNC_WITH_LENGTH, "Get NCP Extension Information", 11 /* extension */, ncp_0x2400_request, ncp_0x2400_reply, ncp_0x2400_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x24, 0x01, SUBFUNC_WITH_LENGTH, "Get NCP Extension Maximum Data Size", 11 /* extension */, + { 0x24, 0x01, SUBFUNC_WITH_LENGTH, "Get NCP Extension Maximum Data Size", 11 /* extension */, NULL, ncp_0x2401_reply, ncp_0x2400_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x24, 0x02, SUBFUNC_WITH_LENGTH, "Get NCP Extension Information by Name", 11 /* extension */, + { 0x24, 0x02, SUBFUNC_WITH_LENGTH, "Get NCP Extension Information by Name", 11 /* extension */, ncp_0x2402_request, ncp_0x2400_reply, ncp_0x2400_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x2402_req }, - { 0x24, 0x03, SUBFUNC_WITH_LENGTH, "Get Number of Registered NCP Extensions", 11 /* extension */, + { 0x24, 0x03, SUBFUNC_WITH_LENGTH, "Get Number of Registered NCP Extensions", 11 /* extension */, NULL, ncp_0x2403_reply, ncp_0x2400_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x24, 0x04, SUBFUNC_WITH_LENGTH, "Get NCP Extension Registered Verbs List", 11 /* extension */, + { 0x24, 0x04, SUBFUNC_WITH_LENGTH, "Get NCP Extension Registered Verbs List", 11 /* extension */, ncp_0x2404_request, ncp_0x2404_reply, ncp_0x2400_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x24, 0x05, SUBFUNC_WITH_LENGTH, "Return NCP Extension Information", 11 /* extension */, + { 0x24, 0x05, SUBFUNC_WITH_LENGTH, "Return NCP Extension Information", 11 /* extension */, ncp_0x2400_request, ncp_0x2400_reply, ncp_0x2400_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x24, 0x06, SUBFUNC_WITH_LENGTH, "Return NCP Extension Maximum Data Size", 11 /* extension */, + { 0x24, 0x06, SUBFUNC_WITH_LENGTH, "Return NCP Extension Maximum Data Size", 11 /* extension */, NULL, ncp_0x2406_reply, ncp_0x2400_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x25, 0x00, NO_SUBFUNC, "Execute NCP Extension", 11 /* extension */, + { 0x25, 0x00, NO_SUBFUNC, "Execute NCP Extension", 11 /* extension */, ncp_0x2400_request, NULL, ncp_0x25_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x3b, 0x00, NO_SUBFUNC, "Commit File", 2 /* file */, + { 0x3b, 0x00, NO_SUBFUNC, "Commit File", 2 /* file */, ncp_0x3b_request, NULL, ncp_0x3b_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x3b_req }, - { 0x3d, 0x00, NO_SUBFUNC, "Commit File", 2 /* file */, + { 0x3d, 0x00, NO_SUBFUNC, "Commit File", 2 /* file */, ncp_0x3b_request, NULL, ncp_0x3b_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x3d_req }, - { 0x3e, 0x00, NO_SUBFUNC, "File Search Initialize", 2 /* file */, + { 0x3e, 0x00, NO_SUBFUNC, "File Search Initialize", 2 /* file */, ncp_0x1603_request, ncp_0x3e_reply, ncp_0x3e_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x3e_req }, - { 0x3f, 0x00, NO_SUBFUNC, "File Search Continue", 2 /* file */, + { 0x3f, 0x00, NO_SUBFUNC, "File Search Continue", 2 /* file */, ncp_0x3f_request, ncp_0x3f_reply, ncp_0x3f_errors, ncp_0x3f_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x3f_req }, - { 0x40, 0x00, NO_SUBFUNC, "Search for a File", 2 /* file */, + { 0x40, 0x00, NO_SUBFUNC, "Search for a File", 2 /* file */, ncp_0x40_request, ncp_0x40_reply, ncp_0x40_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x40_req }, - { 0x41, 0x00, NO_SUBFUNC, "Open File", 2 /* file */, + { 0x41, 0x00, NO_SUBFUNC, "Open File", 2 /* file */, ncp_0x41_request, ncp_0x41_reply, ncp_0x41_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x41_req }, - { 0x42, 0x00, NO_SUBFUNC, "Close File", 2 /* file */, + { 0x42, 0x00, NO_SUBFUNC, "Close File", 2 /* file */, ncp_0x3b_request, NULL, ncp_0x42_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x42_req }, - { 0x43, 0x00, NO_SUBFUNC, "Create File", 2 /* file */, + { 0x43, 0x00, NO_SUBFUNC, "Create File", 2 /* file */, ncp_0x43_request, ncp_0x41_reply, ncp_0x43_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x43_req }, - { 0x44, 0x00, NO_SUBFUNC, "Erase File", 2 /* file */, + { 0x44, 0x00, NO_SUBFUNC, "Erase File", 2 /* file */, ncp_0x41_request, NULL, ncp_0x44_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x44_req }, - { 0x45, 0x00, NO_SUBFUNC, "Rename File", 2 /* file */, + { 0x45, 0x00, NO_SUBFUNC, "Rename File", 2 /* file */, ncp_0x45_request, NULL, ncp_0x45_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x45_req }, - { 0x46, 0x00, NO_SUBFUNC, "Set File Attributes", 2 /* file */, + { 0x46, 0x00, NO_SUBFUNC, "Set File Attributes", 2 /* file */, ncp_0x46_request, NULL, ncp_0x46_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x46_req }, - { 0x47, 0x00, NO_SUBFUNC, "Get Current Size of File", 2 /* file */, + { 0x47, 0x00, NO_SUBFUNC, "Get Current Size of File", 2 /* file */, ncp_0x3b_request, ncp_0x47_reply, ncp_0x47_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x47_req }, - { 0x48, 0x00, NO_SUBFUNC, "Read From A File", 2 /* file */, + { 0x48, 0x00, NO_SUBFUNC, "Read From A File", 2 /* file */, ncp_0x48_request, ncp_0x48_reply, ncp_0x48_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x48_req }, - { 0x49, 0x00, NO_SUBFUNC, "Write to a File", 2 /* file */, + { 0x49, 0x00, NO_SUBFUNC, "Write to a File", 2 /* file */, ncp_0x48_request, NULL, ncp_0x49_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x49_req }, - { 0x4a, 0x00, NO_SUBFUNC, "Copy from One File to Another", 2 /* file */, + { 0x4a, 0x00, NO_SUBFUNC, "Copy from One File to Another", 2 /* file */, ncp_0x4a_request, ncp_0x4a_reply, ncp_0x4a_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x4b, 0x00, NO_SUBFUNC, "Set File Time Date Stamp", 2 /* file */, + { 0x4b, 0x00, NO_SUBFUNC, "Set File Time Date Stamp", 2 /* file */, ncp_0x4b_request, NULL, ncp_0x4b_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x4b_req }, - { 0x4c, 0x00, NO_SUBFUNC, "Open File", 2 /* file */, + { 0x4c, 0x00, NO_SUBFUNC, "Open File", 2 /* file */, ncp_0x4c_request, ncp_0x41_reply, ncp_0x41_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x4c_req }, - { 0x4d, 0x00, NO_SUBFUNC, "Create File", 2 /* file */, + { 0x4d, 0x00, NO_SUBFUNC, "Create File", 2 /* file */, ncp_0x43_request, ncp_0x41_reply, ncp_0x43_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x4d_req }, - { 0x4f, 0x00, NO_SUBFUNC, "Set File Extended Attributes", 2 /* file */, + { 0x4f, 0x00, NO_SUBFUNC, "Set File Extended Attributes", 2 /* file */, ncp_0x4f_request, NULL, ncp_0x46_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x4f_req }, - { 0x54, 0x00, NO_SUBFUNC, "Open/Create File", 2 /* file */, + { 0x54, 0x00, NO_SUBFUNC, "Open/Create File", 2 /* file */, ncp_0x54_request, ncp_0x41_reply, ncp_0x54_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x54_req }, - { 0x55, 0x00, NO_SUBFUNC, "Get Sparse File Data Block Bit Map", 2 /* file */, + { 0x55, 0x00, NO_SUBFUNC, "Get Sparse File Data Block Bit Map", 2 /* file */, ncp_0x55_request, ncp_0x55_reply, ncp_0x47_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x55_req }, - { 0x56, 0x01, SUBFUNC_NO_LENGTH, "Close Extended Attribute Handle", 12 /* extended */, + { 0x56, 0x01, SUBFUNC_NO_LENGTH, "Close Extended Attribute Handle", 12 /* extended */, ncp_0x5601_request, NULL, ncp_0x5601_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x56, 0x02, SUBFUNC_NO_LENGTH, "Write Extended Attribute", 12 /* extended */, + { 0x56, 0x02, SUBFUNC_NO_LENGTH, "Write Extended Attribute", 12 /* extended */, ncp_0x5602_request, ncp_0x5602_reply, ncp_0x5602_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5602_req }, - { 0x56, 0x03, SUBFUNC_NO_LENGTH, "Read Extended Attribute", 12 /* extended */, + { 0x56, 0x03, SUBFUNC_NO_LENGTH, "Read Extended Attribute", 12 /* extended */, ncp_0x5603_request, ncp_0x5603_reply, ncp_0x5603_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5603_req }, - { 0x56, 0x04, SUBFUNC_NO_LENGTH, "Enumerate Extended Attribute", 12 /* extended */, + { 0x56, 0x04, SUBFUNC_NO_LENGTH, "Enumerate Extended Attribute", 12 /* extended */, ncp_0x5604_request, ncp_0x5604_reply, ncp_0x5604_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5604_req }, - { 0x56, 0x05, SUBFUNC_NO_LENGTH, "Duplicate Extended Attributes", 12 /* extended */, + { 0x56, 0x05, SUBFUNC_NO_LENGTH, "Duplicate Extended Attributes", 12 /* extended */, ncp_0x5605_request, ncp_0x5605_reply, ncp_0x5605_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x57, 0x01, SUBFUNC_NO_LENGTH, "Open/Create File or Subdirectory", 2 /* file */, + { 0x57, 0x01, SUBFUNC_NO_LENGTH, "Open/Create File or Subdirectory", 2 /* file */, ncp_0x5701_request, ncp_0x5701_reply, ncp_0x5701_errors, ncp_0x5701_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x5701_req }, - { 0x57, 0x02, SUBFUNC_NO_LENGTH, "Initialize Search", 2 /* file */, + { 0x57, 0x02, SUBFUNC_NO_LENGTH, "Initialize Search", 2 /* file */, ncp_0x5702_request, ncp_0x5702_reply, ncp_0x5702_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5702_req }, - { 0x57, 0x03, SUBFUNC_NO_LENGTH, "Search for File or Subdirectory", 2 /* file */, + { 0x57, 0x03, SUBFUNC_NO_LENGTH, "Search for File or Subdirectory", 2 /* file */, ncp_0x5703_request, ncp_0x5703_reply, ncp_0x5702_errors, ncp_0x5701_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x5703_req }, - { 0x57, 0x04, SUBFUNC_NO_LENGTH, "Rename Or Move a File or Subdirectory", 2 /* file */, + { 0x57, 0x04, SUBFUNC_NO_LENGTH, "Rename Or Move a File or Subdirectory", 2 /* file */, ncp_0x5704_request, NULL, ncp_0x5704_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5704_req }, - { 0x57, 0x05, SUBFUNC_NO_LENGTH, "Scan File or Subdirectory for Trustees", 2 /* file */, + { 0x57, 0x05, SUBFUNC_NO_LENGTH, "Scan File or Subdirectory for Trustees", 2 /* file */, ncp_0x5705_request, ncp_0x5705_reply, ncp_0x5705_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5705_req }, - { 0x57, 0x06, SUBFUNC_NO_LENGTH, "Obtain File or SubDirectory Information", 2 /* file */, + { 0x57, 0x06, SUBFUNC_NO_LENGTH, "Obtain File or SubDirectory Information", 2 /* file */, ncp_0x5706_request, ncp_0x5706_reply, ncp_0x5706_errors, ncp_0x5706_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x5706_req }, - { 0x57, 0x07, SUBFUNC_NO_LENGTH, "Modify File or Subdirectory DOS Information", 2 /* file */, + { 0x57, 0x07, SUBFUNC_NO_LENGTH, "Modify File or Subdirectory DOS Information", 2 /* file */, ncp_0x5707_request, NULL, ncp_0x5707_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5707_req }, - { 0x57, 0x08, SUBFUNC_NO_LENGTH, "Delete a File or Subdirectory", 2 /* file */, + { 0x57, 0x08, SUBFUNC_NO_LENGTH, "Delete a File or Subdirectory", 2 /* file */, ncp_0x5708_request, NULL, ncp_0x5708_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5708_req }, - { 0x57, 0x09, SUBFUNC_NO_LENGTH, "Set Short Directory Handle", 2 /* file */, + { 0x57, 0x09, SUBFUNC_NO_LENGTH, "Set Short Directory Handle", 2 /* file */, ncp_0x5709_request, NULL, ncp_0x5702_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5709_req }, - { 0x57, 0x0a, SUBFUNC_NO_LENGTH, "Add Trustee Set to File or Subdirectory", 2 /* file */, + { 0x57, 0x0a, SUBFUNC_NO_LENGTH, "Add Trustee Set to File or Subdirectory", 2 /* file */, ncp_0x570a_request, NULL, ncp_0x570a_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x570a_req }, - { 0x57, 0x0b, SUBFUNC_NO_LENGTH, "Delete Trustee Set from File or SubDirectory", 2 /* file */, + { 0x57, 0x0b, SUBFUNC_NO_LENGTH, "Delete Trustee Set from File or SubDirectory", 2 /* file */, ncp_0x570b_request, NULL, ncp_0x570b_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x570b_req }, - { 0x57, 0x0c, SUBFUNC_NO_LENGTH, "Allocate Short Directory Handle", 2 /* file */, + { 0x57, 0x0c, SUBFUNC_NO_LENGTH, "Allocate Short Directory Handle", 2 /* file */, ncp_0x570c_request, ncp_0x570c_reply, ncp_0x570c_errors, ncp_0x570c_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x570c_req }, - { 0x57, 0x10, SUBFUNC_NO_LENGTH, "Scan Salvageable Files", 2 /* file */, + { 0x57, 0x10, SUBFUNC_NO_LENGTH, "Scan Salvageable Files", 2 /* file */, ncp_0x5710_request, ncp_0x5710_reply, ncp_0x5710_errors, ncp_0x5710_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x5710_req }, - { 0x57, 0x11, SUBFUNC_NO_LENGTH, "Recover Salvageable File", 2 /* file */, + { 0x57, 0x11, SUBFUNC_NO_LENGTH, "Recover Salvageable File", 2 /* file */, ncp_0x5711_request, NULL, ncp_0x5711_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5711_req }, - { 0x57, 0x12, SUBFUNC_NO_LENGTH, "Purge Salvageable Files", 2 /* file */, + { 0x57, 0x12, SUBFUNC_NO_LENGTH, "Purge Salvageable Files", 2 /* file */, ncp_0x5712_request, NULL, ncp_0x5712_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x57, 0x13, SUBFUNC_NO_LENGTH, "Get Name Space Information", 2 /* file */, + { 0x57, 0x13, SUBFUNC_NO_LENGTH, "Get Name Space Information", 2 /* file */, ncp_0x5713_request, ncp_0x5713_reply, ncp_0x5710_errors, ncp_0x5713_req_cond_indexes, REQ_COND_SIZE_VARIABLE, NULL }, - { 0x57, 0x14, SUBFUNC_NO_LENGTH, "Search for File or Subdirectory Set", 2 /* file */, + { 0x57, 0x14, SUBFUNC_NO_LENGTH, "Search for File or Subdirectory Set", 2 /* file */, ncp_0x5714_request, NULL, ncp_0x5702_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x57, 0x15, SUBFUNC_NO_LENGTH, "Get Path String from Short Directory Handle", 2 /* file */, + { 0x57, 0x15, SUBFUNC_NO_LENGTH, "Get Path String from Short Directory Handle", 2 /* file */, ncp_0x5715_request, ncp_0x1601_reply, ncp_0x54_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x57, 0x16, SUBFUNC_NO_LENGTH, "Generate Directory Base and Volume Number", 2 /* file */, + { 0x57, 0x16, SUBFUNC_NO_LENGTH, "Generate Directory Base and Volume Number", 2 /* file */, ncp_0x5716_request, ncp_0x5716_reply, ncp_0x5710_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5716_req }, - { 0x57, 0x17, SUBFUNC_NO_LENGTH, "Query Name Space Information Format", 2 /* file */, + { 0x57, 0x17, SUBFUNC_NO_LENGTH, "Query Name Space Information Format", 2 /* file */, ncp_0x5717_request, ncp_0x5717_reply, ncp_0x5710_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x57, 0x18, SUBFUNC_NO_LENGTH, "Get Name Spaces Loaded List from Volume Number", 2 /* file */, + { 0x57, 0x18, SUBFUNC_NO_LENGTH, "Get Name Spaces Loaded List from Volume Number", 2 /* file */, ncp_0x5718_request, ncp_0x5718_reply, ncp_0x5710_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5718_req }, - { 0x57, 0x19, SUBFUNC_NO_LENGTH, "Set Name Space Information", 2 /* file */, + { 0x57, 0x19, SUBFUNC_NO_LENGTH, "Set Name Space Information", 2 /* file */, ncp_0x5719_request, NULL, ncp_0x5719_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x57, 0x1a, SUBFUNC_NO_LENGTH, "Get Huge Name Space Information", 2 /* file */, + { 0x57, 0x1a, SUBFUNC_NO_LENGTH, "Get Huge Name Space Information", 2 /* file */, ncp_0x571a_request, ncp_0x571a_reply, ncp_0x5719_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x57, 0x1b, SUBFUNC_NO_LENGTH, "Set Huge Name Space Information", 2 /* file */, + { 0x57, 0x1b, SUBFUNC_NO_LENGTH, "Set Huge Name Space Information", 2 /* file */, ncp_0x571b_request, ncp_0x571b_reply, ncp_0x5719_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x57, 0x1c, SUBFUNC_NO_LENGTH, "Get Full Path String", 2 /* file */, + { 0x57, 0x1c, SUBFUNC_NO_LENGTH, "Get Full Path String", 2 /* file */, ncp_0x571c_request, ncp_0x571c_reply, ncp_0x5719_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x571c_req }, - { 0x57, 0x1d, SUBFUNC_NO_LENGTH, "Get Effective Directory Rights", 2 /* file */, + { 0x57, 0x1d, SUBFUNC_NO_LENGTH, "Get Effective Directory Rights", 2 /* file */, ncp_0x571d_request, ncp_0x571d_reply, ncp_0x5710_errors, ncp_0x5710_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x571d_req }, - { 0x57, 0x1e, SUBFUNC_NO_LENGTH, "Open/Create File or Subdirectory", 2 /* file */, + { 0x57, 0x1e, SUBFUNC_NO_LENGTH, "Open/Create File or Subdirectory", 2 /* file */, ncp_0x571e_request, ncp_0x571e_reply, ncp_0x571e_errors, ncp_0x5710_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x571e_req }, - { 0x57, 0x1f, SUBFUNC_NO_LENGTH, "Get File Information", 2 /* file */, + { 0x57, 0x1f, SUBFUNC_NO_LENGTH, "Get File Information", 2 /* file */, ncp_0x571f_request, ncp_0x571f_reply, ncp_0x5710_errors, ncp_0x571f_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x571f_req }, - { 0x57, 0x20, SUBFUNC_NO_LENGTH, "Open/Create File or Subdirectory with Callback", 2 /* file */, + { 0x57, 0x20, SUBFUNC_NO_LENGTH, "Open/Create File or Subdirectory with Callback", 2 /* file */, ncp_0x5701_request, ncp_0x5720_reply, ncp_0x5720_errors, ncp_0x5701_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x5720_req }, - { 0x57, 0x21, SUBFUNC_NO_LENGTH, "Open/Create File or Subdirectory II with Callback", 2 /* file */, + { 0x57, 0x21, SUBFUNC_NO_LENGTH, "Open/Create File or Subdirectory II with Callback", 2 /* file */, ncp_0x571e_request, ncp_0x5721_reply, ncp_0x571e_errors, ncp_0x5701_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x5721_req }, - { 0x57, 0x22, SUBFUNC_NO_LENGTH, "Open CallBack Control (Op-Lock)", 2 /* file */, + { 0x57, 0x22, SUBFUNC_NO_LENGTH, "Open CallBack Control (Op-Lock)", 2 /* file */, ncp_0x5722_request, NULL, ncp_0x5722_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x57, 0x23, SUBFUNC_NO_LENGTH, "Modify DOS Attributes on a File or Subdirectory", 2 /* file */, + { 0x57, 0x23, SUBFUNC_NO_LENGTH, "Modify DOS Attributes on a File or Subdirectory", 2 /* file */, ncp_0x5723_request, ncp_0x5723_reply, ncp_0x5723_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5723_req }, - { 0x57, 0x24, SUBFUNC_NO_LENGTH, "Log File", 0 /* sync */, + { 0x57, 0x24, SUBFUNC_NO_LENGTH, "Log File", 0 /* sync */, ncp_0x5724_request, NULL, ncp_0x5710_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5724_req }, - { 0x57, 0x25, SUBFUNC_NO_LENGTH, "Release File", 0 /* sync */, + { 0x57, 0x25, SUBFUNC_NO_LENGTH, "Release File", 0 /* sync */, ncp_0x5725_request, NULL, ncp_0x5710_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5725_req }, - { 0x57, 0x26, SUBFUNC_NO_LENGTH, "Clear File", 0 /* sync */, + { 0x57, 0x26, SUBFUNC_NO_LENGTH, "Clear File", 0 /* sync */, ncp_0x5725_request, NULL, ncp_0x5710_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5726_req }, - { 0x57, 0x27, SUBFUNC_NO_LENGTH, "Get Directory Disk Space Restriction", 2 /* file */, + { 0x57, 0x27, SUBFUNC_NO_LENGTH, "Get Directory Disk Space Restriction", 2 /* file */, ncp_0x5727_request, ncp_0x5727_reply, ncp_0x5710_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5727_req }, - { 0x57, 0x28, SUBFUNC_NO_LENGTH, "Search for File or Subdirectory Set (Extended Errors)", 2 /* file */, + { 0x57, 0x28, SUBFUNC_NO_LENGTH, "Search for File or Subdirectory Set (Extended Errors)", 2 /* file */, ncp_0x5714_request, ncp_0x5728_reply, ncp_0x5710_errors, ncp_0x5710_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x5728_req }, - { 0x57, 0x29, SUBFUNC_NO_LENGTH, "Scan Salvageable Files", 2 /* file */, + { 0x57, 0x29, SUBFUNC_NO_LENGTH, "Scan Salvageable Files", 2 /* file */, ncp_0x5729_request, ncp_0x5729_reply, ncp_0x5710_errors, ncp_0x5729_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x5729_req }, - { 0x57, 0x2a, SUBFUNC_NO_LENGTH, "Purge Salvageable File List", 2 /* file */, + { 0x57, 0x2a, SUBFUNC_NO_LENGTH, "Purge Salvageable File List", 2 /* file */, ncp_0x572a_request, ncp_0x572a_reply, ncp_0x5710_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x57, 0x2b, SUBFUNC_NO_LENGTH, "Revoke File Handle Rights", 2 /* file */, + { 0x57, 0x2b, SUBFUNC_NO_LENGTH, "Revoke File Handle Rights", 2 /* file */, ncp_0x572b_request, ncp_0x572b_reply, ncp_0x5710_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x57, 0x2c, SUBFUNC_NO_LENGTH, "Update File Handle Rights", 2 /* file */, + { 0x57, 0x2c, SUBFUNC_NO_LENGTH, "Update File Handle Rights", 2 /* file */, ncp_0x572c_request, ncp_0x572c_reply, ncp_0x572c_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x57, 0x40, SUBFUNC_NO_LENGTH, "Read from File", 2 /* file */, + { 0x57, 0x40, SUBFUNC_NO_LENGTH, "Read from File", 2 /* file */, ncp_0x5740_request, ncp_0x48_reply, ncp_0x5740_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x57, 0x41, SUBFUNC_NO_LENGTH, "Write to File", 2 /* file */, + { 0x57, 0x41, SUBFUNC_NO_LENGTH, "Write to File", 2 /* file */, ncp_0x5740_request, NULL, ncp_0x5741_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x57, 0x42, SUBFUNC_NO_LENGTH, "Get Current Size of File", 2 /* file */, + { 0x57, 0x42, SUBFUNC_NO_LENGTH, "Get Current Size of File", 2 /* file */, ncp_0x5742_request, ncp_0x5742_reply, ncp_0x5742_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x57, 0x43, SUBFUNC_NO_LENGTH, "Log Physical Record", 2 /* file */, + { 0x57, 0x43, SUBFUNC_NO_LENGTH, "Log Physical Record", 2 /* file */, ncp_0x5743_request, NULL, ncp_0x5743_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x57, 0x44, SUBFUNC_NO_LENGTH, "Release Physical Record", 2 /* file */, + { 0x57, 0x44, SUBFUNC_NO_LENGTH, "Release Physical Record", 2 /* file */, ncp_0x5744_request, NULL, ncp_0x5744_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x57, 0x45, SUBFUNC_NO_LENGTH, "Clear Physical Record", 2 /* file */, + { 0x57, 0x45, SUBFUNC_NO_LENGTH, "Clear Physical Record", 2 /* file */, ncp_0x5744_request, NULL, ncp_0x5744_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x01, SUBFUNC_NO_LENGTH, "Query Volume Audit Status", 13 /* auditing */, + { 0x58, 0x01, SUBFUNC_NO_LENGTH, "Query Volume Audit Status", 13 /* auditing */, ncp_0x17fe_request, ncp_0x5801_reply, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x02, SUBFUNC_NO_LENGTH, "Add User Audit Property", 13 /* auditing */, + { 0x58, 0x02, SUBFUNC_NO_LENGTH, "Add User Audit Property", 13 /* auditing */, ncp_0x5802_request, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x03, SUBFUNC_NO_LENGTH, "Add Auditor Access", 13 /* auditing */, + { 0x58, 0x03, SUBFUNC_NO_LENGTH, "Add Auditor Access", 13 /* auditing */, NULL, NULL, ncp_0x5803_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x04, SUBFUNC_NO_LENGTH, "Change Auditor Volume Password", 13 /* auditing */, + { 0x58, 0x04, SUBFUNC_NO_LENGTH, "Change Auditor Volume Password", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x05, SUBFUNC_NO_LENGTH, "Check Auditor Access", 13 /* auditing */, + { 0x58, 0x05, SUBFUNC_NO_LENGTH, "Check Auditor Access", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x06, SUBFUNC_NO_LENGTH, "Delete User Audit Property", 13 /* auditing */, + { 0x58, 0x06, SUBFUNC_NO_LENGTH, "Delete User Audit Property", 13 /* auditing */, NULL, NULL, ncp_0x5806_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x07, SUBFUNC_NO_LENGTH, "Disable Auditing On A Volume", 13 /* auditing */, + { 0x58, 0x07, SUBFUNC_NO_LENGTH, "Disable Auditing On A Volume", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x08, SUBFUNC_NO_LENGTH, "Enable Auditing On A Volume", 13 /* auditing */, + { 0x58, 0x08, SUBFUNC_NO_LENGTH, "Enable Auditing On A Volume", 13 /* auditing */, NULL, NULL, ncp_0x5803_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x09, SUBFUNC_NO_LENGTH, "Query User Being Audited", 13 /* auditing */, + { 0x58, 0x09, SUBFUNC_NO_LENGTH, "Query User Being Audited", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x0a, SUBFUNC_NO_LENGTH, "Read Audit Bit Map", 13 /* auditing */, + { 0x58, 0x0a, SUBFUNC_NO_LENGTH, "Read Audit Bit Map", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x0b, SUBFUNC_NO_LENGTH, "Read Audit File Configuration Header", 13 /* auditing */, + { 0x58, 0x0b, SUBFUNC_NO_LENGTH, "Read Audit File Configuration Header", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x0d, SUBFUNC_NO_LENGTH, "Remove Auditor Access", 13 /* auditing */, + { 0x58, 0x0d, SUBFUNC_NO_LENGTH, "Remove Auditor Access", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x0e, SUBFUNC_NO_LENGTH, "Reset Audit File", 13 /* auditing */, + { 0x58, 0x0e, SUBFUNC_NO_LENGTH, "Reset Audit File", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x0f, SUBFUNC_NO_LENGTH, "Auditing NCP", 13 /* auditing */, + { 0x58, 0x0f, SUBFUNC_NO_LENGTH, "Auditing NCP", 13 /* auditing */, NULL, NULL, ncp_0x580f_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x10, SUBFUNC_NO_LENGTH, "Write Audit Bit Map", 13 /* auditing */, + { 0x58, 0x10, SUBFUNC_NO_LENGTH, "Write Audit Bit Map", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x11, SUBFUNC_NO_LENGTH, "Write Audit File Configuration Header", 13 /* auditing */, + { 0x58, 0x11, SUBFUNC_NO_LENGTH, "Write Audit File Configuration Header", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x12, SUBFUNC_NO_LENGTH, "Change Auditor Volume Password2", 13 /* auditing */, + { 0x58, 0x12, SUBFUNC_NO_LENGTH, "Change Auditor Volume Password2", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x13, SUBFUNC_NO_LENGTH, "Return Audit Flags", 13 /* auditing */, + { 0x58, 0x13, SUBFUNC_NO_LENGTH, "Return Audit Flags", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x14, SUBFUNC_NO_LENGTH, "Close Old Audit File", 13 /* auditing */, + { 0x58, 0x14, SUBFUNC_NO_LENGTH, "Close Old Audit File", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x16, SUBFUNC_NO_LENGTH, "Check Level Two Access", 13 /* auditing */, + { 0x58, 0x16, SUBFUNC_NO_LENGTH, "Check Level Two Access", 13 /* auditing */, NULL, NULL, ncp_0x5803_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x17, SUBFUNC_NO_LENGTH, "Return Old Audit File List", 13 /* auditing */, + { 0x58, 0x17, SUBFUNC_NO_LENGTH, "Return Old Audit File List", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x18, SUBFUNC_NO_LENGTH, "Init Audit File Reads", 13 /* auditing */, + { 0x58, 0x18, SUBFUNC_NO_LENGTH, "Init Audit File Reads", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x19, SUBFUNC_NO_LENGTH, "Read Auditing File", 13 /* auditing */, + { 0x58, 0x19, SUBFUNC_NO_LENGTH, "Read Auditing File", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x1a, SUBFUNC_NO_LENGTH, "Delete Old Audit File", 13 /* auditing */, + { 0x58, 0x1a, SUBFUNC_NO_LENGTH, "Delete Old Audit File", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x1e, SUBFUNC_NO_LENGTH, "Restart Volume auditing", 13 /* auditing */, + { 0x58, 0x1e, SUBFUNC_NO_LENGTH, "Restart Volume auditing", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x58, 0x1f, SUBFUNC_NO_LENGTH, "Set Volume Password", 13 /* auditing */, + { 0x58, 0x1f, SUBFUNC_NO_LENGTH, "Set Volume Password", 13 /* auditing */, NULL, NULL, ncp_0x5801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x59, 0x01, SUBFUNC_NO_LENGTH, "Open/Create File or Subdirectory", 14 /* enhanced */, + { 0x59, 0x01, SUBFUNC_NO_LENGTH, "Open/Create File or Subdirectory", 14 /* enhanced */, ncp_0x5901_request, ncp_0x5901_reply, ncp_0x5901_errors, ncp_0x5901_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x5901_req }, - { 0x59, 0x02, SUBFUNC_NO_LENGTH, "Initialize Search", 14 /* enhanced */, + { 0x59, 0x02, SUBFUNC_NO_LENGTH, "Initialize Search", 14 /* enhanced */, ncp_0x5902_request, ncp_0x5702_reply, ncp_0x5902_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5902_req }, - { 0x59, 0x03, SUBFUNC_NO_LENGTH, "Search for File or Subdirectory", 14 /* enhanced */, + { 0x59, 0x03, SUBFUNC_NO_LENGTH, "Search for File or Subdirectory", 14 /* enhanced */, ncp_0x5903_request, ncp_0x5903_reply, ncp_0x5902_errors, ncp_0x5901_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x5903_req }, - { 0x59, 0x04, SUBFUNC_NO_LENGTH, "Rename Or Move a File or Subdirectory", 14 /* enhanced */, + { 0x59, 0x04, SUBFUNC_NO_LENGTH, "Rename Or Move a File or Subdirectory", 14 /* enhanced */, ncp_0x5904_request, NULL, ncp_0x5904_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5904_req }, - { 0x59, 0x05, SUBFUNC_NO_LENGTH, "Scan File or Subdirectory for Trustees", 14 /* enhanced */, + { 0x59, 0x05, SUBFUNC_NO_LENGTH, "Scan File or Subdirectory for Trustees", 14 /* enhanced */, ncp_0x5905_request, ncp_0x5705_reply, ncp_0x5902_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5905_req }, - { 0x59, 0x06, SUBFUNC_NO_LENGTH, "Obtain File or SubDirectory Information", 14 /* enhanced */, + { 0x59, 0x06, SUBFUNC_NO_LENGTH, "Obtain File or SubDirectory Information", 14 /* enhanced */, ncp_0x5906_request, ncp_0x5906_reply, ncp_0x5906_errors, ncp_0x5906_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x5906_req }, - { 0x59, 0x07, SUBFUNC_NO_LENGTH, "Modify File or Subdirectory DOS Information", 14 /* enhanced */, + { 0x59, 0x07, SUBFUNC_NO_LENGTH, "Modify File or Subdirectory DOS Information", 14 /* enhanced */, ncp_0x5907_request, NULL, ncp_0x5907_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5907_req }, - { 0x59, 0x08, SUBFUNC_NO_LENGTH, "Delete a File or Subdirectory", 14 /* enhanced */, + { 0x59, 0x08, SUBFUNC_NO_LENGTH, "Delete a File or Subdirectory", 14 /* enhanced */, ncp_0x5908_request, NULL, ncp_0x5908_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5908_req }, - { 0x59, 0x09, SUBFUNC_NO_LENGTH, "Set Short Directory Handle", 14 /* enhanced */, + { 0x59, 0x09, SUBFUNC_NO_LENGTH, "Set Short Directory Handle", 14 /* enhanced */, ncp_0x5909_request, NULL, ncp_0x5902_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5909_req }, - { 0x59, 0x0a, SUBFUNC_NO_LENGTH, "Add Trustee Set to File or Subdirectory", 14 /* enhanced */, + { 0x59, 0x0a, SUBFUNC_NO_LENGTH, "Add Trustee Set to File or Subdirectory", 14 /* enhanced */, ncp_0x590a_request, NULL, ncp_0x590a_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x590a_req }, - { 0x59, 0x0b, SUBFUNC_NO_LENGTH, "Delete Trustee Set from File or SubDirectory", 14 /* enhanced */, + { 0x59, 0x0b, SUBFUNC_NO_LENGTH, "Delete Trustee Set from File or SubDirectory", 14 /* enhanced */, ncp_0x590b_request, NULL, ncp_0x590b_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x590b_req }, - { 0x59, 0x0c, SUBFUNC_NO_LENGTH, "Allocate Short Directory Handle", 14 /* enhanced */, + { 0x59, 0x0c, SUBFUNC_NO_LENGTH, "Allocate Short Directory Handle", 14 /* enhanced */, ncp_0x590c_request, ncp_0x570c_reply, ncp_0x5902_errors, ncp_0x570c_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x590c_req }, - { 0x59, 0x10, SUBFUNC_NO_LENGTH, "Scan Salvageable Files", 14 /* enhanced */, + { 0x59, 0x10, SUBFUNC_NO_LENGTH, "Scan Salvageable Files", 14 /* enhanced */, ncp_0x5910_request, ncp_0x5910_reply, ncp_0x5902_errors, ncp_0x5910_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x5910_req }, - { 0x59, 0x11, SUBFUNC_NO_LENGTH, "Recover Salvageable File", 14 /* enhanced */, + { 0x59, 0x11, SUBFUNC_NO_LENGTH, "Recover Salvageable File", 14 /* enhanced */, ncp_0x5911_request, NULL, ncp_0x5911_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5911_req }, - { 0x59, 0x13, SUBFUNC_NO_LENGTH, "Get Name Space Information", 14 /* enhanced */, + { 0x59, 0x13, SUBFUNC_NO_LENGTH, "Get Name Space Information", 14 /* enhanced */, ncp_0x5913_request, ncp_0x5913_reply, ncp_0x5902_errors, ncp_0x5713_req_cond_indexes, REQ_COND_SIZE_VARIABLE, NULL }, - { 0x59, 0x14, SUBFUNC_NO_LENGTH, "Search for File or Subdirectory Set", 14 /* enhanced */, + { 0x59, 0x14, SUBFUNC_NO_LENGTH, "Search for File or Subdirectory Set", 14 /* enhanced */, ncp_0x5914_request, NULL, ncp_0x5902_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x59, 0x16, SUBFUNC_NO_LENGTH, "Generate Directory Base and Volume Number", 14 /* enhanced */, + { 0x59, 0x16, SUBFUNC_NO_LENGTH, "Generate Directory Base and Volume Number", 14 /* enhanced */, ncp_0x5916_request, ncp_0x5716_reply, ncp_0x5902_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5916_req }, - { 0x59, 0x19, SUBFUNC_NO_LENGTH, "Set Name Space Information", 14 /* enhanced */, + { 0x59, 0x19, SUBFUNC_NO_LENGTH, "Set Name Space Information", 14 /* enhanced */, ncp_0x5919_request, NULL, ncp_0x5919_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x59, 0x1c, SUBFUNC_NO_LENGTH, "Get Full Path String", 14 /* enhanced */, + { 0x59, 0x1c, SUBFUNC_NO_LENGTH, "Get Full Path String", 14 /* enhanced */, ncp_0x591c_request, ncp_0x591c_reply, ncp_0x591c_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x591c_req }, - { 0x59, 0x1d, SUBFUNC_NO_LENGTH, "Get Effective Directory Rights", 14 /* enhanced */, + { 0x59, 0x1d, SUBFUNC_NO_LENGTH, "Get Effective Directory Rights", 14 /* enhanced */, ncp_0x591d_request, ncp_0x591d_reply, ncp_0x5902_errors, ncp_0x591d_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x591d_req }, - { 0x59, 0x1e, SUBFUNC_NO_LENGTH, "Open/Create File or Subdirectory", 14 /* enhanced */, + { 0x59, 0x1e, SUBFUNC_NO_LENGTH, "Open/Create File or Subdirectory", 14 /* enhanced */, ncp_0x591e_request, ncp_0x591e_reply, ncp_0x5911_errors, ncp_0x591d_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x591e_req }, - { 0x59, 0x20, SUBFUNC_NO_LENGTH, "Open/Create File or Subdirectory with Callback", 14 /* enhanced */, + { 0x59, 0x20, SUBFUNC_NO_LENGTH, "Open/Create File or Subdirectory with Callback", 14 /* enhanced */, ncp_0x5901_request, ncp_0x5920_reply, ncp_0x5920_errors, ncp_0x5901_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x5920_req }, - { 0x59, 0x21, SUBFUNC_NO_LENGTH, "Open/Create File or Subdirectory II with Callback", 14 /* enhanced */, + { 0x59, 0x21, SUBFUNC_NO_LENGTH, "Open/Create File or Subdirectory II with Callback", 14 /* enhanced */, ncp_0x591e_request, ncp_0x5921_reply, ncp_0x5911_errors, ncp_0x5901_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x5921_req }, - { 0x59, 0x23, SUBFUNC_NO_LENGTH, "Modify DOS Attributes on a File or Subdirectory", 14 /* enhanced */, + { 0x59, 0x23, SUBFUNC_NO_LENGTH, "Modify DOS Attributes on a File or Subdirectory", 14 /* enhanced */, ncp_0x5923_request, ncp_0x5723_reply, ncp_0x5911_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5923_req }, - { 0x59, 0x27, SUBFUNC_NO_LENGTH, "Get Directory Disk Space Restriction", 14 /* enhanced */, + { 0x59, 0x27, SUBFUNC_NO_LENGTH, "Get Directory Disk Space Restriction", 14 /* enhanced */, ncp_0x5927_request, ncp_0x5727_reply, ncp_0x5902_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5927_req }, - { 0x59, 0x28, SUBFUNC_NO_LENGTH, "Search for File or Subdirectory Set (Extended Errors)", 14 /* enhanced */, + { 0x59, 0x28, SUBFUNC_NO_LENGTH, "Search for File or Subdirectory Set (Extended Errors)", 14 /* enhanced */, ncp_0x5914_request, ncp_0x5928_reply, ncp_0x5902_errors, ncp_0x591d_req_cond_indexes, REQ_COND_SIZE_VARIABLE, &info_str_0x5928_req }, - { 0x59, 0x32, SUBFUNC_NO_LENGTH, "Get Object Effective Rights", 14 /* enhanced */, + { 0x59, 0x32, SUBFUNC_NO_LENGTH, "Get Object Effective Rights", 14 /* enhanced */, ncp_0x5932_request, ncp_0x1632_reply, ncp_0x5932_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x59, 0x34, SUBFUNC_NO_LENGTH, "Write Extended Attribute", 14 /* enhanced */, + { 0x59, 0x34, SUBFUNC_NO_LENGTH, "Write Extended Attribute", 14 /* enhanced */, ncp_0x5934_request, ncp_0x5602_reply, ncp_0x5934_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5934_req }, - { 0x59, 0x35, SUBFUNC_NO_LENGTH, "Read Extended Attribute", 14 /* enhanced */, + { 0x59, 0x35, SUBFUNC_NO_LENGTH, "Read Extended Attribute", 14 /* enhanced */, ncp_0x5935_request, ncp_0x5603_reply, ncp_0x5935_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5935_req }, - { 0x59, 0x36, SUBFUNC_NO_LENGTH, "Enumerate Extended Attribute", 14 /* enhanced */, + { 0x59, 0x36, SUBFUNC_NO_LENGTH, "Enumerate Extended Attribute", 14 /* enhanced */, ncp_0x5936_request, ncp_0x5604_reply, ncp_0x5936_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x5936_req }, - { 0x59, 0x47, SUBFUNC_NO_LENGTH, "Scan Volume Trustee Object Paths", 14 /* enhanced */, + { 0x59, 0x47, SUBFUNC_NO_LENGTH, "Scan Volume Trustee Object Paths", 14 /* enhanced */, ncp_0x5947_request, ncp_0x5947_reply, ncp_0x5902_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5a, 0x00, SUBFUNC_WITH_LENGTH, "Parse Tree", 2 /* file */, + { 0x5a, 0x00, SUBFUNC_WITH_LENGTH, "Parse Tree", 2 /* file */, ncp_0x5a00_request, ncp_0x5a00_reply, ncp_0x5a00_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5a, 0x0a, SUBFUNC_WITH_LENGTH, "Get Reference Count from Dir Entry Number", 2 /* file */, + { 0x5a, 0x0a, SUBFUNC_WITH_LENGTH, "Get Reference Count from Dir Entry Number", 2 /* file */, ncp_0x5a0a_request, ncp_0x5a0a_reply, ncp_0x5a00_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5a, 0x0b, SUBFUNC_WITH_LENGTH, "Get Reference Count from Dir Handle", 2 /* file */, + { 0x5a, 0x0b, SUBFUNC_WITH_LENGTH, "Get Reference Count from Dir Handle", 2 /* file */, ncp_0x5a0b_request, ncp_0x5a0a_reply, ncp_0x5a00_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5a, 0x0c, SUBFUNC_WITH_LENGTH, "Set Compressed File Size", 2 /* file */, + { 0x5a, 0x0c, SUBFUNC_WITH_LENGTH, "Set Compressed File Size", 2 /* file */, ncp_0x5a0c_request, ncp_0x5a0c_reply, ncp_0x5a00_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5a, 0x80, SUBFUNC_WITH_LENGTH, "Move File Data To Data Migration", 15 /* migration */, + { 0x5a, 0x80, SUBFUNC_WITH_LENGTH, "Move File Data To Data Migration", 15 /* migration */, ncp_0x5a80_request, NULL, ncp_0x5a80_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5a, 0x81, SUBFUNC_WITH_LENGTH, "Data Migration File Information", 15 /* migration */, + { 0x5a, 0x81, SUBFUNC_WITH_LENGTH, "Data Migration File Information", 15 /* migration */, ncp_0x5a81_request, ncp_0x5a81_reply, ncp_0x5a80_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5a, 0x82, SUBFUNC_WITH_LENGTH, "Volume Data Migration Status", 15 /* migration */, + { 0x5a, 0x82, SUBFUNC_WITH_LENGTH, "Volume Data Migration Status", 15 /* migration */, ncp_0x5a82_request, ncp_0x5a82_reply, ncp_0x5a80_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5a, 0x83, SUBFUNC_WITH_LENGTH, "Migrator Status Info", 15 /* migration */, + { 0x5a, 0x83, SUBFUNC_WITH_LENGTH, "Migrator Status Info", 15 /* migration */, NULL, ncp_0x5a83_reply, ncp_0x5a80_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5a, 0x84, SUBFUNC_WITH_LENGTH, "Data Migration Support Module Information", 15 /* migration */, + { 0x5a, 0x84, SUBFUNC_WITH_LENGTH, "Data Migration Support Module Information", 15 /* migration */, ncp_0x5a84_request, ncp_0x5a84_reply, ncp_0x5a80_errors, ncp_0x5a84_req_cond_indexes, REQ_COND_SIZE_VARIABLE, NULL }, - { 0x5a, 0x85, SUBFUNC_WITH_LENGTH, "Move File Data From Data Migration", 15 /* migration */, + { 0x5a, 0x85, SUBFUNC_WITH_LENGTH, "Move File Data From Data Migration", 15 /* migration */, ncp_0x5a81_request, NULL, ncp_0x5a80_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5a, 0x86, SUBFUNC_WITH_LENGTH, "Get/Set Default Read-Write Support Module ID", 15 /* migration */, + { 0x5a, 0x86, SUBFUNC_WITH_LENGTH, "Get/Set Default Read-Write Support Module ID", 15 /* migration */, ncp_0x5a86_request, ncp_0x5a86_reply, ncp_0x5a80_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5a, 0x87, SUBFUNC_WITH_LENGTH, "Data Migration Support Module Capacity Request", 15 /* migration */, + { 0x5a, 0x87, SUBFUNC_WITH_LENGTH, "Data Migration Support Module Capacity Request", 15 /* migration */, ncp_0x5a87_request, ncp_0x5a87_reply, ncp_0x5a80_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5a, 0x88, SUBFUNC_WITH_LENGTH, "RTDM Request", 15 /* migration */, + { 0x5a, 0x88, SUBFUNC_WITH_LENGTH, "RTDM Request", 15 /* migration */, ncp_0x5a88_request, NULL, ncp_0x5a80_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5a, 0x96, SUBFUNC_WITH_LENGTH, "File Migration Request", 2 /* file */, + { 0x5a, 0x96, SUBFUNC_WITH_LENGTH, "File Migration Request", 2 /* file */, ncp_0x5a96_request, NULL, ncp_0x5a96_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5b, 0x00, NO_SUBFUNC, "NMAS Graded Authentication", 16 /* nmas */, + { 0x5b, 0x00, NO_SUBFUNC, "NMAS Graded Authentication", 16 /* nmas */, NULL, NULL, ncp_0x5b_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5c, 0x01, SUBFUNC_NO_LENGTH, "SecretStore Services (Ping Server)", 17 /* sss */, + { 0x5c, 0x01, SUBFUNC_NO_LENGTH, "SecretStore Services (Ping Server)", 17 /* sss */, NULL, NULL, ncp_0x5b_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5c, 0x02, SUBFUNC_NO_LENGTH, "SecretStore Services (Fragment)", 17 /* sss */, + { 0x5c, 0x02, SUBFUNC_NO_LENGTH, "SecretStore Services (Fragment)", 17 /* sss */, NULL, NULL, ncp_0x5b_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5c, 0x03, SUBFUNC_NO_LENGTH, "SecretStore Services (Write App Secrets)", 17 /* sss */, + { 0x5c, 0x03, SUBFUNC_NO_LENGTH, "SecretStore Services (Write App Secrets)", 17 /* sss */, NULL, NULL, ncp_0x5b_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5c, 0x04, SUBFUNC_NO_LENGTH, "SecretStore Services (Add Secret ID)", 17 /* sss */, + { 0x5c, 0x04, SUBFUNC_NO_LENGTH, "SecretStore Services (Add Secret ID)", 17 /* sss */, NULL, NULL, ncp_0x5b_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5c, 0x05, SUBFUNC_NO_LENGTH, "SecretStore Services (Remove Secret ID)", 17 /* sss */, + { 0x5c, 0x05, SUBFUNC_NO_LENGTH, "SecretStore Services (Remove Secret ID)", 17 /* sss */, NULL, NULL, ncp_0x5b_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5c, 0x06, SUBFUNC_NO_LENGTH, "SecretStore Services (Remove SecretStore)", 17 /* sss */, + { 0x5c, 0x06, SUBFUNC_NO_LENGTH, "SecretStore Services (Remove SecretStore)", 17 /* sss */, NULL, NULL, ncp_0x5b_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5c, 0x07, SUBFUNC_NO_LENGTH, "SecretStore Services (Enumerate Secret IDs)", 17 /* sss */, + { 0x5c, 0x07, SUBFUNC_NO_LENGTH, "SecretStore Services (Enumerate Secret IDs)", 17 /* sss */, NULL, NULL, ncp_0x5b_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5c, 0x08, SUBFUNC_NO_LENGTH, "SecretStore Services (Unlock Store)", 17 /* sss */, + { 0x5c, 0x08, SUBFUNC_NO_LENGTH, "SecretStore Services (Unlock Store)", 17 /* sss */, NULL, NULL, ncp_0x5b_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5c, 0x09, SUBFUNC_NO_LENGTH, "SecretStore Services (Set Master Password)", 17 /* sss */, + { 0x5c, 0x09, SUBFUNC_NO_LENGTH, "SecretStore Services (Set Master Password)", 17 /* sss */, NULL, NULL, ncp_0x5b_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5c, 0x0a, SUBFUNC_NO_LENGTH, "SecretStore Services (Get Service Information)", 17 /* sss */, + { 0x5c, 0x0a, SUBFUNC_NO_LENGTH, "SecretStore Services (Get Service Information)", 17 /* sss */, NULL, NULL, ncp_0x5b_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5e, 0x01, SUBFUNC_NO_LENGTH, "NMAS Communications Packet (Ping)", 16 /* nmas */, + { 0x5e, 0x01, SUBFUNC_NO_LENGTH, "NMAS Communications Packet (Ping)", 16 /* nmas */, NULL, NULL, ncp_0x5e01_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5e, 0x02, SUBFUNC_NO_LENGTH, "NMAS Communications Packet (Fragment)", 16 /* nmas */, + { 0x5e, 0x02, SUBFUNC_NO_LENGTH, "NMAS Communications Packet (Fragment)", 16 /* nmas */, NULL, NULL, ncp_0x5e01_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x5e, 0x03, SUBFUNC_NO_LENGTH, "NMAS Communications Packet (Abort)", 16 /* nmas */, + { 0x5e, 0x03, SUBFUNC_NO_LENGTH, "NMAS Communications Packet (Abort)", 16 /* nmas */, NULL, NULL, ncp_0x5e01_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x61, 0x00, NO_SUBFUNC, "Get Big Packet NCP Max Packet Size", 3 /* connection */, + { 0x61, 0x00, NO_SUBFUNC, "Get Big Packet NCP Max Packet Size", 3 /* connection */, ncp_0x61_request, ncp_0x61_reply, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x61_req }, - { 0x63, 0x00, NO_SUBFUNC, "Undocumented Packet Burst", 18 /* pburst */, + { 0x63, 0x00, NO_SUBFUNC, "Undocumented Packet Burst", 18 /* pburst */, NULL, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x64, 0x00, NO_SUBFUNC, "Undocumented Packet Burst", 18 /* pburst */, + { 0x64, 0x00, NO_SUBFUNC, "Undocumented Packet Burst", 18 /* pburst */, NULL, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x65, 0x00, NO_SUBFUNC, "Packet Burst Connection Request", 18 /* pburst */, + { 0x65, 0x00, NO_SUBFUNC, "Packet Burst Connection Request", 18 /* pburst */, ncp_0x65_request, ncp_0x65_reply, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x66, 0x00, NO_SUBFUNC, "Undocumented Packet Burst", 18 /* pburst */, + { 0x66, 0x00, NO_SUBFUNC, "Undocumented Packet Burst", 18 /* pburst */, NULL, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x67, 0x00, NO_SUBFUNC, "Undocumented Packet Burst", 18 /* pburst */, + { 0x67, 0x00, NO_SUBFUNC, "Undocumented Packet Burst", 18 /* pburst */, NULL, NULL, ncp_0x1_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0x01, SUBFUNC_NO_LENGTH, "Ping for NDS NCP", 19 /* nds */, + { 0x68, 0x01, SUBFUNC_NO_LENGTH, "Ping for NDS NCP", 19 /* nds */, NULL, NULL, ncp_0x6801_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0x02, SUBFUNC_NO_LENGTH, "Send NDS Fragmented Request/Reply", 19 /* nds */, + { 0x68, 0x02, SUBFUNC_NO_LENGTH, "Send NDS Fragmented Request/Reply", 19 /* nds */, NULL, NULL, ncp_0x6802_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0x03, SUBFUNC_NO_LENGTH, "Fragment Close", 19 /* nds */, + { 0x68, 0x03, SUBFUNC_NO_LENGTH, "Fragment Close", 19 /* nds */, ncp_0x6803_request, NULL, ncp_0x2_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0x04, SUBFUNC_NO_LENGTH, "Return Bindery Context", 19 /* nds */, + { 0x68, 0x04, SUBFUNC_NO_LENGTH, "Return Bindery Context", 19 /* nds */, NULL, ncp_0x6804_reply, ncp_0x6804_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0x05, SUBFUNC_NO_LENGTH, "Monitor NDS Connection", 19 /* nds */, + { 0x68, 0x05, SUBFUNC_NO_LENGTH, "Monitor NDS Connection", 19 /* nds */, NULL, NULL, ncp_0x6805_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0x06, SUBFUNC_NO_LENGTH, "Return NDS Statistics", 19 /* nds */, + { 0x68, 0x06, SUBFUNC_NO_LENGTH, "Return NDS Statistics", 19 /* nds */, ncp_0x6806_request, NULL, ncp_0x6806_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0x07, SUBFUNC_NO_LENGTH, "Clear NDS Statistics", 19 /* nds */, + { 0x68, 0x07, SUBFUNC_NO_LENGTH, "Clear NDS Statistics", 19 /* nds */, NULL, NULL, ncp_0x6806_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0x08, SUBFUNC_NO_LENGTH, "Reload NDS Software", 19 /* nds */, + { 0x68, 0x08, SUBFUNC_NO_LENGTH, "Reload NDS Software", 19 /* nds */, NULL, ncp_0x6808_reply, ncp_0x6806_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xc8, SUBFUNC_NO_LENGTH, "Query Container Audit Status", 13 /* auditing */, + { 0x68, 0xc8, SUBFUNC_NO_LENGTH, "Query Container Audit Status", 13 /* auditing */, ncp_0x17fe_request, ncp_0x5801_reply, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xca, SUBFUNC_NO_LENGTH, "Add Auditor Access", 13 /* auditing */, + { 0x68, 0xca, SUBFUNC_NO_LENGTH, "Add Auditor Access", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xcb, SUBFUNC_NO_LENGTH, "Change Auditor Container Password", 13 /* auditing */, + { 0x68, 0xcb, SUBFUNC_NO_LENGTH, "Change Auditor Container Password", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xcc, SUBFUNC_NO_LENGTH, "Check Auditor Access", 13 /* auditing */, + { 0x68, 0xcc, SUBFUNC_NO_LENGTH, "Check Auditor Access", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x80, 0xce, SUBFUNC_NO_LENGTH, "Disable Container Auditing", 13 /* auditing */, + { 0x80, 0xce, SUBFUNC_NO_LENGTH, "Disable Container Auditing", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xcf, SUBFUNC_NO_LENGTH, "Enable Container Auditing", 13 /* auditing */, + { 0x68, 0xcf, SUBFUNC_NO_LENGTH, "Enable Container Auditing", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xd1, SUBFUNC_NO_LENGTH, "Read Audit File Header", 13 /* auditing */, + { 0x68, 0xd1, SUBFUNC_NO_LENGTH, "Read Audit File Header", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xd3, SUBFUNC_NO_LENGTH, "Remove Auditor Access", 13 /* auditing */, + { 0x68, 0xd3, SUBFUNC_NO_LENGTH, "Remove Auditor Access", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xd4, SUBFUNC_NO_LENGTH, "Reset Audit File", 13 /* auditing */, + { 0x68, 0xd4, SUBFUNC_NO_LENGTH, "Reset Audit File", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xd6, SUBFUNC_NO_LENGTH, "Write Audit File Configuration Header", 13 /* auditing */, + { 0x68, 0xd6, SUBFUNC_NO_LENGTH, "Write Audit File Configuration Header", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xd7, SUBFUNC_NO_LENGTH, "Change Auditor Container Password2", 13 /* auditing */, + { 0x68, 0xd7, SUBFUNC_NO_LENGTH, "Change Auditor Container Password2", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xd8, SUBFUNC_NO_LENGTH, "Return Audit Flags", 13 /* auditing */, + { 0x68, 0xd8, SUBFUNC_NO_LENGTH, "Return Audit Flags", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xd9, SUBFUNC_NO_LENGTH, "Close Old Audit File", 13 /* auditing */, + { 0x68, 0xd9, SUBFUNC_NO_LENGTH, "Close Old Audit File", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xdb, SUBFUNC_NO_LENGTH, "Check Level Two Access", 13 /* auditing */, + { 0x68, 0xdb, SUBFUNC_NO_LENGTH, "Check Level Two Access", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xdc, SUBFUNC_NO_LENGTH, "Check Object Audited", 13 /* auditing */, + { 0x68, 0xdc, SUBFUNC_NO_LENGTH, "Check Object Audited", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xdd, SUBFUNC_NO_LENGTH, "Change Object Audited", 13 /* auditing */, + { 0x68, 0xdd, SUBFUNC_NO_LENGTH, "Change Object Audited", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xde, SUBFUNC_NO_LENGTH, "Return Old Audit File List", 13 /* auditing */, + { 0x68, 0xde, SUBFUNC_NO_LENGTH, "Return Old Audit File List", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xdf, SUBFUNC_NO_LENGTH, "Init Audit File Reads", 13 /* auditing */, + { 0x68, 0xdf, SUBFUNC_NO_LENGTH, "Init Audit File Reads", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xe0, SUBFUNC_NO_LENGTH, "Read Auditing File", 13 /* auditing */, + { 0x68, 0xe0, SUBFUNC_NO_LENGTH, "Read Auditing File", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xe1, SUBFUNC_NO_LENGTH, "Delete Old Audit File", 13 /* auditing */, + { 0x68, 0xe1, SUBFUNC_NO_LENGTH, "Delete Old Audit File", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xe5, SUBFUNC_NO_LENGTH, "Set Audit Password", 13 /* auditing */, + { 0x68, 0xe5, SUBFUNC_NO_LENGTH, "Set Audit Password", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x68, 0xe7, SUBFUNC_NO_LENGTH, "External Audit Append To File", 13 /* auditing */, + { 0x68, 0xe7, SUBFUNC_NO_LENGTH, "External Audit Append To File", 13 /* auditing */, NULL, NULL, ncp_0x68c8_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x69, 0x00, NO_SUBFUNC, "Log File", 0 /* sync */, + { 0x69, 0x00, NO_SUBFUNC, "Log File", 0 /* sync */, ncp_0x69_request, NULL, ncp_0x69_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x69_req }, - { 0x6a, 0x00, NO_SUBFUNC, "Lock File Set", 0 /* sync */, + { 0x6a, 0x00, NO_SUBFUNC, "Lock File Set", 0 /* sync */, ncp_0x4_request, NULL, ncp_0x69_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x6b, 0x00, NO_SUBFUNC, "Log Logical Record", 0 /* sync */, + { 0x6b, 0x00, NO_SUBFUNC, "Log Logical Record", 0 /* sync */, ncp_0x6b_request, NULL, ncp_0x6b_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x6b_req }, - { 0x6c, 0x00, NO_SUBFUNC, "Log Logical Record", 0 /* sync */, + { 0x6c, 0x00, NO_SUBFUNC, "Log Logical Record", 0 /* sync */, ncp_0xa_request, NULL, ncp_0x6b_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x6d, 0x00, NO_SUBFUNC, "Log Physical Record", 0 /* sync */, + { 0x6d, 0x00, NO_SUBFUNC, "Log Physical Record", 0 /* sync */, ncp_0x6d_request, NULL, ncp_0x6d_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x6e, 0x00, NO_SUBFUNC, "Lock Physical Record Set", 0 /* sync */, + { 0x6e, 0x00, NO_SUBFUNC, "Lock Physical Record Set", 0 /* sync */, ncp_0x1b_request, NULL, ncp_0x6d_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x6f, 0x00, SUBFUNC_NO_LENGTH, "Open/Create a Semaphore", 0 /* sync */, + { 0x6f, 0x00, SUBFUNC_NO_LENGTH, "Open/Create a Semaphore", 0 /* sync */, ncp_0x6f00_request, ncp_0x6f00_reply, ncp_0x2000_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x6f00_req }, - { 0x6f, 0x01, SUBFUNC_NO_LENGTH, "Examine Semaphore", 0 /* sync */, + { 0x6f, 0x01, SUBFUNC_NO_LENGTH, "Examine Semaphore", 0 /* sync */, ncp_0x6f01_request, ncp_0x2001_reply, ncp_0x2000_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x6f, 0x02, SUBFUNC_NO_LENGTH, "Wait On (P) Semaphore", 0 /* sync */, + { 0x6f, 0x02, SUBFUNC_NO_LENGTH, "Wait On (P) Semaphore", 0 /* sync */, ncp_0x6f02_request, NULL, ncp_0x6f02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x6f, 0x03, SUBFUNC_NO_LENGTH, "Signal (V) Semaphore", 0 /* sync */, + { 0x6f, 0x03, SUBFUNC_NO_LENGTH, "Signal (V) Semaphore", 0 /* sync */, ncp_0x6f01_request, NULL, ncp_0x6f02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x6f, 0x04, SUBFUNC_NO_LENGTH, "Close Semaphore", 0 /* sync */, + { 0x6f, 0x04, SUBFUNC_NO_LENGTH, "Close Semaphore", 0 /* sync */, ncp_0x6f01_request, ncp_0x6f04_reply, ncp_0x6f02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x70, 0x00, NO_SUBFUNC, "Clear and Get Waiting Lock Completion", 0 /* sync */, + { 0x70, 0x00, NO_SUBFUNC, "Clear and Get Waiting Lock Completion", 0 /* sync */, NULL, NULL, ncp_0x5_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x72, 0x01, SUBFUNC_WITH_LENGTH, "Timesync Get Time", 20 /* tsync */, + { 0x72, 0x01, SUBFUNC_WITH_LENGTH, "Timesync Get Time", 20 /* tsync */, NULL, ncp_0x7201_reply, ncp_0x7201_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x72, 0x02, SUBFUNC_WITH_LENGTH, "Timesync Exchange Time", 20 /* tsync */, + { 0x72, 0x02, SUBFUNC_WITH_LENGTH, "Timesync Exchange Time", 20 /* tsync */, ncp_0x7202_request, ncp_0x7202_reply, ncp_0x7201_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x7202_req }, - { 0x72, 0x05, SUBFUNC_WITH_LENGTH, "Timesync Get Server List", 20 /* tsync */, + { 0x72, 0x05, SUBFUNC_WITH_LENGTH, "Timesync Get Server List", 20 /* tsync */, ncp_0x7205_request, ncp_0x7205_reply, ncp_0x7201_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x72, 0x06, SUBFUNC_WITH_LENGTH, "Timesync Set Server List", 20 /* tsync */, + { 0x72, 0x06, SUBFUNC_WITH_LENGTH, "Timesync Set Server List", 20 /* tsync */, ncp_0x7205_request, ncp_0x7205_reply, ncp_0x7201_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x72, 0x0c, SUBFUNC_WITH_LENGTH, "Timesync Get Version", 20 /* tsync */, + { 0x72, 0x0c, SUBFUNC_WITH_LENGTH, "Timesync Get Version", 20 /* tsync */, NULL, ncp_0x720c_reply, ncp_0x7201_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x01, SUBFUNC_WITH_LENGTH, "Get Cache Information", 21 /* stats */, + { 0x7b, 0x01, SUBFUNC_WITH_LENGTH, "Get Cache Information", 21 /* stats */, NULL, ncp_0x7b01_reply, ncp_0x7b01_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x02, SUBFUNC_WITH_LENGTH, "Get File Server Information", 21 /* stats */, + { 0x7b, 0x02, SUBFUNC_WITH_LENGTH, "Get File Server Information", 21 /* stats */, NULL, ncp_0x7b02_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x03, SUBFUNC_WITH_LENGTH, "NetWare File System Information", 21 /* stats */, + { 0x7b, 0x03, SUBFUNC_WITH_LENGTH, "NetWare File System Information", 21 /* stats */, ncp_0x7b03_request, ncp_0x7b03_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x04, SUBFUNC_WITH_LENGTH, "User Information", 21 /* stats */, + { 0x7b, 0x04, SUBFUNC_WITH_LENGTH, "User Information", 21 /* stats */, ncp_0x7b04_request, ncp_0x7b04_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x05, SUBFUNC_WITH_LENGTH, "Packet Burst Information", 21 /* stats */, + { 0x7b, 0x05, SUBFUNC_WITH_LENGTH, "Packet Burst Information", 21 /* stats */, NULL, ncp_0x7b05_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x06, SUBFUNC_WITH_LENGTH, "IPX SPX Information", 21 /* stats */, + { 0x7b, 0x06, SUBFUNC_WITH_LENGTH, "IPX SPX Information", 21 /* stats */, NULL, ncp_0x7b06_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x07, SUBFUNC_WITH_LENGTH, "Garbage Collection Information", 21 /* stats */, + { 0x7b, 0x07, SUBFUNC_WITH_LENGTH, "Garbage Collection Information", 21 /* stats */, NULL, ncp_0x7b07_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x08, SUBFUNC_WITH_LENGTH, "CPU Information", 21 /* stats */, + { 0x7b, 0x08, SUBFUNC_WITH_LENGTH, "CPU Information", 21 /* stats */, ncp_0x7b08_request, ncp_0x7b08_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x09, SUBFUNC_WITH_LENGTH, "Volume Switch Information", 21 /* stats */, + { 0x7b, 0x09, SUBFUNC_WITH_LENGTH, "Volume Switch Information", 21 /* stats */, ncp_0x7205_request, ncp_0x7b09_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x0a, SUBFUNC_WITH_LENGTH, "Get NLM Loaded List", 21 /* stats */, + { 0x7b, 0x0a, SUBFUNC_WITH_LENGTH, "Get NLM Loaded List", 21 /* stats */, ncp_0x7205_request, ncp_0x7b0a_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x0b, SUBFUNC_WITH_LENGTH, "NLM Information", 21 /* stats */, + { 0x7b, 0x0b, SUBFUNC_WITH_LENGTH, "NLM Information", 21 /* stats */, ncp_0x7b0b_request, ncp_0x7b0b_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x0c, SUBFUNC_WITH_LENGTH, "Get Directory Cache Information", 21 /* stats */, + { 0x7b, 0x0c, SUBFUNC_WITH_LENGTH, "Get Directory Cache Information", 21 /* stats */, NULL, ncp_0x7b0c_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x0d, SUBFUNC_WITH_LENGTH, "Get Operating System Version Information", 21 /* stats */, + { 0x7b, 0x0d, SUBFUNC_WITH_LENGTH, "Get Operating System Version Information", 21 /* stats */, NULL, ncp_0x7b0d_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x0e, SUBFUNC_WITH_LENGTH, "Get Active Connection List by Type", 21 /* stats */, + { 0x7b, 0x0e, SUBFUNC_WITH_LENGTH, "Get Active Connection List by Type", 21 /* stats */, ncp_0x7b0e_request, ncp_0x7b0e_reply, ncp_0x7b0e_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x0f, SUBFUNC_WITH_LENGTH, "Get NLM Resource Tag List", 21 /* stats */, + { 0x7b, 0x0f, SUBFUNC_WITH_LENGTH, "Get NLM Resource Tag List", 21 /* stats */, ncp_0x7b0f_request, ncp_0x7b0f_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x10, SUBFUNC_WITH_LENGTH, "Enumerate Connection Information from Connection List", 21 /* stats */, + { 0x7b, 0x10, SUBFUNC_WITH_LENGTH, "Enumerate Connection Information from Connection List", 21 /* stats */, ncp_0x7b10_request, ncp_0x7b10_reply, ncp_0x7b02_errors, ncp_0x7b10_req_cond_indexes, REQ_COND_SIZE_VARIABLE, NULL }, - { 0x7b, 0x11, SUBFUNC_WITH_LENGTH, "Enumerate NCP Service Network Addresses", 21 /* stats */, + { 0x7b, 0x11, SUBFUNC_WITH_LENGTH, "Enumerate NCP Service Network Addresses", 21 /* stats */, ncp_0x7b11_request, ncp_0x7b11_reply, ncp_0x7b11_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x14, SUBFUNC_WITH_LENGTH, "Active LAN Board List", 21 /* stats */, + { 0x7b, 0x14, SUBFUNC_WITH_LENGTH, "Active LAN Board List", 21 /* stats */, ncp_0x7205_request, ncp_0x7b14_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x15, SUBFUNC_WITH_LENGTH, "LAN Configuration Information", 21 /* stats */, + { 0x7b, 0x15, SUBFUNC_WITH_LENGTH, "LAN Configuration Information", 21 /* stats */, ncp_0x7b15_request, ncp_0x7b15_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x16, SUBFUNC_WITH_LENGTH, "LAN Common Counters Information", 21 /* stats */, + { 0x7b, 0x16, SUBFUNC_WITH_LENGTH, "LAN Common Counters Information", 21 /* stats */, ncp_0x7b16_request, ncp_0x7b16_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x17, SUBFUNC_WITH_LENGTH, "LAN Custom Counters Information", 21 /* stats */, + { 0x7b, 0x17, SUBFUNC_WITH_LENGTH, "LAN Custom Counters Information", 21 /* stats */, ncp_0x7b17_request, ncp_0x7b17_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x18, SUBFUNC_WITH_LENGTH, "LAN Name Information", 21 /* stats */, + { 0x7b, 0x18, SUBFUNC_WITH_LENGTH, "LAN Name Information", 21 /* stats */, ncp_0x7b15_request, ncp_0x7b18_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x19, SUBFUNC_WITH_LENGTH, "LSL Information", 21 /* stats */, + { 0x7b, 0x19, SUBFUNC_WITH_LENGTH, "LSL Information", 21 /* stats */, NULL, ncp_0x7b19_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x1a, SUBFUNC_WITH_LENGTH, "LSL Logical Board Statistics", 21 /* stats */, + { 0x7b, 0x1a, SUBFUNC_WITH_LENGTH, "LSL Logical Board Statistics", 21 /* stats */, ncp_0x7b15_request, ncp_0x7b1a_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x1b, SUBFUNC_WITH_LENGTH, "MLID Board Information", 21 /* stats */, + { 0x7b, 0x1b, SUBFUNC_WITH_LENGTH, "MLID Board Information", 21 /* stats */, ncp_0x7b15_request, ncp_0x7b1b_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x1e, SUBFUNC_WITH_LENGTH, "Get Media Manager Object Information", 21 /* stats */, + { 0x7b, 0x1e, SUBFUNC_WITH_LENGTH, "Get Media Manager Object Information", 21 /* stats */, ncp_0x7b1e_request, ncp_0x7b1e_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x1f, SUBFUNC_WITH_LENGTH, "Get Media Manager Objects List", 21 /* stats */, + { 0x7b, 0x1f, SUBFUNC_WITH_LENGTH, "Get Media Manager Objects List", 21 /* stats */, ncp_0x7b1f_request, ncp_0x7b1f_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x20, SUBFUNC_WITH_LENGTH, "Get Media Manager Object Childrens List", 21 /* stats */, + { 0x7b, 0x20, SUBFUNC_WITH_LENGTH, "Get Media Manager Object Childrens List", 21 /* stats */, ncp_0x7b20_request, ncp_0x7b1f_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x21, SUBFUNC_WITH_LENGTH, "Get Volume Segment List", 21 /* stats */, + { 0x7b, 0x21, SUBFUNC_WITH_LENGTH, "Get Volume Segment List", 21 /* stats */, ncp_0x7b21_request, ncp_0x7b21_reply, ncp_0x7b21_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x22, SUBFUNC_WITH_LENGTH, "Get Volume Information by Level", 21 /* stats */, + { 0x7b, 0x22, SUBFUNC_WITH_LENGTH, "Get Volume Information by Level", 21 /* stats */, ncp_0x7b22_request, ncp_0x7b22_reply, ncp_0x7b02_errors, ncp_0x7b22_req_cond_indexes, REQ_COND_SIZE_VARIABLE, NULL }, - { 0x7b, 0x28, SUBFUNC_WITH_LENGTH, "Active Protocol Stacks", 21 /* stats */, + { 0x7b, 0x28, SUBFUNC_WITH_LENGTH, "Active Protocol Stacks", 21 /* stats */, ncp_0x7205_request, ncp_0x7b28_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x29, SUBFUNC_WITH_LENGTH, "Get Protocol Stack Configuration Information", 21 /* stats */, + { 0x7b, 0x29, SUBFUNC_WITH_LENGTH, "Get Protocol Stack Configuration Information", 21 /* stats */, ncp_0x7b29_request, ncp_0x7b29_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x2a, SUBFUNC_WITH_LENGTH, "Get Protocol Stack Statistics Information", 21 /* stats */, + { 0x7b, 0x2a, SUBFUNC_WITH_LENGTH, "Get Protocol Stack Statistics Information", 21 /* stats */, ncp_0x7b29_request, ncp_0x7b2a_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x2b, SUBFUNC_WITH_LENGTH, "Get Protocol Stack Custom Information", 21 /* stats */, + { 0x7b, 0x2b, SUBFUNC_WITH_LENGTH, "Get Protocol Stack Custom Information", 21 /* stats */, ncp_0x7b2b_request, ncp_0x7b2b_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x2c, SUBFUNC_WITH_LENGTH, "Get Protocol Stack Numbers by Media Number", 21 /* stats */, + { 0x7b, 0x2c, SUBFUNC_WITH_LENGTH, "Get Protocol Stack Numbers by Media Number", 21 /* stats */, ncp_0x7b2c_request, ncp_0x7b2c_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x2d, SUBFUNC_WITH_LENGTH, "Get Protocol Stack Numbers by LAN Board Number", 21 /* stats */, + { 0x7b, 0x2d, SUBFUNC_WITH_LENGTH, "Get Protocol Stack Numbers by LAN Board Number", 21 /* stats */, ncp_0x7b15_request, ncp_0x7b2c_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x2e, SUBFUNC_WITH_LENGTH, "Get Media Name by Media Number", 21 /* stats */, + { 0x7b, 0x2e, SUBFUNC_WITH_LENGTH, "Get Media Name by Media Number", 21 /* stats */, ncp_0x7b2c_request, ncp_0x7b2e_reply, ncp_0x7b02_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x2f, SUBFUNC_WITH_LENGTH, "Get Loaded Media Number", 21 /* stats */, + { 0x7b, 0x2f, SUBFUNC_WITH_LENGTH, "Get Loaded Media Number", 21 /* stats */, NULL, ncp_0x7b2f_reply, ncp_0x7b2f_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x32, SUBFUNC_WITH_LENGTH, "Get General Router and SAP Information", 21 /* stats */, + { 0x7b, 0x32, SUBFUNC_WITH_LENGTH, "Get General Router and SAP Information", 21 /* stats */, NULL, ncp_0x7b32_reply, ncp_0x7b2f_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x33, SUBFUNC_WITH_LENGTH, "Get Network Router Information", 21 /* stats */, + { 0x7b, 0x33, SUBFUNC_WITH_LENGTH, "Get Network Router Information", 21 /* stats */, ncp_0x7b33_request, ncp_0x7b33_reply, ncp_0x7b33_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x34, SUBFUNC_WITH_LENGTH, "Get Network Routers Information", 21 /* stats */, + { 0x7b, 0x34, SUBFUNC_WITH_LENGTH, "Get Network Routers Information", 21 /* stats */, ncp_0x7b34_request, ncp_0x7b34_reply, ncp_0x7b33_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x35, SUBFUNC_WITH_LENGTH, "Get Known Networks Information", 21 /* stats */, + { 0x7b, 0x35, SUBFUNC_WITH_LENGTH, "Get Known Networks Information", 21 /* stats */, ncp_0x7205_request, ncp_0x7b35_reply, ncp_0x7b2f_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x36, SUBFUNC_WITH_LENGTH, "Get Server Information", 21 /* stats */, + { 0x7b, 0x36, SUBFUNC_WITH_LENGTH, "Get Server Information", 21 /* stats */, ncp_0x7b36_request, ncp_0x7b36_reply, ncp_0x7b2f_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x7b36_req }, - { 0x7b, 0x37, SUBFUNC_WITH_LENGTH, "Get Server Sources Information", 21 /* stats */, + { 0x7b, 0x37, SUBFUNC_WITH_LENGTH, "Get Server Sources Information", 21 /* stats */, ncp_0x7b37_request, ncp_0x7b37_reply, ncp_0x7b33_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x7b37_req }, - { 0x7b, 0x38, SUBFUNC_WITH_LENGTH, "Get Known Servers Information", 21 /* stats */, + { 0x7b, 0x38, SUBFUNC_WITH_LENGTH, "Get Known Servers Information", 21 /* stats */, ncp_0x7b38_request, ncp_0x7b38_reply, ncp_0x7b33_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x3c, SUBFUNC_WITH_LENGTH, "Get Server Set Commands Information", 21 /* stats */, + { 0x7b, 0x3c, SUBFUNC_WITH_LENGTH, "Get Server Set Commands Information", 21 /* stats */, ncp_0x7205_request, ncp_0x7b3c_reply, ncp_0x7b2f_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x3d, SUBFUNC_WITH_LENGTH, "Get Server Set Categories", 21 /* stats */, + { 0x7b, 0x3d, SUBFUNC_WITH_LENGTH, "Get Server Set Categories", 21 /* stats */, ncp_0x7205_request, ncp_0x7b3d_reply, ncp_0x7b2f_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x3e, SUBFUNC_WITH_LENGTH, "Get Server Set Commands Information By Name", 21 /* stats */, + { 0x7b, 0x3e, SUBFUNC_WITH_LENGTH, "Get Server Set Commands Information By Name", 21 /* stats */, ncp_0x7b3e_request, ncp_0x7b3e_reply, ncp_0x7b3e_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x7b3e_req }, - { 0x7b, 0x46, SUBFUNC_WITH_LENGTH, "Get Current Compressing File", 21 /* stats */, + { 0x7b, 0x46, SUBFUNC_WITH_LENGTH, "Get Current Compressing File", 21 /* stats */, ncp_0x7b21_request, ncp_0x7b46_reply, ncp_0x7b46_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x47, SUBFUNC_WITH_LENGTH, "Get Current DeCompressing File Info List", 21 /* stats */, + { 0x7b, 0x47, SUBFUNC_WITH_LENGTH, "Get Current DeCompressing File Info List", 21 /* stats */, ncp_0x7b21_request, ncp_0x7b47_reply, ncp_0x7b47_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0x48, SUBFUNC_WITH_LENGTH, "Get Compression and Decompression Time and Counts", 21 /* stats */, + { 0x7b, 0x48, SUBFUNC_WITH_LENGTH, "Get Compression and Decompression Time and Counts", 21 /* stats */, ncp_0x7b21_request, ncp_0x7b48_reply, ncp_0x7b47_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0xf9, SUBFUNC_WITH_LENGTH, "Set Alert Notification", 21 /* stats */, + { 0x7b, 0xf9, SUBFUNC_WITH_LENGTH, "Set Alert Notification", 21 /* stats */, NULL, NULL, ncp_0x7201_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0xfb, SUBFUNC_WITH_LENGTH, "Get Item Configuration Information", 21 /* stats */, + { 0x7b, 0xfb, SUBFUNC_WITH_LENGTH, "Get Item Configuration Information", 21 /* stats */, NULL, NULL, ncp_0x7201_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0xfc, SUBFUNC_WITH_LENGTH, "Get Subject Item ID List", 21 /* stats */, + { 0x7b, 0xfc, SUBFUNC_WITH_LENGTH, "Get Subject Item ID List", 21 /* stats */, NULL, NULL, ncp_0x7201_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0xfd, SUBFUNC_WITH_LENGTH, "Get Subject Item List Count", 21 /* stats */, + { 0x7b, 0xfd, SUBFUNC_WITH_LENGTH, "Get Subject Item List Count", 21 /* stats */, NULL, NULL, ncp_0x7201_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0xfe, SUBFUNC_WITH_LENGTH, "Get Subject ID List", 21 /* stats */, + { 0x7b, 0xfe, SUBFUNC_WITH_LENGTH, "Get Subject ID List", 21 /* stats */, NULL, NULL, ncp_0x7201_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x7b, 0xff, SUBFUNC_WITH_LENGTH, "Get Number of NetMan Subjects", 21 /* stats */, + { 0x7b, 0xff, SUBFUNC_WITH_LENGTH, "Get Number of NetMan Subjects", 21 /* stats */, NULL, NULL, ncp_0x7201_errors, NULL, NO_REQ_COND_SIZE, NULL }, - { 0x83, 0x01, SUBFUNC_WITH_LENGTH, "RPC Load an NLM", 22 /* remote */, + { 0x83, 0x01, SUBFUNC_WITH_LENGTH, "RPC Load an NLM", 22 /* remote */, ncp_0x8301_request, ncp_0x8301_reply, ncp_0x8301_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x8301_req }, - { 0x83, 0x02, SUBFUNC_WITH_LENGTH, "RPC Unload an NLM", 22 /* remote */, + { 0x83, 0x02, SUBFUNC_WITH_LENGTH, "RPC Unload an NLM", 22 /* remote */, ncp_0x8302_request, ncp_0x8301_reply, ncp_0x8301_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x8302_req }, - { 0x83, 0x03, SUBFUNC_WITH_LENGTH, "RPC Mount Volume", 22 /* remote */, + { 0x83, 0x03, SUBFUNC_WITH_LENGTH, "RPC Mount Volume", 22 /* remote */, ncp_0x8303_request, ncp_0x8303_reply, ncp_0x8303_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x8303_req }, - { 0x83, 0x04, SUBFUNC_WITH_LENGTH, "RPC Dismount Volume", 22 /* remote */, + { 0x83, 0x04, SUBFUNC_WITH_LENGTH, "RPC Dismount Volume", 22 /* remote */, ncp_0x8303_request, ncp_0x8301_reply, ncp_0x8303_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x8304_req }, - { 0x83, 0x05, SUBFUNC_WITH_LENGTH, "RPC Add Name Space To Volume", 22 /* remote */, + { 0x83, 0x05, SUBFUNC_WITH_LENGTH, "RPC Add Name Space To Volume", 22 /* remote */, ncp_0x8305_request, ncp_0x8301_reply, ncp_0x8303_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x8305_req }, - { 0x83, 0x06, SUBFUNC_WITH_LENGTH, "RPC Set Command Value", 22 /* remote */, + { 0x83, 0x06, SUBFUNC_WITH_LENGTH, "RPC Set Command Value", 22 /* remote */, ncp_0x8306_request, ncp_0x8301_reply, ncp_0x8303_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x8306_req }, - { 0x83, 0x07, SUBFUNC_WITH_LENGTH, "RPC Execute NCF File", 22 /* remote */, + { 0x83, 0x07, SUBFUNC_WITH_LENGTH, "RPC Execute NCF File", 22 /* remote */, ncp_0x8307_request, ncp_0x8301_reply, ncp_0x8303_errors, NULL, NO_REQ_COND_SIZE, &info_str_0x8307_req }, { 0, 0, 0, NULL, 0, NULL, NULL, NULL, NULL, NO_REQ_COND_SIZE, NULL } @@ -19573,1688 +19556,1688 @@ static const value_string ncp_nds_verb_vals[] = { - { 1, "Resolve Name" }, - { 2, "Read Entry Information" }, - { 3, "Read" }, - { 4, "Compare" }, - { 5, "List" }, - { 6, "Search Entries" }, - { 7, "Add Entry" }, - { 8, "Remove Entry" }, - { 9, "Modify Entry" }, - { 10, "Modify RDN" }, - { 11, "Create Attribute" }, - { 12, "Read Attribute Definition" }, - { 13, "Remove Attribute Definition" }, - { 14, "Define Class" }, - { 15, "Read Class Definition " }, - { 16, "Modify Class Definition" }, - { 17, "Remove Class Definition" }, - { 18, "List Containable Classes" }, - { 19, "Get Effective Rights" }, - { 20, "Add Partition" }, - { 21, "Remove Partition" }, - { 22, "List Partitions" }, - { 23, "Split Partition" }, - { 24, "Join Partitions" }, - { 25, "Add Replica" }, - { 26, "Remove Replica" }, - { 27, "Open Stream" }, - { 28, "Search Filter" }, - { 29, "Create Subordinate Reference" }, - { 30, "Link Replica" }, - { 31, "Change Replica Type" }, - { 32, "Start Update Schema" }, - { 33, "End Update Schema" }, - { 34, "Update Schema" }, - { 35, "Start Update Replica" }, - { 36, "End Update Replica" }, - { 37, "Update Replica" }, - { 38, "Synchronize Partition" }, - { 39, "Synchronize Schema" }, - { 40, "Read Syntaxes" }, - { 41, "Get Replica Root ID" }, - { 42, "Begin Move Entry" }, - { 43, "Finish Move Entry" }, - { 44, "Release Moved Entry" }, - { 45, "Backup Entry" }, - { 46, "Restore Entry" }, - { 47, "Save DIB (Obsolete)" }, - { 48, "Control" }, - { 49, "Remove Backlink" }, - { 50, "Close Iteration" }, - { 51, "Mutate Entry" }, - { 52, "Audit Skulking" }, - { 53, "Get Server Address" }, - { 54, "Set Keys" }, - { 55, "Change Password" }, - { 56, "Verify Password" }, - { 57, "Begin Login" }, - { 58, "Finish Login" }, - { 59, "Begin Authentication" }, - { 60, "Finish Authentication" }, - { 61, "Logout" }, - { 62, "Repair Ring (Obsolete)" }, - { 63, "Repair Timestamps" }, - { 64, "Create Back Link" }, - { 65, "Delete External Reference" }, - { 66, "Rename External Reference" }, - { 67, "Create Queue Entry Directory" }, - { 68, "Remove Queue Entry Directory" }, - { 69, "Merge Entries" }, - { 70, "Change Tree Name" }, - { 71, "Partition Entry Count" }, - { 72, "Check Login Restrictions" }, - { 73, "Start Join" }, - { 74, "Low Level Split" }, - { 75, "Low Level Join" }, - { 76, "Abort Partition Operation" }, - { 77, "Get All Servers" }, - { 78, "Partition Function" }, - { 79, "Read References" }, - { 80, "Inspect Entry" }, - { 81, "Get Remote Entry ID" }, - { 82, "Change Security" }, - { 83, "Check Console Operator" }, - { 84, "Start Move Tree" }, - { 85, "Move Tree" }, - { 86, "End Move Tree" }, - { 87, "Low Level Abort Join" }, - { 88, "Check Security Equivalence" }, - { 89, "Merge Tree" }, - { 90, "Sync External Reference" }, - { 91, "Resend Entry" }, - { 92, "New Schema Epoch" }, - { 93, "Statistics" }, - { 94, "Ping" }, - { 95, "Get Bindery Contexts" }, - { 96, "Monitor Connection" }, - { 97, "Get DS Statistics" }, - { 98, "Reset DS Counters" }, - { 99, "Console" }, - { 100, "Read Stream" }, - { 101, "Write Stream" }, - { 102, "Create Orphan Partition" }, - { 103, "Remove Orphan Partition" }, - { 104, "Link Orphan Partition" }, - { 105, "Set Distributed Reference Link (DRL)" }, - { 106, "Available" }, - { 107, "Available" }, - { 108, "Verify Distributed Reference Link (DRL)" }, - { 109, "Verify Partition" }, - { 110, "Iterator" }, - { 111, "Available" }, - { 112, "Close Stream" }, - { 113, "Available" }, - { 114, "Read Status" }, - { 115, "Partition Sync Status" }, - { 116, "Read Reference Data" }, - { 117, "Write Reference Data" }, - { 118, "Resource Event" }, - { 119, "DIB Request (obsolete)" }, - { 120, "Set Replication Filter" }, - { 121, "Get Replication Filter" }, - { 122, "Change Attribute Definition" }, - { 123, "Schema in Use" }, - { 124, "Remove Keys" }, - { 125, "Clone" }, - { 126, "Multiple Operations Transaction" }, - { 240, "Ping" }, - { 255, "EDirectory Call" }, - { 0, NULL } + { 1, "Resolve Name" }, + { 2, "Read Entry Information" }, + { 3, "Read" }, + { 4, "Compare" }, + { 5, "List" }, + { 6, "Search Entries" }, + { 7, "Add Entry" }, + { 8, "Remove Entry" }, + { 9, "Modify Entry" }, + { 10, "Modify RDN" }, + { 11, "Create Attribute" }, + { 12, "Read Attribute Definition" }, + { 13, "Remove Attribute Definition" }, + { 14, "Define Class" }, + { 15, "Read Class Definition " }, + { 16, "Modify Class Definition" }, + { 17, "Remove Class Definition" }, + { 18, "List Containable Classes" }, + { 19, "Get Effective Rights" }, + { 20, "Add Partition" }, + { 21, "Remove Partition" }, + { 22, "List Partitions" }, + { 23, "Split Partition" }, + { 24, "Join Partitions" }, + { 25, "Add Replica" }, + { 26, "Remove Replica" }, + { 27, "Open Stream" }, + { 28, "Search Filter" }, + { 29, "Create Subordinate Reference" }, + { 30, "Link Replica" }, + { 31, "Change Replica Type" }, + { 32, "Start Update Schema" }, + { 33, "End Update Schema" }, + { 34, "Update Schema" }, + { 35, "Start Update Replica" }, + { 36, "End Update Replica" }, + { 37, "Update Replica" }, + { 38, "Synchronize Partition" }, + { 39, "Synchronize Schema" }, + { 40, "Read Syntaxes" }, + { 41, "Get Replica Root ID" }, + { 42, "Begin Move Entry" }, + { 43, "Finish Move Entry" }, + { 44, "Release Moved Entry" }, + { 45, "Backup Entry" }, + { 46, "Restore Entry" }, + { 47, "Save DIB (Obsolete)" }, + { 48, "Control" }, + { 49, "Remove Backlink" }, + { 50, "Close Iteration" }, + { 51, "Mutate Entry" }, + { 52, "Audit Skulking" }, + { 53, "Get Server Address" }, + { 54, "Set Keys" }, + { 55, "Change Password" }, + { 56, "Verify Password" }, + { 57, "Begin Login" }, + { 58, "Finish Login" }, + { 59, "Begin Authentication" }, + { 60, "Finish Authentication" }, + { 61, "Logout" }, + { 62, "Repair Ring (Obsolete)" }, + { 63, "Repair Timestamps" }, + { 64, "Create Back Link" }, + { 65, "Delete External Reference" }, + { 66, "Rename External Reference" }, + { 67, "Create Queue Entry Directory" }, + { 68, "Remove Queue Entry Directory" }, + { 69, "Merge Entries" }, + { 70, "Change Tree Name" }, + { 71, "Partition Entry Count" }, + { 72, "Check Login Restrictions" }, + { 73, "Start Join" }, + { 74, "Low Level Split" }, + { 75, "Low Level Join" }, + { 76, "Abort Partition Operation" }, + { 77, "Get All Servers" }, + { 78, "Partition Function" }, + { 79, "Read References" }, + { 80, "Inspect Entry" }, + { 81, "Get Remote Entry ID" }, + { 82, "Change Security" }, + { 83, "Check Console Operator" }, + { 84, "Start Move Tree" }, + { 85, "Move Tree" }, + { 86, "End Move Tree" }, + { 87, "Low Level Abort Join" }, + { 88, "Check Security Equivalence" }, + { 89, "Merge Tree" }, + { 90, "Sync External Reference" }, + { 91, "Resend Entry" }, + { 92, "New Schema Epoch" }, + { 93, "Statistics" }, + { 94, "Ping" }, + { 95, "Get Bindery Contexts" }, + { 96, "Monitor Connection" }, + { 97, "Get DS Statistics" }, + { 98, "Reset DS Counters" }, + { 99, "Console" }, + { 100, "Read Stream" }, + { 101, "Write Stream" }, + { 102, "Create Orphan Partition" }, + { 103, "Remove Orphan Partition" }, + { 104, "Link Orphan Partition" }, + { 105, "Set Distributed Reference Link (DRL)" }, + { 106, "Available" }, + { 107, "Available" }, + { 108, "Verify Distributed Reference Link (DRL)" }, + { 109, "Verify Partition" }, + { 110, "Iterator" }, + { 111, "Available" }, + { 112, "Close Stream" }, + { 113, "Available" }, + { 114, "Read Status" }, + { 115, "Partition Sync Status" }, + { 116, "Read Reference Data" }, + { 117, "Write Reference Data" }, + { 118, "Resource Event" }, + { 119, "DIB Request (obsolete)" }, + { 120, "Set Replication Filter" }, + { 121, "Get Replication Filter" }, + { 122, "Change Attribute Definition" }, + { 123, "Schema in Use" }, + { 124, "Remove Keys" }, + { 125, "Clone" }, + { 126, "Multiple Operations Transaction" }, + { 240, "Ping" }, + { 255, "EDirectory Call" }, + { 0, NULL } }; static const value_string connection_status_vals[] = { - { 0x00, "Ok" }, - { 0x01, "Bad Service Connection" }, - { 0x10, "File Server is Down" }, - { 0x40, "Broadcast Message Pending" }, - { 0, NULL } + { 0x00, "Ok" }, + { 0x01, "Bad Service Connection" }, + { 0x10, "File Server is Down" }, + { 0x40, "Broadcast Message Pending" }, + { 0, NULL } }; void proto_register_ncp2222(void) { - static hf_register_info hf[] = { - { &hf_ncp_func, - { "Function", "ncp.func", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + static hf_register_info hf[] = { + { &hf_ncp_func, + { "Function", "ncp.func", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_length, - { "Packet Length", "ncp.length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_length, + { "Packet Length", "ncp.length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_subfunc, - { "SubFunction", "ncp.subfunc", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_subfunc, + { "SubFunction", "ncp.subfunc", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_completion_code, - { "Completion Code", "ncp.completion_code", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_completion_code, + { "Completion Code", "ncp.completion_code", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_group, - { "NCP Group Type", "ncp.group", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_group, + { "NCP Group Type", "ncp.group", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_fragment_handle, - { "NDS Fragment Handle", "ncp.ndsfrag", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_fragment_handle, + { "NDS Fragment Handle", "ncp.ndsfrag", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_fragment_size, - { "NDS Fragment Size", "ncp.ndsfragsize", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_fragment_size, + { "NDS Fragment Size", "ncp.ndsfragsize", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_message_size, - { "Message Size", "ncp.ndsmessagesize", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_message_size, + { "Message Size", "ncp.ndsmessagesize", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_nds_flag, - { "Flags", "ncp.ndsflag", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_nds_flag, + { "Flags", "ncp.ndsflag", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_nds_verb, - { "NDS Verb", "ncp.ndsverb", FT_UINT8, BASE_HEX, VALS(ncp_nds_verb_vals), 0x0, NULL, HFILL }}, + { &hf_ncp_nds_verb, + { "NDS Verb", "ncp.ndsverb", FT_UINT8, BASE_HEX, VALS(ncp_nds_verb_vals), 0x0, NULL, HFILL }}, - { &hf_ping_version, - { "NDS Version", "ncp.ping_version", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_ping_version, + { "NDS Version", "ncp.ping_version", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, #if 0 /* Unused ? */ - { &hf_nds_version, - { "NDS Version", "ncp.nds_version", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_version, + { "NDS Version", "ncp.nds_version", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, #endif - { &hf_nds_tree_name, - { "Tree Name", "ncp.nds_tree_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_tree_name, + { "Tree Name", "ncp.nds_tree_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - /* - * XXX - the page at - * - * http://www.odyssea.com/whats_new/tcpipnet/tcpipnet.html - * - * says of the connection status "The Connection Code field may - * contain values that indicate the status of the client host to - * server connection. A value of 1 in the fourth bit of this data - * byte indicates that the server is unavailable (server was - * downed). - * - * The page at - * - * http://www.unm.edu/~network/presentations/course/appendix/appendix_f/tsld088.htm - * - * says that bit 0 is "bad service", bit 2 is "no connection - * available", bit 4 is "service down", and bit 6 is "server - * has a broadcast message waiting for the client". - * - * Should it be displayed in hex, and should those bits (and any - * other bits with significance) be displayed as bitfields - * underneath it? - */ - { &hf_ncp_connection_status, - { "Connection Status", "ncp.connection_status", FT_UINT8, BASE_DEC, VALS(connection_status_vals), 0x0, NULL, HFILL }}, + /* + * XXX - the page at + * + * http://www.odyssea.com/whats_new/tcpipnet/tcpipnet.html + * + * says of the connection status "The Connection Code field may + * contain values that indicate the status of the client host to + * server connection. A value of 1 in the fourth bit of this data + * byte indicates that the server is unavailable (server was + * downed). + * + * The page at + * + * http://www.unm.edu/~network/presentations/course/appendix/appendix_f/tsld088.htm + * + * says that bit 0 is "bad service", bit 2 is "no connection + * available", bit 4 is "service down", and bit 6 is "server + * has a broadcast message waiting for the client". + * + * Should it be displayed in hex, and should those bits (and any + * other bits with significance) be displayed as bitfields + * underneath it? + */ + { &hf_ncp_connection_status, + { "Connection Status", "ncp.connection_status", FT_UINT8, BASE_DEC, VALS(connection_status_vals), 0x0, NULL, HFILL }}, - { &hf_ncp_req_frame_num, - { "Response to Request in Frame Number", "ncp.req_frame_num", FT_FRAMENUM, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_req_frame_num, + { "Response to Request in Frame Number", "ncp.req_frame_num", FT_FRAMENUM, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_req_frame_time, - { "Time from Request", "ncp.time", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, "Time between request and response in seconds", HFILL }}, + { &hf_ncp_req_frame_time, + { "Time from Request", "ncp.time", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, "Time between request and response in seconds", HFILL }}, #if 0 /* Unused ? */ - { &hf_nds_flags, - { "NDS Return Flags", "ncp.nds_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_flags, + { "NDS Return Flags", "ncp.nds_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, #endif - { &hf_nds_reply_depth, - { "Distance from Root", "ncp.ndsdepth", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_reply_depth, + { "Distance from Root", "ncp.ndsdepth", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_reply_rev, - { "NDS Revision", "ncp.ndsrev", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_reply_rev, + { "NDS Revision", "ncp.ndsrev", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_reply_flags, - { "Flags", "ncp.ndsflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_reply_flags, + { "Flags", "ncp.ndsflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_p1type, - { "NDS Parameter Type", "ncp.p1type", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_p1type, + { "NDS Parameter Type", "ncp.p1type", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_uint32value, - { "NDS Value", "ncp.uint32value", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_uint32value, + { "NDS Value", "ncp.uint32value", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_bit1, - { "Typeless", "ncp.nds_bit1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_nds_bit1, + { "Typeless", "ncp.nds_bit1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_nds_bit2, - { "All Containers", "ncp.nds_bit2", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_nds_bit2, + { "All Containers", "ncp.nds_bit2", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_nds_bit3, - { "Slashed", "ncp.nds_bit3", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_nds_bit3, + { "Slashed", "ncp.nds_bit3", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_nds_bit4, - { "Dotted", "ncp.nds_bit4", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_nds_bit4, + { "Dotted", "ncp.nds_bit4", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_nds_bit5, - { "Tuned", "ncp.nds_bit5", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_nds_bit5, + { "Tuned", "ncp.nds_bit5", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_nds_bit6, - { "Not Defined", "ncp.nds_bit6", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_nds_bit6, + { "Not Defined", "ncp.nds_bit6", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_nds_bit7, - { "Not Defined", "ncp.nds_bit7", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_nds_bit7, + { "Not Defined", "ncp.nds_bit7", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_nds_bit8, - { "Not Defined", "ncp.nds_bit8", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_nds_bit8, + { "Not Defined", "ncp.nds_bit8", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_nds_bit9, - { "Not Defined", "ncp.nds_bit9", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_nds_bit9, + { "Not Defined", "ncp.nds_bit9", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_nds_bit10, - { "Not Defined", "ncp.nds_bit10", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_nds_bit10, + { "Not Defined", "ncp.nds_bit10", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_nds_bit11, - { "Not Defined", "ncp.nds_bit11", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_nds_bit11, + { "Not Defined", "ncp.nds_bit11", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_nds_bit12, - { "Not Defined", "ncp.nds_bit12", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_nds_bit12, + { "Not Defined", "ncp.nds_bit12", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_nds_bit13, - { "Not Defined", "ncp.nds_bit13", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_nds_bit13, + { "Not Defined", "ncp.nds_bit13", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_nds_bit14, - { "Not Defined", "ncp.nds_bit14", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_nds_bit14, + { "Not Defined", "ncp.nds_bit14", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_nds_bit15, - { "Not Defined", "ncp.nds_bit15", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_nds_bit15, + { "Not Defined", "ncp.nds_bit15", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_nds_bit16, - { "Not Defined", "ncp.nds_bit16", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_nds_bit16, + { "Not Defined", "ncp.nds_bit16", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1outflags, - { "Output Flags", "ncp.bit1outflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1outflags, + { "Output Flags", "ncp.bit1outflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2outflags, - { "Entry ID", "ncp.bit2outflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2outflags, + { "Entry ID", "ncp.bit2outflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3outflags, - { "Replica State", "ncp.bit3outflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3outflags, + { "Replica State", "ncp.bit3outflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4outflags, - { "Modification Timestamp", "ncp.bit4outflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4outflags, + { "Modification Timestamp", "ncp.bit4outflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5outflags, - { "Purge Time", "ncp.bit5outflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5outflags, + { "Purge Time", "ncp.bit5outflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6outflags, - { "Local Partition ID", "ncp.bit6outflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6outflags, + { "Local Partition ID", "ncp.bit6outflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7outflags, - { "Distinguished Name", "ncp.bit7outflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7outflags, + { "Distinguished Name", "ncp.bit7outflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8outflags, - { "Replica Type", "ncp.bit8outflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8outflags, + { "Replica Type", "ncp.bit8outflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9outflags, - { "Partition Busy", "ncp.bit9outflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9outflags, + { "Partition Busy", "ncp.bit9outflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10outflags, - { "Not Defined", "ncp.bit10outflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10outflags, + { "Not Defined", "ncp.bit10outflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11outflags, - { "Not Defined", "ncp.bit11outflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11outflags, + { "Not Defined", "ncp.bit11outflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12outflags, - { "Not Defined", "ncp.bit12outflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12outflags, + { "Not Defined", "ncp.bit12outflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13outflags, - { "Not Defined", "ncp.bit13outflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13outflags, + { "Not Defined", "ncp.bit13outflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14outflags, - { "Not Defined", "ncp.bit14outflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14outflags, + { "Not Defined", "ncp.bit14outflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15outflags, - { "Not Defined", "ncp.bit15outflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15outflags, + { "Not Defined", "ncp.bit15outflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16outflags, - { "Not Defined", "ncp.bit16outflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16outflags, + { "Not Defined", "ncp.bit16outflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1nflags, - { "Entry ID", "ncp.bit1nflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1nflags, + { "Entry ID", "ncp.bit1nflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2nflags, - { "Readable", "ncp.bit2nflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2nflags, + { "Readable", "ncp.bit2nflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3nflags, - { "Writeable", "ncp.bit3nflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3nflags, + { "Writeable", "ncp.bit3nflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4nflags, - { "Master", "ncp.bit4nflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4nflags, + { "Master", "ncp.bit4nflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5nflags, - { "Create ID", "ncp.bit5nflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5nflags, + { "Create ID", "ncp.bit5nflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6nflags, - { "Walk Tree", "ncp.bit6nflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6nflags, + { "Walk Tree", "ncp.bit6nflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7nflags, - { "Dereference Alias", "ncp.bit7nflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7nflags, + { "Dereference Alias", "ncp.bit7nflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8nflags, - { "Not Defined", "ncp.bit8nflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8nflags, + { "Not Defined", "ncp.bit8nflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9nflags, - { "Not Defined", "ncp.bit9nflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9nflags, + { "Not Defined", "ncp.bit9nflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10nflags, - { "Not Defined", "ncp.bit10nflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10nflags, + { "Not Defined", "ncp.bit10nflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11nflags, - { "Not Defined", "ncp.bit11nflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11nflags, + { "Not Defined", "ncp.bit11nflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12nflags, - { "Not Defined", "ncp.bit12nflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12nflags, + { "Not Defined", "ncp.bit12nflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13nflags, - { "Not Defined", "ncp.bit13nflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13nflags, + { "Not Defined", "ncp.bit13nflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14nflags, - { "Prefer Referrals", "ncp.bit14nflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14nflags, + { "Prefer Referrals", "ncp.bit14nflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15nflags, - { "Prefer Only Referrals", "ncp.bit15nflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15nflags, + { "Prefer Only Referrals", "ncp.bit15nflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16nflags, - { "Not Defined", "ncp.bit16nflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16nflags, + { "Not Defined", "ncp.bit16nflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1rflags, - { "Typeless", "ncp.bit1rflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1rflags, + { "Typeless", "ncp.bit1rflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2rflags, - { "Slashed", "ncp.bit2rflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2rflags, + { "Slashed", "ncp.bit2rflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3rflags, - { "Dotted", "ncp.bit3rflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3rflags, + { "Dotted", "ncp.bit3rflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4rflags, - { "Tuned", "ncp.bit4rflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4rflags, + { "Tuned", "ncp.bit4rflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5rflags, - { "Not Defined", "ncp.bit5rflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5rflags, + { "Not Defined", "ncp.bit5rflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6rflags, - { "Not Defined", "ncp.bit6rflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6rflags, + { "Not Defined", "ncp.bit6rflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7rflags, - { "Not Defined", "ncp.bit7rflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7rflags, + { "Not Defined", "ncp.bit7rflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8rflags, - { "Not Defined", "ncp.bit8rflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8rflags, + { "Not Defined", "ncp.bit8rflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9rflags, - { "Not Defined", "ncp.bit9rflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9rflags, + { "Not Defined", "ncp.bit9rflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10rflags, - { "Not Defined", "ncp.bit10rflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10rflags, + { "Not Defined", "ncp.bit10rflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11rflags, - { "Not Defined", "ncp.bit11rflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11rflags, + { "Not Defined", "ncp.bit11rflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12rflags, - { "Not Defined", "ncp.bit12rflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12rflags, + { "Not Defined", "ncp.bit12rflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13rflags, - { "Not Defined", "ncp.bit13rflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13rflags, + { "Not Defined", "ncp.bit13rflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14rflags, - { "Not Defined", "ncp.bit14rflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14rflags, + { "Not Defined", "ncp.bit14rflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15rflags, - { "Not Defined", "ncp.bit15rflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15rflags, + { "Not Defined", "ncp.bit15rflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16rflags, - { "Not Defined", "ncp.bit16rflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16rflags, + { "Not Defined", "ncp.bit16rflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1eflags, - { "Alias Entry", "ncp.bit1eflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1eflags, + { "Alias Entry", "ncp.bit1eflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2eflags, - { "Partition Root", "ncp.bit2eflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2eflags, + { "Partition Root", "ncp.bit2eflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3eflags, - { "Container Entry", "ncp.bit3eflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3eflags, + { "Container Entry", "ncp.bit3eflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4eflags, - { "Container Alias", "ncp.bit4eflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4eflags, + { "Container Alias", "ncp.bit4eflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5eflags, - { "Matches List Filter", "ncp.bit5eflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5eflags, + { "Matches List Filter", "ncp.bit5eflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6eflags, - { "Reference Entry", "ncp.bit6eflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6eflags, + { "Reference Entry", "ncp.bit6eflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7eflags, - { "40x Reference Entry", "ncp.bit7eflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7eflags, + { "40x Reference Entry", "ncp.bit7eflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8eflags, - { "Back Linked", "ncp.bit8eflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8eflags, + { "Back Linked", "ncp.bit8eflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9eflags, - { "New Entry", "ncp.bit9eflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9eflags, + { "New Entry", "ncp.bit9eflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10eflags, - { "Temporary Reference", "ncp.bit10eflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10eflags, + { "Temporary Reference", "ncp.bit10eflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11eflags, - { "Audited", "ncp.bit11eflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11eflags, + { "Audited", "ncp.bit11eflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12eflags, - { "Entry Not Present", "ncp.bit12eflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12eflags, + { "Entry Not Present", "ncp.bit12eflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13eflags, - { "Entry Verify CTS", "ncp.bit13eflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13eflags, + { "Entry Verify CTS", "ncp.bit13eflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14eflags, - { "Entry Damaged", "ncp.bit14eflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14eflags, + { "Entry Damaged", "ncp.bit14eflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15eflags, - { "Not Defined", "ncp.bit15rflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15eflags, + { "Not Defined", "ncp.bit15rflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16eflags, - { "Not Defined", "ncp.bit16rflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16eflags, + { "Not Defined", "ncp.bit16rflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1infoflagsl, - { "Output Flags", "ncp.bit1infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1infoflagsl, + { "Output Flags", "ncp.bit1infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2infoflagsl, - { "Entry ID", "ncp.bit2infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2infoflagsl, + { "Entry ID", "ncp.bit2infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3infoflagsl, - { "Entry Flags", "ncp.bit3infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3infoflagsl, + { "Entry Flags", "ncp.bit3infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4infoflagsl, - { "Subordinate Count", "ncp.bit4infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4infoflagsl, + { "Subordinate Count", "ncp.bit4infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5infoflagsl, - { "Modification Time", "ncp.bit5infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5infoflagsl, + { "Modification Time", "ncp.bit5infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6infoflagsl, - { "Modification Timestamp", "ncp.bit6infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6infoflagsl, + { "Modification Timestamp", "ncp.bit6infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7infoflagsl, - { "Creation Timestamp", "ncp.bit7infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7infoflagsl, + { "Creation Timestamp", "ncp.bit7infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8infoflagsl, - { "Partition Root ID", "ncp.bit8infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8infoflagsl, + { "Partition Root ID", "ncp.bit8infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9infoflagsl, - { "Parent ID", "ncp.bit9infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9infoflagsl, + { "Parent ID", "ncp.bit9infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10infoflagsl, - { "Revision Count", "ncp.bit10infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10infoflagsl, + { "Revision Count", "ncp.bit10infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11infoflagsl, - { "Replica Type", "ncp.bit11infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11infoflagsl, + { "Replica Type", "ncp.bit11infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12infoflagsl, - { "Base Class", "ncp.bit12infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12infoflagsl, + { "Base Class", "ncp.bit12infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13infoflagsl, - { "Relative Distinguished Name", "ncp.bit13infoflagsl", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13infoflagsl, + { "Relative Distinguished Name", "ncp.bit13infoflagsl", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14infoflagsl, - { "Distinguished Name", "ncp.bit14infoflagsl", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14infoflagsl, + { "Distinguished Name", "ncp.bit14infoflagsl", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15infoflagsl, - { "Root Distinguished Name", "ncp.bit15infoflagsl", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15infoflagsl, + { "Root Distinguished Name", "ncp.bit15infoflagsl", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16infoflagsl, - { "Parent Distinguished Name", "ncp.bit16infoflagsl", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16infoflagsl, + { "Parent Distinguished Name", "ncp.bit16infoflagsl", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1infoflagsh, - { "Purge Time", "ncp.bit1infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1infoflagsh, + { "Purge Time", "ncp.bit1infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2infoflagsh, - { "Dereference Base Class", "ncp.bit2infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2infoflagsh, + { "Dereference Base Class", "ncp.bit2infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3infoflagsh, - { "Not Defined", "ncp.bit3infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3infoflagsh, + { "Not Defined", "ncp.bit3infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4infoflagsh, - { "Not Defined", "ncp.bit4infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4infoflagsh, + { "Not Defined", "ncp.bit4infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5infoflagsh, - { "Not Defined", "ncp.bit5infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5infoflagsh, + { "Not Defined", "ncp.bit5infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6infoflagsh, - { "Not Defined", "ncp.bit6infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6infoflagsh, + { "Not Defined", "ncp.bit6infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7infoflagsh, - { "Not Defined", "ncp.bit7infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7infoflagsh, + { "Not Defined", "ncp.bit7infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8infoflagsh, - { "Not Defined", "ncp.bit8infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8infoflagsh, + { "Not Defined", "ncp.bit8infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9infoflagsh, - { "Not Defined", "ncp.bit9infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9infoflagsh, + { "Not Defined", "ncp.bit9infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10infoflagsh, - { "Not Defined", "ncp.bit10infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10infoflagsh, + { "Not Defined", "ncp.bit10infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11infoflagsh, - { "Not Defined", "ncp.bit11infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11infoflagsh, + { "Not Defined", "ncp.bit11infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12infoflagsh, - { "Not Defined", "ncp.bit12infoflagshs", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12infoflagsh, + { "Not Defined", "ncp.bit12infoflagshs", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13infoflagsh, - { "Not Defined", "ncp.bit13infoflagsh", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13infoflagsh, + { "Not Defined", "ncp.bit13infoflagsh", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14infoflagsh, - { "Not Defined", "ncp.bit14infoflagsh", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14infoflagsh, + { "Not Defined", "ncp.bit14infoflagsh", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15infoflagsh, - { "Not Defined", "ncp.bit15infoflagsh", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15infoflagsh, + { "Not Defined", "ncp.bit15infoflagsh", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16infoflagsh, - { "Not Defined", "ncp.bit16infoflagsh", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16infoflagsh, + { "Not Defined", "ncp.bit16infoflagsh", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1lflags, - { "List Typeless", "ncp.bit1lflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1lflags, + { "List Typeless", "ncp.bit1lflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2lflags, - { "List Containers", "ncp.bit2lflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2lflags, + { "List Containers", "ncp.bit2lflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3lflags, - { "List Slashed", "ncp.bit3lflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3lflags, + { "List Slashed", "ncp.bit3lflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4lflags, - { "List Dotted", "ncp.bit4lflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4lflags, + { "List Dotted", "ncp.bit4lflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5lflags, - { "Dereference Alias", "ncp.bit5lflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5lflags, + { "Dereference Alias", "ncp.bit5lflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6lflags, - { "List All Containers", "ncp.bit6lflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6lflags, + { "List All Containers", "ncp.bit6lflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7lflags, - { "List Obsolete", "ncp.bit7lflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7lflags, + { "List Obsolete", "ncp.bit7lflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8lflags, - { "List Tuned Output", "ncp.bit8lflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8lflags, + { "List Tuned Output", "ncp.bit8lflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9lflags, - { "List External Reference", "ncp.bit9lflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9lflags, + { "List External Reference", "ncp.bit9lflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10lflags, - { "Not Defined", "ncp.bit10lflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10lflags, + { "Not Defined", "ncp.bit10lflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11lflags, - { "Not Defined", "ncp.bit11lflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11lflags, + { "Not Defined", "ncp.bit11lflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12lflags, - { "Not Defined", "ncp.bit12lflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12lflags, + { "Not Defined", "ncp.bit12lflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13lflags, - { "Not Defined", "ncp.bit13lflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13lflags, + { "Not Defined", "ncp.bit13lflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14lflags, - { "Not Defined", "ncp.bit14lflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14lflags, + { "Not Defined", "ncp.bit14lflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15lflags, - { "Not Defined", "ncp.bit15lflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15lflags, + { "Not Defined", "ncp.bit15lflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16lflags, - { "Not Defined", "ncp.bit16lflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16lflags, + { "Not Defined", "ncp.bit16lflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1l1flagsl, - { "Output Flags", "ncp.bit1l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1l1flagsl, + { "Output Flags", "ncp.bit1l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2l1flagsl, - { "Entry ID", "ncp.bit2l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2l1flagsl, + { "Entry ID", "ncp.bit2l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3l1flagsl, - { "Replica State", "ncp.bit3l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3l1flagsl, + { "Replica State", "ncp.bit3l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4l1flagsl, - { "Modification Timestamp", "ncp.bit4l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4l1flagsl, + { "Modification Timestamp", "ncp.bit4l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5l1flagsl, - { "Purge Time", "ncp.bit5l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5l1flagsl, + { "Purge Time", "ncp.bit5l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6l1flagsl, - { "Local Partition ID", "ncp.bit6l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6l1flagsl, + { "Local Partition ID", "ncp.bit6l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7l1flagsl, - { "Distinguished Name", "ncp.bit7l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7l1flagsl, + { "Distinguished Name", "ncp.bit7l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8l1flagsl, - { "Replica Type", "ncp.bit8l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8l1flagsl, + { "Replica Type", "ncp.bit8l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9l1flagsl, - { "Partition Busy", "ncp.bit9l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9l1flagsl, + { "Partition Busy", "ncp.bit9l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10l1flagsl, - { "Not Defined", "ncp.bit10l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10l1flagsl, + { "Not Defined", "ncp.bit10l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11l1flagsl, - { "Not Defined", "ncp.bit11l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11l1flagsl, + { "Not Defined", "ncp.bit11l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12l1flagsl, - { "Not Defined", "ncp.bit12l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12l1flagsl, + { "Not Defined", "ncp.bit12l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13l1flagsl, - { "Not Defined", "ncp.bit13l1flagsl", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13l1flagsl, + { "Not Defined", "ncp.bit13l1flagsl", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14l1flagsl, - { "Not Defined", "ncp.bit14l1flagsl", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14l1flagsl, + { "Not Defined", "ncp.bit14l1flagsl", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15l1flagsl, - { "Not Defined", "ncp.bit15l1flagsl", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15l1flagsl, + { "Not Defined", "ncp.bit15l1flagsl", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16l1flagsl, - { "Not Defined", "ncp.bit16l1flagsl", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16l1flagsl, + { "Not Defined", "ncp.bit16l1flagsl", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1l1flagsh, - { "Not Defined", "ncp.bit1l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1l1flagsh, + { "Not Defined", "ncp.bit1l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2l1flagsh, - { "Not Defined", "ncp.bit2l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2l1flagsh, + { "Not Defined", "ncp.bit2l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3l1flagsh, - { "Not Defined", "ncp.bit3l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3l1flagsh, + { "Not Defined", "ncp.bit3l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4l1flagsh, - { "Not Defined", "ncp.bit4l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4l1flagsh, + { "Not Defined", "ncp.bit4l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5l1flagsh, - { "Not Defined", "ncp.bit5l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5l1flagsh, + { "Not Defined", "ncp.bit5l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6l1flagsh, - { "Not Defined", "ncp.bit6l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6l1flagsh, + { "Not Defined", "ncp.bit6l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7l1flagsh, - { "Not Defined", "ncp.bit7l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7l1flagsh, + { "Not Defined", "ncp.bit7l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8l1flagsh, - { "Not Defined", "ncp.bit8l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8l1flagsh, + { "Not Defined", "ncp.bit8l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9l1flagsh, - { "Not Defined", "ncp.bit9l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9l1flagsh, + { "Not Defined", "ncp.bit9l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10l1flagsh, - { "Not Defined", "ncp.bit10l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10l1flagsh, + { "Not Defined", "ncp.bit10l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11l1flagsh, - { "Not Defined", "ncp.bit11l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11l1flagsh, + { "Not Defined", "ncp.bit11l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12l1flagsh, - { "Not Defined", "ncp.bit12l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12l1flagsh, + { "Not Defined", "ncp.bit12l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13l1flagsh, - { "Not Defined", "ncp.bit13l1flagsh", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13l1flagsh, + { "Not Defined", "ncp.bit13l1flagsh", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14l1flagsh, - { "Not Defined", "ncp.bit14l1flagsh", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14l1flagsh, + { "Not Defined", "ncp.bit14l1flagsh", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15l1flagsh, - { "Not Defined", "ncp.bit15l1flagsh", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15l1flagsh, + { "Not Defined", "ncp.bit15l1flagsh", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16l1flagsh, - { "Not Defined", "ncp.bit16l1flagsh", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16l1flagsh, + { "Not Defined", "ncp.bit16l1flagsh", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1vflags, - { "Naming", "ncp.bit1vflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1vflags, + { "Naming", "ncp.bit1vflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2vflags, - { "Base Class", "ncp.bit2vflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2vflags, + { "Base Class", "ncp.bit2vflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3vflags, - { "Present", "ncp.bit3vflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3vflags, + { "Present", "ncp.bit3vflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4vflags, - { "Value Damaged", "ncp.bit4vflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4vflags, + { "Value Damaged", "ncp.bit4vflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5vflags, - { "Not Defined", "ncp.bit5vflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5vflags, + { "Not Defined", "ncp.bit5vflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6vflags, - { "Not Defined", "ncp.bit6vflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6vflags, + { "Not Defined", "ncp.bit6vflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7vflags, - { "Not Defined", "ncp.bit7vflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7vflags, + { "Not Defined", "ncp.bit7vflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8vflags, - { "Not Defined", "ncp.bit8vflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8vflags, + { "Not Defined", "ncp.bit8vflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9vflags, - { "Not Defined", "ncp.bit9vflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9vflags, + { "Not Defined", "ncp.bit9vflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10vflags, - { "Not Defined", "ncp.bit10vflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10vflags, + { "Not Defined", "ncp.bit10vflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11vflags, - { "Not Defined", "ncp.bit11vflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11vflags, + { "Not Defined", "ncp.bit11vflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12vflags, - { "Not Defined", "ncp.bit12vflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12vflags, + { "Not Defined", "ncp.bit12vflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13vflags, - { "Not Defined", "ncp.bit13vflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13vflags, + { "Not Defined", "ncp.bit13vflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14vflags, - { "Not Defined", "ncp.bit14vflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14vflags, + { "Not Defined", "ncp.bit14vflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15vflags, - { "Not Defined", "ncp.bit15vflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15vflags, + { "Not Defined", "ncp.bit15vflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16vflags, - { "Not Defined", "ncp.bit16vflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16vflags, + { "Not Defined", "ncp.bit16vflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1cflags, - { "Container", "ncp.bit1cflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1cflags, + { "Container", "ncp.bit1cflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2cflags, - { "Effective", "ncp.bit2cflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2cflags, + { "Effective", "ncp.bit2cflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3cflags, - { "Class Definition Cannot be Removed", "ncp.bit3cflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3cflags, + { "Class Definition Cannot be Removed", "ncp.bit3cflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4cflags, - { "Ambiguous Naming", "ncp.bit4cflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4cflags, + { "Ambiguous Naming", "ncp.bit4cflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5cflags, - { "Ambiguous Containment", "ncp.bit5cflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5cflags, + { "Ambiguous Containment", "ncp.bit5cflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6cflags, - { "Auxiliary", "ncp.bit6cflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6cflags, + { "Auxiliary", "ncp.bit6cflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7cflags, - { "Operational", "ncp.bit7cflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7cflags, + { "Operational", "ncp.bit7cflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8cflags, - { "Sparse Required", "ncp.bit8cflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8cflags, + { "Sparse Required", "ncp.bit8cflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9cflags, - { "Sparse Operational", "ncp.bit9cflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9cflags, + { "Sparse Operational", "ncp.bit9cflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10cflags, - { "Not Defined", "ncp.bit10cflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10cflags, + { "Not Defined", "ncp.bit10cflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11cflags, - { "Not Defined", "ncp.bit11cflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11cflags, + { "Not Defined", "ncp.bit11cflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12cflags, - { "Not Defined", "ncp.bit12cflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12cflags, + { "Not Defined", "ncp.bit12cflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13cflags, - { "Not Defined", "ncp.bit13cflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13cflags, + { "Not Defined", "ncp.bit13cflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14cflags, - { "Not Defined", "ncp.bit14cflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14cflags, + { "Not Defined", "ncp.bit14cflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15cflags, - { "Not Defined", "ncp.bit15cflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15cflags, + { "Not Defined", "ncp.bit15cflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16cflags, - { "Not Defined", "ncp.bit16cflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16cflags, + { "Not Defined", "ncp.bit16cflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1acflags, - { "Single Valued", "ncp.bit1acflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1acflags, + { "Single Valued", "ncp.bit1acflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2acflags, - { "Sized", "ncp.bit2acflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2acflags, + { "Sized", "ncp.bit2acflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3acflags, - { "Non-Removable", "ncp.bit3acflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3acflags, + { "Non-Removable", "ncp.bit3acflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4acflags, - { "Read Only", "ncp.bit4acflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4acflags, + { "Read Only", "ncp.bit4acflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5acflags, - { "Hidden", "ncp.bit5acflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5acflags, + { "Hidden", "ncp.bit5acflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6acflags, - { "String", "ncp.bit6acflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6acflags, + { "String", "ncp.bit6acflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7acflags, - { "Synchronize Immediate", "ncp.bit7acflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7acflags, + { "Synchronize Immediate", "ncp.bit7acflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8acflags, - { "Public Read", "ncp.bit8acflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8acflags, + { "Public Read", "ncp.bit8acflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9acflags, - { "Server Read", "ncp.bit9acflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9acflags, + { "Server Read", "ncp.bit9acflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10acflags, - { "Write Managed", "ncp.bit10acflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10acflags, + { "Write Managed", "ncp.bit10acflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11acflags, - { "Per Replica", "ncp.bit11acflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11acflags, + { "Per Replica", "ncp.bit11acflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12acflags, - { "Never Schedule Synchronization", "ncp.bit12acflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12acflags, + { "Never Schedule Synchronization", "ncp.bit12acflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13acflags, - { "Operational", "ncp.bit13acflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13acflags, + { "Operational", "ncp.bit13acflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14acflags, - { "Not Defined", "ncp.bit14acflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14acflags, + { "Not Defined", "ncp.bit14acflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15acflags, - { "Not Defined", "ncp.bit15acflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15acflags, + { "Not Defined", "ncp.bit15acflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16acflags, - { "Not Defined", "ncp.bit16acflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16acflags, + { "Not Defined", "ncp.bit16acflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_nds_reply_error, - { "NDS Error", "ncp.ndsreplyerror", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_reply_error, + { "NDS Error", "ncp.ndsreplyerror", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_net, - { "Network","ncp.ndsnet", FT_IPXNET, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_net, + { "Network","ncp.ndsnet", FT_IPXNET, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_node, - { "Node", "ncp.ndsnode", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_node, + { "Node", "ncp.ndsnode", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_socket, - { "Socket", "ncp.ndssocket", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_socket, + { "Socket", "ncp.ndssocket", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_add_ref_ip, - { "Address Referral", "ncp.ipref", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_add_ref_ip, + { "Address Referral", "ncp.ipref", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_add_ref_udp, - { "Address Referral", "ncp.udpref", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_add_ref_udp, + { "Address Referral", "ncp.udpref", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_add_ref_tcp, - { "Address Referral", "ncp.tcpref", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_add_ref_tcp, + { "Address Referral", "ncp.tcpref", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_referral_record, - { "Referral Record", "ncp.ref_rec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_referral_record, + { "Referral Record", "ncp.ref_rec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_referral_addcount, - { "Address Count", "ncp.ref_addcount", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_referral_addcount, + { "Address Count", "ncp.ref_addcount", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_port, - { "Port", "ncp.ndsport", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_port, + { "Port", "ncp.ndsport", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_mv_string, - { "Attribute Name", "ncp.mv_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_mv_string, + { "Attribute Name", "ncp.mv_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_syntax, - { "Attribute Syntax", "ncp.nds_syntax", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_syntax, + { "Attribute Syntax", "ncp.nds_syntax", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_value_string, - { "Value", "ncp.value_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_value_string, + { "Value", "ncp.value_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_stream_name, - { "Stream Name", "ncp.nds_stream_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_stream_name, + { "Stream Name", "ncp.nds_stream_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_buffer_size, - { "NDS Reply Buffer Size", "ncp.nds_reply_buf", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_buffer_size, + { "NDS Reply Buffer Size", "ncp.nds_reply_buf", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_ver, - { "NDS Version", "ncp.nds_ver", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_ver, + { "NDS Version", "ncp.nds_ver", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_nflags, - { "Flags", "ncp.nds_nflags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_nflags, + { "Flags", "ncp.nds_nflags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_rflags, - { "Request Flags", "ncp.nds_rflags", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_rflags, + { "Request Flags", "ncp.nds_rflags", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_eflags, - { "Entry Flags", "ncp.nds_eflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_eflags, + { "Entry Flags", "ncp.nds_eflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_scope, - { "Scope", "ncp.nds_scope", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_scope, + { "Scope", "ncp.nds_scope", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_name, - { "Name", "ncp.nds_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_name, + { "Name", "ncp.nds_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_name_type, - { "Name Type", "ncp.nds_name_type", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_name_type, + { "Name Type", "ncp.nds_name_type", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_comm_trans, - { "Communications Transport", "ncp.nds_comm_trans", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_comm_trans, + { "Communications Transport", "ncp.nds_comm_trans", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_tree_trans, - { "Tree Walker Transport", "ncp.nds_tree_trans", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_tree_trans, + { "Tree Walker Transport", "ncp.nds_tree_trans", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_iteration, - { "Iteration Handle", "ncp.nds_iteration", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_iteration, + { "Iteration Handle", "ncp.nds_iteration", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_iterator, - { "Iterator", "ncp.nds_iterator", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_iterator, + { "Iterator", "ncp.nds_iterator", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_file_handle, - { "File Handle", "ncp.nds_file_handle", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_file_handle, + { "File Handle", "ncp.nds_file_handle", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_file_size, - { "File Size", "ncp.nds_file_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_file_size, + { "File Size", "ncp.nds_file_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_eid, - { "NDS EID", "ncp.nds_eid", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_eid, + { "NDS EID", "ncp.nds_eid", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_depth, - { "Distance object is from Root", "ncp.nds_depth", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_depth, + { "Distance object is from Root", "ncp.nds_depth", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_info_type, - { "Info Type", "ncp.nds_info_type", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_info_type, + { "Info Type", "ncp.nds_info_type", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_class_def_type, - { "Class Definition Type", "ncp.nds_class_def_type", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_class_def_type, + { "Class Definition Type", "ncp.nds_class_def_type", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_all_attr, - { "All Attributes", "ncp.nds_all_attr", FT_UINT32, BASE_DEC, NULL, 0x0, "Return all Attributes?", HFILL }}, + { &hf_nds_all_attr, + { "All Attributes", "ncp.nds_all_attr", FT_UINT32, BASE_DEC, NULL, 0x0, "Return all Attributes?", HFILL }}, - { &hf_nds_return_all_classes, - { "All Classes", "ncp.nds_return_all_classes", FT_STRING, BASE_NONE, NULL, 0x0, "Return all Classes?", HFILL }}, + { &hf_nds_return_all_classes, + { "All Classes", "ncp.nds_return_all_classes", FT_STRING, BASE_NONE, NULL, 0x0, "Return all Classes?", HFILL }}, - { &hf_nds_req_flags, - { "Request Flags", "ncp.nds_req_flags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_req_flags, + { "Request Flags", "ncp.nds_req_flags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_attr, - { "Attributes", "ncp.nds_attributes", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_attr, + { "Attributes", "ncp.nds_attributes", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_classes, - { "Classes", "ncp.nds_classes", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_classes, + { "Classes", "ncp.nds_classes", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_crc, - { "CRC", "ncp.nds_crc", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_crc, + { "CRC", "ncp.nds_crc", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_referrals, - { "Referrals", "ncp.nds_referrals", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_referrals, + { "Referrals", "ncp.nds_referrals", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_result_flags, - { "Result Flags", "ncp.nds_result_flags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_result_flags, + { "Result Flags", "ncp.nds_result_flags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_stream_flags, - { "Streams Flags", "ncp.nds_stream_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_stream_flags, + { "Streams Flags", "ncp.nds_stream_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_tag_string, - { "Tags", "ncp.nds_tags", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_tag_string, + { "Tags", "ncp.nds_tags", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_value_bytes, - { "Bytes", "ncp.value_bytes", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_value_bytes, + { "Bytes", "ncp.value_bytes", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_replica_type, - { "Replica Type", "ncp.rtype", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_replica_type, + { "Replica Type", "ncp.rtype", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_replica_state, - { "Replica State", "ncp.rstate", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_replica_state, + { "Replica State", "ncp.rstate", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_rnum, - { "Replica Number", "ncp.rnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_rnum, + { "Replica Number", "ncp.rnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_revent, - { "Event", "ncp.revent", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_revent, + { "Event", "ncp.revent", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_replica_number, - { "Replica Number", "ncp.rnum", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_replica_number, + { "Replica Number", "ncp.rnum", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_min_nds_ver, - { "Minimum NDS Version", "ncp.min_nds_version", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_min_nds_ver, + { "Minimum NDS Version", "ncp.min_nds_version", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_ver_include, - { "Include NDS Version", "ncp.inc_nds_ver", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_ver_include, + { "Include NDS Version", "ncp.inc_nds_ver", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_ver_exclude, - { "Exclude NDS Version", "ncp.exc_nds_ver", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_ver_exclude, + { "Exclude NDS Version", "ncp.exc_nds_ver", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, #if 0 /* Unused ? */ - { &hf_nds_es, - { "Input Entry Specifier", "ncp.nds_es", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_es, + { "Input Entry Specifier", "ncp.nds_es", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, #endif - { &hf_es_type, - { "Entry Specifier Type", "ncp.nds_es_type", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_es_type, + { "Entry Specifier Type", "ncp.nds_es_type", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_rdn_string, - { "RDN", "ncp.nds_rdn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_rdn_string, + { "RDN", "ncp.nds_rdn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, #if 0 /* Unused ? */ - { &hf_delim_string, - { "Delimiter", "ncp.nds_delim", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_delim_string, + { "Delimiter", "ncp.nds_delim", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, #endif - { &hf_nds_dn_output_type, - { "Output Entry Specifier Type", "ncp.nds_out_es_type", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_dn_output_type, + { "Output Entry Specifier Type", "ncp.nds_out_es_type", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_nested_output_type, - { "Nested Output Entry Specifier Type", "ncp.nds_nested_out_es", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_nested_output_type, + { "Nested Output Entry Specifier Type", "ncp.nds_nested_out_es", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_output_delimiter, - { "Output Delimiter", "ncp.nds_out_delimiter", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_output_delimiter, + { "Output Delimiter", "ncp.nds_out_delimiter", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_output_entry_specifier, - { "Output Entry Specifier", "ncp.nds_out_es", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_output_entry_specifier, + { "Output Entry Specifier", "ncp.nds_out_es", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_es_value, - { "Entry Specifier Value", "ncp.nds_es_value", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_es_value, + { "Entry Specifier Value", "ncp.nds_es_value", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_es_rdn_count, - { "RDN Count", "ncp.nds_es_rdn_count", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_es_rdn_count, + { "RDN Count", "ncp.nds_es_rdn_count", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_replica_num, - { "Replica Number", "ncp.nds_replica_num", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_replica_num, + { "Replica Number", "ncp.nds_replica_num", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_es_seconds, - { "Seconds", "ncp.nds_es_seconds", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, + { &hf_es_seconds, + { "Seconds", "ncp.nds_es_seconds", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_event_num, - { "Event Number", "ncp.nds_event_num", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_event_num, + { "Event Number", "ncp.nds_event_num", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_compare_results, - { "Compare Results", "ncp.nds_compare_results", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_compare_results, + { "Compare Results", "ncp.nds_compare_results", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_parent, - { "Parent ID", "ncp.nds_parent", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_parent, + { "Parent ID", "ncp.nds_parent", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_name_filter, - { "Name Filter", "ncp.nds_name_filter", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_name_filter, + { "Name Filter", "ncp.nds_name_filter", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_class_filter, - { "Class Filter", "ncp.nds_class_filter", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_class_filter, + { "Class Filter", "ncp.nds_class_filter", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_time_filter, - { "Time Filter", "ncp.nds_time_filter", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_time_filter, + { "Time Filter", "ncp.nds_time_filter", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_partition_root_id, - { "Partition Root ID", "ncp.nds_partition_root_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_partition_root_id, + { "Partition Root ID", "ncp.nds_partition_root_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_replicas, - { "Replicas", "ncp.nds_replicas", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_replicas, + { "Replicas", "ncp.nds_replicas", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_purge, - { "Purge Time", "ncp.nds_purge", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_purge, + { "Purge Time", "ncp.nds_purge", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_local_partition, - { "Local Partition ID", "ncp.nds_local_partition", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_local_partition, + { "Local Partition ID", "ncp.nds_local_partition", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_partition_busy, - { "Partition Busy", "ncp.nds_partition_busy", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_partition_busy, + { "Partition Busy", "ncp.nds_partition_busy", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_number_of_changes, - { "Number of Attribute Changes", "ncp.nds_number_of_changes", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_number_of_changes, + { "Number of Attribute Changes", "ncp.nds_number_of_changes", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_sub_count, - { "Subordinate Count", "ncp.sub_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_sub_count, + { "Subordinate Count", "ncp.sub_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_revision, - { "Revision Count", "ncp.nds_rev_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_revision, + { "Revision Count", "ncp.nds_rev_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_base_class, - { "Base Class", "ncp.nds_base_class", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_base_class, + { "Base Class", "ncp.nds_base_class", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_relative_dn, - { "Relative Distinguished Name", "ncp.nds_relative_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_relative_dn, + { "Relative Distinguished Name", "ncp.nds_relative_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, #if 0 /* Unused ? */ - { &hf_nds_root_dn, - { "Root Distinguished Name", "ncp.nds_root_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_root_dn, + { "Root Distinguished Name", "ncp.nds_root_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, #endif #if 0 /* Unused ? */ - { &hf_nds_parent_dn, - { "Parent Distinguished Name", "ncp.nds_parent_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_parent_dn, + { "Parent Distinguished Name", "ncp.nds_parent_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, #endif - { &hf_deref_base, - { "Dereference Base Class", "ncp.nds_deref_base", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_deref_base, + { "Dereference Base Class", "ncp.nds_deref_base", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_base, - { "Base Class", "ncp.nds_base", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_base, + { "Base Class", "ncp.nds_base", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_super, - { "Super Class", "ncp.nds_super", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_super, + { "Super Class", "ncp.nds_super", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, #if 0 /* Unused ? */ - { &hf_nds_entry_info, - { "Entry Information", "ncp.nds_entry_info", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_entry_info, + { "Entry Information", "ncp.nds_entry_info", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, #endif - { &hf_nds_privileges, - { "Privileges", "ncp.nds_privileges", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_privileges, + { "Privileges", "ncp.nds_privileges", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_compare_attributes, - { "Compare Attributes?", "ncp.nds_compare_attributes", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_nds_compare_attributes, + { "Compare Attributes?", "ncp.nds_compare_attributes", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_nds_read_attribute, - { "Read Attribute?", "ncp.nds_read_attribute", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_nds_read_attribute, + { "Read Attribute?", "ncp.nds_read_attribute", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_nds_write_add_delete_attribute, - { "Write, Add, Delete Attribute?", "ncp.nds_write_add_delete_attribute", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_nds_write_add_delete_attribute, + { "Write, Add, Delete Attribute?", "ncp.nds_write_add_delete_attribute", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_nds_add_delete_self, - { "Add/Delete Self?", "ncp.nds_add_delete_self", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_nds_add_delete_self, + { "Add/Delete Self?", "ncp.nds_add_delete_self", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_nds_privilege_not_defined, - { "Privilege Not defined", "ncp.nds_privilege_not_defined", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_nds_privilege_not_defined, + { "Privilege Not defined", "ncp.nds_privilege_not_defined", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_nds_supervisor, - { "Supervisor?", "ncp.nds_supervisor", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_nds_supervisor, + { "Supervisor?", "ncp.nds_supervisor", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_nds_inheritance_control, - { "Inheritance?", "ncp.nds_inheritance_control", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_nds_inheritance_control, + { "Inheritance?", "ncp.nds_inheritance_control", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_nds_browse_entry, - { "Browse Entry?", "ncp.nds_browse_entry", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_nds_browse_entry, + { "Browse Entry?", "ncp.nds_browse_entry", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_nds_add_entry, - { "Add Entry?", "ncp.nds_add_entry", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_nds_add_entry, + { "Add Entry?", "ncp.nds_add_entry", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_nds_delete_entry, - { "Delete Entry?", "ncp.nds_delete_entry", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_nds_delete_entry, + { "Delete Entry?", "ncp.nds_delete_entry", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_nds_rename_entry, - { "Rename Entry?", "ncp.nds_rename_entry", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_nds_rename_entry, + { "Rename Entry?", "ncp.nds_rename_entry", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_nds_supervisor_entry, - { "Supervisor?", "ncp.nds_supervisor_entry", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_nds_supervisor_entry, + { "Supervisor?", "ncp.nds_supervisor_entry", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_nds_entry_privilege_not_defined, - { "Privilege Not Defined", "ncp.nds_entry_privilege_not_defined", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_nds_entry_privilege_not_defined, + { "Privilege Not Defined", "ncp.nds_entry_privilege_not_defined", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_nds_vflags, - { "Value Flags", "ncp.nds_vflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_vflags, + { "Value Flags", "ncp.nds_vflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_value_len, - { "Value Length", "ncp.nds_vlength", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_value_len, + { "Value Length", "ncp.nds_vlength", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_cflags, - { "Class Flags", "ncp.nds_cflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_cflags, + { "Class Flags", "ncp.nds_cflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_asn1, - { "ASN.1 ID", "ncp.nds_asn1", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_asn1, + { "ASN.1 ID", "ncp.nds_asn1", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_acflags, - { "Attribute Constraint Flags", "ncp.nds_acflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_acflags, + { "Attribute Constraint Flags", "ncp.nds_acflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_upper, - { "Upper Limit Value", "ncp.nds_upper", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_upper, + { "Upper Limit Value", "ncp.nds_upper", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_lower, - { "Lower Limit Value", "ncp.nds_lower", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_lower, + { "Lower Limit Value", "ncp.nds_lower", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_trustee_dn, - { "Trustee Distinguished Name", "ncp.nds_trustee_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_trustee_dn, + { "Trustee Distinguished Name", "ncp.nds_trustee_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_attribute_dn, - { "Attribute Name", "ncp.nds_attribute_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_attribute_dn, + { "Attribute Name", "ncp.nds_attribute_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_acl_add, - { "Access Control Lists to Add", "ncp.nds_acl_add", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_acl_add, + { "Access Control Lists to Add", "ncp.nds_acl_add", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_acl_del, - { "Access Control Lists to Delete", "ncp.nds_acl_del", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_acl_del, + { "Access Control Lists to Delete", "ncp.nds_acl_del", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_att_add, - { "Attribute to Add", "ncp.nds_att_add", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_att_add, + { "Attribute to Add", "ncp.nds_att_add", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_att_del, - { "Attribute to Delete", "ncp.nds_att_del", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_att_del, + { "Attribute to Delete", "ncp.nds_att_del", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_keep, - { "Delete Original RDN", "ncp.nds_keep", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_keep, + { "Delete Original RDN", "ncp.nds_keep", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_new_rdn, - { "New Relative Distinguished Name", "ncp.nds_new_rdn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_new_rdn, + { "New Relative Distinguished Name", "ncp.nds_new_rdn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_time_delay, - { "Time Delay", "ncp.nds_time_delay", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_time_delay, + { "Time Delay", "ncp.nds_time_delay", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_root_name, - { "Root Most Object Name", "ncp.nds_root_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_root_name, + { "Root Most Object Name", "ncp.nds_root_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_new_part_id, - { "New Partition Root ID", "ncp.nds_new_part_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_new_part_id, + { "New Partition Root ID", "ncp.nds_new_part_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_child_part_id, - { "Child Partition Root ID", "ncp.nds_child_part_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_child_part_id, + { "Child Partition Root ID", "ncp.nds_child_part_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_master_part_id, - { "Master Partition Root ID", "ncp.nds_master_part_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_master_part_id, + { "Master Partition Root ID", "ncp.nds_master_part_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_target_name, - { "Target Server Name", "ncp.nds_target_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_target_name, + { "Target Server Name", "ncp.nds_target_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_bit1pingflags1, - { "Supported Fields", "ncp.bit1pingflags1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1pingflags1, + { "Supported Fields", "ncp.bit1pingflags1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2pingflags1, - { "Depth", "ncp.bit2pingflags1", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2pingflags1, + { "Depth", "ncp.bit2pingflags1", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3pingflags1, - { "Build Number", "ncp.bit3pingflags1", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3pingflags1, + { "Build Number", "ncp.bit3pingflags1", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4pingflags1, - { "Flags", "ncp.bit4pingflags1", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4pingflags1, + { "Flags", "ncp.bit4pingflags1", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5pingflags1, - { "Verification Flags", "ncp.bit5pingflags1", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5pingflags1, + { "Verification Flags", "ncp.bit5pingflags1", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6pingflags1, - { "Letter Version", "ncp.bit6pingflags1", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6pingflags1, + { "Letter Version", "ncp.bit6pingflags1", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7pingflags1, - { "OS Version", "ncp.bit7pingflags1", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7pingflags1, + { "OS Version", "ncp.bit7pingflags1", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8pingflags1, - { "Not Defined", "ncp.bit8pingflags1", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8pingflags1, + { "Not Defined", "ncp.bit8pingflags1", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9pingflags1, - { "License Flags", "ncp.bit9pingflags1", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9pingflags1, + { "License Flags", "ncp.bit9pingflags1", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10pingflags1, - { "DS Time", "ncp.bit10pingflags1", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10pingflags1, + { "DS Time", "ncp.bit10pingflags1", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11pingflags1, - { "Server Time", "ncp.bit11pingflags1", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11pingflags1, + { "Server Time", "ncp.bit11pingflags1", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12pingflags1, - { "Create Time", "ncp.bit12pingflags1", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12pingflags1, + { "Create Time", "ncp.bit12pingflags1", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13pingflags1, - { "Not Defined", "ncp.bit13pingflags1", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13pingflags1, + { "Not Defined", "ncp.bit13pingflags1", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14pingflags1, - { "Not Defined", "ncp.bit14pingflags1", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14pingflags1, + { "Not Defined", "ncp.bit14pingflags1", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15pingflags1, - { "Not Defined", "ncp.bit15pingflags1", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15pingflags1, + { "Not Defined", "ncp.bit15pingflags1", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16pingflags1, - { "Not Defined", "ncp.bit16pingflags1", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16pingflags1, + { "Not Defined", "ncp.bit16pingflags1", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1pingflags2, - { "Sap Name", "ncp.bit1pingflags2", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1pingflags2, + { "Sap Name", "ncp.bit1pingflags2", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2pingflags2, - { "Tree Name", "ncp.bit2pingflags2", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2pingflags2, + { "Tree Name", "ncp.bit2pingflags2", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3pingflags2, - { "OS Name", "ncp.bit3pingflags2", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3pingflags2, + { "OS Name", "ncp.bit3pingflags2", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4pingflags2, - { "Hardware Name", "ncp.bit4pingflags2", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4pingflags2, + { "Hardware Name", "ncp.bit4pingflags2", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5pingflags2, - { "Vendor Name", "ncp.bit5pingflags2", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5pingflags2, + { "Vendor Name", "ncp.bit5pingflags2", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6pingflags2, - { "Not Defined", "ncp.bit6pingflags2", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6pingflags2, + { "Not Defined", "ncp.bit6pingflags2", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7pingflags2, - { "Not Defined", "ncp.bit7pingflags2", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7pingflags2, + { "Not Defined", "ncp.bit7pingflags2", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8pingflags2, - { "Not Defined", "ncp.bit8pingflags2", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8pingflags2, + { "Not Defined", "ncp.bit8pingflags2", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9pingflags2, - { "Not Defined", "ncp.bit9pingflags2", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9pingflags2, + { "Not Defined", "ncp.bit9pingflags2", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10pingflags2, - { "Not Defined", "ncp.bit10pingflags2", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10pingflags2, + { "Not Defined", "ncp.bit10pingflags2", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11pingflags2, - { "Not Defined", "ncp.bit11pingflags2", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11pingflags2, + { "Not Defined", "ncp.bit11pingflags2", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12pingflags2, - { "Not Defined", "ncp.bit12pingflags2", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12pingflags2, + { "Not Defined", "ncp.bit12pingflags2", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13pingflags2, - { "Not Defined", "ncp.bit13pingflags2", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13pingflags2, + { "Not Defined", "ncp.bit13pingflags2", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14pingflags2, - { "Not Defined", "ncp.bit14pingflags2", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14pingflags2, + { "Not Defined", "ncp.bit14pingflags2", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15pingflags2, - { "Not Defined", "ncp.bit15pingflags2", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15pingflags2, + { "Not Defined", "ncp.bit15pingflags2", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16pingflags2, - { "Not Defined", "ncp.bit16pingflags2", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16pingflags2, + { "Not Defined", "ncp.bit16pingflags2", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1pingpflags1, - { "Root Most Master Replica", "ncp.bit1pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1pingpflags1, + { "Root Most Master Replica", "ncp.bit1pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2pingpflags1, - { "Is Time Synchronized?", "ncp.bit2pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2pingpflags1, + { "Is Time Synchronized?", "ncp.bit2pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3pingpflags1, - { "Is Time Valid?", "ncp.bit3pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3pingpflags1, + { "Is Time Valid?", "ncp.bit3pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4pingpflags1, - { "Is DS Time Synchronized?", "ncp.bit4pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4pingpflags1, + { "Is DS Time Synchronized?", "ncp.bit4pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5pingpflags1, - { "Does Agent Have All Replicas?", "ncp.bit5pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5pingpflags1, + { "Does Agent Have All Replicas?", "ncp.bit5pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6pingpflags1, - { "Not Defined", "ncp.bit6pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6pingpflags1, + { "Not Defined", "ncp.bit6pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7pingpflags1, - { "Not Defined", "ncp.bit7pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7pingpflags1, + { "Not Defined", "ncp.bit7pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8pingpflags1, - { "Not Defined", "ncp.bit8pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8pingpflags1, + { "Not Defined", "ncp.bit8pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9pingpflags1, - { "Not Defined", "ncp.bit9pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9pingpflags1, + { "Not Defined", "ncp.bit9pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10pingpflags1, - { "Not Defined", "ncp.bit10pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10pingpflags1, + { "Not Defined", "ncp.bit10pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11pingpflags1, - { "Not Defined", "ncp.bit11pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11pingpflags1, + { "Not Defined", "ncp.bit11pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12pingpflags1, - { "Not Defined", "ncp.bit12pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12pingpflags1, + { "Not Defined", "ncp.bit12pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13pingpflags1, - { "Not Defined", "ncp.bit13pingpflags1", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13pingpflags1, + { "Not Defined", "ncp.bit13pingpflags1", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14pingpflags1, - { "Not Defined", "ncp.bit14pingpflags1", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14pingpflags1, + { "Not Defined", "ncp.bit14pingpflags1", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15pingpflags1, - { "Not Defined", "ncp.bit15pingpflags1", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15pingpflags1, + { "Not Defined", "ncp.bit15pingpflags1", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16pingpflags1, - { "Not Defined", "ncp.bit16pingpflags1", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16pingpflags1, + { "Not Defined", "ncp.bit16pingpflags1", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1pingvflags1, - { "Checksum", "ncp.bit1pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1pingvflags1, + { "Checksum", "ncp.bit1pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2pingvflags1, - { "CRC32", "ncp.bit2pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2pingvflags1, + { "CRC32", "ncp.bit2pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3pingvflags1, - { "Not Defined", "ncp.bit3pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3pingvflags1, + { "Not Defined", "ncp.bit3pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4pingvflags1, - { "Not Defined", "ncp.bit4pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4pingvflags1, + { "Not Defined", "ncp.bit4pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5pingvflags1, - { "Not Defined", "ncp.bit5pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5pingvflags1, + { "Not Defined", "ncp.bit5pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6pingvflags1, - { "Not Defined", "ncp.bit6pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6pingvflags1, + { "Not Defined", "ncp.bit6pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7pingvflags1, - { "Not Defined", "ncp.bit7pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7pingvflags1, + { "Not Defined", "ncp.bit7pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8pingvflags1, - { "Not Defined", "ncp.bit8pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8pingvflags1, + { "Not Defined", "ncp.bit8pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9pingvflags1, - { "Not Defined", "ncp.bit9pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9pingvflags1, + { "Not Defined", "ncp.bit9pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10pingvflags1, - { "Not Defined", "ncp.bit10pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10pingvflags1, + { "Not Defined", "ncp.bit10pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11pingvflags1, - { "Not Defined", "ncp.bit11pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11pingvflags1, + { "Not Defined", "ncp.bit11pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12pingvflags1, - { "Not Defined", "ncp.bit12pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12pingvflags1, + { "Not Defined", "ncp.bit12pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13pingvflags1, - { "Not Defined", "ncp.bit13pingvflags1", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13pingvflags1, + { "Not Defined", "ncp.bit13pingvflags1", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14pingvflags1, - { "Not Defined", "ncp.bit14pingvflags1", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14pingvflags1, + { "Not Defined", "ncp.bit14pingvflags1", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15pingvflags1, - { "Not Defined", "ncp.bit15pingvflags1", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15pingvflags1, + { "Not Defined", "ncp.bit15pingvflags1", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16pingvflags1, - { "Not Defined", "ncp.bit16pingvflags1", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16pingvflags1, + { "Not Defined", "ncp.bit16pingvflags1", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_nds_letter_ver, - { "Letter Version", "ncp.nds_letter_ver", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_letter_ver, + { "Letter Version", "ncp.nds_letter_ver", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_os_majver, - { "OS Major Version", "ncp.nds_os_majver", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_os_majver, + { "OS Major Version", "ncp.nds_os_majver", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_os_minver, - { "OS Minor Version", "ncp.nds_os_minver", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_os_minver, + { "OS Minor Version", "ncp.nds_os_minver", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_lic_flags, - { "License Flags", "ncp.nds_lic_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_lic_flags, + { "License Flags", "ncp.nds_lic_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_ds_time, - { "DS Time", "ncp.nds_ds_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_ds_time, + { "DS Time", "ncp.nds_ds_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_svr_time, - { "Server Time", "ncp.nds_svr_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_svr_time, + { "Server Time", "ncp.nds_svr_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_crt_time, - { "Agent Create Time", "ncp.nds_crt_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_crt_time, + { "Agent Create Time", "ncp.nds_crt_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_ping_version, - { "Ping Version", "ncp.nds_ping_version", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_ping_version, + { "Ping Version", "ncp.nds_ping_version", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_search_scope, - { "Search Scope", "ncp.nds_search_scope", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_search_scope, + { "Search Scope", "ncp.nds_search_scope", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_num_objects, - { "Number of Objects to Search", "ncp.nds_num_objects", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_num_objects, + { "Number of Objects to Search", "ncp.nds_num_objects", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_bit1siflags, - { "Names", "ncp.bit1siflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1siflags, + { "Names", "ncp.bit1siflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2siflags, - { "Names and Values", "ncp.bit2siflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2siflags, + { "Names and Values", "ncp.bit2siflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3siflags, - { "Effective Privileges", "ncp.bit3siflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3siflags, + { "Effective Privileges", "ncp.bit3siflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4siflags, - { "Value Info", "ncp.bit4siflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4siflags, + { "Value Info", "ncp.bit4siflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5siflags, - { "Abbreviated Value", "ncp.bit5siflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5siflags, + { "Abbreviated Value", "ncp.bit5siflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6siflags, - { "Not Defined", "ncp.bit6siflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6siflags, + { "Not Defined", "ncp.bit6siflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7siflags, - { "Not Defined", "ncp.bit7siflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7siflags, + { "Not Defined", "ncp.bit7siflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8siflags, - { "Not Defined", "ncp.bit8siflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8siflags, + { "Not Defined", "ncp.bit8siflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9siflags, - { "Expanded Class", "ncp.bit9siflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9siflags, + { "Expanded Class", "ncp.bit9siflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10siflags, - { "Not Defined", "ncp.bit10siflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10siflags, + { "Not Defined", "ncp.bit10siflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11siflags, - { "Not Defined", "ncp.bit11siflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11siflags, + { "Not Defined", "ncp.bit11siflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12siflags, - { "Not Defined", "ncp.bit12siflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12siflags, + { "Not Defined", "ncp.bit12siflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13siflags, - { "Not Defined", "ncp.bit13siflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13siflags, + { "Not Defined", "ncp.bit13siflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14siflags, - { "Not Defined", "ncp.bit14siflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14siflags, + { "Not Defined", "ncp.bit14siflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15siflags, - { "Not Defined", "ncp.bit15siflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15siflags, + { "Not Defined", "ncp.bit15siflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16siflags, - { "Not Defined", "ncp.bit16siflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16siflags, + { "Not Defined", "ncp.bit16siflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_nds_segment_overlap, - { "Segment overlap", "nds.segment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Segment overlaps with other segments", HFILL }}, + { &hf_nds_segment_overlap, + { "Segment overlap", "nds.segment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Segment overlaps with other segments", HFILL }}, - { &hf_nds_segment_overlap_conflict, - { "Conflicting data in segment overlap", "nds.segment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Overlapping segments contained conflicting data", HFILL }}, + { &hf_nds_segment_overlap_conflict, + { "Conflicting data in segment overlap", "nds.segment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Overlapping segments contained conflicting data", HFILL }}, - { &hf_nds_segment_multiple_tails, - { "Multiple tail segments found", "nds.segment.multipletails", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Several tails were found when desegmenting the packet", HFILL }}, + { &hf_nds_segment_multiple_tails, + { "Multiple tail segments found", "nds.segment.multipletails", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Several tails were found when desegmenting the packet", HFILL }}, - { &hf_nds_segment_too_long_segment, - { "Segment too long", "nds.segment.toolongsegment", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Segment contained data past end of packet", HFILL }}, + { &hf_nds_segment_too_long_segment, + { "Segment too long", "nds.segment.toolongsegment", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Segment contained data past end of packet", HFILL }}, - { &hf_nds_segment_error, - { "Desegmentation error", "nds.segment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "Desegmentation error due to illegal segments", HFILL }}, + { &hf_nds_segment_error, + { "Desegmentation error", "nds.segment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "Desegmentation error due to illegal segments", HFILL }}, - { &hf_nds_segment_count, - { "Segment count", "nds.segment.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_segment_count, + { "Segment count", "nds.segment.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_reassembled_length, - { "Reassembled NDS length", "nds.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL }}, + { &hf_nds_reassembled_length, + { "Reassembled NDS length", "nds.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL }}, - { &hf_nds_segment, - { "NDS Fragment", "nds.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "NDPS Fragment", HFILL }}, + { &hf_nds_segment, + { "NDS Fragment", "nds.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "NDPS Fragment", HFILL }}, - { &hf_nds_segments, - { "NDS Fragments", "nds.fragments", FT_NONE, BASE_NONE, NULL, 0x0, "NDPS Fragments", HFILL }}, + { &hf_nds_segments, + { "NDS Fragments", "nds.fragments", FT_NONE, BASE_NONE, NULL, 0x0, "NDPS Fragments", HFILL }}, - { &hf_nds_verb2b_req_flags, - { "Flags", "ncp.nds_verb2b_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_verb2b_req_flags, + { "Flags", "ncp.nds_verb2b_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_ip_address, - { "IP Address", "ncp.ip_addr", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_ip_address, + { "IP Address", "ncp.ip_addr", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_copyright, - { "Copyright", "ncp.copyright", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_copyright, + { "Copyright", "ncp.copyright", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_ndsprot1flag, - { "Not Defined", "ncp.nds_prot_bit1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_ndsprot1flag, + { "Not Defined", "ncp.nds_prot_bit1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_ndsprot2flag, - { "Not Defined", "ncp.nds_prot_bit2", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_ndsprot2flag, + { "Not Defined", "ncp.nds_prot_bit2", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_ndsprot3flag, - { "Not Defined", "ncp.nds_prot_bit3", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_ndsprot3flag, + { "Not Defined", "ncp.nds_prot_bit3", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_ndsprot4flag, - { "Not Defined", "ncp.nds_prot_bit4", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_ndsprot4flag, + { "Not Defined", "ncp.nds_prot_bit4", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_ndsprot5flag, - { "Not Defined", "ncp.nds_prot_bit5", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_ndsprot5flag, + { "Not Defined", "ncp.nds_prot_bit5", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_ndsprot6flag, - { "Not Defined", "ncp.nds_prot_bit6", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_ndsprot6flag, + { "Not Defined", "ncp.nds_prot_bit6", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_ndsprot7flag, - { "Not Defined", "ncp.nds_prot_bit7", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_ndsprot7flag, + { "Not Defined", "ncp.nds_prot_bit7", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_ndsprot8flag, - { "Not Defined", "ncp.nds_prot_bit8", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_ndsprot8flag, + { "Not Defined", "ncp.nds_prot_bit8", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_ndsprot9flag, - { "Not Defined", "ncp.nds_prot_bit9", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_ndsprot9flag, + { "Not Defined", "ncp.nds_prot_bit9", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_ndsprot10flag, - { "Not Defined", "ncp.nds_prot_bit10", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_ndsprot10flag, + { "Not Defined", "ncp.nds_prot_bit10", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_ndsprot11flag, - { "Not Defined", "ncp.nds_prot_bit11", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_ndsprot11flag, + { "Not Defined", "ncp.nds_prot_bit11", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_ndsprot12flag, - { "Not Defined", "ncp.nds_prot_bit12", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_ndsprot12flag, + { "Not Defined", "ncp.nds_prot_bit12", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_ndsprot13flag, - { "Not Defined", "ncp.nds_prot_bit13", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_ndsprot13flag, + { "Not Defined", "ncp.nds_prot_bit13", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_ndsprot14flag, - { "Not Defined", "ncp.nds_prot_bit14", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_ndsprot14flag, + { "Not Defined", "ncp.nds_prot_bit14", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_ndsprot15flag, - { "Include CRC in NDS Header", "ncp.nds_prot_bit15", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_ndsprot15flag, + { "Include CRC in NDS Header", "ncp.nds_prot_bit15", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_ndsprot16flag, - { "Client is a Server", "ncp.nds_prot_bit16", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_ndsprot16flag, + { "Client is a Server", "ncp.nds_prot_bit16", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_nds_svr_dst_name, - { "Server Distinguished Name", "ncp.nds_svr_dist_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_svr_dst_name, + { "Server Distinguished Name", "ncp.nds_svr_dist_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_tune_mark, - { "Tune Mark", "ncp.ndstunemark", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_tune_mark, + { "Tune Mark", "ncp.ndstunemark", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, #if 0 /* Unused ? */ - { &hf_nds_create_time, - { "NDS Creation Time", "ncp.ndscreatetime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_create_time, + { "NDS Creation Time", "ncp.ndscreatetime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, #endif - { &hf_srvr_param_string, - { "Set Parameter Value", "ncp.srvr_param_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_srvr_param_string, + { "Set Parameter Value", "ncp.srvr_param_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_srvr_param_number, - { "Set Parameter Value", "ncp.srvr_param_string", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_srvr_param_number, + { "Set Parameter Value", "ncp.srvr_param_string", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_srvr_param_boolean, - { "Set Parameter Value", "ncp.srvr_param_boolean", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_srvr_param_boolean, + { "Set Parameter Value", "ncp.srvr_param_boolean", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_number_of_items, - { "Number of Items", "ncp.ndsitems", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_number_of_items, + { "Number of Items", "ncp.ndsitems", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_nds_iterverb, - { "NDS Iteration Verb", "ncp.ndsiterverb", FT_UINT32, BASE_HEX, NULL /*VALS(iterator_subverbs)*/, 0x0, NULL, HFILL }}, + { &hf_ncp_nds_iterverb, + { "NDS Iteration Verb", "ncp.ndsiterverb", FT_UINT32, BASE_HEX, NULL /*VALS(iterator_subverbs)*/, 0x0, NULL, HFILL }}, - { &hf_iter_completion_code, - { "Iteration Completion Code", "ncp.iter_completion_code", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_iter_completion_code, + { "Iteration Completion Code", "ncp.iter_completion_code", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, #if 0 /* Unused ? */ - { &hf_nds_iterobj, - { "Iterator Object", "ncp.ndsiterobj", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_iterobj, + { "Iterator Object", "ncp.ndsiterobj", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, #endif - { &hf_iter_verb_completion_code, - { "Completion Code", "ncp.iter_verb_completion_code", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_iter_verb_completion_code, + { "Completion Code", "ncp.iter_verb_completion_code", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_iter_ans, - { "Iterator Answer", "ncp.iter_answer", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_iter_ans, + { "Iterator Answer", "ncp.iter_answer", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_positionable, - { "Positionable", "ncp.iterpositionable", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_positionable, + { "Positionable", "ncp.iterpositionable", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_num_skipped, - { "Number Skipped", "ncp.iternumskipped", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_num_skipped, + { "Number Skipped", "ncp.iternumskipped", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_num_to_skip, - { "Number to Skip", "ncp.iternumtoskip", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_num_to_skip, + { "Number to Skip", "ncp.iternumtoskip", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_timelimit, - { "Time Limit", "ncp.itertimelimit", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_timelimit, + { "Time Limit", "ncp.itertimelimit", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_iter_index, - { "Iterator Index", "ncp.iterindex", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_iter_index, + { "Iterator Index", "ncp.iterindex", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_num_to_get, - { "Number to Get", "ncp.iternumtoget", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_num_to_get, + { "Number to Get", "ncp.iternumtoget", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, #if 0 /* Unused ? */ - { &hf_ret_info_type, - { "Return Information Type", "ncp.iterretinfotype", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_ret_info_type, + { "Return Information Type", "ncp.iterretinfotype", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, #endif - { &hf_data_size, - { "Data Size", "ncp.iterdatasize", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_data_size, + { "Data Size", "ncp.iterdatasize", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + + { &hf_this_count, + { "Number of Items", "ncp.itercount", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_this_count, - { "Number of Items", "ncp.itercount", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_max_entries, + { "Maximum Entries", "ncp.itermaxentries", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_max_entries, - { "Maximum Entries", "ncp.itermaxentries", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_move_position, + { "Move Position", "ncp.itermoveposition", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_move_position, - { "Move Position", "ncp.itermoveposition", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_iter_copy, + { "Iterator Copy", "ncp.itercopy", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_iter_copy, - { "Iterator Copy", "ncp.itercopy", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_iter_position, + { "Iteration Position", "ncp.iterposition", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_iter_position, - { "Iteration Position", "ncp.iterposition", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_iter_search, + { "Search Filter", "ncp.iter_search", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_iter_search, - { "Search Filter", "ncp.iter_search", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_iter_other, + { "Other Iteration", "ncp.iterother", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_iter_other, - { "Other Iteration", "ncp.iterother", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_oid, + { "Object ID", "ncp.nds_oid", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_oid, - { "Object ID", "ncp.nds_oid", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_64_bit_flag, { "64 Bit Support", "ncp.64_bit_flag", FT_UINT8, BASE_HEX, VALS(ncp_64_bit_flag_vals), 0x0, NULL, HFILL }}, @@ -26710,12 +26693,12 @@ }; - proto_register_field_array(proto_ncp, hf, array_length(hf)); + proto_register_field_array(proto_ncp, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); +proto_register_subtree_array(ett, array_length(ett)); - register_init_routine(&ncp_init_protocol); - register_postseq_cleanup_routine(&ncp_postseq_cleanup); + register_init_routine(&ncp_init_protocol); + register_postseq_cleanup_routine(&ncp_postseq_cleanup); } #include "packet-ncp2222.inc" diff -Nru wireshark-1.10.5/epan/dissectors/packet-ncp2222.inc wireshark-1.10.6/epan/dissectors/packet-ncp2222.inc --- wireshark-1.10.5/epan/dissectors/packet-ncp2222.inc 2013-07-22 23:12:24.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ncp2222.inc 2014-03-07 18:07:14.000000000 +0000 @@ -19,7 +19,7 @@ * Portions Copyright (c) Gilbert Ramirez 2000-2002 * Portions Copyright (c) Novell, Inc. 2000-2003 * - * $Id: packet-ncp2222.inc 50804 2013-07-22 23:06:14Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ncp.c wireshark-1.10.6/epan/dissectors/packet-ncp.c --- wireshark-1.10.5/epan/dissectors/packet-ncp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ncp.c 2014-03-07 18:07:14.000000000 +0000 @@ -9,7 +9,7 @@ * Portions Copyright (c) by James Coe 2000-2002 * Portions Copyright (c) Novell, Inc. 2000-2003 * - * $Id: packet-ncp.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ncp-int.h wireshark-1.10.6/epan/dissectors/packet-ncp-int.h --- wireshark-1.10.5/epan/dissectors/packet-ncp-int.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ncp-int.h 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * Portions Copyright (c) Gilbert Ramirez 2000-2002 * Portions Copyright (c) Novell, Inc. 2000-2003 * - * $Id: packet-ncp-int.h 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ncp-nmas.c wireshark-1.10.6/epan/dissectors/packet-ncp-nmas.c --- wireshark-1.10.5/epan/dissectors/packet-ncp-nmas.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ncp-nmas.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Greg Morris * Copyright (c) Novell, Inc. 2002-2004 * - * $Id: packet-ncp-nmas.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ncp-nmas.h wireshark-1.10.6/epan/dissectors/packet-ncp-nmas.h --- wireshark-1.10.5/epan/dissectors/packet-ncp-nmas.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ncp-nmas.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Greg Morris * Copyright (c) Novell, Inc. 2002-2004 * - * $Id: packet-ncp-nmas.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ncp-sss.c wireshark-1.10.6/epan/dissectors/packet-ncp-sss.c --- wireshark-1.10.5/epan/dissectors/packet-ncp-sss.c 2013-09-09 18:34:31.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ncp-sss.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Greg Morris * Copyright (c) Novell, Inc. 2002-2003 * - * $Id: packet-ncp-sss.c 51874 2013-09-09 18:28:56Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ncp-sss.h wireshark-1.10.6/epan/dissectors/packet-ncp-sss.h --- wireshark-1.10.5/epan/dissectors/packet-ncp-sss.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ncp-sss.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Greg Morris * Copyright (c) Novell, Inc. 2002-2004 * - * $Id: packet-ncp-sss.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ncs.c wireshark-1.10.6/epan/dissectors/packet-ncs.c --- wireshark-1.10.5/epan/dissectors/packet-ncs.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ncs.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Greg Morris * Copyright (c) Novell, Inc. 2002-2005 * - * $Id: packet-ncs.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ndmp.c wireshark-1.10.6/epan/dissectors/packet-ndmp.c --- wireshark-1.10.5/epan/dissectors/packet-ndmp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ndmp.c 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * Routines for NDMP dissection * 2001 Ronnie Sahlberg (see AUTHORS for email) * - * $Id: packet-ndmp.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ndmp.h wireshark-1.10.6/epan/dissectors/packet-ndmp.h --- wireshark-1.10.5/epan/dissectors/packet-ndmp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ndmp.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ndmp.h * - * $Id: packet-ndmp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * (c) 2007 Ronnie Sahlberg * diff -Nru wireshark-1.10.5/epan/dissectors/packet-ndp.c wireshark-1.10.6/epan/dissectors/packet-ndp.c --- wireshark-1.10.5/epan/dissectors/packet-ndp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ndp.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * the SynOptics Network Management Protocol (SONMP). * (c) Copyright Giles Scott * - * $Id: packet-ndp.c 48425 2013-03-19 19:28:57Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ndps.c wireshark-1.10.6/epan/dissectors/packet-ndps.c --- wireshark-1.10.5/epan/dissectors/packet-ndps.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ndps.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Greg Morris * Copyright (c) Novell, Inc. 2002-2003 * - * $Id: packet-ndps.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ndps.h wireshark-1.10.6/epan/dissectors/packet-ndps.h --- wireshark-1.10.5/epan/dissectors/packet-ndps.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ndps.h 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright (c) Novell, Inc. 2002-2003 * - * $Id: packet-ndps.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-negoex.c wireshark-1.10.6/epan/dissectors/packet-negoex.c --- wireshark-1.10.5/epan/dissectors/packet-negoex.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-negoex.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2012 Richard Sharpe * Routines for SPNEGO Extended Negotiation Security Mechanism * - * $Id: packet-negoex.c 48869 2013-04-16 00:00:09Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-netanalyzer.c wireshark-1.10.6/epan/dissectors/packet-netanalyzer.c --- wireshark-1.10.5/epan/dissectors/packet-netanalyzer.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-netanalyzer.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Dissector for Hilscher netANALYZER frames. * Copyright 2008-2011, Hilscher GmbH, Holger Pfrommer hpfrommer[AT]hilscher.com * - * $Id: packet-netanalyzer.c 48425 2013-03-19 19:28:57Z etxrab $ + * $Id$ * * Packet structure: * +---------------------------+ diff -Nru wireshark-1.10.5/epan/dissectors/packet-netbios.c wireshark-1.10.6/epan/dissectors/packet-netbios.c --- wireshark-1.10.5/epan/dissectors/packet-netbios.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-netbios.c 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * * derived from the packet-nbns.c * - * $Id: packet-netbios.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-netbios.h wireshark-1.10.6/epan/dissectors/packet-netbios.h --- wireshark-1.10.5/epan/dissectors/packet-netbios.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-netbios.h 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * * derived from the packet-nbns.c * - * $Id: packet-netbios.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-netdump.c wireshark-1.10.6/epan/dissectors/packet-netdump.c --- wireshark-1.10.5/epan/dissectors/packet-netdump.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-netdump.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Netdump dissection * Copyright 2009, Neil Horman * - * $Id: packet-netdump.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-netflow.c wireshark-1.10.6/epan/dissectors/packet-netflow.c --- wireshark-1.10.5/epan/dissectors/packet-netflow.c 2013-09-07 00:36:13.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-netflow.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* ** packet-netflow.c ** - ** $Id: packet-netflow.c 51807 2013-09-07 00:30:29Z gerald $ + ** $Id$ ** ** (c) 2002 bill fumerola ** (C) 2005-06 Luca Deri diff -Nru wireshark-1.10.5/epan/dissectors/packet-netperfmeter.c wireshark-1.10.6/epan/dissectors/packet-netperfmeter.c --- wireshark-1.10.5/epan/dissectors/packet-netperfmeter.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-netperfmeter.c 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright 2009 by Thomas Dreibholz * - * $Id: packet-netperfmeter.c 47459 2013-02-03 22:29:48Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-netrom.c wireshark-1.10.6/epan/dissectors/packet-netrom.c --- wireshark-1.10.5/epan/dissectors/packet-netrom.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-netrom.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * NET/ROM inter-node frames. * Copyright 2005,2006,2007,2008,2009,2010,2012 R.W. Stearn * - * $Id: packet-netrom.c 48732 2013-04-04 15:33:14Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-netrom.h wireshark-1.10.6/epan/dissectors/packet-netrom.h --- wireshark-1.10.5/epan/dissectors/packet-netrom.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-netrom.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for Amateur Packet Radio protocol dissection * Copyright 2005,2006,2007,2008,2009,2010,2012 R.W. Stearn * - * $Id: packet-netrom.h 45728 2012-10-22 20:46:47Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-netsync.c wireshark-1.10.6/epan/dissectors/packet-netsync.c --- wireshark-1.10.5/epan/dissectors/packet-netsync.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-netsync.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-netsync.c * Routines for Monotone Netsync packet disassembly * - * $Id: packet-netsync.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Copyright (c) 2005 by Erwin Rol * diff -Nru wireshark-1.10.5/epan/dissectors/packet-nettl.c wireshark-1.10.6/epan/dissectors/packet-nettl.c --- wireshark-1.10.5/epan/dissectors/packet-nettl.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nettl.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * Original Author Mark C. Brown * Copyright (C) 2005 Hewlett-Packard Development Company, L.P. * - * $Id: packet-nettl.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-newmail.c wireshark-1.10.6/epan/dissectors/packet-newmail.c --- wireshark-1.10.5/epan/dissectors/packet-newmail.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-newmail.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Exchange New Mail Notification dissection * Copyright 2006, Stephen Fisher (see AUTHORS file) * - * $Id: packet-newmail.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nflog.c wireshark-1.10.6/epan/dissectors/packet-nflog.c --- wireshark-1.10.5/epan/dissectors/packet-nflog.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nflog.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-nflog.c * Copyright 2011,2012 Jakub Zawadzki * - * $Id: packet-nflog.c 46766 2012-12-26 10:30:34Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nfsacl.c wireshark-1.10.6/epan/dissectors/packet-nfsacl.c --- wireshark-1.10.5/epan/dissectors/packet-nfsacl.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nfsacl.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * * Guy Harris * - * $Id: packet-nfsacl.c 48934 2013-04-19 18:16:50Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nfsauth.c wireshark-1.10.6/epan/dissectors/packet-nfsauth.c --- wireshark-1.10.5/epan/dissectors/packet-nfsauth.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nfsauth.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Ronnie Sahlberg * - * $Id: packet-nfsauth.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nfs.c wireshark-1.10.6/epan/dissectors/packet-nfs.c --- wireshark-1.10.5/epan/dissectors/packet-nfs.c 2013-12-13 21:23:55.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nfs.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 1999, Uwe Girlich * Copyright 2000-2004, Mike Frisch (NFSv4 decoding) * - * $Id: packet-nfs.c 54060 2013-12-13 20:47:45Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -950,24 +950,31 @@ nfs_name_snoop_t *nns, *old_nns; const char *ptr=NULL; + if (name_len <= 0) { + /* Do we need some way to signal an error here? This could be + * programmatic or just a corrupt packet, depending on the + * caller... */ + return; + } + /* filter out all '.' and '..' names */ if(!name){ ptr=(const char *)tvb_get_ptr(tvb, name_offset, name_len); } else { ptr=name; } - if(ptr[0]=='.'){ - if(ptr[1]==0){ + if (ptr[0] == '.') { + if (name_len <= 1 || ptr[1] == 0) { return; } - if(ptr[1]=='.'){ - if(ptr[2]==0){ + if (ptr[1] == '.') { + if (name_len <= 2 || ptr[2] == 0) { return; } } } - nns=(nfs_name_snoop_t *)g_malloc(sizeof(nfs_name_snoop_t)); + nns = g_new(nfs_name_snoop_t, 1); nns->fh_length=0; nns->fh=NULL; diff -Nru wireshark-1.10.5/epan/dissectors/packet-nfs.h wireshark-1.10.6/epan/dissectors/packet-nfs.h --- wireshark-1.10.5/epan/dissectors/packet-nfs.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nfs.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,5 +1,5 @@ /* packet-nfs.h (c) 1999 Uwe Girlich */ -/* $Id: packet-nfs.h 48934 2013-04-19 18:16:50Z eapache $ +/* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nhrp.c wireshark-1.10.6/epan/dissectors/packet-nhrp.c --- wireshark-1.10.5/epan/dissectors/packet-nhrp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nhrp.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * RFC 2520: NHRP with Mobile NHCs * RFC 2735: NHRP Support for Virtual Private Networks * - * $Id: packet-nhrp.c 48626 2013-03-28 18:13:12Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nhrp.h wireshark-1.10.6/epan/dissectors/packet-nhrp.h --- wireshark-1.10.5/epan/dissectors/packet-nhrp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nhrp.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-nhrp.h * Definitions for NHRP * - * $Id: packet-nhrp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nisplus.c wireshark-1.10.6/epan/dissectors/packet-nisplus.c --- wireshark-1.10.5/epan/dissectors/packet-nisplus.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nisplus.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-nisplus.c * 2001 Ronnie Sahlberg * - * $Id: packet-nisplus.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nisplus.h wireshark-1.10.6/epan/dissectors/packet-nisplus.h --- wireshark-1.10.5/epan/dissectors/packet-nisplus.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nisplus.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-nisplus.h * 2001 Ronnie Sahlberg * - * $Id: packet-nisplus.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nlm.c wireshark-1.10.6/epan/dissectors/packet-nlm.c --- wireshark-1.10.5/epan/dissectors/packet-nlm.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nlm.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-nlm.c * Routines for nlm dissection * - * $Id: packet-nlm.c 48934 2013-04-19 18:16:50Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nlm.h wireshark-1.10.6/epan/dissectors/packet-nlm.h --- wireshark-1.10.5/epan/dissectors/packet-nlm.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nlm.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,5 +1,5 @@ /* packet-nlm.h (c) 1999 Uwe Girlich */ -/* $Id: packet-nlm.h 43536 2012-06-28 22:56:06Z darkjames $ +/* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nlsp.c wireshark-1.10.6/epan/dissectors/packet-nlsp.c --- wireshark-1.10.5/epan/dissectors/packet-nlsp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nlsp.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-nlsp.c * Routines for NetWare Link Services Protocol * - * $Id: packet-nlsp.c 46745 2012-12-25 22:39:11Z guy $ + * $Id$ * * Based on ISIS dissector by Stuart Stanley * diff -Nru wireshark-1.10.5/epan/dissectors/packet-nntp.c wireshark-1.10.6/epan/dissectors/packet-nntp.c --- wireshark-1.10.5/epan/dissectors/packet-nntp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nntp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for nntp packet dissection * Copyright 1999, Richard Sharpe * - * $Id: packet-nntp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-noe.c wireshark-1.10.6/epan/dissectors/packet-noe.c --- wireshark-1.10.5/epan/dissectors/packet-noe.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-noe.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for UA/UDP (Universal Alcatel over UDP) and NOE packet dissection. * Copyright 2012, Alcatel-Lucent Enterprise * - * $Id: packet-noe.c 48425 2013-03-19 19:28:57Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ns_cert_exts.c wireshark-1.10.6/epan/dissectors/packet-ns_cert_exts.c --- wireshark-1.10.5/epan/dissectors/packet-ns_cert_exts.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ns_cert_exts.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for NetScape Certificate Extensions packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-ns_cert_exts.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nsip.c wireshark-1.10.6/epan/dissectors/packet-nsip.c --- wireshark-1.10.5/epan/dissectors/packet-nsip.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nsip.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Network Service Over IP dissection * Copyright 2000, Susanne Edlund * - * $Id: packet-nsip.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nsrp.c wireshark-1.10.6/epan/dissectors/packet-nsrp.c --- wireshark-1.10.5/epan/dissectors/packet-nsrp.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nsrp.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Secfire * - * $Id: packet-nsrp.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nstrace.c wireshark-1.10.6/epan/dissectors/packet-nstrace.c --- wireshark-1.10.5/epan/dissectors/packet-nstrace.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nstrace.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for nstrace dissection * Copyright 2006, Ravi Kondamuru * - * $Id: packet-nstrace.c 47751 2013-02-19 23:17:07Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ntlmssp.c wireshark-1.10.6/epan/dissectors/packet-ntlmssp.c --- wireshark-1.10.5/epan/dissectors/packet-ntlmssp.c 2013-12-13 22:36:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ntlmssp.c 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * Devin Heitmueller * Copyright 2003, Tim Potter * - * $Id: packet-ntlmssp.c 54072 2013-12-13 22:18:37Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ntlmssp.h wireshark-1.10.6/epan/dissectors/packet-ntlmssp.h --- wireshark-1.10.5/epan/dissectors/packet-ntlmssp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ntlmssp.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Declarations for NTLM Secure Service Provider * Copyright 2003, Tim Potter * - * $Id: packet-ntlmssp.h 44542 2012-08-16 17:03:07Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nt-oui.c wireshark-1.10.6/epan/dissectors/packet-nt-oui.c --- wireshark-1.10.5/epan/dissectors/packet-nt-oui.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nt-oui.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-nt-oui.c * Register an LLC dissector table for Nortel's OUI 00:00:0c * - * $Id: packet-nt-oui.c 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ntp.c wireshark-1.10.6/epan/dissectors/packet-ntp.c --- wireshark-1.10.5/epan/dissectors/packet-ntp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ntp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for NTP packet dissection * Copyright 1999, Nathan Neulinger * - * $Id: packet-ntp.c 48425 2013-03-19 19:28:57Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ntp.h wireshark-1.10.6/epan/dissectors/packet-ntp.h --- wireshark-1.10.5/epan/dissectors/packet-ntp.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ntp.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ntp.h * Definitions for packet disassembly structures and routines * - * $Id: packet-ntp.h 45783 2012-10-25 12:54:37Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nt-tpcp.c wireshark-1.10.6/epan/dissectors/packet-nt-tpcp.c --- wireshark-1.10.5/epan/dissectors/packet-nt-tpcp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nt-tpcp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Transparent Proxy Cache Protocol packet disassembly * (c) Copyright Giles Scott * -* $Id: packet-nt-tpcp.c 45017 2012-09-20 02:03:38Z morriss $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-null.c wireshark-1.10.6/epan/dissectors/packet-null.c --- wireshark-1.10.5/epan/dissectors/packet-null.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-null.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-null.c * Routines for null packet disassembly * - * $Id: packet-null.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-null.h wireshark-1.10.6/epan/dissectors/packet-null.h --- wireshark-1.10.5/epan/dissectors/packet-null.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-null.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-null.h * - * $Id: packet-null.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-nwmtp.c wireshark-1.10.6/epan/dissectors/packet-nwmtp.c --- wireshark-1.10.5/epan/dissectors/packet-nwmtp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-nwmtp.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2010 by Holger Hans Peter Freyther * Copyright 2010 by On-Waves * - * $Id: packet-nwmtp.c 46993 2013-01-07 22:12:38Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ocsp.c wireshark-1.10.6/epan/dissectors/packet-ocsp.c --- wireshark-1.10.5/epan/dissectors/packet-ocsp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ocsp.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for Online Certificate Status Protocol (RFC2560) packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-ocsp.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ocsp.h wireshark-1.10.6/epan/dissectors/packet-ocsp.h --- wireshark-1.10.5/epan/dissectors/packet-ocsp.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ocsp.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for Online Certificate Status Protocol (RFC2560) packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-ocsp.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-oicq.c wireshark-1.10.6/epan/dissectors/packet-oicq.c --- wireshark-1.10.5/epan/dissectors/packet-oicq.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-oicq.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for OICQ - IM software,popular in China - packet dissection * (c) Copyright Secfire * - * $Id: packet-oicq.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * OICQ is an IM software,which is popular in China. And, * OICQ has more than 10 millions users at present. diff -Nru wireshark-1.10.5/epan/dissectors/packet-oipf.c wireshark-1.10.6/epan/dissectors/packet-oipf.c --- wireshark-1.10.5/epan/dissectors/packet-oipf.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-oipf.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Dissector for Open IPTV Forum protocols * Copyright 2012, Martin Kaiser * - * $Id: packet-oipf.c 48339 2013-03-16 09:37:06Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-olsr.c wireshark-1.10.6/epan/dissectors/packet-olsr.c --- wireshark-1.10.5/epan/dissectors/packet-olsr.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-olsr.c 2014-03-07 18:07:14.000000000 +0000 @@ -9,7 +9,7 @@ * Updated to Olsr.org and NRLOLSR packages by Henning Rogge * http://www.ietf.org/rfc/rfc3626.txt * - * $Id: packet-olsr.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-omapi.c wireshark-1.10.6/epan/dissectors/packet-omapi.c --- wireshark-1.10.5/epan/dissectors/packet-omapi.c 2013-12-19 18:19:40.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-omapi.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * ISC OMAPI (Object Management API) dissector * Copyright 2006, Jaap Keuter * - * $Id: packet-omapi.c 54258 2013-12-19 17:59:14Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-omron-fins.c wireshark-1.10.6/epan/dissectors/packet-omron-fins.c --- wireshark-1.10.5/epan/dissectors/packet-omron-fins.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-omron-fins.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for OMRON FINS UDP dissection * Copyright Sourcefire, Inc. 2008-2009, Matthew Watchinski * - * $Id: packet-omron-fins.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-opensafety.c wireshark-1.10.6/epan/dissectors/packet-opensafety.c --- wireshark-1.10.5/epan/dissectors/packet-opensafety.c 2013-10-22 02:22:45.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-opensafety.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-opensafety.c * - * $Id: packet-opensafety.c 52753 2013-10-22 02:16:09Z mmann $ + * $Id$ * * openSAFETY is a machine-safety protocol, encapsulated in modern fieldbus * and industrial ethernet solutions. @@ -2005,13 +2005,6 @@ if ( handled == TRUE && packageCounter == 0 ) handled = FALSE; - if ( ! handled ) - { - if ( call_sub_dissector ) - call_dissector(protocol_dissector, message_tvb, pinfo, tree); - handled = TRUE; - } - return ( handled ? TRUE : FALSE ); } @@ -2115,7 +2108,7 @@ * this behaviour is technically correct, it differs from other implemented IEM protocol handlers. * Therefore, the openSAFETY frame get's put one up, if the parent is not NULL */ return opensafety_package_dissector("openSAFETY/Modbus TCP", "", FALSE, TRUE, 0, - message_tvb, pinfo, ( tree->parent != NULL ? tree->parent : tree )); + message_tvb, pinfo, ( ((tree != NULL) && (tree->parent != NULL)) ? tree->parent : tree )); } static gboolean diff -Nru wireshark-1.10.5/epan/dissectors/packet-openvpn.c wireshark-1.10.6/epan/dissectors/packet-openvpn.c --- wireshark-1.10.5/epan/dissectors/packet-openvpn.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-openvpn.c 2014-03-07 18:07:14.000000000 +0000 @@ -13,7 +13,7 @@ * Stiftinger Thomas * Werner Sebastian * - * $Id: packet-openvpn.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/epan/dissectors/packet-openwire.c wireshark-1.10.6/epan/dissectors/packet-openwire.c --- wireshark-1.10.5/epan/dissectors/packet-openwire.c 2013-10-10 13:14:25.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-openwire.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * metatech * - * $Id: packet-openwire.c 52490 2013-10-10 13:08:02Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-opsi.c wireshark-1.10.6/epan/dissectors/packet-opsi.c --- wireshark-1.10.5/epan/dissectors/packet-opsi.c 2013-04-22 21:38:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-opsi.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for OPSI protocol dissection * Copyright 2004, Laurent Rabret (France Telecom R&D) * - * $Id: packet-opsi.c 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-osi.c wireshark-1.10.6/epan/dissectors/packet-osi.c --- wireshark-1.10.5/epan/dissectors/packet-osi.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-osi.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ISO/OSI network and transport protocol packet disassembly * Main entrance point and common functions * - * $Id: packet-osi.c 46060 2012-11-17 22:12:37Z guy $ + * $Id$ * Laurent Deniel * Ralf Schneider * diff -Nru wireshark-1.10.5/epan/dissectors/packet-osi.h wireshark-1.10.6/epan/dissectors/packet-osi.h --- wireshark-1.10.5/epan/dissectors/packet-osi.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-osi.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-osi.h * - * $Id: packet-osi.h 46060 2012-11-17 22:12:37Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-osi-options.c wireshark-1.10.6/epan/dissectors/packet-osi-options.c --- wireshark-1.10.5/epan/dissectors/packet-osi-options.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-osi-options.c 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * ISO 10589 ISIS (Intradomain Routing Information Exchange Protocol) * ISO 9542 ESIS (End System To Intermediate System Routing Exchange Protocol) * - * $Id: packet-osi-options.c 46043 2012-11-16 14:18:27Z etxrab $ + * $Id$ * Ralf Schneider * * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/epan/dissectors/packet-osi-options.h wireshark-1.10.6/epan/dissectors/packet-osi-options.h --- wireshark-1.10.5/epan/dissectors/packet-osi-options.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-osi-options.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-osi-options.h * Defines for OSI options part decode * - * $Id: packet-osi-options.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * Ralf Schneider * * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/epan/dissectors/packet-ositp.c wireshark-1.10.6/epan/dissectors/packet-ositp.c --- wireshark-1.10.5/epan/dissectors/packet-ositp.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ositp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ISO/OSI transport protocol (connection-oriented * and connectionless) packet disassembly * - * $Id: packet-ositp.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * Laurent Deniel * Ralf Schneider * diff -Nru wireshark-1.10.5/epan/dissectors/packet-ospf.c wireshark-1.10.6/epan/dissectors/packet-ospf.c --- wireshark-1.10.5/epan/dissectors/packet-ospf.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ospf.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for OSPF packet disassembly * (c) Copyright Hannes R. Boehm * - * $Id: packet-ospf.c 48425 2013-03-19 19:28:57Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ouch.c wireshark-1.10.6/epan/dissectors/packet-ouch.c --- wireshark-1.10.5/epan/dissectors/packet-ouch.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ouch.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for OUCH 4.x protocol dissection * Copyright 2013 David Arnold * - * $Id: packet-ouch.c 48532 2013-03-24 18:14:58Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-p1.c wireshark-1.10.6/epan/dissectors/packet-p1.c --- wireshark-1.10.5/epan/dissectors/packet-p1.c 2013-06-30 13:52:24.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-p1.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.411 (X.400 Message Transfer) packet dissection * Graeme Lunt 2005 * - * $Id: packet-p1.c 50253 2013-06-30 13:46:31Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-p1.h wireshark-1.10.6/epan/dissectors/packet-p1.h --- wireshark-1.10.5/epan/dissectors/packet-p1.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-p1.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.411 (X.400 Message Transfer) packet dissection * Graeme Lunt 2005 * - * $Id: packet-p1.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-p22.c wireshark-1.10.6/epan/dissectors/packet-p22.c --- wireshark-1.10.5/epan/dissectors/packet-p22.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-p22.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.420 (X.400 Message Transfer) packet dissection * Graeme Lunt 2005 * - * $Id: packet-p22.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-p22.h wireshark-1.10.6/epan/dissectors/packet-p22.h --- wireshark-1.10.5/epan/dissectors/packet-p22.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-p22.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.420 (X.400 Message Transfer) packet dissection * Graeme Lunt 2005 * - * $Id: packet-p22.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-p772.c wireshark-1.10.6/epan/dissectors/packet-p772.c --- wireshark-1.10.5/epan/dissectors/packet-p772.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-p772.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for STANAG 4406 (X.400 Military Message Extensions) packet dissection * Graeme Lunt 2005 * - * $Id: packet-p772.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-p772.h wireshark-1.10.6/epan/dissectors/packet-p772.h --- wireshark-1.10.5/epan/dissectors/packet-p772.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-p772.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for STANAG 4406 (X.400 Military Message Extensions) packet dissection * Graeme Lunt 2005 * - * $Id: packet-p772.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-p7.c wireshark-1.10.6/epan/dissectors/packet-p7.c --- wireshark-1.10.5/epan/dissectors/packet-p7.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-p7.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.413 (P7) packet dissection * Graeme Lunt 2007 * - * $Id: packet-p7.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-p7.h wireshark-1.10.6/epan/dissectors/packet-p7.h --- wireshark-1.10.5/epan/dissectors/packet-p7.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-p7.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.413 (P7) packet dissection * Graeme Lunt 2007 * - * $Id: packet-p7.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-packetbb.c wireshark-1.10.6/epan/dissectors/packet-packetbb.c --- wireshark-1.10.5/epan/dissectors/packet-packetbb.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-packetbb.c 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * http://tools.ietf.org/html/rfc5444 * http://tools.ietf.org/html/rfc5498 * - * $Id: packet-packetbb.c 47204 2013-01-22 02:48:55Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-packetlogger.c wireshark-1.10.6/epan/dissectors/packet-packetlogger.c --- wireshark-1.10.5/epan/dissectors/packet-packetlogger.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-packetlogger.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2009, Stig Bjorlykke * - * $Id: packet-packetlogger.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pagp.c wireshark-1.10.6/epan/dissectors/packet-pagp.c --- wireshark-1.10.5/epan/dissectors/packet-pagp.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pagp.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Original Author Mark C. Brown * Copyright (C) 2004 Hewlett-Packard Development Company, L.P. * - * $Id: packet-pagp.c 45478 2012-10-11 19:39:32Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-paltalk.c wireshark-1.10.6/epan/dissectors/packet-paltalk.c --- wireshark-1.10.5/epan/dissectors/packet-paltalk.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-paltalk.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2005, Tim Hentenaar < tim at hentenaar dot com > * Copyright 2008, Mohammad Ebrahim Mohammadi Panah < mebrahim at gmail dot com > * - * $Id: packet-paltalk.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pana.c wireshark-1.10.6/epan/dissectors/packet-pana.c --- wireshark-1.10.5/epan/dissectors/packet-pana.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pana.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Protocol for carrying Authentication for Network Access dissection * Copyright 2006, Peter Racz * - * $Id: packet-pana.c 48425 2013-03-19 19:28:57Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-parlay.c wireshark-1.10.6/epan/dissectors/packet-parlay.c --- wireshark-1.10.5/epan/dissectors/packet-parlay.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-parlay.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-parlay.c * - * $Id: packet-parlay.c 47217 2013-01-22 22:07:44Z jake $ + * $Id$ * * Routines for IDL dissection * diff -Nru wireshark-1.10.5/epan/dissectors/packet-pcap.c wireshark-1.10.6/epan/dissectors/packet-pcap.c --- wireshark-1.10.5/epan/dissectors/packet-pcap.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pcap.c 2014-03-07 18:07:14.000000000 +0000 @@ -11,7 +11,7 @@ * * Copyright 2008, Anders Broman * - * $Id: packet-pcap.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pcep.c wireshark-1.10.6/epan/dissectors/packet-pcep.c --- wireshark-1.10.5/epan/dissectors/packet-pcep.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pcep.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * * (c) Copyright 2007 Silvia Cristina Tejedor * - * $Id: packet-pcep.c 47924 2013-02-27 22:43:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pcli.c wireshark-1.10.6/epan/dissectors/packet-pcli.c --- wireshark-1.10.5/epan/dissectors/packet-pcli.c 2013-04-22 21:38:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pcli.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * http://www.cablelabs.com/specifications/archives/PKT-SP-ESP-I01-991229.pdf * Chapter 4 ( Call Content Connection Interface ) * - * $Id: packet-pcli.c 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Copyright (c) 2000 by Ed Warnicke * diff -Nru wireshark-1.10.5/epan/dissectors/packet-pcnfsd.c wireshark-1.10.6/epan/dissectors/packet-pcnfsd.c --- wireshark-1.10.5/epan/dissectors/packet-pcnfsd.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pcnfsd.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-pcnfsd.c * Routines for PCNFSD dissection * - * $Id: packet-pcnfsd.c 48425 2013-03-19 19:28:57Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pcnfsd.h wireshark-1.10.6/epan/dissectors/packet-pcnfsd.h --- wireshark-1.10.5/epan/dissectors/packet-pcnfsd.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pcnfsd.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-pcnfsd.h * - * $Id: packet-pcnfsd.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pcp.c wireshark-1.10.6/epan/dissectors/packet-pcp.c --- wireshark-1.10.5/epan/dissectors/packet-pcp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pcp.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-pcp.c * Routines for Performace Co-Pilot protocol dissection * - * $Id: packet-pcp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pdcp-lte.c wireshark-1.10.6/epan/dissectors/packet-pdcp-lte.c --- wireshark-1.10.5/epan/dissectors/packet-pdcp-lte.c 2013-07-17 01:50:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pdcp-lte.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Martin Mathieson * - * $Id: packet-pdcp-lte.c 50688 2013-07-17 01:34:46Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pdcp-lte.h wireshark-1.10.6/epan/dissectors/packet-pdcp-lte.h --- wireshark-1.10.5/epan/dissectors/packet-pdcp-lte.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pdcp-lte.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-pdcp-lte.h * * Martin Mathieson - * $Id: packet-pdcp-lte.h 47891 2013-02-26 01:06:19Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-peekremote.c wireshark-1.10.6/epan/dissectors/packet-peekremote.c --- wireshark-1.10.5/epan/dissectors/packet-peekremote.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-peekremote.c 2014-03-07 18:07:14.000000000 +0000 @@ -17,7 +17,7 @@ * * Tested with frames captured from a Cisco WCS. * - * $Id: packet-peekremote.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Copyright 2007 Joerg Mayer (see AUTHORS file) * diff -Nru wireshark-1.10.5/epan/dissectors/packet-per.c wireshark-1.10.6/epan/dissectors/packet-per.c --- wireshark-1.10.5/epan/dissectors/packet-per.c 2013-09-07 00:36:13.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-per.c 2014-03-07 18:07:14.000000000 +0000 @@ -7,7 +7,7 @@ * Routines for dissection of ASN.1 Aligned PER * 2003 Ronnie Sahlberg * - * $Id: packet-per.c 51807 2013-09-07 00:30:29Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-per.h wireshark-1.10.6/epan/dissectors/packet-per.h --- wireshark-1.10.5/epan/dissectors/packet-per.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-per.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for dissection of ASN.1 Aligned PER * 2003 Ronnie Sahlberg * - * $Id: packet-per.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pflog.c wireshark-1.10.6/epan/dissectors/packet-pflog.c --- wireshark-1.10.5/epan/dissectors/packet-pflog.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pflog.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-pflog.c * Routines for pflog (OpenBSD Firewall Logging) packet disassembly * - * $Id: packet-pflog.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Copyright 2001 Mike Frantzen * All rights reserved. diff -Nru wireshark-1.10.5/epan/dissectors/packet-pgm.c wireshark-1.10.6/epan/dissectors/packet-pgm.c --- wireshark-1.10.5/epan/dissectors/packet-pgm.c 2013-12-19 18:19:40.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pgm.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-pgm.c * Routines for PGM packet disassembly, RFC 3208 * - * $Id: packet-pgm.c 54258 2013-12-19 17:59:14Z cmaynard $ + * $Id$ * * Copyright (c) 2000 by Talarian Corp * Rewritten by Jaap Keuter diff -Nru wireshark-1.10.5/epan/dissectors/packet-pgsql.c wireshark-1.10.6/epan/dissectors/packet-pgsql.c --- wireshark-1.10.5/epan/dissectors/packet-pgsql.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pgsql.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2004 Abhijit Menon-Sen * - * $Id: packet-pgsql.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pim.c wireshark-1.10.6/epan/dissectors/packet-pim.c --- wireshark-1.10.5/epan/dissectors/packet-pim.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pim.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for PIM disassembly * (c) Copyright Jun-ichiro itojun Hagino * - * $Id: packet-pim.c 48760 2013-04-06 23:25:16Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pim.h wireshark-1.10.6/epan/dissectors/packet-pim.h --- wireshark-1.10.5/epan/dissectors/packet-pim.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pim.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-pim.h * Declarations of routines for IGMP/PIMv1 packet disassembly * - * $Id: packet-pim.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pingpongprotocol.c wireshark-1.10.6/epan/dissectors/packet-pingpongprotocol.c --- wireshark-1.10.5/epan/dissectors/packet-pingpongprotocol.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pingpongprotocol.c 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright 2006 by Thomas Dreibholz * - * $Id: packet-pingpongprotocol.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pkcs12.c wireshark-1.10.6/epan/dissectors/packet-pkcs12.c --- wireshark-1.10.5/epan/dissectors/packet-pkcs12.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pkcs12.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for PKCS#12: Personal Information Exchange packet dissection * Graeme Lunt 2006 * - * $Id: packet-pkcs12.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pkcs12.h wireshark-1.10.6/epan/dissectors/packet-pkcs12.h --- wireshark-1.10.5/epan/dissectors/packet-pkcs12.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pkcs12.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for PKCS#12 Personal Information Exchange packet dissection * Graeme Lunt 2006 * - * $Id: packet-pkcs12.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pkcs1.c wireshark-1.10.6/epan/dissectors/packet-pkcs1.c --- wireshark-1.10.5/epan/dissectors/packet-pkcs1.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pkcs1.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for PKCS#1/RFC2313 packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkcs1.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pkcs1.h wireshark-1.10.6/epan/dissectors/packet-pkcs1.h --- wireshark-1.10.5/epan/dissectors/packet-pkcs1.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pkcs1.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for PKCS#1/RFC2313 packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkcs1.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pkinit.c wireshark-1.10.6/epan/dissectors/packet-pkinit.c --- wireshark-1.10.5/epan/dissectors/packet-pkinit.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pkinit.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for PKINIT packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkinit.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pkinit.h wireshark-1.10.6/epan/dissectors/packet-pkinit.h --- wireshark-1.10.5/epan/dissectors/packet-pkinit.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pkinit.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for PKINIT packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkinit.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pkix1explicit.c wireshark-1.10.6/epan/dissectors/packet-pkix1explicit.c --- wireshark-1.10.5/epan/dissectors/packet-pkix1explicit.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pkix1explicit.c 2014-03-07 18:07:14.000000000 +0000 @@ -11,7 +11,7 @@ /* packet-pkix1explicit.c * Routines for PKIX1Explitic packet dissection * - * $Id: packet-pkix1explicit.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pkix1explicit.h wireshark-1.10.6/epan/dissectors/packet-pkix1explicit.h --- wireshark-1.10.5/epan/dissectors/packet-pkix1explicit.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pkix1explicit.h 2014-03-07 18:07:14.000000000 +0000 @@ -9,7 +9,7 @@ /* packet-pkix1explicit.h * Routines for PKIX1Explicit packet dissection * - * $Id: packet-pkix1explicit.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pkix1implicit.c wireshark-1.10.6/epan/dissectors/packet-pkix1implicit.c --- wireshark-1.10.5/epan/dissectors/packet-pkix1implicit.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pkix1implicit.c 2014-03-07 18:07:14.000000000 +0000 @@ -9,7 +9,7 @@ /* packet-pkix1implicit.c * Routines for PKIX1Implitic packet dissection * - * $Id: packet-pkix1implicit.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pkix1implicit.h wireshark-1.10.6/epan/dissectors/packet-pkix1implicit.h --- wireshark-1.10.5/epan/dissectors/packet-pkix1implicit.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pkix1implicit.h 2014-03-07 18:07:14.000000000 +0000 @@ -9,7 +9,7 @@ /* packet-pkix1implicit.h * Routines for PKIX1Implicit packet dissection * - * $Id: packet-pkix1implicit.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pkixac.c wireshark-1.10.6/epan/dissectors/packet-pkixac.c --- wireshark-1.10.5/epan/dissectors/packet-pkixac.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pkixac.c 2014-03-07 18:07:14.000000000 +0000 @@ -12,7 +12,7 @@ * * Copyright 2010, Stig Bjorlykke * - * $Id: packet-pkixac.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pkixac.h wireshark-1.10.6/epan/dissectors/packet-pkixac.h --- wireshark-1.10.5/epan/dissectors/packet-pkixac.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pkixac.h 2014-03-07 18:07:14.000000000 +0000 @@ -12,7 +12,7 @@ * * Copyright 2010, Stig Bjorlykke * - * $Id: packet-pkixac.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pkixproxy.c wireshark-1.10.6/epan/dissectors/packet-pkixproxy.c --- wireshark-1.10.5/epan/dissectors/packet-pkixproxy.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pkixproxy.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for RFC3820 PKIXProxy packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkixproxy.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pkixproxy.h wireshark-1.10.6/epan/dissectors/packet-pkixproxy.h --- wireshark-1.10.5/epan/dissectors/packet-pkixproxy.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pkixproxy.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for RFC3820 PKIXProxy packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkixproxy.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pkixqualified.c wireshark-1.10.6/epan/dissectors/packet-pkixqualified.c --- wireshark-1.10.5/epan/dissectors/packet-pkixqualified.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pkixqualified.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for RFC3739 PKIXqualified packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkixqualified.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pkixqualified.h wireshark-1.10.6/epan/dissectors/packet-pkixqualified.h --- wireshark-1.10.5/epan/dissectors/packet-pkixqualified.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pkixqualified.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for RFC3739 PKIXqualified packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkixqualified.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pkixtsp.c wireshark-1.10.6/epan/dissectors/packet-pkixtsp.c --- wireshark-1.10.5/epan/dissectors/packet-pkixtsp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pkixtsp.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for RFC2634 Extended Security Services packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkixtsp.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pkixtsp.h wireshark-1.10.6/epan/dissectors/packet-pkixtsp.h --- wireshark-1.10.5/epan/dissectors/packet-pkixtsp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pkixtsp.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for RFC3161 Time-Stamp Protocol packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkixtsp.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pktc.c wireshark-1.10.6/epan/dissectors/packet-pktc.c --- wireshark-1.10.5/epan/dissectors/packet-pktc.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pktc.c 2014-03-07 18:07:14.000000000 +0000 @@ -9,7 +9,7 @@ * Ronnie Sahlberg 2004 * Thomas Anders 2004 * - * $Id: packet-pktc.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pktc.h wireshark-1.10.6/epan/dissectors/packet-pktc.h --- wireshark-1.10.5/epan/dissectors/packet-pktc.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pktc.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Ronnie Sahlberg 2004 * See the spec: PKT-SP-SEC-I10-040113.pdf * - * $Id: packet-pktc.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pktgen.c wireshark-1.10.6/epan/dissectors/packet-pktgen.c --- wireshark-1.10.5/epan/dissectors/packet-pktgen.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pktgen.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2006 _FF_ * Francesco Fondelli * - * $Id: packet-pktgen.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-p_mul.c wireshark-1.10.6/epan/dissectors/packet-p_mul.c --- wireshark-1.10.5/epan/dissectors/packet-p_mul.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-p_mul.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * * Copyright 2005, Stig Bjorlykke , Thales Norway AS * - * $Id: packet-p_mul.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pnrp.c wireshark-1.10.6/epan/dissectors/packet-pnrp.c --- wireshark-1.10.5/epan/dissectors/packet-pnrp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pnrp.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2010, Jan Gerbecks * - * $Id: packet-pnrp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pop.c wireshark-1.10.6/epan/dissectors/packet-pop.c --- wireshark-1.10.5/epan/dissectors/packet-pop.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pop.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * RFC 1939 * Copyright 1999, Richard Sharpe * - * $Id: packet-pop.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-portmap.c wireshark-1.10.6/epan/dissectors/packet-portmap.c --- wireshark-1.10.5/epan/dissectors/packet-portmap.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-portmap.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-portmap.c * Routines for portmap dissection * - * $Id: packet-portmap.c 48425 2013-03-19 19:28:57Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-portmap.h wireshark-1.10.6/epan/dissectors/packet-portmap.h --- wireshark-1.10.5/epan/dissectors/packet-portmap.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-portmap.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-portmap.h * - * $Id: packet-portmap.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ppcap.c wireshark-1.10.6/epan/dissectors/packet-ppcap.c --- wireshark-1.10.5/epan/dissectors/packet-ppcap.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ppcap.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ppcap.c * Copyright 2012, Ericsson AB * - * $Id: packet-ppcap.c 48400 2013-03-18 21:16:23Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ppi-antenna.c wireshark-1.10.6/epan/dissectors/packet-ppi-antenna.c --- wireshark-1.10.5/epan/dissectors/packet-ppi-antenna.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ppi-antenna.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for PPI-GEOLOCATION-ANNTENNA dissection * Copyright 2010, Harris Corp, jellch@harris.com * - * $Id: packet-ppi-antenna.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ppi.c wireshark-1.10.6/epan/dissectors/packet-ppi.c --- wireshark-1.10.5/epan/dissectors/packet-ppi.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ppi.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * packet-ppi.c * Routines for PPI Packet Header dissection * - * $Id: packet-ppi.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ppi-geolocation-common.c wireshark-1.10.6/epan/dissectors/packet-ppi-geolocation-common.c --- wireshark-1.10.5/epan/dissectors/packet-ppi-geolocation-common.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ppi-geolocation-common.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for PPI-GEOLOCATION dissection * Copyright 2010, Harris Corp, jellch@harris.com * - * $Id: packet-ppi-geolocation-common.c 47813 2013-02-22 01:34:53Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ppi-geolocation-common.h wireshark-1.10.6/epan/dissectors/packet-ppi-geolocation-common.h --- wireshark-1.10.5/epan/dissectors/packet-ppi-geolocation-common.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ppi-geolocation-common.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for PPI-GEOLOCATION dissection * Copyright 2010, Harris Corp, jellch@harris.com * - * $Id: packet-ppi-geolocation-common.h 39081 2011-09-21 17:49:11Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ppi-gps.c wireshark-1.10.6/epan/dissectors/packet-ppi-gps.c --- wireshark-1.10.5/epan/dissectors/packet-ppi-gps.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ppi-gps.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for PPI-GEOLOCATION-GPS dissection * Copyright 2010, Harris Corp, jellch@harris.com * - * $Id: packet-ppi-gps.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ppi.h wireshark-1.10.6/epan/dissectors/packet-ppi.h --- wireshark-1.10.5/epan/dissectors/packet-ppi.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ppi.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ppi.h * - * $Id: packet-ppi.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ppi-sensor.c wireshark-1.10.6/epan/dissectors/packet-ppi-sensor.c --- wireshark-1.10.5/epan/dissectors/packet-ppi-sensor.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ppi-sensor.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for PPI-GEOLOCATION-SENSOR dissection * Copyright 2010, Harris Corp, jellch@harris.com * - * $Id: packet-ppi-sensor.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ppi-vector.c wireshark-1.10.6/epan/dissectors/packet-ppi-vector.c --- wireshark-1.10.5/epan/dissectors/packet-ppi-vector.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ppi-vector.c 2014-03-07 18:07:14.000000000 +0000 @@ -8,7 +8,7 @@ * * for specifications. * - * $Id: packet-ppi-vector.c 47899 2013-02-26 04:42:26Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ppp.c wireshark-1.10.6/epan/dissectors/packet-ppp.c --- wireshark-1.10.5/epan/dissectors/packet-ppp.c 2013-07-17 22:26:25.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ppp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ppp packet disassembly * RFC 1661, RFC 1662 * - * $Id: packet-ppp.c 50710 2013-07-17 22:20:12Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ppp.h wireshark-1.10.6/epan/dissectors/packet-ppp.h --- wireshark-1.10.5/epan/dissectors/packet-ppp.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ppp.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ppp.h * - * $Id: packet-ppp.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pppoe.c wireshark-1.10.6/epan/dissectors/packet-pppoe.c --- wireshark-1.10.5/epan/dissectors/packet-pppoe.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pppoe.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for PPP Over Ethernet (PPPoE) packet disassembly (RFC2516) * Up to date with http://www.iana.org/assignments/pppoe-parameters (2008-04-30) * - * $Id: packet-pppoe.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pptp.c wireshark-1.10.6/epan/dissectors/packet-pptp.c --- wireshark-1.10.5/epan/dissectors/packet-pptp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pptp.c 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * 10/2010 - Rework PPTP Dissector * Alexis La Goutte * - * $Id: packet-pptp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pres.c wireshark-1.10.6/epan/dissectors/packet-pres.c --- wireshark-1.10.5/epan/dissectors/packet-pres.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pres.c 2014-03-07 18:07:14.000000000 +0000 @@ -11,7 +11,7 @@ * Based on the dissector by * Yuriy Sidelnikov * - * $Id: packet-pres.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pres.h wireshark-1.10.6/epan/dissectors/packet-pres.h --- wireshark-1.10.5/epan/dissectors/packet-pres.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pres.h 2014-03-07 18:07:14.000000000 +0000 @@ -9,7 +9,7 @@ /* packet-pres.h * Routines for pres packet dissection * - * $Id: packet-pres.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-prp.c wireshark-1.10.6/epan/dissectors/packet-prp.c --- wireshark-1.10.5/epan/dissectors/packet-prp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-prp.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2011, Martin Renold * Copyright 2011, Florian Reichert * - * $Id: packet-prp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ptp.c wireshark-1.10.6/epan/dissectors/packet-ptp.c --- wireshark-1.10.5/epan/dissectors/packet-ptp.c 2013-10-29 22:38:53.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ptp.c 2014-03-07 18:07:14.000000000 +0000 @@ -20,7 +20,7 @@ * - Torrey Atcitty & Dave Olsen 05.14.2010 * - Added support for 802.1AS D7.0 * - * $Id: packet-ptp.c 52973 2013-10-29 22:19:18Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pulse.c wireshark-1.10.6/epan/dissectors/packet-pulse.c --- wireshark-1.10.5/epan/dissectors/packet-pulse.c 2013-08-15 04:32:55.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pulse.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2013, Masatake YAMATO * Copyright 2013, Red Hat, Inc. * - * $Id: packet-pulse.c 51370 2013-08-15 03:52:19Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pvfs2.c wireshark-1.10.6/epan/dissectors/packet-pvfs2.c --- wireshark-1.10.5/epan/dissectors/packet-pvfs2.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pvfs2.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By Mike Frisch * Joint and Several Copyright 2005, Mike Frisch and Platform Computing Inc. * - * $Id: packet-pvfs2.c 48920 2013-04-19 00:09:18Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pw-atm.c wireshark-1.10.6/epan/dissectors/packet-pw-atm.c --- wireshark-1.10.5/epan/dissectors/packet-pw-atm.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pw-atm.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * Francesco Fondelli * Artem Tamazov * - * $Id: packet-pw-atm.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pw-atm.h wireshark-1.10.6/epan/dissectors/packet-pw-atm.h --- wireshark-1.10.5/epan/dissectors/packet-pw-atm.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pw-atm.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Interface of pw-atm module * Copyright 2009, Artem Tamazov * - * $Id: packet-pw-atm.h 47968 2013-03-01 06:01:51Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pw-cesopsn.c wireshark-1.10.6/epan/dissectors/packet-pw-cesopsn.c --- wireshark-1.10.5/epan/dissectors/packet-pw-cesopsn.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pw-cesopsn.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for CESoPSN PW dissection as per RFC5086. * Copyright 2009, Dmitry Trebich, Artem Tamazov * - * $Id: packet-pw-cesopsn.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pw-common.c wireshark-1.10.6/epan/dissectors/packet-pw-common.c --- wireshark-1.10.5/epan/dissectors/packet-pw-common.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pw-common.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Common functions and objects for PWE3 dissectors. * Copyright 2009, Artem Tamazov * - * $Id: packet-pw-common.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pw-common.h wireshark-1.10.6/epan/dissectors/packet-pw-common.h --- wireshark-1.10.5/epan/dissectors/packet-pw-common.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pw-common.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Interface of pw-common module * Copyright 2009, Artem Tamazov * - * $Id: packet-pw-common.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pw-eth.c wireshark-1.10.6/epan/dissectors/packet-pw-eth.c --- wireshark-1.10.5/epan/dissectors/packet-pw-eth.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pw-eth.c 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * * Francesco Fondelli * - * $Id: packet-pw-eth.c 46420 2012-12-06 15:15:05Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pw-fr.c wireshark-1.10.6/epan/dissectors/packet-pw-fr.c --- wireshark-1.10.5/epan/dissectors/packet-pw-fr.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pw-fr.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Frame Relay MPLS PW dissection as per RFC4619. * Copyright 2009, Dmitry Trebich, Artem Tamazov * - * $Id: packet-pw-fr.c 48948 2013-04-21 08:11:28Z jmayer $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pw-hdlc.c wireshark-1.10.6/epan/dissectors/packet-pw-hdlc.c --- wireshark-1.10.5/epan/dissectors/packet-pw-hdlc.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pw-hdlc.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for HDLC PW dissection as per RFC4618. * Copyright 2009, Dmitry Trebich, Artem Tamazov * - * $Id: packet-pw-hdlc.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pw-oam.c wireshark-1.10.6/epan/dissectors/packet-pw-oam.c --- wireshark-1.10.5/epan/dissectors/packet-pw-oam.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pw-oam.c 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * (c) Copyright 2012, Krishnamurthy Mayya * Nikitha Malgi * -* $Id: packet-pw-oam.c 48732 2013-04-04 15:33:14Z cmaynard $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-pw-satop.c wireshark-1.10.6/epan/dissectors/packet-pw-satop.c --- wireshark-1.10.5/epan/dissectors/packet-pw-satop.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-pw-satop.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for SAToP PW dissection as per RFC4553. * Copyright 2009, Dmitry Trebich, Artem Tamazov * - * $Id: packet-pw-satop.c 48400 2013-03-18 21:16:23Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-q2931.c wireshark-1.10.6/epan/dissectors/packet-q2931.c --- wireshark-1.10.5/epan/dissectors/packet-q2931.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-q2931.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Q.2931 frame disassembly * Guy Harris * - * $Id: packet-q2931.c 48784 2013-04-07 18:56:46Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-q708.c wireshark-1.10.6/epan/dissectors/packet-q708.c --- wireshark-1.10.5/epan/dissectors/packet-q708.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-q708.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routine and tables for analyzing an ISPC according to Q.708 * Copyright 2010, Gerasimos Dimitriadis * - * $Id: packet-q708.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-q708.h wireshark-1.10.6/epan/dissectors/packet-q708.h --- wireshark-1.10.5/epan/dissectors/packet-q708.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-q708.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routine and tables for analyzing an ISPC according to Q.708 * Copyright 2010, Gerasimos Dimitriadis * - * $Id: packet-q708.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-q931.c wireshark-1.10.6/epan/dissectors/packet-q931.c --- wireshark-1.10.5/epan/dissectors/packet-q931.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-q931.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Q.931 frame disassembly * Guy Harris * - * $Id: packet-q931.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Modified by Andreas Sikkema for possible use with H.323 * diff -Nru wireshark-1.10.5/epan/dissectors/packet-q931.h wireshark-1.10.6/epan/dissectors/packet-q931.h --- wireshark-1.10.5/epan/dissectors/packet-q931.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-q931.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * disassembly * Guy Harris * - * $Id: packet-q931.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-q932.c wireshark-1.10.6/epan/dissectors/packet-q932.c --- wireshark-1.10.5/epan/dissectors/packet-q932.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-q932.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for Q.932 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-q932.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-q932.h wireshark-1.10.6/epan/dissectors/packet-q932.h --- wireshark-1.10.5/epan/dissectors/packet-q932.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-q932.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for Q.932 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-q932.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-q932-ros.c wireshark-1.10.6/epan/dissectors/packet-q932-ros.c --- wireshark-1.10.5/epan/dissectors/packet-q932-ros.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-q932-ros.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for Q.932 packet dissection * 2007 Tomas Kukosa * - * $Id: packet-q932-ros.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-q933.c wireshark-1.10.6/epan/dissectors/packet-q933.c --- wireshark-1.10.5/epan/dissectors/packet-q933.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-q933.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Q.933 frame disassembly * Guy Harris * - * $Id: packet-q933.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-qllc.c wireshark-1.10.6/epan/dissectors/packet-qllc.c --- wireshark-1.10.5/epan/dissectors/packet-qllc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-qllc.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for QLLC protocol - Qualified? LLC * Gilbert Ramirez * - * $Id: packet-qllc.c 48425 2013-03-19 19:28:57Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-qsig.c wireshark-1.10.6/epan/dissectors/packet-qsig.c --- wireshark-1.10.5/epan/dissectors/packet-qsig.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-qsig.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for QSIG packet dissection * 2007 Tomas Kukosa * - * $Id: packet-qsig.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-qsig.h wireshark-1.10.6/epan/dissectors/packet-qsig.h --- wireshark-1.10.5/epan/dissectors/packet-qsig.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-qsig.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for QSIG packet dissection * 2007 Tomas Kukosa * - * $Id: packet-qsig.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-quake2.c wireshark-1.10.6/epan/dissectors/packet-quake2.c --- wireshark-1.10.5/epan/dissectors/packet-quake2.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-quake2.c 2014-03-07 18:07:14.000000000 +0000 @@ -7,7 +7,7 @@ * http://www.dgs.monash.edu.au/~timf/bottim/ * http://www.opt-sci.Arizona.EDU/Pandora/default.asp * - * $Id: packet-quake2.c 45684 2012-10-21 14:53:51Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-quake3.c wireshark-1.10.6/epan/dissectors/packet-quake3.c --- wireshark-1.10.5/epan/dissectors/packet-quake3.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-quake3.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Uwe Girlich * - * $Id: packet-quake3.c 45686 2012-10-21 14:54:11Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-quake.c wireshark-1.10.6/epan/dissectors/packet-quake.c --- wireshark-1.10.5/epan/dissectors/packet-quake.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-quake.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * Uwe Girlich * http://www.idsoftware.com/q1source/q1source.zip * - * $Id: packet-quake.c 45115 2012-09-25 01:00:41Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-quakeworld.c wireshark-1.10.6/epan/dissectors/packet-quakeworld.c --- wireshark-1.10.5/epan/dissectors/packet-quakeworld.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-quakeworld.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * Uwe Girlich * http://www.idsoftware.com/q1source/q1source.zip * - * $Id: packet-quakeworld.c 45685 2012-10-21 14:54:01Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-radius.c wireshark-1.10.6/epan/dissectors/packet-radius.c --- wireshark-1.10.5/epan/dissectors/packet-radius.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-radius.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * Changed 07/2005 Luis Ontanon - use FreeRADIUS' dictionary * Changed 10/2006 Alejandro Vaquero - add Conversations support * - * $Id: packet-radius.c 48797 2013-04-09 02:48:03Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-radius.h wireshark-1.10.6/epan/dissectors/packet-radius.h --- wireshark-1.10.5/epan/dissectors/packet-radius.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-radius.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * packet-radius.h * * Definitions for RADIUS packet disassembly - * $Id: packet-radius.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-radius_packetcable.c wireshark-1.10.6/epan/dissectors/packet-radius_packetcable.c --- wireshark-1.10.5/epan/dissectors/packet-radius_packetcable.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-radius_packetcable.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Routines for Packetcable's RADIUS AVPs dissection * - * $Id: packet-radius_packetcable.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ranap.c wireshark-1.10.6/epan/dissectors/packet-ranap.c --- wireshark-1.10.5/epan/dissectors/packet-ranap.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ranap.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for UMTS Node B Application Part(RANAP) packet dissection * Copyright 2005 - 2010, Anders Broman * - * $Id: packet-ranap.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ranap.h wireshark-1.10.6/epan/dissectors/packet-ranap.h --- wireshark-1.10.5/epan/dissectors/packet-ranap.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ranap.h 2014-03-07 18:07:14.000000000 +0000 @@ -9,7 +9,7 @@ /* packet-ranap-template.h * Routines for GSM Supplementary Services dissection * Copyright 2005, Anders Broman - * $Id: packet-ranap.h 48820 2013-04-11 18:14:53Z pascal $ * + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs * Copyright 1998 Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-raw.c wireshark-1.10.6/epan/dissectors/packet-raw.c --- wireshark-1.10.5/epan/dissectors/packet-raw.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-raw.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-raw.c * Routines for raw packet disassembly * - * $Id: packet-raw.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-raw.h wireshark-1.10.6/epan/dissectors/packet-raw.h --- wireshark-1.10.5/epan/dissectors/packet-raw.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-raw.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-raw.h * - * $Id: packet-raw.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rdm.c wireshark-1.10.6/epan/dissectors/packet-rdm.c --- wireshark-1.10.5/epan/dissectors/packet-rdm.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rdm.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-rdm.c * RDM (Remote Device Management) packet disassembly. * - * $Id: packet-rdm.c 45634 2012-10-18 16:27:11Z wmeier $ + * $Id$ * * This dissector is written by * diff -Nru wireshark-1.10.5/epan/dissectors/packet-rdp.c wireshark-1.10.6/epan/dissectors/packet-rdp.c --- wireshark-1.10.5/epan/dissectors/packet-rdp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rdp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Remote Desktop Protocol (RDP) packet dissection * Copyright 2010, Graeme Lunt * - * $Id: packet-rdp.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rdt.c wireshark-1.10.6/epan/dissectors/packet-rdt.c --- wireshark-1.10.5/epan/dissectors/packet-rdt.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rdt.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * Copyright 2005 * Written by Martin Mathieson and Tom Marshall * - * $Id: packet-rdt.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rdt.h wireshark-1.10.6/epan/dissectors/packet-rdt.h --- wireshark-1.10.5/epan/dissectors/packet-rdt.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rdt.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for RDT dissection * RDT = Real Data Transport * - * $Id: packet-rdt.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Written by Martin Mathieson * diff -Nru wireshark-1.10.5/epan/dissectors/packet-redback.c wireshark-1.10.6/epan/dissectors/packet-redback.c --- wireshark-1.10.5/epan/dissectors/packet-redback.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-redback.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-redback.c * - * $Id: packet-redback.c 47891 2013-02-26 01:06:19Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-redbackli.c wireshark-1.10.6/epan/dissectors/packet-redbackli.c --- wireshark-1.10.5/epan/dissectors/packet-redbackli.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-redbackli.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-redbackli.c * - * $Id: packet-redbackli.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Redback Lawful Intercept Packet dissector * diff -Nru wireshark-1.10.5/epan/dissectors/packet-reload.c wireshark-1.10.6/epan/dissectors/packet-reload.c --- wireshark-1.10.5/epan/dissectors/packet-reload.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-reload.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Author: Stephane Bryant * Copyright 2010 Stonyfish Inc. * - * $Id: packet-reload.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-reload-framing.c wireshark-1.10.6/epan/dissectors/packet-reload-framing.c --- wireshark-1.10.5/epan/dissectors/packet-reload-framing.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-reload-framing.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Author: Stephane Bryant * Copyright 2010 Stonyfish Inc. * - * $Id: packet-reload-framing.c 48409 2013-03-18 22:38:56Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-reload.h wireshark-1.10.6/epan/dissectors/packet-reload.h --- wireshark-1.10.5/epan/dissectors/packet-reload.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-reload.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * RELOAD dissection utilities * Author: Stephane Bryant * - * $Id: packet-reload.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-retix-bpdu.c wireshark-1.10.6/epan/dissectors/packet-retix-bpdu.c --- wireshark-1.10.5/epan/dissectors/packet-retix-bpdu.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-retix-bpdu.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-retix-bpdu.c * Routines for BPDU (Retix Spanning Tree Protocol) disassembly * - * $Id: packet-retix-bpdu.c 47891 2013-02-26 01:06:19Z wmeier $ + * $Id$ * * Copyright 2005 Giles Scott (gscott arubanetworks dot com> * diff -Nru wireshark-1.10.5/epan/dissectors/packet-rfc2190.c wireshark-1.10.6/epan/dissectors/packet-rfc2190.c --- wireshark-1.10.5/epan/dissectors/packet-rfc2190.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rfc2190.c 2014-03-07 18:07:14.000000000 +0000 @@ -8,7 +8,7 @@ * Copyright 2008 Richard van der Hoff, MX Telecom * * - * $Id: packet-rfc2190.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rfid-felica.c wireshark-1.10.6/epan/dissectors/packet-rfid-felica.c --- wireshark-1.10.5/epan/dissectors/packet-rfid-felica.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rfid-felica.c 2014-03-07 18:07:14.000000000 +0000 @@ -11,7 +11,7 @@ * * Copyright 2012, Tyson Key * - * $Id: packet-rfid-felica.c 47254 2013-01-24 10:14:37Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rfid-mifare.c wireshark-1.10.6/epan/dissectors/packet-rfid-mifare.c --- wireshark-1.10.5/epan/dissectors/packet-rfid-mifare.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rfid-mifare.c 2014-03-07 18:07:14.000000000 +0000 @@ -8,7 +8,7 @@ * * Copyright 2011, Tyson Key * - * $Id: packet-rfid-mifare.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rfid-pn532.c wireshark-1.10.6/epan/dissectors/packet-rfid-pn532.c --- wireshark-1.10.5/epan/dissectors/packet-rfid-pn532.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rfid-pn532.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * * Copyright 2012, Tyson Key * - * $Id: packet-rfid-pn532.c 48656 2013-03-30 17:09:26Z jake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rgmp.c wireshark-1.10.6/epan/dissectors/packet-rgmp.c --- wireshark-1.10.5/epan/dissectors/packet-rgmp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rgmp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for IGMP/RGMP packet disassembly * Copyright 2006 Jaap Keuter * - * $Id: packet-rgmp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rgmp.h wireshark-1.10.6/epan/dissectors/packet-rgmp.h --- wireshark-1.10.5/epan/dissectors/packet-rgmp.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rgmp.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Declarations of routines for IGMP/RGMP packet disassembly * Copyright 2006 Jaap Keuter * - * $Id: packet-rgmp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rip.c wireshark-1.10.6/epan/dissectors/packet-rip.c --- wireshark-1.10.5/epan/dissectors/packet-rip.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rip.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * RFC2082 ( Keyed Message Digest Algorithm ) * Emanuele Caratti * - * $Id: packet-rip.c 44438 2012-08-10 22:55:02Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ripng.c wireshark-1.10.6/epan/dissectors/packet-ripng.c --- wireshark-1.10.5/epan/dissectors/packet-ripng.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ripng.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * (c) Copyright Jun-ichiro itojun Hagino * derived from packet-rip.c * - * $Id: packet-ripng.c 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rlc.c wireshark-1.10.6/epan/dissectors/packet-rlc.c --- wireshark-1.10.5/epan/dissectors/packet-rlc.c 2013-12-13 23:12:45.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rlc.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* Routines for UMTS RLC (Radio Link Control) v9.3.0 disassembly * http://www.3gpp.org/ftp/Specs/archive/25_series/25.322/ * - * $Id: packet-rlc.c 54076 2013-12-13 22:49:30Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -413,7 +413,7 @@ { struct rlc_sdu *sdu; - sdu = (struct rlc_sdu *)se_alloc0(sizeof(struct rlc_sdu)); + sdu = (struct rlc_sdu *)g_malloc0(sizeof(struct rlc_sdu)); return sdu; } @@ -474,7 +474,7 @@ { struct rlc_frag *frag; - frag = (struct rlc_frag *)se_alloc0(sizeof(struct rlc_frag)); + frag = (struct rlc_frag *)g_malloc0(sizeof(struct rlc_frag)); rlc_frag_assign(frag, mode, pinfo, seq, li); rlc_frag_assign_data(frag, tvb, offset, length); @@ -529,6 +529,7 @@ g_list_free(list->list); list->list = NULL; /* for good measure */ } + g_free(list); } /** Utility functions used for various comparions/cleanups in tree **/ @@ -886,7 +887,7 @@ } else if (pinfo != NULL) { struct rlc_channel *ch; ch = rlc_channel_create(ch_lookup->mode, pinfo); - frags = (struct rlc_frag **)se_alloc0(sizeof(struct rlc_frag *) * 4096); + frags = (struct rlc_frag **)g_malloc0(sizeof(struct rlc_frag *) * 4096); g_hash_table_insert(fragment_table, ch, frags); } else { return NULL; @@ -1245,7 +1246,7 @@ list = (struct rlc_seqlist *)g_hash_table_lookup(sequence_table, &lookup.ch); if (!list) { /* we see this channel for the first time */ - list = (struct rlc_seqlist *)se_alloc0(sizeof(*list)); + list = (struct rlc_seqlist *)g_malloc0(sizeof(*list)); rlc_channel_assign(&list->ch, mode, pinfo); g_hash_table_insert(sequence_table, &list->ch, list); } diff -Nru wireshark-1.10.5/epan/dissectors/packet-rlc.h wireshark-1.10.6/epan/dissectors/packet-rlc.h --- wireshark-1.10.5/epan/dissectors/packet-rlc.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rlc.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* Routines for UMTS RLC disassembly * - * $Id: packet-rlc.h 47891 2013-02-26 01:06:19Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rlc-lte.c wireshark-1.10.6/epan/dissectors/packet-rlc-lte.c --- wireshark-1.10.5/epan/dissectors/packet-rlc-lte.c 2013-08-19 11:31:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rlc-lte.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Martin Mathieson * - * $Id: packet-rlc-lte.c 51425 2013-08-19 11:25:35Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rlc-lte.h wireshark-1.10.6/epan/dissectors/packet-rlc-lte.h --- wireshark-1.10.5/epan/dissectors/packet-rlc-lte.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rlc-lte.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-rlc-lte.h * * Martin Mathieson - * $Id: packet-rlc-lte.h 47891 2013-02-26 01:06:19Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rlm.c wireshark-1.10.6/epan/dissectors/packet-rlm.c --- wireshark-1.10.5/epan/dissectors/packet-rlm.c 2013-04-22 21:38:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rlm.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for RLM dissection * Copyright 2004, Duncan Sargeant * - * $Id: packet-rlm.c 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rlogin.c wireshark-1.10.6/epan/dissectors/packet-rlogin.c --- wireshark-1.10.5/epan/dissectors/packet-rlogin.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rlogin.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for unix rlogin packet dissection * Copyright 2000, Jeffrey C. Foster * - * $Id: packet-rlogin.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rmcp.c wireshark-1.10.6/epan/dissectors/packet-rmcp.c --- wireshark-1.10.5/epan/dissectors/packet-rmcp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rmcp.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Duncan Laurie * - * $Id: packet-rmcp.c 48869 2013-04-16 00:00:09Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rmi.c wireshark-1.10.6/epan/dissectors/packet-rmi.c --- wireshark-1.10.5/epan/dissectors/packet-rmi.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rmi.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for java rmiregistry dissection * Copyright 2002, Michael Stiller * - * $Id: packet-rmi.c 48500 2013-03-23 13:07:53Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rmi.h wireshark-1.10.6/epan/dissectors/packet-rmi.h --- wireshark-1.10.5/epan/dissectors/packet-rmi.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rmi.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * header file for java rmiregistry dissection * Copyright 2002, Michael Stiller * - * $Id: packet-rmi.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rmp.c wireshark-1.10.6/epan/dissectors/packet-rmp.c --- wireshark-1.10.5/epan/dissectors/packet-rmp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rmp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for HP remote management protocol * Gilbert Ramirez * - * $Id: packet-rmp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rmt-alc.c wireshark-1.10.6/epan/dissectors/packet-rmt-alc.c --- wireshark-1.10.5/epan/dissectors/packet-rmt-alc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rmt-alc.c 2014-03-07 18:07:14.000000000 +0000 @@ -17,7 +17,7 @@ * References: * RFC 3450, Asynchronous Layered Coding protocol instantiation * - * $Id: packet-rmt-alc.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rmt-alc.h wireshark-1.10.6/epan/dissectors/packet-rmt-alc.h --- wireshark-1.10.5/epan/dissectors/packet-rmt-alc.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rmt-alc.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * ALC Protocol Instantiation function definitions * Copyright 2005, Stefano Pettini * - * $Id: packet-rmt-alc.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rmt-common.c wireshark-1.10.6/epan/dissectors/packet-rmt-common.c --- wireshark-1.10.5/epan/dissectors/packet-rmt-common.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rmt-common.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Common RMT functions * Copyright 2005, Stefano Pettini * - * $Id: packet-rmt-common.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rmt-common.h wireshark-1.10.6/epan/dissectors/packet-rmt-common.h --- wireshark-1.10.5/epan/dissectors/packet-rmt-common.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rmt-common.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Common RMT function definitions * Copyright 2005, Stefano Pettini * - * $Id: packet-rmt-common.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rmt-fec.c wireshark-1.10.6/epan/dissectors/packet-rmt-fec.c --- wireshark-1.10.5/epan/dissectors/packet-rmt-fec.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rmt-fec.c 2014-03-07 18:07:14.000000000 +0000 @@ -17,7 +17,7 @@ * Simple XOR, Reed-Solomon, and Parity Check Matrix-based FEC Schemes draft-peltotalo-rmt-bb-fec-supp-xor-pcm-rs-00 * IANA RMT FEC parameters (http://www.iana.org/assignments/rmt-fec-parameters) * - * $Id: packet-rmt-fec.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rmt-fec.h wireshark-1.10.6/epan/dissectors/packet-rmt-fec.h --- wireshark-1.10.5/epan/dissectors/packet-rmt-fec.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rmt-fec.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * FEC Building Block function definitions * Copyright 2005, Stefano Pettini * - * $Id: packet-rmt-fec.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rmt-lct.c wireshark-1.10.6/epan/dissectors/packet-rmt-lct.c --- wireshark-1.10.5/epan/dissectors/packet-rmt-lct.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rmt-lct.c 2014-03-07 18:07:14.000000000 +0000 @@ -17,7 +17,7 @@ * References: * RFC 3451, Layered Coding Transport (LCT) Building Block * - * $Id: packet-rmt-lct.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rmt-lct.h wireshark-1.10.6/epan/dissectors/packet-rmt-lct.h --- wireshark-1.10.5/epan/dissectors/packet-rmt-lct.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rmt-lct.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * LCT Building Block function definitions * Copyright 2005, Stefano Pettini * - * $Id: packet-rmt-lct.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rmt-norm.c wireshark-1.10.6/epan/dissectors/packet-rmt-norm.c --- wireshark-1.10.5/epan/dissectors/packet-rmt-norm.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rmt-norm.c 2014-03-07 18:07:14.000000000 +0000 @@ -18,7 +18,7 @@ * References: * RFC 3940, Negative-acknowledgment (NACK)-Oriented Reliable Multicast (NORM) Protocol * - * $Id: packet-rmt-norm.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rmt-norm.h wireshark-1.10.6/epan/dissectors/packet-rmt-norm.h --- wireshark-1.10.5/epan/dissectors/packet-rmt-norm.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rmt-norm.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * NORM Protocol Instantiation function definitions * Copyright 2005, Stefano Pettini * - * $Id: packet-rmt-norm.h 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rnsap.c wireshark-1.10.6/epan/dissectors/packet-rnsap.c --- wireshark-1.10.5/epan/dissectors/packet-rnsap.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rnsap.c 2014-03-07 18:07:14.000000000 +0000 @@ -13,7 +13,7 @@ * (3GPP TS 25.423 version 6.7.0 Release 6) packet dissection * Copyright 2005 - 2006, Anders Broman * - * $Id: packet-rnsap.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rohc.c wireshark-1.10.6/epan/dissectors/packet-rohc.c --- wireshark-1.10.5/epan/dissectors/packet-rohc.c 2013-10-11 18:12:32.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rohc.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2011, Anders Broman * Per Liedberg * - * $Id: packet-rohc.c 52546 2013-10-11 18:06:59Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rohc.h wireshark-1.10.6/epan/dissectors/packet-rohc.h --- wireshark-1.10.5/epan/dissectors/packet-rohc.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rohc.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2011, Anders Broman * - * $Id: packet-rohc.h 47869 2013-02-24 22:06:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-roofnet.c wireshark-1.10.6/epan/dissectors/packet-roofnet.c --- wireshark-1.10.5/epan/dissectors/packet-roofnet.c 2013-12-19 18:19:40.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-roofnet.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for roofnet dissection * Copyright 2006, Sebastien Tandel (sebastien@tandel.be) * - * $Id: packet-roofnet.c 54259 2013-12-19 18:02:03Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ros.c wireshark-1.10.6/epan/dissectors/packet-ros.c --- wireshark-1.10.5/epan/dissectors/packet-ros.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ros.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for ROS packet dissection * Graeme Lunt 2005 * - * $Id: packet-ros.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ros.h wireshark-1.10.6/epan/dissectors/packet-ros.h --- wireshark-1.10.5/epan/dissectors/packet-ros.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ros.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for ROS packet dissection * Graeme Lunt 2005 * - * $Id: packet-ros.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rpcap.c wireshark-1.10.6/epan/dissectors/packet-rpcap.c --- wireshark-1.10.5/epan/dissectors/packet-rpcap.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rpcap.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 2008, Stig Bjorlykke , Thales Norway AS * - * $Id: packet-rpcap.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rpc.c wireshark-1.10.6/epan/dissectors/packet-rpc.c --- wireshark-1.10.5/epan/dissectors/packet-rpc.c 2013-06-04 00:27:19.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rpc.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for rpc dissection * Copyright 1999, Uwe Girlich * - * $Id: packet-rpc.c 49737 2013-06-04 00:21:21Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rpc.h wireshark-1.10.6/epan/dissectors/packet-rpc.h --- wireshark-1.10.5/epan/dissectors/packet-rpc.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rpc.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-rpc.h * - * $Id: packet-rpc.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * (c) 1999 Uwe Girlich * diff -Nru wireshark-1.10.5/epan/dissectors/packet-rpki-rtr.c wireshark-1.10.6/epan/dissectors/packet-rpki-rtr.c --- wireshark-1.10.5/epan/dissectors/packet-rpki-rtr.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rpki-rtr.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for RPKI-Router Protocol dissection (RFC6810) * Copyright 2013, Alexis La Goutte * - * $Id: packet-rpki-rtr.c 48362 2013-03-17 19:22:27Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rpl.c wireshark-1.10.6/epan/dissectors/packet-rpl.c --- wireshark-1.10.5/epan/dissectors/packet-rpl.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rpl.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for RPL * Jochen Friedrich * - * $Id: packet-rpl.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rquota.c wireshark-1.10.6/epan/dissectors/packet-rquota.c --- wireshark-1.10.5/epan/dissectors/packet-rquota.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rquota.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for rquota dissection * Copyright 2001, Mike Frisch * - * $Id: packet-rquota.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rquota.h wireshark-1.10.6/epan/dissectors/packet-rquota.h --- wireshark-1.10.5/epan/dissectors/packet-rquota.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rquota.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-rquota.h * - * $Id: packet-rquota.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rrc.c wireshark-1.10.6/epan/dissectors/packet-rrc.c --- wireshark-1.10.5/epan/dissectors/packet-rrc.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rrc.c 2014-03-07 18:07:14.000000000 +0000 @@ -12,7 +12,7 @@ * (3GPP TS 25.331 packet dissection * Copyright 2006-2010, Anders Broman * - * $Id: packet-rrc.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rrc.h wireshark-1.10.6/epan/dissectors/packet-rrc.h --- wireshark-1.10.5/epan/dissectors/packet-rrc.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rrc.h 2014-03-07 18:07:14.000000000 +0000 @@ -9,7 +9,7 @@ /* packet-rrc-template.h * Copyright 2009, Anders Broman * - * $Id: packet-rrc.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rrlp.c wireshark-1.10.6/epan/dissectors/packet-rrlp.c --- wireshark-1.10.5/epan/dissectors/packet-rrlp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rrlp.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for 3GPP Radio Resource LCS Protocol (RRLP) packet dissection * Copyright 2006, Anders Broman * - * $Id: packet-rrlp.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rsh.c wireshark-1.10.6/epan/dissectors/packet-rsh.c --- wireshark-1.10.5/epan/dissectors/packet-rsh.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rsh.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for rsh (Remote Shell) dissection * Copyright 2012, Stephen Fisher (see AUTHORS file) * - * $Id: packet-rsh.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rsip.c wireshark-1.10.6/epan/dissectors/packet-rsip.c --- wireshark-1.10.5/epan/dissectors/packet-rsip.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rsip.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright (c) 2006, 2010 Cray Inc. All Rights Reserved. * - * $Id: packet-rsip.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rsl.c wireshark-1.10.6/epan/dissectors/packet-rsl.c --- wireshark-1.10.5/epan/dissectors/packet-rsl.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rsl.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2007, 2011, Anders Broman * Copyright 2009-2011, Harald Welte * - * $Id: packet-rsl.c 47401 2013-01-31 22:34:12Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rstat.c wireshark-1.10.6/epan/dissectors/packet-rstat.c --- wireshark-1.10.5/epan/dissectors/packet-rstat.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rstat.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Guy Harris * - * $Id: packet-rstat.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rsvp.c wireshark-1.10.6/epan/dissectors/packet-rsvp.c --- wireshark-1.10.5/epan/dissectors/packet-rsvp.c 2013-04-26 05:02:22.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rsvp.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * (c) Copyright Ashok Narayanan * - * $Id: packet-rsvp.c 49047 2013-04-26 04:56:17Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rsvp.h wireshark-1.10.6/epan/dissectors/packet-rsvp.h --- wireshark-1.10.5/epan/dissectors/packet-rsvp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rsvp.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-rsvp.h * Declarations of variables exported by "packet-rsvp.c" * - * $Id: packet-rsvp.h 44665 2012-08-25 01:20:32Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rsync.c wireshark-1.10.6/epan/dissectors/packet-rsync.c --- wireshark-1.10.5/epan/dissectors/packet-rsync.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rsync.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * [ very rough, but mininally functional ] * Copyright 2003, Brad Hards * - * $Id: packet-rsync.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rtcdc.c wireshark-1.10.6/epan/dissectors/packet-rtcdc.c --- wireshark-1.10.5/epan/dissectors/packet-rtcdc.c 2013-08-15 03:45:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rtcdc.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * in the future, but I'll leave it in for now. * Copyright 2012 - 2013, Michael Tuexen * - * $Id: packet-rtcdc.c 51367 2013-08-15 03:39:38Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rtcp.c wireshark-1.10.6/epan/dissectors/packet-rtcp.c --- wireshark-1.10.5/epan/dissectors/packet-rtcp.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rtcp.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-rtcp.c * - * $Id: packet-rtcp.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Routines for RTCP dissection * RTCP = Real-time Transport Control Protocol diff -Nru wireshark-1.10.5/epan/dissectors/packet-rtcp.h wireshark-1.10.6/epan/dissectors/packet-rtcp.h --- wireshark-1.10.5/epan/dissectors/packet-rtcp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rtcp.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-rtcp.h * - * $Id: packet-rtcp.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Routines for RTCP dissection * RTCP = Real-time Transport Control Protocol diff -Nru wireshark-1.10.5/epan/dissectors/packet-rtmpt.c wireshark-1.10.6/epan/dissectors/packet-rtmpt.c --- wireshark-1.10.5/epan/dissectors/packet-rtmpt.c 2013-05-16 02:03:23.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rtmpt.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Real Time Messaging Protocol packet dissection * metatech * - * $Id: packet-rtmpt.c 49323 2013-05-16 01:57:03Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rtnet.c wireshark-1.10.6/epan/dissectors/packet-rtnet.c --- wireshark-1.10.5/epan/dissectors/packet-rtnet.c 2013-04-22 21:38:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rtnet.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-rtnet.c * Routines for RTnet packet disassembly * - * $Id: packet-rtnet.c 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Copyright (c) 2003 by Erwin Rol * Copyright (c) 2004 by Jan Kiszka diff -Nru wireshark-1.10.5/epan/dissectors/packet-rtp.c wireshark-1.10.6/epan/dissectors/packet-rtp.c --- wireshark-1.10.5/epan/dissectors/packet-rtp.c 2013-10-29 22:10:51.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rtp.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * Copyright 2000, Philips Electronics N.V. * Written by Andreas Sikkema * - * $Id: packet-rtp.c 52970 2013-10-29 21:58:59Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rtp-events.c wireshark-1.10.6/epan/dissectors/packet-rtp-events.c --- wireshark-1.10.5/epan/dissectors/packet-rtp-events.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rtp-events.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for RFC 2833 RTP Events dissection * Copyright 2003, Kevin A. Noll * - * $Id: packet-rtp-events.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rtp-events.h wireshark-1.10.6/epan/dissectors/packet-rtp-events.h --- wireshark-1.10.5/epan/dissectors/packet-rtp-events.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rtp-events.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Defines for RFC 2833 RTP Events dissection * Copyright 2003, Kevin A. Noll * - * $Id: packet-rtp-events.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rtp.h wireshark-1.10.6/epan/dissectors/packet-rtp.h --- wireshark-1.10.5/epan/dissectors/packet-rtp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rtp.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for RTP dissection * RTP = Real time Transport Protocol * - * $Id: packet-rtp.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Copyright 2000, Philips Electronics N.V. * Written by Andreas Sikkema diff -Nru wireshark-1.10.5/epan/dissectors/packet-rtp-midi.c wireshark-1.10.6/epan/dissectors/packet-rtp-midi.c --- wireshark-1.10.5/epan/dissectors/packet-rtp-midi.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rtp-midi.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for RFC 4695/6295 RTP-MIDI dissection * Copyright 2006-2012, Tobias Erichsen * - * $Id: packet-rtp-midi.c 48477 2013-03-22 12:34:50Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs ' diff -Nru wireshark-1.10.5/epan/dissectors/packet-rtps.c wireshark-1.10.6/epan/dissectors/packet-rtps.c --- wireshark-1.10.5/epan/dissectors/packet-rtps.c 2013-09-01 12:42:29.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rtps.c 2014-03-07 18:07:14.000000000 +0000 @@ -15,7 +15,7 @@ * Faculty of Electrical Engineering * Department of Control Engineering * - * $Id: packet-rtps.c 51623 2013-09-01 12:36:18Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rtps.h wireshark-1.10.6/epan/dissectors/packet-rtps.h --- wireshark-1.10.5/epan/dissectors/packet-rtps.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rtps.h 2014-03-07 18:07:14.000000000 +0000 @@ -16,7 +16,7 @@ * Faculty of Electrical Engineering * Department of Control Engineering * - * $Id: packet-rtps.h 48727 2013-04-04 12:22:04Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rtse.c wireshark-1.10.6/epan/dissectors/packet-rtse.c --- wireshark-1.10.5/epan/dissectors/packet-rtse.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rtse.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for RTSE packet dissection * Graeme Lunt 2005 * - * $Id: packet-rtse.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rtse.h wireshark-1.10.6/epan/dissectors/packet-rtse.h --- wireshark-1.10.5/epan/dissectors/packet-rtse.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rtse.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for RTSE packet dissection * Graeme Lunt 2005 * - * $Id: packet-rtse.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rtsp.c wireshark-1.10.6/epan/dissectors/packet-rtsp.c --- wireshark-1.10.5/epan/dissectors/packet-rtsp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rtsp.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * Jason Lango * Liberally copied from packet-http.c, by Guy Harris * - * $Id: packet-rtsp.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rtsp.h wireshark-1.10.6/epan/dissectors/packet-rtsp.h --- wireshark-1.10.5/epan/dissectors/packet-rtsp.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rtsp.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-rtsp.h * - * $Id: packet-rtsp.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * Liberally copied from packet-http.h, * by Stephane GORSE (Orange Labs / France Telecom) * diff -Nru wireshark-1.10.5/epan/dissectors/packet-rua.c wireshark-1.10.6/epan/dissectors/packet-rua.c --- wireshark-1.10.5/epan/dissectors/packet-rua.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rua.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for UMTS Home Node B RANAP User Adaptation (RUA) packet dissection * Copyright 2010 Neil Piercy, ip.access Limited * - * $Id: packet-rua.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rudp.c wireshark-1.10.6/epan/dissectors/packet-rudp.c --- wireshark-1.10.5/epan/dissectors/packet-rudp.c 2013-04-22 21:38:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rudp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Reliable UDP Protocol. * Copyright 2004, Duncan Sargeant * - * $Id: packet-rudp.c 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rwall.c wireshark-1.10.6/epan/dissectors/packet-rwall.c --- wireshark-1.10.5/epan/dissectors/packet-rwall.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rwall.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-rwall.c * - * $Id: packet-rwall.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rwall.h wireshark-1.10.6/epan/dissectors/packet-rwall.h --- wireshark-1.10.5/epan/dissectors/packet-rwall.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rwall.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-rwall.h * - * $Id: packet-rwall.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rx.c wireshark-1.10.6/epan/dissectors/packet-rx.c --- wireshark-1.10.5/epan/dissectors/packet-rx.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rx.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * Based on routines from tcpdump patches by * Ken Hornstein * - * $Id: packet-rx.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-rx.h wireshark-1.10.6/epan/dissectors/packet-rx.h --- wireshark-1.10.5/epan/dissectors/packet-rx.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-rx.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-rx.h * Definitions for packet disassembly structures and routines * - * $Id: packet-rx.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-s1ap.c wireshark-1.10.6/epan/dissectors/packet-s1ap.c --- wireshark-1.10.5/epan/dissectors/packet-s1ap.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-s1ap.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for E-UTRAN S1 Application Protocol (S1AP) packet dissection * Copyright 2007-2010, Anders Broman * - * $Id: packet-s1ap.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-s1ap.h wireshark-1.10.6/epan/dissectors/packet-s1ap.h --- wireshark-1.10.5/epan/dissectors/packet-s1ap.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-s1ap.h 2014-03-07 18:07:14.000000000 +0000 @@ -9,7 +9,7 @@ /* packet-s1ap.h * Routines for E-UTRAN S1 Application Protocol (S1AP) packet dissection * - * $Id: packet-s1ap.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-s5066.c wireshark-1.10.6/epan/dissectors/packet-s5066.c --- wireshark-1.10.5/epan/dissectors/packet-s5066.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-s5066.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-s5066.c * Routines for STANAG 5066 SIS layer packet disassembly * - * $Id: packet-s5066.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Copyright (c) 2005 by Menno Andriesse * diff -Nru wireshark-1.10.5/epan/dissectors/packet-sabp.c wireshark-1.10.6/epan/dissectors/packet-sabp.c --- wireshark-1.10.5/epan/dissectors/packet-sabp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sabp.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for UTRAN Iu-BC Interface: Service Area Broadcast Protocol (SBAP) packet dissection * Copyright 2007, Tomas Kukosa * - * $Id: packet-sabp.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sadmind.c wireshark-1.10.6/epan/dissectors/packet-sadmind.c --- wireshark-1.10.5/epan/dissectors/packet-sadmind.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sadmind.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Guy Harris * - * $Id: packet-sadmind.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sametime.c wireshark-1.10.6/epan/dissectors/packet-sametime.c --- wireshark-1.10.5/epan/dissectors/packet-sametime.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sametime.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for SAMETIME dissection * Copyright 2010, Toralf Foerster * - * $Id: packet-sametime.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sap.c wireshark-1.10.6/epan/dissectors/packet-sap.c --- wireshark-1.10.5/epan/dissectors/packet-sap.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sap.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * * Heikki Vatiainen * - * $Id: packet-sap.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sasp.c wireshark-1.10.6/epan/dissectors/packet-sasp.c --- wireshark-1.10.5/epan/dissectors/packet-sasp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sasp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for sasp packet dissection * Copyright 2010, Venkateshwaran Dorai * - * $Id: packet-sasp.c 48619 2013-03-28 15:07:32Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sbc-ap.c wireshark-1.10.6/epan/dissectors/packet-sbc-ap.c --- wireshark-1.10.5/epan/dissectors/packet-sbc-ap.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sbc-ap.c 2014-03-07 18:07:14.000000000 +0000 @@ -9,7 +9,7 @@ /* packet-sbc-ap.c * Routines for SBc Application Part (SBc-AP) packet dissection * - * $Id: packet-sbc-ap.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sbc.c wireshark-1.10.6/epan/dissectors/packet-sbc.c --- wireshark-1.10.5/epan/dissectors/packet-sbc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sbc.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2012, Michal Labedzki for Tieto Corporation * - * $Id: packet-sbc.c 48710 2013-04-02 21:13:02Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sbus.c wireshark-1.10.6/epan/dissectors/packet-sbus.c --- wireshark-1.10.5/epan/dissectors/packet-sbus.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sbus.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Ether-S-Bus dissection * Copyright 2010, Christian Durrer * - * $Id: packet-sbus.c 48508 2013-03-23 13:09:09Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sccp.c wireshark-1.10.6/epan/dissectors/packet-sccp.c --- wireshark-1.10.5/epan/dissectors/packet-sccp.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sccp.c 2014-03-07 18:07:14.000000000 +0000 @@ -12,7 +12,7 @@ * * Copyright 2002, Jeff Morriss * - * $Id: packet-sccp.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sccp.h wireshark-1.10.6/epan/dissectors/packet-sccp.h --- wireshark-1.10.5/epan/dissectors/packet-sccp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sccp.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-sccp.h * Definitions for Signalling Connection Control Part (SCCP) dissection * - * $Id: packet-sccp.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sccpmg.c wireshark-1.10.6/epan/dissectors/packet-sccpmg.c --- wireshark-1.10.5/epan/dissectors/packet-sccpmg.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sccpmg.c 2014-03-07 18:07:14.000000000 +0000 @@ -12,7 +12,7 @@ * * Copyright 2002, Jeff Morriss * - * $Id: packet-sccpmg.c 48510 2013-03-23 13:09:27Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-scop.c wireshark-1.10.6/epan/dissectors/packet-scop.c --- wireshark-1.10.5/epan/dissectors/packet-scop.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-scop.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-scop.c * Owen Kirby * - * $Id: packet-scop.c 48740 2013-04-04 20:40:32Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-scriptingservice.c wireshark-1.10.6/epan/dissectors/packet-scriptingservice.c --- wireshark-1.10.5/epan/dissectors/packet-scriptingservice.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-scriptingservice.c 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright 2008-2010 by Thomas Dreibholz * - * $Id: packet-scriptingservice.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-scsi.c wireshark-1.10.6/epan/dissectors/packet-scsi.c --- wireshark-1.10.5/epan/dissectors/packet-scsi.c 2013-09-09 17:40:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-scsi.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * Routines for decoding SCSI CDBs and responsess * Author: Dinesh G Dutt (ddutt@cisco.com) * - * $Id: packet-scsi.c 51870 2013-09-09 17:34:35Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-scsi.h wireshark-1.10.6/epan/dissectors/packet-scsi.h --- wireshark-1.10.5/epan/dissectors/packet-scsi.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-scsi.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-scsi.h * Author: Dinesh G Dutt (ddutt@cisco.com) * - * $Id: packet-scsi.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-scsi-mmc.c wireshark-1.10.6/epan/dissectors/packet-scsi-mmc.c --- wireshark-1.10.5/epan/dissectors/packet-scsi-mmc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-scsi-mmc.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Ronnie Sahlberg 2006 * copied from packet-scsi.c * - * $Id: packet-scsi-mmc.c 47932 2013-02-28 03:15:57Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-scsi-mmc.h wireshark-1.10.6/epan/dissectors/packet-scsi-mmc.h --- wireshark-1.10.5/epan/dissectors/packet-scsi-mmc.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-scsi-mmc.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-scsi-mmc.h * Ronnie sahlberg 2006 * - * $Id: packet-scsi-mmc.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-scsi-osd.c wireshark-1.10.6/epan/dissectors/packet-scsi-osd.c --- wireshark-1.10.5/epan/dissectors/packet-scsi-osd.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-scsi-osd.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * Ronnie sahlberg 2006 * Joe Breher 2006 * - * $Id: packet-scsi-osd.c 48399 2013-03-18 20:44:36Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-scsi-osd.h wireshark-1.10.6/epan/dissectors/packet-scsi-osd.h --- wireshark-1.10.5/epan/dissectors/packet-scsi-osd.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-scsi-osd.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-scsi-osd.h * Ronnie sahlberg 2006 * - * $Id: packet-scsi-osd.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-scsi-sbc.c wireshark-1.10.6/epan/dissectors/packet-scsi-sbc.c --- wireshark-1.10.5/epan/dissectors/packet-scsi-sbc.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-scsi-sbc.c 2014-03-07 18:07:14.000000000 +0000 @@ -15,7 +15,7 @@ * Dinesh G Dutt (ddutt@cisco.com) * Ronnie sahlberg 2006 * - * $Id: packet-scsi-sbc.c 47782 2013-02-20 22:56:29Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-scsi-sbc.h wireshark-1.10.6/epan/dissectors/packet-scsi-sbc.h --- wireshark-1.10.5/epan/dissectors/packet-scsi-sbc.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-scsi-sbc.h 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * Dinesh G Dutt (ddutt@cisco.com) * Ronnie sahlberg 2006 * - * $Id: packet-scsi-sbc.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-scsi-smc.c wireshark-1.10.6/epan/dissectors/packet-scsi-smc.c --- wireshark-1.10.5/epan/dissectors/packet-scsi-smc.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-scsi-smc.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * Dinesh G Dutt (ddutt@cisco.com) * Ronnie sahlberg 2006 * - * $Id: packet-scsi-smc.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-scsi-smc.h wireshark-1.10.6/epan/dissectors/packet-scsi-smc.h --- wireshark-1.10.5/epan/dissectors/packet-scsi-smc.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-scsi-smc.h 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * Dinesh G Dutt (ddutt@cisco.com) * Ronnie sahlberg 2006 * - * $Id: packet-scsi-smc.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-scsi-ssc.c wireshark-1.10.6/epan/dissectors/packet-scsi-ssc.c --- wireshark-1.10.5/epan/dissectors/packet-scsi-ssc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-scsi-ssc.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Dinesh G Dutt (ddutt@cisco.com) * Ronnie sahlberg 2006 * - * $Id: packet-scsi-ssc.c 48380 2013-03-17 19:25:00Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-scsi-ssc.h wireshark-1.10.6/epan/dissectors/packet-scsi-ssc.h --- wireshark-1.10.5/epan/dissectors/packet-scsi-ssc.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-scsi-ssc.h 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * Dinesh G Dutt (ddutt@cisco.com) * Ronnie sahlberg 2006 * - * $Id: packet-scsi-ssc.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sctp.c wireshark-1.10.6/epan/dissectors/packet-sctp.c --- wireshark-1.10.5/epan/dissectors/packet-sctp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sctp.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2000-2012 Michael Tuexen * Copyright 2011 Thomas Dreibholz * - * $Id: packet-sctp.c 48294 2013-03-14 08:41:11Z stig $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sctp.h wireshark-1.10.6/epan/dissectors/packet-sctp.h --- wireshark-1.10.5/epan/dissectors/packet-sctp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sctp.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Defintion of SCTP specific structures used by tap listeners. * - * $Id: packet-sctp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * Copyright 2004 Michael Tuexen * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/epan/dissectors/packet-sdh.c wireshark-1.10.6/epan/dissectors/packet-sdh.c --- wireshark-1.10.5/epan/dissectors/packet-sdh.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sdh.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-sdh.c * Routines for SDH/SONET encapsulation dissection * - * $Id: packet-sdh.c 46292 2012-11-29 20:15:37Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sdlc.c wireshark-1.10.6/epan/dissectors/packet-sdlc.c --- wireshark-1.10.5/epan/dissectors/packet-sdlc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sdlc.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-sdlc.c * Routines for SDLC frame disassembly * - * $Id: packet-sdlc.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sdp.c wireshark-1.10.6/epan/dissectors/packet-sdp.c --- wireshark-1.10.5/epan/dissectors/packet-sdp.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sdp.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * Jason Lango * Liberally copied from packet-http.c, by Guy Harris * - * $Id: packet-sdp.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sdp.h wireshark-1.10.6/epan/dissectors/packet-sdp.h --- wireshark-1.10.5/epan/dissectors/packet-sdp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sdp.h 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * Liberally copied from packet-http.c, by Guy Harris * 2005 Alejandro Vaquero , add support for tap * - * $Id: packet-sdp.h 47572 2013-02-08 17:52:12Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sebek.c wireshark-1.10.6/epan/dissectors/packet-sebek.c --- wireshark-1.10.5/epan/dissectors/packet-sebek.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sebek.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * * See: http://project.honeynet.org/tools/sebek/ for more details * - * $Id: packet-sebek.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-selfm.c wireshark-1.10.6/epan/dissectors/packet-selfm.c --- wireshark-1.10.5/epan/dissectors/packet-selfm.c 2013-12-13 21:58:08.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-selfm.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By Chris Bontje (cbontje[AT]gmail.com * Copyright Nov/Dec 2012, * - * $Id: packet-selfm.c 54070 2013-12-13 21:47:00Z gerald $ + * $Id$ * * Schweitzer Engineering Labs manufactures and sells digital protective relay equipment for * use in industrial high-voltage installations. SEL FM protocol evolved over time as a @@ -212,12 +212,7 @@ #define CMD_FASTOP_RESET 0xA5ED #define RELAYDEF_PROTO_SEL 0x0000 -#define RELAYDEF_PROTO_SEL_FO 0x0100 -#define RELAYDEF_PROTO_SEL_FM 0x0200 -#define RELAYDEF_PROTO_SEL_FO_FM 0x0300 #define RELAYDEF_PROTO_LMD 0x0001 -#define RELAYDEF_PROTO_LMD_FO 0x0101 -#define RELAYDEF_PROTO_LMD_FO_FM 0x0301 #define RELAYDEF_PROTO_MODBUS 0x0002 #define RELAYDEF_PROTO_SYMAX 0x0003 #define RELAYDEF_PROTO_R2R 0x0004 @@ -225,6 +220,11 @@ #define RELAYDEF_PROTO_MB 0x0006 #define RELAYDEF_PROTO_C37_118 0x0007 #define RELAYDEF_PROTO_61850 0x0008 +#define RELAYDEF_PROTO_SEL_FO 0x0100 +#define RELAYDEF_PROTO_LMD_FO 0x0101 +#define RELAYDEF_PROTO_SEL_FM 0x0200 +#define RELAYDEF_PROTO_SEL_FO_FM 0x0300 +#define RELAYDEF_PROTO_LMD_FO_FM 0x0301 #define FM_CONFIG_SF_LOC_FM 0 #define FM_CONFIG_SF_LOC_CFG 1 @@ -482,33 +482,28 @@ } fastser_config_frame; static const value_string selfm_msgtype_vals[] = { - { CMD_CLEAR_STATBIT, "Clear Status Bits Command" }, { CMD_FAST_SER, "Fast SER Block" }, - { CMD_FASTOP_BR_CTRL, "Fast Operate Breaker Bit Control" }, - { CMD_FASTOP_RB_CTRL, "Fast Operate Remote Bit Control" }, - { CMD_FASTOP_CONFIG, "Fast Operate Configuration" }, - { CMD_FASTOP_CONFIG_ALT, "Fast Operate Configuration (alt)" }, - { CMD_FASTOP_RESET, "Fast Operate Reset" }, - { CMD_FASTOP_RESETDEF, "Fast Operate Reset Definition" }, + { CMD_CLEAR_STATBIT, "Clear Status Bits Command" }, { CMD_RELAY_DEF, "Relay Definition Block" }, { CMD_FM_CONFIG, "Fast Meter Configuration Block" }, - { CMD_FM_DATA, "Fast Meter Data Block" }, { CMD_DFM_CONFIG, "Demand Fast Meter Configuration Block" }, - { CMD_DFM_DATA, "Demand Fast Meter Data Block" }, { CMD_PDFM_CONFIG, "Peak Demand Fast Meter Configuration Block" }, + { CMD_FASTOP_RESETDEF, "Fast Operate Reset Definition" }, + { CMD_FASTOP_CONFIG, "Fast Operate Configuration" }, + { CMD_FASTOP_CONFIG_ALT, "Fast Operate Configuration (alt)" }, + { CMD_FM_DATA, "Fast Meter Data Block" }, + { CMD_DFM_DATA, "Demand Fast Meter Data Block" }, { CMD_PDFM_DATA, "Peak Demand Fast Meter Data Block" }, + { CMD_FASTOP_RB_CTRL, "Fast Operate Remote Bit Control" }, + { CMD_FASTOP_BR_CTRL, "Fast Operate Breaker Bit Control" }, + { CMD_FASTOP_RESET, "Fast Operate Reset" }, { 0, NULL } }; static value_string_ext selfm_msgtype_vals_ext = VALUE_STRING_EXT_INIT(selfm_msgtype_vals); static const value_string selfm_relaydef_proto_vals[] = { { RELAYDEF_PROTO_SEL, "SEL Fast Meter" }, - { RELAYDEF_PROTO_SEL_FO, "SEL Fast Meter w/ Fast Operate" }, - { RELAYDEF_PROTO_SEL_FM, "SEL Fast Meter w/ Fast SER" }, - { RELAYDEF_PROTO_SEL_FO_FM, "SEL Fast Meter w/ Fast Operate and Fast SER" }, { RELAYDEF_PROTO_LMD, "SEL Limited Multidrop (LMD)" }, - { RELAYDEF_PROTO_LMD_FO, "SEL Limited Multidrop (LMD) w/ Fast Operate" }, - { RELAYDEF_PROTO_LMD_FO_FM, "SEL Limited Multidrop (LMD) w/ Fast Operate and Fast SER" }, { RELAYDEF_PROTO_MODBUS, "Modbus" }, { RELAYDEF_PROTO_SYMAX, "SY/MAX" }, { RELAYDEF_PROTO_R2R, "SEL Relay-to-Relay" }, @@ -516,6 +511,11 @@ { RELAYDEF_PROTO_MB, "SEL Mirrored Bits" }, { RELAYDEF_PROTO_C37_118, "IEEE 37.118 Synchrophasors" }, { RELAYDEF_PROTO_61850, "IEC 61850" }, + { RELAYDEF_PROTO_SEL_FO, "SEL Fast Meter w/ Fast Operate" }, + { RELAYDEF_PROTO_LMD_FO, "SEL Limited Multidrop (LMD) w/ Fast Operate" }, + { RELAYDEF_PROTO_SEL_FM, "SEL Fast Meter w/ Fast SER" }, + { RELAYDEF_PROTO_SEL_FO_FM, "SEL Fast Meter w/ Fast Operate and Fast SER" }, + { RELAYDEF_PROTO_LMD_FO_FM, "SEL Limited Multidrop (LMD) w/ Fast Operate and Fast SER" }, { 0, NULL } }; static value_string_ext selfm_relaydef_proto_vals_ext = VALUE_STRING_EXT_INIT(selfm_relaydef_proto_vals); diff -Nru wireshark-1.10.5/epan/dissectors/packet-sercosiii.c wireshark-1.10.6/epan/dissectors/packet-sercosiii.c --- wireshark-1.10.5/epan/dissectors/packet-sercosiii.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sercosiii.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Convert to built-in dissector * Michael Mann * Copyright 2011 * - * $Id: packet-sercosiii.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ses.c wireshark-1.10.6/epan/dissectors/packet-ses.c --- wireshark-1.10.5/epan/dissectors/packet-ses.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ses.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Routine to dissect ITU-T Rec. X.225 (1995 E)/ISO 8327-1 OSI Session Protocol packets * -* $Id: packet-ses.c 49721 2013-06-03 17:44:22Z gerald $ +* $Id$ * * Yuriy Sidelnikov * diff -Nru wireshark-1.10.5/epan/dissectors/packet-ses.h wireshark-1.10.6/epan/dissectors/packet-ses.h --- wireshark-1.10.5/epan/dissectors/packet-ses.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ses.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Routine to dissect ISO 8327-1 OSI Session Protocol packets * -* $Id: packet-ses.h 43536 2012-06-28 22:56:06Z darkjames $ +* $Id$ * * Yuriy Sidelnikov * diff -Nru wireshark-1.10.5/epan/dissectors/packet-sflow.c wireshark-1.10.6/epan/dissectors/packet-sflow.c --- wireshark-1.10.5/epan/dissectors/packet-sflow.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sflow.c 2014-03-07 18:07:14.000000000 +0000 @@ -7,7 +7,7 @@ * * By Yi Yu * - * $Id: packet-sflow.c 48379 2013-03-17 19:24:51Z alagoutte $ + * $Id$ * * TODO: * 802.11 aggregation data dissection (sFlow v5) diff -Nru wireshark-1.10.5/epan/dissectors/packet-sgsap.c wireshark-1.10.6/epan/dissectors/packet-sgsap.c --- wireshark-1.10.5/epan/dissectors/packet-sgsap.c 2013-12-19 17:37:26.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sgsap.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2010 - 2011, Anders Broman * - * $Id: packet-sgsap.c 54252 2013-12-19 17:31:09Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sigcomp.c wireshark-1.10.6/epan/dissectors/packet-sigcomp.c --- wireshark-1.10.5/epan/dissectors/packet-sigcomp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sigcomp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Signaling Compression (SigComp) dissection. * Copyright 2004-2005, Anders Broman * - * $Id: packet-sigcomp.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-simulcrypt.c wireshark-1.10.6/epan/dissectors/packet-simulcrypt.c --- wireshark-1.10.5/epan/dissectors/packet-simulcrypt.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-simulcrypt.c 2014-03-07 18:07:14.000000000 +0000 @@ -11,7 +11,7 @@ * EIS <-> SCS support, (P)SIG <-> MUX support, MUX <-> CiM support and (P) <-> CiP support * Copyright 2010, Giuliano Fabris / AppearTV * - * $Id: packet-simulcrypt.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sip.c wireshark-1.10.6/epan/dissectors/packet-sip.c --- wireshark-1.10.5/epan/dissectors/packet-sip.c 2013-12-13 20:37:23.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sip.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Copyright 2004, Anders Broman * Copyright 2011, Anders Broman , Johan Wahl * - * $Id: packet-sip.c 54059 2013-12-13 20:31:28Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sipfrag.c wireshark-1.10.6/epan/dissectors/packet-sipfrag.c --- wireshark-1.10.5/epan/dissectors/packet-sipfrag.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sipfrag.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Martin Mathieson * Based on packet-sdp.c * - * $Id: packet-sipfrag.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sip.h wireshark-1.10.6/epan/dissectors/packet-sip.h --- wireshark-1.10.5/epan/dissectors/packet-sip.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sip.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-sip.h * - * $Id: packet-sip.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sita.c wireshark-1.10.6/epan/dissectors/packet-sita.c --- wireshark-1.10.5/epan/dissectors/packet-sita.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sita.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 2007, Fulko Hew, SITA INC Canada, Inc. * - * $Id: packet-sita.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-skinny.c wireshark-1.10.6/epan/dissectors/packet-skinny.c --- wireshark-1.10.5/epan/dissectors/packet-skinny.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-skinny.c 2014-03-07 18:07:14.000000000 +0000 @@ -11,7 +11,7 @@ * This file is based on packet-aim.c, which is * Copyright 2000, Ralf Hoelzer * - * $Id: packet-skinny.c 48377 2013-03-17 19:24:34Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-skinny.h wireshark-1.10.6/epan/dissectors/packet-skinny.h --- wireshark-1.10.5/epan/dissectors/packet-skinny.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-skinny.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-skinny.h * Routines for skinny packet disassembly * - * $Id: packet-skinny.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-skype.c wireshark-1.10.6/epan/dissectors/packet-skype.c --- wireshark-1.10.5/epan/dissectors/packet-skype.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-skype.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-skype.c * Routines for the disassembly of Skype * - * $Id: packet-skype.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Copyright 2009 Joerg Mayer (see AUTHORS file) * diff -Nru wireshark-1.10.5/epan/dissectors/packet-slimp3.c wireshark-1.10.6/epan/dissectors/packet-slimp3.c --- wireshark-1.10.5/epan/dissectors/packet-slimp3.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-slimp3.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * Adds support for the data packet protocol for the SliMP3 * See www.slimdevices.com for details. * - * $Id: packet-slimp3.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sll.c wireshark-1.10.6/epan/dissectors/packet-sll.c --- wireshark-1.10.5/epan/dissectors/packet-sll.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sll.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-sll.c * Routines for disassembly of packets from Linux "cooked mode" captures * - * $Id: packet-sll.c 47649 2013-02-13 07:16:14Z jake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sll.h wireshark-1.10.6/epan/dissectors/packet-sll.h --- wireshark-1.10.5/epan/dissectors/packet-sll.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sll.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-sll.h * - * $Id: packet-sll.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-slowprotocols.c wireshark-1.10.6/epan/dissectors/packet-slowprotocols.c --- wireshark-1.10.5/epan/dissectors/packet-slowprotocols.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-slowprotocols.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-slowprotocols.c * Routines for EtherType (0x8809) Slow Protocols disassembly. * - * $Id: packet-slowprotocols.c 48739 2013-04-04 20:28:42Z cmaynard $ + * $Id$ * * Copyright 2002 Steve Housley * Copyright 2005 Dominique Bastien diff -Nru wireshark-1.10.5/epan/dissectors/packet-slsk.c wireshark-1.10.6/epan/dissectors/packet-slsk.c --- wireshark-1.10.5/epan/dissectors/packet-slsk.c 2013-07-22 22:01:26.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-slsk.c 2014-03-07 18:07:14.000000000 +0000 @@ -9,7 +9,7 @@ * http://cvs.sourceforge.net/viewcvs.py/soleseek/SoleSeek/doc/protocol.html?rev=HEAD * Updated for SoulSeek client version 151 * - * $Id: packet-slsk.c 50800 2013-07-22 21:52:07Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-smb2.c wireshark-1.10.6/epan/dissectors/packet-smb2.c --- wireshark-1.10.5/epan/dissectors/packet-smb2.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smb2.c 2014-03-07 18:07:14.000000000 +0000 @@ -9,7 +9,7 @@ * * If you edit this file, keep the wiki updated as well. * - * $Id: packet-smb2.c 48355 2013-03-17 16:48:47Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-smb2.h wireshark-1.10.6/epan/dissectors/packet-smb2.h --- wireshark-1.10.5/epan/dissectors/packet-smb2.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smb2.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-smb2.h * Defines for SMB2 packet dissection * - * $Id: packet-smb2.h 48355 2013-03-17 16:48:47Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-smb-browse.c wireshark-1.10.6/epan/dissectors/packet-smb-browse.c --- wireshark-1.10.5/epan/dissectors/packet-smb-browse.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smb-browse.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for SMB Browser packet dissection * Copyright 1999, Richard Sharpe * - * $Id: packet-smb-browse.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-smb-browse.h wireshark-1.10.6/epan/dissectors/packet-smb-browse.h --- wireshark-1.10.5/epan/dissectors/packet-smb-browse.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smb-browse.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Declaration of routines for SMB Browser packet dissection * Copyright 1999, Richard Sharpe * - * $Id: packet-smb-browse.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-smb.c wireshark-1.10.6/epan/dissectors/packet-smb.c --- wireshark-1.10.5/epan/dissectors/packet-smb.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smb.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 1999, Richard Sharpe * 2001 Rewrite by Ronnie Sahlberg and Guy Harris * - * $Id: packet-smb.c 48922 2013-04-19 01:37:48Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-smb-common.c wireshark-1.10.6/epan/dissectors/packet-smb-common.c --- wireshark-1.10.5/epan/dissectors/packet-smb-common.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smb-common.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Common routines for smb packet dissection * Copyright 2000, Jeffrey C. Foster * - * $Id: packet-smb-common.c 48400 2013-03-18 21:16:23Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-smb-common.h wireshark-1.10.6/epan/dissectors/packet-smb-common.h --- wireshark-1.10.5/epan/dissectors/packet-smb-common.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smb-common.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for SMB packet dissection * Copyright 1999, Richard Sharpe * - * $Id: packet-smb-common.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-smb.h wireshark-1.10.6/epan/dissectors/packet-smb.h --- wireshark-1.10.5/epan/dissectors/packet-smb.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smb.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Defines for SMB packet dissection * Copyright 1999, Richard Sharpe * - * $Id: packet-smb.h 48210 2013-03-09 08:44:14Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-smb-logon.c wireshark-1.10.6/epan/dissectors/packet-smb-logon.c --- wireshark-1.10.5/epan/dissectors/packet-smb-logon.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smb-logon.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for SMB net logon packet dissection * Copyright 2000, Jeffrey C. Foster * - * $Id: packet-smb-logon.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-smb-mailslot.c wireshark-1.10.6/epan/dissectors/packet-smb-mailslot.c --- wireshark-1.10.5/epan/dissectors/packet-smb-mailslot.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smb-mailslot.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for SMB mailslot packet dissection * Copyright 2000, Jeffrey C. Foster * - * $Id: packet-smb-mailslot.c 48400 2013-03-18 21:16:23Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-smb-mailslot.h wireshark-1.10.6/epan/dissectors/packet-smb-mailslot.h --- wireshark-1.10.5/epan/dissectors/packet-smb-mailslot.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smb-mailslot.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Declaration of routines for SMB mailslot packet dissection * Copyright 2000, Jeffrey C. Foster * - * $Id: packet-smb-mailslot.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-smb-pipe.c wireshark-1.10.6/epan/dissectors/packet-smb-pipe.c --- wireshark-1.10.5/epan/dissectors/packet-smb-pipe.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smb-pipe.c 2014-03-07 18:07:14.000000000 +0000 @@ -8,7 +8,7 @@ * significant rewrite to tvbuffify the dissector, Ronnie Sahlberg and * Guy Harris 2001 * - * $Id: packet-smb-pipe.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-smb-pipe.h wireshark-1.10.6/epan/dissectors/packet-smb-pipe.h --- wireshark-1.10.5/epan/dissectors/packet-smb-pipe.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smb-pipe.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Declarations of routines for SMB named pipe packet dissection * Copyright 1999, Richard Sharpe * - * $Id: packet-smb-pipe.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-smb-sidsnooping.c wireshark-1.10.6/epan/dissectors/packet-smb-sidsnooping.c --- wireshark-1.10.5/epan/dissectors/packet-smb-sidsnooping.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smb-sidsnooping.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for snooping SID to name mappings * Copyright 2003, Ronnie Sahlberg * - * $Id: packet-smb-sidsnooping.c 48399 2013-03-18 20:44:36Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-smb-sidsnooping.h wireshark-1.10.6/epan/dissectors/packet-smb-sidsnooping.h --- wireshark-1.10.5/epan/dissectors/packet-smb-sidsnooping.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smb-sidsnooping.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for snooping SID to name mappings * Copyright 2003, Ronnie Sahlberg * - * $Id: packet-smb-sidsnooping.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sml.c wireshark-1.10.6/epan/dissectors/packet-sml.c --- wireshark-1.10.5/epan/dissectors/packet-sml.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sml.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for SML dissection * Copyright 2013, Alexander Gaertner * - * $Id: packet-sml.c 47873 2013-02-25 16:19:15Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-smpp.c wireshark-1.10.6/epan/dissectors/packet-smpp.c --- wireshark-1.10.5/epan/dissectors/packet-smpp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smpp.c 2014-03-07 18:07:14.000000000 +0000 @@ -20,7 +20,7 @@ * Enhanced error code handling * provided by Stipe Tolj from Kannel. * - * $Id: packet-smpp.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Refer to the AUTHORS file or the AUTHORS section in the man page * for contacting the author(s) of this file. @@ -1474,7 +1474,7 @@ hf_smpp_source_bearer_type, offset); break; case 0x0010: /* source_telematics_id */ - smpp_handle_int2(sub_tree, tvb, + smpp_handle_int1(sub_tree, tvb, hf_smpp_source_telematics_id, offset); break; case 0x0017: /* qos_time_to_live */ @@ -3122,7 +3122,7 @@ }, { &hf_smpp_source_telematics_id, { "Telematic interworking (orig)", "smpp.source_telematics_id", - FT_UINT16, BASE_HEX, NULL, 0x00, + FT_UINT8, BASE_HEX, NULL, 0x00, "Telematic interworking used for message submission.", HFILL } diff -Nru wireshark-1.10.5/epan/dissectors/packet-smpp.h wireshark-1.10.6/epan/dissectors/packet-smpp.h --- wireshark-1.10.5/epan/dissectors/packet-smpp.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smpp.h 2014-03-07 18:07:14.000000000 +0000 @@ -8,7 +8,7 @@ * Dissection of multiple SMPP PDUs within one packet * provided by Chris Wilson. * - * $Id: packet-smpp.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Refer to the AUTHORS file or the AUTHORS section in the man page * for contacting the author(s) of this file. diff -Nru wireshark-1.10.5/epan/dissectors/packet-smrse.c wireshark-1.10.6/epan/dissectors/packet-smrse.c --- wireshark-1.10.5/epan/dissectors/packet-smrse.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smrse.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for SMRSE Short Message Relay Service packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-smrse.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-smrse.h wireshark-1.10.6/epan/dissectors/packet-smrse.h --- wireshark-1.10.5/epan/dissectors/packet-smrse.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smrse.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for SMRSE Short Message Relay Service packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-smrse.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-smtp.c wireshark-1.10.6/epan/dissectors/packet-smtp.c --- wireshark-1.10.5/epan/dissectors/packet-smtp.c 2013-07-22 22:01:26.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-smtp.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-smtp.c * Routines for SMTP packet disassembly * - * $Id: packet-smtp.c 50800 2013-07-22 21:52:07Z gerald $ + * $Id$ * * Copyright (c) 2000 by Richard Sharpe * diff -Nru wireshark-1.10.5/epan/dissectors/packet-sna.c wireshark-1.10.6/epan/dissectors/packet-sna.c --- wireshark-1.10.5/epan/dissectors/packet-sna.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sna.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Gilbert Ramirez * Jochen Friedrich * - * $Id: packet-sna.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-snaeth.c wireshark-1.10.6/epan/dissectors/packet-snaeth.c --- wireshark-1.10.5/epan/dissectors/packet-snaeth.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-snaeth.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-snaeth.c * Routines for SNA-over-Ethernet (Ethernet type 80d5) * - * $Id: packet-snaeth.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sndcp.c wireshark-1.10.6/epan/dissectors/packet-sndcp.c --- wireshark-1.10.5/epan/dissectors/packet-sndcp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sndcp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Subnetwork Dependent Convergence Protocol (SNDCP) dissection * Copyright 2000, Christian Falckenberg * - * $Id: packet-sndcp.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sndcp-xid.c wireshark-1.10.6/epan/dissectors/packet-sndcp-xid.c --- wireshark-1.10.5/epan/dissectors/packet-sndcp-xid.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sndcp-xid.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Used to dissect XID compression parameters negotiated in GSM (TS44.065) * Copyright 2008, Vincent Helfre * - * $Id: packet-sndcp-xid.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-snmp.c wireshark-1.10.6/epan/dissectors/packet-snmp.c --- wireshark-1.10.5/epan/dissectors/packet-snmp.c 2013-08-19 11:31:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-snmp.c 2014-03-07 18:07:14.000000000 +0000 @@ -25,7 +25,7 @@ * See RFC 2578 for Structure of Management Information Version 2 (SMIv2) * Copyright (C) 2007 Luis E. Garcia Ontanon * - * $Id: packet-snmp.c 51425 2013-08-19 11:25:35Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-snmp.h wireshark-1.10.6/epan/dissectors/packet-snmp.h --- wireshark-1.10.5/epan/dissectors/packet-snmp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-snmp.h 2014-03-07 18:07:14.000000000 +0000 @@ -9,7 +9,7 @@ /* packet-snmp.h * Routines for snmp packet dissection * - * $Id: packet-snmp.h 48812 2013-04-10 21:24:19Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-socketcan.c wireshark-1.10.6/epan/dissectors/packet-socketcan.c --- wireshark-1.10.5/epan/dissectors/packet-socketcan.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-socketcan.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for disassembly of packets from SocketCAN * Felix Obenhuber * - * $Id: packet-socketcan.c 46292 2012-11-29 20:15:37Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-socks.c wireshark-1.10.6/epan/dissectors/packet-socks.c --- wireshark-1.10.5/epan/dissectors/packet-socks.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-socks.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2000, Jeffrey C. Foster * Copyright 2008, Jelmer Vernooij * - * $Id: packet-socks.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-soupbintcp.c wireshark-1.10.6/epan/dissectors/packet-soupbintcp.c --- wireshark-1.10.5/epan/dissectors/packet-soupbintcp.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-soupbintcp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for SoupBinTCP 3.0 protocol dissection * Copyright 2013 David Arnold * - * $Id: packet-soupbintcp.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-spice.c wireshark-1.10.6/epan/dissectors/packet-spice.c --- wireshark-1.10.5/epan/dissectors/packet-spice.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-spice.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Spice protocol dissection * Copyright 2011, Yaniv Kaul * - * $Id: packet-spice.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-spnego.c wireshark-1.10.6/epan/dissectors/packet-spnego.c --- wireshark-1.10.5/epan/dissectors/packet-spnego.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-spnego.c 2014-03-07 18:07:14.000000000 +0000 @@ -15,7 +15,7 @@ * Copyright 2005, Ronnie Sahlberg (krb decryption) * Copyright 2005, Anders Broman (converted to asn2wrs generated dissector) * - * $Id: packet-spnego.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-spp.c wireshark-1.10.6/epan/dissectors/packet-spp.c --- wireshark-1.10.5/epan/dissectors/packet-spp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-spp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for XNS SPP * Based on the Netware SPX dissector by Gilbert Ramirez * - * $Id: packet-spp.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-spray.c wireshark-1.10.6/epan/dissectors/packet-spray.c --- wireshark-1.10.5/epan/dissectors/packet-spray.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-spray.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-spray.c * 2001 Ronnie Sahlberg * - * $Id: packet-spray.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-spray.h wireshark-1.10.6/epan/dissectors/packet-spray.h --- wireshark-1.10.5/epan/dissectors/packet-spray.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-spray.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-spray.h * 2001 Ronnie Sahlberg * - * $Id: packet-spray.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sprt.c wireshark-1.10.6/epan/dissectors/packet-sprt.c --- wireshark-1.10.5/epan/dissectors/packet-sprt.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sprt.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for SPRT dissection * SPRT = Simple Packet Relay Transport * - * $Id: packet-sprt.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Written by Jamison Adcock * for Sparta Inc., dba Cobham Analytic Solutions diff -Nru wireshark-1.10.5/epan/dissectors/packet-sprt.h wireshark-1.10.6/epan/dissectors/packet-sprt.h --- wireshark-1.10.5/epan/dissectors/packet-sprt.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sprt.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Routines for SPRT dissection * SPRT = Simple Packet Relay Transport * - * $Id: packet-sprt.h 43897 2012-07-21 15:32:36Z wmeier $ + * $Id$ * * Written by Jamison Adcock * for Sparta Inc., dba Cobham Analytic Solutions diff -Nru wireshark-1.10.5/epan/dissectors/packet-srp.c wireshark-1.10.6/epan/dissectors/packet-srp.c --- wireshark-1.10.5/epan/dissectors/packet-srp.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-srp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for H.324/SRP dissection * 2004 Richard van der Hoff * - * $Id: packet-srp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-srvloc.c wireshark-1.10.6/epan/dissectors/packet-srvloc.c --- wireshark-1.10.5/epan/dissectors/packet-srvloc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-srvloc.c 2014-03-07 18:07:14.000000000 +0000 @@ -9,7 +9,7 @@ * In particular I have not had an opportunity to see how it * responds to SRVLOC over TCP. * - * $Id: packet-srvloc.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sscf-nni.c wireshark-1.10.6/epan/dissectors/packet-sscf-nni.c --- wireshark-1.10.5/epan/dissectors/packet-sscf-nni.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sscf-nni.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for SSCF-NNI (Q.2140) frame disassembly * Jeff Morriss * - * $Id: packet-sscf-nni.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sscop.c wireshark-1.10.6/epan/dissectors/packet-sscop.c --- wireshark-1.10.5/epan/dissectors/packet-sscop.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sscop.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for SSCOP (Q.2110, Q.SAAL) frame disassembly * Guy Harris * - * $Id: packet-sscop.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sscop.h wireshark-1.10.6/epan/dissectors/packet-sscop.h --- wireshark-1.10.5/epan/dissectors/packet-sscop.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sscop.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-sscop.h * definitions for SSCOP (Q.2110, Q.SAAL) frame disassembly * - * $Id: packet-sscop.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ssh.c wireshark-1.10.6/epan/dissectors/packet-ssh.c --- wireshark-1.10.5/epan/dissectors/packet-ssh.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ssh.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * Huagang XIE * Kees Cook * - * $Id: packet-ssh.c 48174 2013-03-07 18:37:58Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ssl.c wireshark-1.10.6/epan/dissectors/packet-ssl.c --- wireshark-1.10.5/epan/dissectors/packet-ssl.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ssl.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ssl dissection * Copyright (c) 2000-2001, Scott Renfro * - * $Id: packet-ssl.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ssl.h wireshark-1.10.6/epan/dissectors/packet-ssl.h --- wireshark-1.10.5/epan/dissectors/packet-ssl.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ssl.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ssl.h * - * $Id: packet-ssl.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ssl-utils.c wireshark-1.10.6/epan/dissectors/packet-ssl-utils.c --- wireshark-1.10.5/epan/dissectors/packet-ssl-utils.c 2013-12-16 20:32:09.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ssl-utils.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * ssl manipulation functions * By Paolo Abeni * - * $Id: packet-ssl-utils.c 54154 2013-12-16 20:26:35Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -1633,7 +1633,7 @@ ssl_debug_printf("pcry_private_decrypt: stripping %d bytes, decr_len %" G_GSIZE_MODIFIER "u\n", rc, decr_len); ssl_print_data("decrypted_unstrip_pre_master", decr_data_ptr, decr_len); - g_memmove(decr_data_ptr, &decr_data_ptr[rc], decr_len - rc); + memmove(decr_data_ptr, &decr_data_ptr[rc], decr_len - rc); decr_len -= rc; out: @@ -1670,7 +1670,7 @@ ssl_debug_printf("pcry_private_decrypt: stripping %d bytes, decr_len %d\n", rc, decr_len); ssl_print_data("decrypted_unstrip_pre_master", decr_data_ptr, decr_len); - g_memmove(decr_data_ptr, &decr_data_ptr[rc], decr_len - rc); + memmove(decr_data_ptr, &decr_data_ptr[rc], decr_len - rc); decr_len -= rc; #endif /* SSL_FAST */ gcry_mpi_release(text); diff -Nru wireshark-1.10.5/epan/dissectors/packet-ssl-utils.h wireshark-1.10.6/epan/dissectors/packet-ssl-utils.h --- wireshark-1.10.5/epan/dissectors/packet-ssl-utils.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ssl-utils.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * ssl manipulation functions * By Paolo Abeni * - * $Id: packet-ssl-utils.h 48174 2013-03-07 18:37:58Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-starteam.c wireshark-1.10.6/epan/dissectors/packet-starteam.c --- wireshark-1.10.5/epan/dissectors/packet-starteam.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-starteam.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * metatech * - * $Id: packet-starteam.c 46491 2012-12-10 20:10:30Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-stat.c wireshark-1.10.6/epan/dissectors/packet-stat.c --- wireshark-1.10.5/epan/dissectors/packet-stat.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-stat.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-stat.c * Routines for stat dissection * - * $Id: packet-stat.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-stat.h wireshark-1.10.6/epan/dissectors/packet-stat.h --- wireshark-1.10.5/epan/dissectors/packet-stat.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-stat.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-stat.h * - * $Id: packet-stat.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-stat-notify.c wireshark-1.10.6/epan/dissectors/packet-stat-notify.c --- wireshark-1.10.5/epan/dissectors/packet-stat-notify.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-stat-notify.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for async NSM stat callback dissection * 2001 Ronnie Sahlberg * - * $Id: packet-stat-notify.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-stat-notify.h wireshark-1.10.6/epan/dissectors/packet-stat-notify.h --- wireshark-1.10.5/epan/dissectors/packet-stat-notify.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-stat-notify.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Async callback to notify NSM servers of changes in client status * 2001 Ronnie Sahlberg * - * $Id: packet-stat-notify.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-stun.c wireshark-1.10.6/epan/dissectors/packet-stun.c --- wireshark-1.10.5/epan/dissectors/packet-stun.c 2013-04-22 21:38:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-stun.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * Copyright 2008, Gael Breard * Copyright 2013, Media5 Corporation, David Bergeron * - * $Id: packet-stun.c 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sua.c wireshark-1.10.6/epan/dissectors/packet-sua.c --- wireshark-1.10.5/epan/dissectors/packet-sua.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sua.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * * Copyright 2002, 2003, 2004 Michael Tuexen * - * $Id: packet-sua.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sv.c wireshark-1.10.6/epan/dissectors/packet-sv.c --- wireshark-1.10.5/epan/dissectors/packet-sv.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sv.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for IEC 61850 Sampled Vales packet dissection * Michael Bernhard 2008 * - * $Id: packet-sv.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sv.h wireshark-1.10.6/epan/dissectors/packet-sv.h --- wireshark-1.10.5/epan/dissectors/packet-sv.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sv.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for IEC 61850 Sampled Vales packet dissection * Michael Bernhard 2008 * - * $Id: packet-sv.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-symantec.c wireshark-1.10.6/epan/dissectors/packet-symantec.c --- wireshark-1.10.5/epan/dissectors/packet-symantec.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-symantec.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Symantec Enterprise Firewall/Symantec Gateway Security appliance * v2/Symantec Gateway Security appliance v3. * - * $Id: packet-symantec.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sync.c wireshark-1.10.6/epan/dissectors/packet-sync.c --- wireshark-1.10.5/epan/dissectors/packet-sync.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sync.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for MBMS synchronisation protocol dissection * Copyright 2012, David Wei * - * $Id: packet-sync.c 47751 2013-02-19 23:17:07Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-synergy.c wireshark-1.10.6/epan/dissectors/packet-synergy.c --- wireshark-1.10.5/epan/dissectors/packet-synergy.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-synergy.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for synergy dissection * Copyright 2005, Vasanth Manickam * - * $Id: packet-synergy.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-synphasor.c wireshark-1.10.6/epan/dissectors/packet-synphasor.c --- wireshark-1.10.5/epan/dissectors/packet-synphasor.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-synphasor.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2008, Jens Steinhauser * - * $Id: packet-synphasor.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-sysex.c wireshark-1.10.6/epan/dissectors/packet-sysex.c --- wireshark-1.10.5/epan/dissectors/packet-sysex.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-sysex.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-sysex.c * - * $Id: packet-sysex.c 48045 2013-03-04 06:48:36Z etxrab $ + * $Id$ * * MIDI SysEx dissector * Tomasz Mon 2012 diff -Nru wireshark-1.10.5/epan/dissectors/packet-syslog.c wireshark-1.10.6/epan/dissectors/packet-syslog.c --- wireshark-1.10.5/epan/dissectors/packet-syslog.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-syslog.c 2014-03-07 18:07:14.000000000 +0000 @@ -7,7 +7,7 @@ * facility) to the MTP3 dissector by Abhik Sarkar * with some rework by Jeff Morriss * - * $Id: packet-syslog.c 46057 2012-11-17 12:16:05Z jake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-t124.c wireshark-1.10.6/epan/dissectors/packet-t124.c --- wireshark-1.10.5/epan/dissectors/packet-t124.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-t124.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for t124 packet dissection * Copyright 2010, Graeme Lunt * - * $Id: packet-t124.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -2973,9 +2973,11 @@ * to have a version of dissect_per_sequence() that checks all * references to the tvbuff before making them and returning "no" * if they would fail. + * + * We (ab)use hf_t124_connectGCCPDU here just to give a valid entry... */ TRY { - (void) dissect_per_sequence(tvb, 0, &asn1_ctx, NULL, -1, -1, t124Heur_sequence); + (void) dissect_per_sequence(tvb, 0, &asn1_ctx, NULL, hf_t124_connectGCCPDU, -1, t124Heur_sequence); } CATCH_BOUNDS_ERRORS { failed = TRUE; } ENDTRY; @@ -3900,7 +3902,7 @@ NULL, HFILL }}, /*--- End of included file: packet-t124-hfarr.c ---*/ -#line 201 "../../asn1/t124/packet-t124-template.c" +#line 203 "../../asn1/t124/packet-t124-template.c" }; /* List of subtrees */ @@ -4013,7 +4015,7 @@ &ett_t124_DomainMCSPDU, /*--- End of included file: packet-t124-ettarr.c ---*/ -#line 208 "../../asn1/t124/packet-t124-template.c" +#line 210 "../../asn1/t124/packet-t124-template.c" }; /* Register protocol */ diff -Nru wireshark-1.10.5/epan/dissectors/packet-t124.h wireshark-1.10.6/epan/dissectors/packet-t124.h --- wireshark-1.10.5/epan/dissectors/packet-t124.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-t124.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for t124 packet dissection * Copyright 2010, Graeme Lunt * - * $Id: packet-t124.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-t125.c wireshark-1.10.6/epan/dissectors/packet-t125.c --- wireshark-1.10.5/epan/dissectors/packet-t125.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-t125.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for t125 packet dissection * Copyright 2007, Ronnie Sahlberg * - * $Id: packet-t125.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-t30.c wireshark-1.10.6/epan/dissectors/packet-t30.c --- wireshark-1.10.5/epan/dissectors/packet-t30.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-t30.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for T.30 packet dissection * 2006 Alejandro Vaquero, add T30 reassemble and dissection * - * $Id: packet-t30.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-t30.h wireshark-1.10.6/epan/dissectors/packet-t30.h --- wireshark-1.10.5/epan/dissectors/packet-t30.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-t30.h 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * 2003 Hans Viens * 2004 Alejandro Vaquero, add support to conversation * - * $Id: packet-t30.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-t38.c wireshark-1.10.6/epan/dissectors/packet-t38.c --- wireshark-1.10.5/epan/dissectors/packet-t38.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-t38.c 2014-03-07 18:07:14.000000000 +0000 @@ -12,7 +12,7 @@ * 2004 Alejandro Vaquero, add support Conversations for SDP * 2006 Alejandro Vaquero, add T30 reassemble and dissection * - * $Id: packet-t38.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-t38.h wireshark-1.10.6/epan/dissectors/packet-t38.h --- wireshark-1.10.5/epan/dissectors/packet-t38.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-t38.h 2014-03-07 18:07:14.000000000 +0000 @@ -12,7 +12,7 @@ * 2003 Hans Viens * 2004 Alejandro Vaquero, add support to conversation * - * $Id: packet-t38.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tacacs.c wireshark-1.10.6/epan/dissectors/packet-tacacs.c --- wireshark-1.10.5/epan/dissectors/packet-tacacs.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tacacs.c 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * Full Tacacs+ parsing with decryption by * Emanuele Caratti * - * $Id: packet-tacacs.c 48749 2013-04-05 14:07:34Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tacacs.h wireshark-1.10.6/epan/dissectors/packet-tacacs.h --- wireshark-1.10.5/epan/dissectors/packet-tacacs.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tacacs.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for cisco tacplus packet dissection * Copyright 2000, Emanuele Caratti * - * $Id: packet-tacacs.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tali.c wireshark-1.10.6/epan/dissectors/packet-tali.c --- wireshark-1.10.5/epan/dissectors/packet-tali.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tali.c 2014-03-07 18:07:14.000000000 +0000 @@ -8,7 +8,7 @@ * Dissector of a TALI (Transport Adapter Layer Interface) version 1.0, as defined by the * Tekelec (www.tekelec.com) in RFC 3094, http://www.ietf.org/rfc/rfc3094.txt * - * $Id: packet-tali.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Refer to the AUTHORS file or the AUTHORS section in the man page * for contacting the author(s) of this file. diff -Nru wireshark-1.10.5/epan/dissectors/packet-tango.c wireshark-1.10.6/epan/dissectors/packet-tango.c --- wireshark-1.10.5/epan/dissectors/packet-tango.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tango.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-tango.c * - * $Id: packet-tango.c 47217 2013-01-22 22:07:44Z jake $ + * $Id$ * * Routines for IDL dissection * diff -Nru wireshark-1.10.5/epan/dissectors/packet-tapa.c wireshark-1.10.6/epan/dissectors/packet-tapa.c --- wireshark-1.10.5/epan/dissectors/packet-tapa.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tapa.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-tapa.c * Routines for the disassembly of the Trapeze TAPA protocol * - * $Id: packet-tapa.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Copyright 2007 Joerg Mayer (see AUTHORS file) * diff -Nru wireshark-1.10.5/epan/dissectors/packet-tcap.c wireshark-1.10.6/epan/dissectors/packet-tcap.c --- wireshark-1.10.5/epan/dissectors/packet-tcap.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tcap.c 2014-03-07 18:07:14.000000000 +0000 @@ -11,7 +11,7 @@ * Copyright 2004 - 2005, Tim Endean * Built from the gsm-map dissector Copyright 2004 - 2005, Anders Broman * - * $Id: packet-tcap.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tcap.h wireshark-1.10.6/epan/dissectors/packet-tcap.h --- wireshark-1.10.5/epan/dissectors/packet-tcap.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tcap.h 2014-03-07 18:07:14.000000000 +0000 @@ -8,7 +8,7 @@ #line 1 "../../asn1/tcap/packet-tcap-template.h" /* packet-tcap.h * - * $Id: packet-tcap.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Copyright 2004, Tim Endean * diff -Nru wireshark-1.10.5/epan/dissectors/packet-tcp.c wireshark-1.10.6/epan/dissectors/packet-tcp.c --- wireshark-1.10.5/epan/dissectors/packet-tcp.c 2013-10-29 20:01:29.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tcp.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-tcp.c * Routines for TCP packet disassembly * - * $Id: packet-tcp.c 52961 2013-10-29 19:55:40Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tcp.h wireshark-1.10.6/epan/dissectors/packet-tcp.h --- wireshark-1.10.5/epan/dissectors/packet-tcp.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tcp.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-tcp.h * - * $Id: packet-tcp.h 48915 2013-04-18 19:11:05Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tdmoe.c wireshark-1.10.6/epan/dissectors/packet-tdmoe.c --- wireshark-1.10.5/epan/dissectors/packet-tdmoe.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tdmoe.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for TDM over Ethernet packet disassembly * Copyright 2010, Haakon Nessjoen * - * $Id: packet-tdmoe.c 48743 2013-04-05 05:09:31Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tds.c wireshark-1.10.6/epan/dissectors/packet-tds.c --- wireshark-1.10.5/epan/dissectors/packet-tds.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tds.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2000-2002, Brian Bruns * Copyright 2002, Steve Langasek * - * $Id: packet-tds.c 48676 2013-03-31 18:10:45Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-teamspeak2.c wireshark-1.10.6/epan/dissectors/packet-teamspeak2.c --- wireshark-1.10.5/epan/dissectors/packet-teamspeak2.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-teamspeak2.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By brooss * Copyright 2008 brooss * - * $Id: packet-teamspeak2.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-teimanagement.c wireshark-1.10.6/epan/dissectors/packet-teimanagement.c --- wireshark-1.10.5/epan/dissectors/packet-teimanagement.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-teimanagement.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Rolf Fiedler * based on code by Gilbert Ramirez * - * $Id: packet-teimanagement.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-teklink.c wireshark-1.10.6/epan/dissectors/packet-teklink.c --- wireshark-1.10.5/epan/dissectors/packet-teklink.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-teklink.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for TEKLINK dissection * Copyright (c)2010 Sven Schnelle * - * $Id: packet-teklink.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-telkonet.c wireshark-1.10.6/epan/dissectors/packet-telkonet.c --- wireshark-1.10.5/epan/dissectors/packet-telkonet.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-telkonet.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-telkonet.c * Routines for ethertype 0x88A1 tunneling dissection * - * $Id: packet-telkonet.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Copyright 2006 Joerg Mayer (see AUTHORS file) * diff -Nru wireshark-1.10.5/epan/dissectors/packet-telnet.c wireshark-1.10.6/epan/dissectors/packet-telnet.c --- wireshark-1.10.5/epan/dissectors/packet-telnet.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-telnet.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Telnet packet dissection; see RFC 854 and RFC 855 * Copyright 1999, Richard Sharpe * - * $Id: packet-telnet.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-teredo.c wireshark-1.10.6/epan/dissectors/packet-teredo.c --- wireshark-1.10.5/epan/dissectors/packet-teredo.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-teredo.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * Copyright 2003, Vincent JARDIN - 6WIND - * Copyright 2004, Remi DENIS-COURMONT * - * $Id: packet-teredo.c 46928 2013-01-04 05:22:43Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tetra.c wireshark-1.10.6/epan/dissectors/packet-tetra.c --- wireshark-1.10.5/epan/dissectors/packet-tetra.c 2013-07-17 01:50:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tetra.c 2014-03-07 18:07:14.000000000 +0000 @@ -9,7 +9,7 @@ /* packet-tetra.c * Routines for TETRA packet dissection * - *$Id: packet-tetra.c 50688 2013-07-17 01:34:46Z gerald $ + *$Id$ * * Copyright (c) 2007 - 2011 Professional Mobile Communication Research Group, * Beijing Institute of Technology, China diff -Nru wireshark-1.10.5/epan/dissectors/packet-tetra.h wireshark-1.10.6/epan/dissectors/packet-tetra.h --- wireshark-1.10.5/epan/dissectors/packet-tetra.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tetra.h 2014-03-07 18:07:14.000000000 +0000 @@ -12,7 +12,7 @@ * Copyright (c) 2007 - 2011 Professional Mobile Communication Research Group, * Beijing Institute of Technology, China * - * $Id: packet-tetra.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-text-media.c wireshark-1.10.6/epan/dissectors/packet-text-media.c --- wireshark-1.10.5/epan/dissectors/packet-text-media.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-text-media.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * * (C) Olivier Biot, 2004. * - * $Id: packet-text-media.c 47864 2013-02-24 19:51:23Z etxrab $ + * $Id$ * * Refer to the AUTHORS file or the AUTHORS section in the man page * for contacting the author(s) of this file. diff -Nru wireshark-1.10.5/epan/dissectors/packet-tftp.c wireshark-1.10.6/epan/dissectors/packet-tftp.c --- wireshark-1.10.5/epan/dissectors/packet-tftp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tftp.c 2014-03-07 18:07:14.000000000 +0000 @@ -7,7 +7,7 @@ * Joerg Mayer (see AUTHORS file) * RFC2348 TFTP Blocksize Option * - * $Id: packet-tftp.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-time.c wireshark-1.10.6/epan/dissectors/packet-time.c --- wireshark-1.10.5/epan/dissectors/packet-time.c 2013-12-16 20:32:09.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-time.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Richard Sharpe * - * $Id: packet-time.c 54154 2013-12-16 20:26:35Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tipc.c wireshark-1.10.6/epan/dissectors/packet-tipc.c --- wireshark-1.10.5/epan/dissectors/packet-tipc.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tipc.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-tipc.c * Routines for Transparent Inter Process Communication packet dissection * - * $Id: packet-tipc.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Copyright 2005-2006, Anders Broman * diff -Nru wireshark-1.10.5/epan/dissectors/packet-tivoconnect.c wireshark-1.10.6/epan/dissectors/packet-tivoconnect.c --- wireshark-1.10.5/epan/dissectors/packet-tivoconnect.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tivoconnect.c 2014-03-07 18:07:14.000000000 +0000 @@ -7,7 +7,7 @@ * IANA's full name is "TiVoConnect Beacon", where as TiVo's own * documentation calls this protocol "TiVoConnect Discovery Protocol". * - * $Id: packet-tivoconnect.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tn3270.c wireshark-1.10.6/epan/dissectors/packet-tn3270.c --- wireshark-1.10.5/epan/dissectors/packet-tn3270.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tn3270.c 2014-03-07 18:07:14.000000000 +0000 @@ -24,7 +24,7 @@ * * Copyright 2009, Robert Hogan * - * $Id: packet-tn3270.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tn3270.h wireshark-1.10.6/epan/dissectors/packet-tn3270.h --- wireshark-1.10.5/epan/dissectors/packet-tn3270.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tn3270.h 2014-03-07 18:07:14.000000000 +0000 @@ -7,7 +7,7 @@ * * Copyright 2009, Robert Hogan * - * $Id: packet-tn3270.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tn5250.c wireshark-1.10.6/epan/dissectors/packet-tn5250.c --- wireshark-1.10.5/epan/dissectors/packet-tn5250.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tn5250.c 2014-03-07 18:07:14.000000000 +0000 @@ -9,7 +9,7 @@ * * Copyright 2009, Robert Hogan * - * $Id: packet-tn5250.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tn5250.h wireshark-1.10.6/epan/dissectors/packet-tn5250.h --- wireshark-1.10.5/epan/dissectors/packet-tn5250.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tn5250.h 2014-03-07 18:07:14.000000000 +0000 @@ -8,7 +8,7 @@ * * Copyright 2009, Robert Hogan * - * $Id: packet-tn5250.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tnef.c wireshark-1.10.6/epan/dissectors/packet-tnef.c --- wireshark-1.10.5/epan/dissectors/packet-tnef.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tnef.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-tnef.c * Routines for Transport-Neutral Encapsulation Format (TNEF) packet disassembly * - * $Id: packet-tnef.c 47861 2013-02-24 19:13:36Z alagoutte $ + * $Id$ * * Copyright (c) 2007 by Graeme Lunt * diff -Nru wireshark-1.10.5/epan/dissectors/packet-tns.c wireshark-1.10.6/epan/dissectors/packet-tns.c --- wireshark-1.10.5/epan/dissectors/packet-tns.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tns.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-tns.c * Routines for Oracle TNS packet dissection * - * $Id: packet-tns.c 47862 2013-02-24 19:13:46Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tns.h wireshark-1.10.6/epan/dissectors/packet-tns.h --- wireshark-1.10.5/epan/dissectors/packet-tns.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tns.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-tns.h * - * $Id: packet-tns.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tpkt.c wireshark-1.10.6/epan/dissectors/packet-tpkt.c --- wireshark-1.10.5/epan/dissectors/packet-tpkt.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tpkt.c 2014-03-07 18:07:14.000000000 +0000 @@ -7,7 +7,7 @@ * Routine to dissect RFC 1006 TPKT packet containing OSI TP PDU * Copyright 2001, Martin Thomas * - * $Id: packet-tpkt.c 47924 2013-02-27 22:43:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tpkt.h wireshark-1.10.6/epan/dissectors/packet-tpkt.h --- wireshark-1.10.5/epan/dissectors/packet-tpkt.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tpkt.h 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * Copyright 2000, Philips Electronics N.V. * Andreas Sikkema * - * $Id: packet-tpkt.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tpncp.c wireshark-1.10.6/epan/dissectors/packet-tpncp.c --- wireshark-1.10.5/epan/dissectors/packet-tpncp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tpncp.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright (c) 2007 by Valery Sigalov * - * $Id: packet-tpncp.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tr.c wireshark-1.10.6/epan/dissectors/packet-tr.c --- wireshark-1.10.5/epan/dissectors/packet-tr.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tr.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Token-Ring packet disassembly * Gilbert Ramirez * - * $Id: packet-tr.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tr.h wireshark-1.10.6/epan/dissectors/packet-tr.h --- wireshark-1.10.5/epan/dissectors/packet-tr.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tr.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-tr.h * - * $Id: packet-tr.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-trill.c wireshark-1.10.6/epan/dissectors/packet-trill.c --- wireshark-1.10.5/epan/dissectors/packet-trill.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-trill.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for TRILL (TRansparent Interconnection of Lots of Links) dissection * Copyright 2010, David Bond * - * $Id: packet-trill.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-trmac.c wireshark-1.10.6/epan/dissectors/packet-trmac.c --- wireshark-1.10.5/epan/dissectors/packet-trmac.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-trmac.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Token-Ring Media Access Control * Gilbert Ramirez * - * $Id: packet-trmac.c 47963 2013-03-01 04:53:26Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tsp.c wireshark-1.10.6/epan/dissectors/packet-tsp.c --- wireshark-1.10.5/epan/dissectors/packet-tsp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tsp.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Uwe Girlich * - * $Id: packet-tsp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tte.c wireshark-1.10.6/epan/dissectors/packet-tte.c --- wireshark-1.10.5/epan/dissectors/packet-tte.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tte.c 2014-03-07 18:07:14.000000000 +0000 @@ -7,7 +7,7 @@ * TTTech Computertechnik AG, Austria. * http://www.tttech.com/solutions/ttethernet/ * - * $Id: packet-tte.c 47541 2013-02-07 22:07:49Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tte.h wireshark-1.10.6/epan/dissectors/packet-tte.h --- wireshark-1.10.5/epan/dissectors/packet-tte.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tte.h 2014-03-07 18:07:14.000000000 +0000 @@ -8,7 +8,7 @@ * http://www.tttech.com/solutions/ttethernet/ * * - * $Id: packet-tte.h 30989 2009-11-17 15:53:38Z krj $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tte-pcf.c wireshark-1.10.6/epan/dissectors/packet-tte-pcf.c --- wireshark-1.10.5/epan/dissectors/packet-tte-pcf.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tte-pcf.c 2014-03-07 18:07:14.000000000 +0000 @@ -7,7 +7,7 @@ * TTTech Computertechnik AG, Austria. * http://www.tttech.com/solutions/ttethernet/ * - * $Id: packet-tte-pcf.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-turbocell.c wireshark-1.10.6/epan/dissectors/packet-turbocell.c --- wireshark-1.10.5/epan/dissectors/packet-turbocell.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-turbocell.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Turbocell Header dissection * Copyright 2004, Colin Slater * - * $Id: packet-turbocell.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-turnchannel.c wireshark-1.10.6/epan/dissectors/packet-turnchannel.c --- wireshark-1.10.5/epan/dissectors/packet-turnchannel.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-turnchannel.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * in the STUN2 dissector * Copyright 2008, 8x8 Inc. * - * $Id: packet-turnchannel.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tuxedo.c wireshark-1.10.6/epan/dissectors/packet-tuxedo.c --- wireshark-1.10.5/epan/dissectors/packet-tuxedo.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tuxedo.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * metatech * - * $Id: packet-tuxedo.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-tzsp.c wireshark-1.10.6/epan/dissectors/packet-tzsp.c --- wireshark-1.10.5/epan/dissectors/packet-tzsp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-tzsp.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-tzsp.c * - * $Id: packet-tzsp.c 47860 2013-02-24 19:13:27Z alagoutte $ + * $Id$ * * Copyright 2002, Tazmen Technologies Inc * diff -Nru wireshark-1.10.5/epan/dissectors/packet-ua3g.c wireshark-1.10.6/epan/dissectors/packet-ua3g.c --- wireshark-1.10.5/epan/dissectors/packet-ua3g.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ua3g.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for UA/UDP (Universal Alcatel over UDP) packet dissection. * Copyright 2012, Alcatel-Lucent Enterprise * - * $Id: packet-ua3g.c 48685 2013-04-01 15:29:49Z jake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ua.c wireshark-1.10.6/epan/dissectors/packet-ua.c --- wireshark-1.10.5/epan/dissectors/packet-ua.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ua.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for UA/UDP (Universal Alcatel over UDP) packet dissection. * Copyright 2012, Alcatel-Lucent Enterprise * - * $Id: packet-ua.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ua.h wireshark-1.10.6/epan/dissectors/packet-ua.h --- wireshark-1.10.5/epan/dissectors/packet-ua.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ua.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for UA (Universal Alcatel) packet dissection. * Copyright 2011, Marek Tews * -* $Id: packet-ua.h 43538 2012-06-28 23:18:38Z darkjames $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-uasip.c wireshark-1.10.6/epan/dissectors/packet-uasip.c --- wireshark-1.10.5/epan/dissectors/packet-uasip.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-uasip.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for UA/UDP (Universal Alcatel over UDP) and NOE/SIP packet dissection. * Copyright 2012, Alcatel-Lucent Enterprise * - * $Id: packet-uasip.c 45848 2012-10-31 13:09:04Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-uaudp.c wireshark-1.10.6/epan/dissectors/packet-uaudp.c --- wireshark-1.10.5/epan/dissectors/packet-uaudp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-uaudp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for UA/UDP (Universal Alcatel over UDP) packet dissection. * Copyright 2012, Alcatel-Lucent Enterprise * - * $Id: packet-uaudp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-uaudp.h wireshark-1.10.6/epan/dissectors/packet-uaudp.h --- wireshark-1.10.5/epan/dissectors/packet-uaudp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-uaudp.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for UA/UDP (Universal Alcatel over UDP) packet dissection. * Copyright 2012, Alcatel-Lucent Enterprise * - * $Id: packet-uaudp.h 45727 2012-10-22 19:58:15Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ucp.c wireshark-1.10.6/epan/dissectors/packet-ucp.c --- wireshark-1.10.5/epan/dissectors/packet-ucp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ucp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Universal Computer Protocol dissection * Copyright 2001, Tom Uijldert * - * $Id: packet-ucp.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-udld.c wireshark-1.10.6/epan/dissectors/packet-udld.c --- wireshark-1.10.5/epan/dissectors/packet-udld.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-udld.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-udld.c * Routines for the disassembly of the "UniDirectional Link Detection" * - * $Id: packet-udld.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-udp.c wireshark-1.10.6/epan/dissectors/packet-udp.c --- wireshark-1.10.5/epan/dissectors/packet-udp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-udp.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-udp.c * Routines for UDP/UDPLite packet disassembly * - * $Id: packet-udp.c 48439 2013-03-20 05:59:22Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-udp.h wireshark-1.10.6/epan/dissectors/packet-udp.h --- wireshark-1.10.5/epan/dissectors/packet-udp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-udp.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-udp.h * - * $Id: packet-udp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-uhd.c wireshark-1.10.6/epan/dissectors/packet-uhd.c --- wireshark-1.10.5/epan/dissectors/packet-uhd.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-uhd.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * (C) 2013 by Klyuchnikov Ivan , Dario Lombardo * - * $Id: packet-uhd.c 48848 2013-04-14 18:55:28Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ulp.c wireshark-1.10.6/epan/dissectors/packet-ulp.c --- wireshark-1.10.5/epan/dissectors/packet-ulp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ulp.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for OMA UserPlane Location Protocol packet dissection * Copyright 2006, Anders Broman * - * $Id: packet-ulp.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-uma.c wireshark-1.10.6/epan/dissectors/packet-uma.c --- wireshark-1.10.5/epan/dissectors/packet-uma.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-uma.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Unlicensed Mobile Access(UMA) dissection * Copyright 2005-2006,2009, Anders Broman * - * $Id: packet-uma.c 46602 2012-12-18 23:28:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-umts_fp.c wireshark-1.10.6/epan/dissectors/packet-umts_fp.c --- wireshark-1.10.5/epan/dissectors/packet-umts_fp.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-umts_fp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Martin Mathieson * - * $Id: packet-umts_fp.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-umts_fp.h wireshark-1.10.6/epan/dissectors/packet-umts_fp.h --- wireshark-1.10.5/epan/dissectors/packet-umts_fp.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-umts_fp.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-fp.h * * Martin Mathieson - * $Id: packet-umts_fp.h 44423 2012-08-10 15:22:50Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-umts_mac.c wireshark-1.10.6/epan/dissectors/packet-umts_mac.c --- wireshark-1.10.5/epan/dissectors/packet-umts_mac.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-umts_mac.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* Routines for UMTS MAC (3GPP TS 25.321) disassembly * - * $Id: packet-umts_mac.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-umts_mac.h wireshark-1.10.6/epan/dissectors/packet-umts_mac.h --- wireshark-1.10.5/epan/dissectors/packet-umts_mac.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-umts_mac.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* Routines for UMTS FP disassembly * - * $Id: packet-umts_mac.h 47899 2013-02-26 04:42:26Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-usb-audio.c wireshark-1.10.6/epan/dissectors/packet-usb-audio.c --- wireshark-1.10.5/epan/dissectors/packet-usb-audio.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-usb-audio.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-usb-audio.c * - * $Id: packet-usb-audio.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * usb audio dissector * Tomasz Mon 2012 diff -Nru wireshark-1.10.5/epan/dissectors/packet-usb.c wireshark-1.10.6/epan/dissectors/packet-usb.c --- wireshark-1.10.5/epan/dissectors/packet-usb.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-usb.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-usb.c * - * $Id: packet-usb.c 48847 2013-04-14 16:00:34Z pascal $ + * $Id$ * * USB basic dissector * By Paolo Abeni diff -Nru wireshark-1.10.5/epan/dissectors/packet-usb-ccid.c wireshark-1.10.6/epan/dissectors/packet-usb-ccid.c --- wireshark-1.10.5/epan/dissectors/packet-usb-ccid.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-usb-ccid.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * * Copyright 2011, Tyson Key * - * $Id: packet-usb-ccid.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-usb.h wireshark-1.10.6/epan/dissectors/packet-usb.h --- wireshark-1.10.5/epan/dissectors/packet-usb.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-usb.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-usb.h * - * $Id: packet-usb.h 48184 2013-03-07 23:57:43Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-usb-hid.c wireshark-1.10.6/epan/dissectors/packet-usb-hid.c --- wireshark-1.10.5/epan/dissectors/packet-usb-hid.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-usb-hid.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-usb-hid.c * - * $Id: packet-usb-hid.c 48710 2013-04-02 21:13:02Z cmaynard $ + * $Id$ * * USB HID dissector * By Adam Nielsen 2009 diff -Nru wireshark-1.10.5/epan/dissectors/packet-usb-hid.h wireshark-1.10.6/epan/dissectors/packet-usb-hid.h --- wireshark-1.10.5/epan/dissectors/packet-usb-hid.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-usb-hid.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-usb-hid.h * - * $Id: packet-usb-hid.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * USB HID dissector * By Adam Nielsen 2009 diff -Nru wireshark-1.10.5/epan/dissectors/packet-usb-hub.c wireshark-1.10.6/epan/dissectors/packet-usb-hub.c --- wireshark-1.10.5/epan/dissectors/packet-usb-hub.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-usb-hub.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for USB HUB dissection * Copyright 2009, Marton Nemeth * - * $Id: packet-usb-hub.c 48356 2013-03-17 17:52:26Z etxrab $ + * $Id$ * * USB HUB Specification can be found in the Universal Serial Bus * Specification 2.0, Chapter 11 Hub Specification. diff -Nru wireshark-1.10.5/epan/dissectors/packet-usb-masstorage.c wireshark-1.10.6/epan/dissectors/packet-usb-masstorage.c --- wireshark-1.10.5/epan/dissectors/packet-usb-masstorage.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-usb-masstorage.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-usb-masstorage.c * - * $Id: packet-usb-masstorage.c 48356 2013-03-17 17:52:26Z etxrab $ + * $Id$ * * usb mass storage dissector * Ronnie Sahlberg 2006 diff -Nru wireshark-1.10.5/epan/dissectors/packet-usb-video.c wireshark-1.10.6/epan/dissectors/packet-usb-video.c --- wireshark-1.10.5/epan/dissectors/packet-usb-video.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-usb-video.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-usb-video.c * - * $Id: packet-usb-video.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Forked from packet-usb-masstorage.c 35224 2010-12-20 05:35:29Z guy * which was authored by Ronnie Sahlberg (2006) diff -Nru wireshark-1.10.5/epan/dissectors/packet-user_encap.c wireshark-1.10.6/epan/dissectors/packet-user_encap.c --- wireshark-1.10.5/epan/dissectors/packet-user_encap.c 2013-05-20 22:17:14.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-user_encap.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Allow users to specify the dissectors for DLTs * Luis E. Garcia Ontanon * - * $Id: packet-user_encap.c 49465 2013-05-20 22:07:30Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-uts.c wireshark-1.10.6/epan/dissectors/packet-uts.c --- wireshark-1.10.5/epan/dissectors/packet-uts.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-uts.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for UTS WAN protocol dissection * Copyright 2007, Fulko Hew, SITA INC Canada, Inc. * - * $Id: packet-uts.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Copied from packet-ipars.c * diff -Nru wireshark-1.10.5/epan/dissectors/packet-v120.c wireshark-1.10.6/epan/dissectors/packet-v120.c --- wireshark-1.10.5/epan/dissectors/packet-v120.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-v120.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for v120 frame disassembly * Bert Driehuis * - * $Id: packet-v120.c 45115 2012-09-25 01:00:41Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-v150fw.c wireshark-1.10.6/epan/dissectors/packet-v150fw.c --- wireshark-1.10.5/epan/dissectors/packet-v150fw.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-v150fw.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * v150fw = v.150.1 SSE messages, contained in RTP packets * - * $Id: packet-v150fw.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Written by Jamison Adcock * for Sparta Inc., dba Cobham Analytic Solutions diff -Nru wireshark-1.10.5/epan/dissectors/packet-v52.c wireshark-1.10.6/epan/dissectors/packet-v52.c --- wireshark-1.10.5/epan/dissectors/packet-v52.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-v52.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,5 +1,5 @@ /* packet-v52.c - * $Id: packet-v52.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * Implementation for V5.2 Interface dissection * References: * ETSI EN 300 324-1 V2.1.1 (2000-04) diff -Nru wireshark-1.10.5/epan/dissectors/packet-v5dl.c wireshark-1.10.6/epan/dissectors/packet-v5dl.c --- wireshark-1.10.5/epan/dissectors/packet-v5dl.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-v5dl.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Rolf Fiedler using the LAPD code of * Gilbert Ramirez * - * $Id: packet-v5dl.c 47459 2013-02-03 22:29:48Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-v5ef.c wireshark-1.10.6/epan/dissectors/packet-v5ef.c --- wireshark-1.10.5/epan/dissectors/packet-v5ef.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-v5ef.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for V5 envelope function frame disassembly * Rolf Fiedler * - * $Id: packet-v5ef.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-v5ua.c wireshark-1.10.6/epan/dissectors/packet-v5ua.c --- wireshark-1.10.5/epan/dissectors/packet-v5ua.c 2013-04-22 21:38:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-v5ua.c 2014-03-07 18:07:14.000000000 +0000 @@ -15,7 +15,7 @@ * * Routines for V5.2-User Adaptation Layer dissection * - * $Id: packet-v5ua.c 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Extension of ISDN Q.921-User Adaptation Layer dissection * Copyright 2002, Michael Tuexen diff -Nru wireshark-1.10.5/epan/dissectors/packet-vcdu.c wireshark-1.10.6/epan/dissectors/packet-vcdu.c --- wireshark-1.10.5/epan/dissectors/packet-vcdu.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-vcdu.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2000, Scott Hovis scott.hovis@ums.msfc.nasa.gov * Enhanced 2008, Matt Dunkle Matthew.L.Dunkle@nasa.gov * - * $Id: packet-vcdu.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-vicp.c wireshark-1.10.6/epan/dissectors/packet-vicp.c --- wireshark-1.10.5/epan/dissectors/packet-vicp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-vicp.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * Written by Frank Kingswood * Copyright 2008, Artimi Ltd. * - * $Id: packet-vicp.c 46928 2013-01-04 05:22:43Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-vines.c wireshark-1.10.6/epan/dissectors/packet-vines.c --- wireshark-1.10.5/epan/dissectors/packet-vines.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-vines.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-vines.c * Routines for Banyan VINES protocol packet disassembly * - * $Id: packet-vines.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Don Lafontaine * diff -Nru wireshark-1.10.5/epan/dissectors/packet-vines.h wireshark-1.10.6/epan/dissectors/packet-vines.h --- wireshark-1.10.5/epan/dissectors/packet-vines.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-vines.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-vines.h * Definitions for packet disassembly structures and routines * - * $Id: packet-vines.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Don Lafontaine * diff -Nru wireshark-1.10.5/epan/dissectors/packet-vj.c wireshark-1.10.6/epan/dissectors/packet-vj.c --- wireshark-1.10.5/epan/dissectors/packet-vj.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-vj.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-vj.c * Routines for Van Jacobson header decompression. (See RFC 1144.) * - * $Id: packet-vj.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-vlan.c wireshark-1.10.6/epan/dissectors/packet-vlan.c --- wireshark-1.10.5/epan/dissectors/packet-vlan.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-vlan.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-vlan.c * Routines for VLAN 802.1Q ethernet header disassembly * - * $Id: packet-vlan.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-vlan.h wireshark-1.10.6/epan/dissectors/packet-vlan.h --- wireshark-1.10.5/epan/dissectors/packet-vlan.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-vlan.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-vlan.h * - * $Id: packet-vlan.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-vmlab.c wireshark-1.10.6/epan/dissectors/packet-vmlab.c --- wireshark-1.10.5/epan/dissectors/packet-vmlab.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-vmlab.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-vmlab.c * Routines for VMware Lab Manager Frame Dis-assembly * - * $Id: packet-vmlab.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-vnc.c wireshark-1.10.6/epan/dissectors/packet-vnc.c --- wireshark-1.10.5/epan/dissectors/packet-vnc.c 2013-06-30 20:15:20.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-vnc.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2005, Ulf Lamping * Copyright 2006-2007, Stephen Fisher (see AUTHORS file) * - * $Id: packet-vnc.c 50266 2013-06-30 20:09:41Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-vntag.c wireshark-1.10.6/epan/dissectors/packet-vntag.c --- wireshark-1.10.5/epan/dissectors/packet-vntag.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-vntag.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-vntag.c * - * $Id: packet-vntag.c 47459 2013-02-03 22:29:48Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-vrrp.c wireshark-1.10.6/epan/dissectors/packet-vrrp.c --- wireshark-1.10.5/epan/dissectors/packet-vrrp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-vrrp.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * * Heikki Vatiainen * - * $Id: packet-vrrp.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-vrt.c wireshark-1.10.6/epan/dissectors/packet-vrt.c --- wireshark-1.10.5/epan/dissectors/packet-vrt.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-vrt.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * * Original dissector repository: https://github.com/bistromath/vrt-dissector * - * $Id: packet-vrt.c 48638 2013-03-29 13:22:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-vssmonitoring.c wireshark-1.10.6/epan/dissectors/packet-vssmonitoring.c --- wireshark-1.10.5/epan/dissectors/packet-vssmonitoring.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-vssmonitoring.c 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * * 20111205 - First edition by Sake Blok (sake.blok@SYN-bit.nl) * - * $Id: packet-vssmonitoring.c 48933 2013-04-19 16:40:06Z jmayer $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-vtp.c wireshark-1.10.6/epan/dissectors/packet-vtp.c --- wireshark-1.10.5/epan/dissectors/packet-vtp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-vtp.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-vtp.c * Routines for the disassembly of Cisco's VLAN Trunking Protocol * - * $Id: packet-vtp.c 48032 2013-03-03 07:29:28Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-vuze-dht.c wireshark-1.10.6/epan/dissectors/packet-vuze-dht.c --- wireshark-1.10.5/epan/dissectors/packet-vuze-dht.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-vuze-dht.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Vuze-DHT dissection * Copyright 2011, Xiao Xiangquan * - * $Id: packet-vuze-dht.c 46324 2012-12-02 04:49:13Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-vxi11.c wireshark-1.10.6/epan/dissectors/packet-vxi11.c --- wireshark-1.10.5/epan/dissectors/packet-vxi11.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-vxi11.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-vxi11.c * Routines for VXI-11 (TCP/IP Instrument Protocol) dissection. * - * $Id: packet-vxi11.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-vxlan.c wireshark-1.10.6/epan/dissectors/packet-vxlan.c --- wireshark-1.10.5/epan/dissectors/packet-vxlan.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-vxlan.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Routines for Virtual eXtensible Local Area Network (VXLAN) packet dissection * - * $Id: packet-vxlan.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wai.c wireshark-1.10.6/epan/dissectors/packet-wai.c --- wireshark-1.10.5/epan/dissectors/packet-wai.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wai.c 2014-03-07 18:07:14.000000000 +0000 @@ -7,7 +7,7 @@ * Lukasz Suchy * Copyright 2010, Tieto. * - * $Id: packet-wai.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wap.c wireshark-1.10.6/epan/dissectors/packet-wap.c --- wireshark-1.10.5/epan/dissectors/packet-wap.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wap.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Utility routines for WAP dissectors * - * $Id: packet-wap.c 46490 2012-12-10 19:12:05Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wap.h wireshark-1.10.6/epan/dissectors/packet-wap.h --- wireshark-1.10.5/epan/dissectors/packet-wap.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wap.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Declarations for WAP packet disassembly * - * $Id: packet-wap.h 46490 2012-12-10 19:12:05Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wassp.c wireshark-1.10.6/epan/dissectors/packet-wassp.c --- wireshark-1.10.5/epan/dissectors/packet-wassp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wassp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the disassembly of the Chantry/HiPath AP-Controller * tunneling protocol. * - * $Id: packet-wassp.c 47924 2013-02-27 22:43:54Z guy $ + * $Id$ * * Copyright 2009 Joerg Mayer (see AUTHORS file) * diff -Nru wireshark-1.10.5/epan/dissectors/packet-waveagent.c wireshark-1.10.6/epan/dissectors/packet-waveagent.c --- wireshark-1.10.5/epan/dissectors/packet-waveagent.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-waveagent.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for WaveAgent dissection * Copyright 2009-2011, Tom Cook * - * $Id: packet-waveagent.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wbxml.c wireshark-1.10.6/epan/dissectors/packet-wbxml.c --- wireshark-1.10.5/epan/dissectors/packet-wbxml.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wbxml.c 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * Routines for WV-CSP 1.3 dissection * Copyright 2007, Andrei Rubaniuk. * - * $Id: packet-wbxml.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Refer to the AUTHORS file or the AUTHORS section in the man page * for contacting the author(s) of this file. diff -Nru wireshark-1.10.5/epan/dissectors/packet-wccp.c wireshark-1.10.6/epan/dissectors/packet-wccp.c --- wireshark-1.10.5/epan/dissectors/packet-wccp.c 2013-10-09 16:14:19.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wccp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Web Cache Communication Protocol dissection * Jerry Talkington * - * $Id: packet-wccp.c 52465 2013-10-09 16:08:39Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wccp.h wireshark-1.10.6/epan/dissectors/packet-wccp.h --- wireshark-1.10.5/epan/dissectors/packet-wccp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wccp.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-wccp.h * Declarations for Cisco Web Cache Communication Protocol * - * $Id: packet-wccp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wcp.c wireshark-1.10.6/epan/dissectors/packet-wcp.c --- wireshark-1.10.5/epan/dissectors/packet-wcp.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wcp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Wellfleet Compression frame disassembly * Copyright 2001, Jeffrey C. Foster * - * $Id: packet-wcp.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-websocket.c wireshark-1.10.6/epan/dissectors/packet-websocket.c --- wireshark-1.10.5/epan/dissectors/packet-websocket.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-websocket.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for WebSocket dissection * Copyright 2012, Alexis La Goutte * - * $Id: packet-websocket.c 48336 2013-03-16 02:56:17Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wfleet-hdlc.c wireshark-1.10.6/epan/dissectors/packet-wfleet-hdlc.c --- wireshark-1.10.5/epan/dissectors/packet-wfleet-hdlc.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wfleet-hdlc.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Wellfleet HDLC packet disassembly * Copied from the Cisco HDLC packet disassembly routines * - * $Id: packet-wfleet-hdlc.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-who.c wireshark-1.10.6/epan/dissectors/packet-who.c --- wireshark-1.10.5/epan/dissectors/packet-who.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-who.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for who protocol (see man rwhod) * Gilbert Ramirez * - * $Id: packet-who.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wifi-p2p.c wireshark-1.10.6/epan/dissectors/packet-wifi-p2p.c --- wireshark-1.10.5/epan/dissectors/packet-wifi-p2p.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wifi-p2p.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 2009-2010 Atheros Communications * - * $Id: packet-wifi-p2p.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/epan/dissectors/packet-wifi-p2p.h wireshark-1.10.6/epan/dissectors/packet-wifi-p2p.h --- wireshark-1.10.5/epan/dissectors/packet-wifi-p2p.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wifi-p2p.h 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 2009-2010 Atheros Communications * - * $Id: packet-wifi-p2p.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/epan/dissectors/packet-windows-common.c wireshark-1.10.6/epan/dissectors/packet-windows-common.c --- wireshark-1.10.5/epan/dissectors/packet-windows-common.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-windows-common.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-windows-common.c * Routines for dissecting various Windows data types * - * $Id: packet-windows-common.c 47924 2013-02-27 22:43:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-windows-common.h wireshark-1.10.6/epan/dissectors/packet-windows-common.h --- wireshark-1.10.5/epan/dissectors/packet-windows-common.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-windows-common.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-windows-common.h * Declarations for dissecting various Windows data types * - * $Id: packet-windows-common.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-winsrepl.c wireshark-1.10.6/epan/dissectors/packet-winsrepl.c --- wireshark-1.10.5/epan/dissectors/packet-winsrepl.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-winsrepl.c 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright 2005 Stefan Metzmacher * - * $Id: packet-winsrepl.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wlancertextn.c wireshark-1.10.6/epan/dissectors/packet-wlancertextn.c --- wireshark-1.10.5/epan/dissectors/packet-wlancertextn.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wlancertextn.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for Wireless Certificate Extension (RFC3770) * Ronnie Sahlberg 2005 * - * $Id: packet-wlancertextn.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wlancertextn.h wireshark-1.10.6/epan/dissectors/packet-wlancertextn.h --- wireshark-1.10.5/epan/dissectors/packet-wlancertextn.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wlancertextn.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for Wireless Certificate Extensions (RFC3770) packet dissection * Ronnie Sahlberg 2005 * - * $Id: packet-wlancertextn.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wlccp.c wireshark-1.10.6/epan/dissectors/packet-wlccp.c --- wireshark-1.10.5/epan/dissectors/packet-wlccp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wlccp.c 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * Copyright 2006, Stephen Fisher (see AUTHORS file) * Copyright 2007, Kevin A. Noll * - * $Id: packet-wlccp.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wol.c wireshark-1.10.6/epan/dissectors/packet-wol.c --- wireshark-1.10.5/epan/dissectors/packet-wol.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wol.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for WOL dissection * Copyright 2007, Christopher Maynard * - * $Id: packet-wol.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wow.c wireshark-1.10.6/epan/dissectors/packet-wow.c --- wireshark-1.10.5/epan/dissectors/packet-wow.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wow.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for World of Warcraft (WoW) protocol dissection * Copyright 2008-2009, Stephen Fisher (see AUTHORS file) * - * $Id: packet-wow.c 47821 2013-02-22 16:51:06Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wps.c wireshark-1.10.6/epan/dissectors/packet-wps.c --- wireshark-1.10.5/epan/dissectors/packet-wps.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wps.c 2014-03-07 18:07:14.000000000 +0000 @@ -12,7 +12,7 @@ * * Copyright 2007 Jens Braeuer * - * $Id: packet-wps.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wps.h wireshark-1.10.6/epan/dissectors/packet-wps.h --- wireshark-1.10.5/epan/dissectors/packet-wps.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wps.h 2014-03-07 18:07:14.000000000 +0000 @@ -12,7 +12,7 @@ * * Copyright 2007 Jens Braeuer * - * $Id: packet-wps.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wreth.c wireshark-1.10.6/epan/dissectors/packet-wreth.c --- wireshark-1.10.5/epan/dissectors/packet-wreth.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wreth.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-wreth.c * Functions for the WSE Remote Ethernet Dissector * - * $Id: packet-wreth.c 48889 2013-04-16 21:57:36Z eapache $ + * $Id$ * * Dissector - WSE RemoteEthernet * By Clement Marrast diff -Nru wireshark-1.10.5/epan/dissectors/packet-wsmp.c wireshark-1.10.6/epan/dissectors/packet-wsmp.c --- wireshark-1.10.5/epan/dissectors/packet-wsmp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wsmp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for WAVE Short Message dissection (WSMP) * Copyright 2008, Arada Systems (http://www.aradasystems.com) (email: siva@aradasystems.com) * - * $Id: packet-wsmp.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wsp.c wireshark-1.10.6/epan/dissectors/packet-wsp.c --- wireshark-1.10.5/epan/dissectors/packet-wsp.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wsp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Routines to dissect WSP component of WAP traffic. * - * $Id: packet-wsp.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Refer to the AUTHORS file or the AUTHORS section in the man page * for contacting the author(s) of this file. diff -Nru wireshark-1.10.5/epan/dissectors/packet-wsp.h wireshark-1.10.6/epan/dissectors/packet-wsp.h --- wireshark-1.10.5/epan/dissectors/packet-wsp.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wsp.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Declarations for disassembly of WSP component of WAP traffic. * - * $Id: packet-wsp.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wtls.c wireshark-1.10.6/epan/dissectors/packet-wtls.c --- wireshark-1.10.5/epan/dissectors/packet-wtls.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wtls.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Routines to dissect WTLS component of WAP traffic. * - * $Id: packet-wtls.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wtls.h wireshark-1.10.6/epan/dissectors/packet-wtls.h --- wireshark-1.10.5/epan/dissectors/packet-wtls.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wtls.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Declarations for disassembly of WTLS component of WAP traffic. * - * $Id: packet-wtls.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wtp.c wireshark-1.10.6/epan/dissectors/packet-wtp.c --- wireshark-1.10.5/epan/dissectors/packet-wtp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wtp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Routines to dissect WTP component of WAP traffic. * - * $Id: packet-wtp.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-wtp.h wireshark-1.10.6/epan/dissectors/packet-wtp.h --- wireshark-1.10.5/epan/dissectors/packet-wtp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-wtp.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Declarations for disassembly of WTP component of WAP traffic. * - * $Id: packet-wtp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-x11.c wireshark-1.10.6/epan/dissectors/packet-x11.c --- wireshark-1.10.5/epan/dissectors/packet-x11.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-x11.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2000, Christophe Tronche * Copyright 2003, Michael Shuldman * - * $Id: packet-x11.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-x11.h wireshark-1.10.6/epan/dissectors/packet-x11.h --- wireshark-1.10.5/epan/dissectors/packet-x11.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-x11.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-x11.h * - * $Id: packet-x11.h 43558 2012-07-03 18:49:12Z wmeier $ + * $Id$ * * Put here so as to make packet-x11.c lighter. See packet-x11.c * This .h file should be included *only* in packet-x11.c diff -Nru wireshark-1.10.5/epan/dissectors/packet-x11-keysymdef.h wireshark-1.10.6/epan/dissectors/packet-x11-keysymdef.h --- wireshark-1.10.5/epan/dissectors/packet-x11-keysymdef.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-x11-keysymdef.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright holders: Digital, The Open Group * (see below for their copyright statement) * - * $Id: packet-x11-keysymdef.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-x224.c wireshark-1.10.6/epan/dissectors/packet-x224.c --- wireshark-1.10.5/epan/dissectors/packet-x224.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-x224.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Routine to dissect X.224 * Copyright 2007, Ronnie Sahlberg * - * $Id: packet-x224.c 48609 2013-03-28 07:34:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-x25.c wireshark-1.10.6/epan/dissectors/packet-x25.c --- wireshark-1.10.5/epan/dissectors/packet-x25.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-x25.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for X.25 packet disassembly * Olivier Abad * - * $Id: packet-x25.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-x29.c wireshark-1.10.6/epan/dissectors/packet-x29.c --- wireshark-1.10.5/epan/dissectors/packet-x29.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-x29.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-x29.c * Routines for X.29 packet dissection * - * $Id: packet-x29.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-x2ap.c wireshark-1.10.6/epan/dissectors/packet-x2ap.c --- wireshark-1.10.5/epan/dissectors/packet-x2ap.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-x2ap.c 2014-03-07 18:07:14.000000000 +0000 @@ -12,7 +12,7 @@ * 3GPP TS 36.423 packet dissection * Copyright 2007-2010, Anders Broman * - * $Id: packet-x2ap.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-x509af.c wireshark-1.10.6/epan/dissectors/packet-x509af.c --- wireshark-1.10.5/epan/dissectors/packet-x509af.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-x509af.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.509 Authentication Framework packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509af.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-x509af.h wireshark-1.10.6/epan/dissectors/packet-x509af.h --- wireshark-1.10.5/epan/dissectors/packet-x509af.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-x509af.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.509 Authentication Framework packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509af.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-x509ce.c wireshark-1.10.6/epan/dissectors/packet-x509ce.c --- wireshark-1.10.5/epan/dissectors/packet-x509ce.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-x509ce.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.509 Certificate Extensions packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509ce.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-x509ce.h wireshark-1.10.6/epan/dissectors/packet-x509ce.h --- wireshark-1.10.5/epan/dissectors/packet-x509ce.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-x509ce.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.509 Certificate Extensions packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509ce.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-x509if.c wireshark-1.10.6/epan/dissectors/packet-x509if.c --- wireshark-1.10.5/epan/dissectors/packet-x509if.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-x509if.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.509 Information Framework packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509if.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-x509if.h wireshark-1.10.6/epan/dissectors/packet-x509if.h --- wireshark-1.10.5/epan/dissectors/packet-x509if.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-x509if.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.509 Information Framework packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509if.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-x509sat.c wireshark-1.10.6/epan/dissectors/packet-x509sat.c --- wireshark-1.10.5/epan/dissectors/packet-x509sat.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-x509sat.c 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.509 Selected Attribute Types packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509sat.c 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-x509sat.h wireshark-1.10.6/epan/dissectors/packet-x509sat.h --- wireshark-1.10.5/epan/dissectors/packet-x509sat.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-x509sat.h 2014-03-07 18:07:14.000000000 +0000 @@ -10,7 +10,7 @@ * Routines for X.509 Selected Attribute Types packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509sat.h 48820 2013-04-11 18:14:53Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xcsl.c wireshark-1.10.6/epan/dissectors/packet-xcsl.c --- wireshark-1.10.5/epan/dissectors/packet-xcsl.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xcsl.c 2014-03-07 18:07:14.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 2008, Dick Gooris (gooris@alcatel-lucent.com) * - * $Id: packet-xcsl.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xdmcp.c wireshark-1.10.6/epan/dissectors/packet-xdmcp.c --- wireshark-1.10.5/epan/dissectors/packet-xdmcp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xdmcp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for XDMCP message dissection * Copyright 2002, Pasi Eronen * - * $Id: packet-xdmcp.c 47416 2013-02-01 09:22:49Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xmcp.c wireshark-1.10.6/epan/dissectors/packet-xmcp.c --- wireshark-1.10.5/epan/dissectors/packet-xmcp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xmcp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for eXtensible Messaging Client Protocol (XMCP) dissection * Copyright 2011, Glenn Matthews * - * $Id: packet-xmcp.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xml.c wireshark-1.10.6/epan/dissectors/packet-xml.c --- wireshark-1.10.5/epan/dissectors/packet-xml.c 2013-08-19 11:31:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xml.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * (C) 2005, Luis E. Garcia Ontanon. * - * $Id: packet-xml.c 51425 2013-08-19 11:25:35Z pascal $ + * $Id$ * * Refer to the AUTHORS file or the AUTHORS section in the man page * for contacting the author(s) of this file. diff -Nru wireshark-1.10.5/epan/dissectors/packet-xml.h wireshark-1.10.6/epan/dissectors/packet-xml.h --- wireshark-1.10.5/epan/dissectors/packet-xml.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xml.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-xml.h * wireshark's xml dissector . * - * $Id: packet-xml.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xmpp.c wireshark-1.10.6/epan/dissectors/packet-xmpp.c --- wireshark-1.10.5/epan/dissectors/packet-xmpp.c 2013-10-29 22:10:51.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xmpp.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2011, Mariusz Okroj * - * $Id: packet-xmpp.c 52970 2013-10-29 21:58:59Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xmpp-conference.c wireshark-1.10.6/epan/dissectors/packet-xmpp-conference.c --- wireshark-1.10.5/epan/dissectors/packet-xmpp-conference.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xmpp-conference.c 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright 2011, Mariusz Okroj * - * $Id: packet-xmpp-conference.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xmpp-conference.h wireshark-1.10.6/epan/dissectors/packet-xmpp-conference.h --- wireshark-1.10.5/epan/dissectors/packet-xmpp-conference.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xmpp-conference.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Copyright 2011, Mariusz Okroj * - * $Id: packet-xmpp-conference.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xmpp-core.c wireshark-1.10.6/epan/dissectors/packet-xmpp-core.c --- wireshark-1.10.5/epan/dissectors/packet-xmpp-core.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xmpp-core.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2011, Mariusz Okroj * - * $Id: packet-xmpp-core.c 48412 2013-03-19 04:54:30Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xmpp-core.h wireshark-1.10.6/epan/dissectors/packet-xmpp-core.h --- wireshark-1.10.5/epan/dissectors/packet-xmpp-core.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xmpp-core.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Copyright 2011, Mariusz Okroj * - * $Id: packet-xmpp-core.h 44088 2012-07-28 03:09:46Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xmpp-gtalk.c wireshark-1.10.6/epan/dissectors/packet-xmpp-gtalk.c --- wireshark-1.10.5/epan/dissectors/packet-xmpp-gtalk.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xmpp-gtalk.c 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright 2011, Mariusz Okroj * - * $Id: packet-xmpp-gtalk.c 48412 2013-03-19 04:54:30Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xmpp-gtalk.h wireshark-1.10.6/epan/dissectors/packet-xmpp-gtalk.h --- wireshark-1.10.5/epan/dissectors/packet-xmpp-gtalk.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xmpp-gtalk.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Copyright 2011, Mariusz Okroj * - * $Id: packet-xmpp-gtalk.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xmpp.h wireshark-1.10.6/epan/dissectors/packet-xmpp.h --- wireshark-1.10.5/epan/dissectors/packet-xmpp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xmpp.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Copyright 2011, Mariusz Okroj * - * $Id: packet-xmpp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xmpp-jingle.c wireshark-1.10.6/epan/dissectors/packet-xmpp-jingle.c --- wireshark-1.10.5/epan/dissectors/packet-xmpp-jingle.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xmpp-jingle.c 2014-03-07 18:07:14.000000000 +0000 @@ -18,7 +18,7 @@ * * Copyright 2011, Mariusz Okroj * - * $Id: packet-xmpp-jingle.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xmpp-jingle.h wireshark-1.10.6/epan/dissectors/packet-xmpp-jingle.h --- wireshark-1.10.5/epan/dissectors/packet-xmpp-jingle.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xmpp-jingle.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Copyright 2011, Mariusz Okroj * - * $Id: packet-xmpp-jingle.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xmpp-other.c wireshark-1.10.6/epan/dissectors/packet-xmpp-other.c --- wireshark-1.10.5/epan/dissectors/packet-xmpp-other.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xmpp-other.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2011, Mariusz Okroj * - * $Id: packet-xmpp-other.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xmpp-other.h wireshark-1.10.6/epan/dissectors/packet-xmpp-other.h --- wireshark-1.10.5/epan/dissectors/packet-xmpp-other.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xmpp-other.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Copyright 2011, Mariusz Okroj * - * $Id: packet-xmpp-other.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xmpp-utils.c wireshark-1.10.6/epan/dissectors/packet-xmpp-utils.c --- wireshark-1.10.5/epan/dissectors/packet-xmpp-utils.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xmpp-utils.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2011, Mariusz Okroj * - * $Id: packet-xmpp-utils.c 48013 2013-03-02 19:21:38Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xmpp-utils.h wireshark-1.10.6/epan/dissectors/packet-xmpp-utils.h --- wireshark-1.10.5/epan/dissectors/packet-xmpp-utils.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xmpp-utils.h 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * * Copyright 2011, Mariusz Okroj * - * $Id: packet-xmpp-utils.h 48641 2013-03-29 17:43:14Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xot.c wireshark-1.10.6/epan/dissectors/packet-xot.c --- wireshark-1.10.5/epan/dissectors/packet-xot.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xot.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2000, Paul Ionescu * - * $Id: packet-xot.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xtp.c wireshark-1.10.6/epan/dissectors/packet-xtp.c --- wireshark-1.10.5/epan/dissectors/packet-xtp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xtp.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Xpress Transport Protocol dissection * Copyright 2008, Shigeo Nakamura * - * $Id: packet-xtp.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-xyplex.c wireshark-1.10.6/epan/dissectors/packet-xyplex.c --- wireshark-1.10.5/epan/dissectors/packet-xyplex.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-xyplex.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2002 Randy McEoin * - * $Id: packet-xyplex.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-yami.c wireshark-1.10.6/epan/dissectors/packet-yami.c --- wireshark-1.10.5/epan/dissectors/packet-yami.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-yami.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2010, Pawel Korbut * Copyright 2012, Jakub Zawadzki * - * $Id: packet-yami.c 48317 2013-03-15 16:35:54Z etxrab $ + * $Id$ * * Protocol documentation available at http://www.inspirel.com/yami4/book/B-2.html * diff -Nru wireshark-1.10.5/epan/dissectors/packet-yhoo.c wireshark-1.10.6/epan/dissectors/packet-yhoo.c --- wireshark-1.10.5/epan/dissectors/packet-yhoo.c 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-yhoo.c 2014-03-07 18:07:14.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for yahoo messenger packet dissection * Copyright 1999, Nathan Neulinger * - * $Id: packet-yhoo.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ymsg.c wireshark-1.10.6/epan/dissectors/packet-ymsg.c --- wireshark-1.10.5/epan/dissectors/packet-ymsg.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ymsg.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2003, Wayne Parrott * Copied from packet-yhoo.c and updated * - * $Id: packet-ymsg.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ypbind.c wireshark-1.10.6/epan/dissectors/packet-ypbind.c --- wireshark-1.10.5/epan/dissectors/packet-ypbind.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ypbind.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ypbind.c * Routines for ypbind dissection * - * $Id: packet-ypbind.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ypbind.h wireshark-1.10.6/epan/dissectors/packet-ypbind.h --- wireshark-1.10.5/epan/dissectors/packet-ypbind.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ypbind.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ypbind.h * - * $Id: packet-ypbind.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-yppasswd.c wireshark-1.10.6/epan/dissectors/packet-yppasswd.c --- wireshark-1.10.5/epan/dissectors/packet-yppasswd.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-yppasswd.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-yppasswd.c * Routines for yppasswd dissection * - * $Id: packet-yppasswd.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-yppasswd.h wireshark-1.10.6/epan/dissectors/packet-yppasswd.h --- wireshark-1.10.5/epan/dissectors/packet-yppasswd.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-yppasswd.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-yppasswd.h * - * $Id: packet-yppasswd.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ypserv.c wireshark-1.10.6/epan/dissectors/packet-ypserv.c --- wireshark-1.10.5/epan/dissectors/packet-ypserv.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ypserv.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ypserv.c * Routines for ypserv dissection * - * $Id: packet-ypserv.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ypserv.h wireshark-1.10.6/epan/dissectors/packet-ypserv.h --- wireshark-1.10.5/epan/dissectors/packet-ypserv.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ypserv.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ypserv.h * - * $Id: packet-ypserv.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ypxfr.c wireshark-1.10.6/epan/dissectors/packet-ypxfr.c --- wireshark-1.10.5/epan/dissectors/packet-ypxfr.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ypxfr.c 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ypxfr.c * Routines for ypxfr dissection * - * $Id: packet-ypxfr.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ypxfr.h wireshark-1.10.6/epan/dissectors/packet-ypxfr.h --- wireshark-1.10.5/epan/dissectors/packet-ypxfr.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ypxfr.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ypxfr.h * - * $Id: packet-ypxfr.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-zbee-aps.c wireshark-1.10.6/epan/dissectors/packet-zbee-aps.c --- wireshark-1.10.5/epan/dissectors/packet-zbee-aps.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-zbee-aps.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By Owen Kirby * Copyright 2009 Exegin Technologies Limited * - * $Id: packet-zbee-aps.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-zbee-aps.h wireshark-1.10.6/epan/dissectors/packet-zbee-aps.h --- wireshark-1.10.5/epan/dissectors/packet-zbee-aps.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-zbee-aps.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By Owen Kirby * Copyright 2009 Exegin Technologies Limited * - * $Id: packet-zbee-aps.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-zbee.h wireshark-1.10.6/epan/dissectors/packet-zbee.h --- wireshark-1.10.5/epan/dissectors/packet-zbee.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-zbee.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By Owen Kirby * Copyright 2009 Exegin Technologies Limited * - * $Id: packet-zbee.h 43990 2012-07-25 12:19:21Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-zbee-nwk.c wireshark-1.10.6/epan/dissectors/packet-zbee-nwk.c --- wireshark-1.10.5/epan/dissectors/packet-zbee-nwk.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-zbee-nwk.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By Owen Kirby * Copyright 2009 Exegin Technologies Limited * - * $Id: packet-zbee-nwk.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-zbee-nwk.h wireshark-1.10.6/epan/dissectors/packet-zbee-nwk.h --- wireshark-1.10.5/epan/dissectors/packet-zbee-nwk.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-zbee-nwk.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By Owen Kirby * Copyright 2009 Exegin Technologies Limited * - * $Id: packet-zbee-nwk.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-zbee-security.c wireshark-1.10.6/epan/dissectors/packet-zbee-security.c --- wireshark-1.10.5/epan/dissectors/packet-zbee-security.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-zbee-security.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By Owen Kirby ; portions by Fred Fierling * Copyright 2009 Exegin Technologies Limited * - * $Id: packet-zbee-security.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-zbee-security.h wireshark-1.10.6/epan/dissectors/packet-zbee-security.h --- wireshark-1.10.5/epan/dissectors/packet-zbee-security.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-zbee-security.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By Owen Kirby * Copyright 2009 Exegin Technologies Limited * - * $Id: packet-zbee-security.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-zbee-zcl.c wireshark-1.10.6/epan/dissectors/packet-zbee-zcl.c --- wireshark-1.10.5/epan/dissectors/packet-zbee-zcl.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-zbee-zcl.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By Fred Fierling * Copyright 2009 Exegin Technologies Limited * - * $Id: packet-zbee-zcl.c 48462 2013-03-21 19:49:49Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-zbee-zcl.h wireshark-1.10.6/epan/dissectors/packet-zbee-zcl.h --- wireshark-1.10.5/epan/dissectors/packet-zbee-zcl.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-zbee-zcl.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By Fred Fierling * Copyright 2009 Exegin Technologies Limited * - * $Id: packet-zbee-zcl.h 48462 2013-03-21 19:49:49Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-zbee-zdp-binding.c wireshark-1.10.6/epan/dissectors/packet-zbee-zdp-binding.c --- wireshark-1.10.5/epan/dissectors/packet-zbee-zdp-binding.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-zbee-zdp-binding.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By Owen Kirby * Copyright 2009 Exegin Technologies Limited * - * $Id: packet-zbee-zdp-binding.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-zbee-zdp.c wireshark-1.10.6/epan/dissectors/packet-zbee-zdp.c --- wireshark-1.10.5/epan/dissectors/packet-zbee-zdp.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-zbee-zdp.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By Owen Kirby * Copyright 2009 Exegin Technologies Limited * - * $Id: packet-zbee-zdp.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-zbee-zdp-discovery.c wireshark-1.10.6/epan/dissectors/packet-zbee-zdp-discovery.c --- wireshark-1.10.5/epan/dissectors/packet-zbee-zdp-discovery.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-zbee-zdp-discovery.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By Owen Kirby * Copyright 2009 Exegin Technologies Limited * - * $Id: packet-zbee-zdp-discovery.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-zbee-zdp.h wireshark-1.10.6/epan/dissectors/packet-zbee-zdp.h --- wireshark-1.10.5/epan/dissectors/packet-zbee-zdp.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-zbee-zdp.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By Owen Kirby * Copyright 2009 Exegin Technologies Limited * - * $Id: packet-zbee-zdp.h 47284 2013-01-25 21:48:38Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-zbee-zdp-management.c wireshark-1.10.6/epan/dissectors/packet-zbee-zdp-management.c --- wireshark-1.10.5/epan/dissectors/packet-zbee-zdp-management.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-zbee-zdp-management.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By Owen Kirby * Copyright 2009 Exegin Technologies Limited * - * $Id: packet-zbee-zdp-management.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-zebra.c wireshark-1.10.6/epan/dissectors/packet-zebra.c --- wireshark-1.10.5/epan/dissectors/packet-zebra.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-zebra.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * * Jochen Friedrich * - * $Id: packet-zebra.c 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-zep.c wireshark-1.10.6/epan/dissectors/packet-zep.c --- wireshark-1.10.5/epan/dissectors/packet-zep.c 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-zep.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By Owen Kirby * Copyright 2009 Exegin Technologies Limited * - * $Id: packet-zep.c 47390 2013-01-31 18:31:28Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-zep.h wireshark-1.10.6/epan/dissectors/packet-zep.h --- wireshark-1.10.5/epan/dissectors/packet-zep.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-zep.h 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * By Owen Kirby * Copyright 2009 Exegin Technologies Limited * - * $Id: packet-zep.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ziop.c wireshark-1.10.6/epan/dissectors/packet-ziop.c --- wireshark-1.10.5/epan/dissectors/packet-ziop.c 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ziop.c 2014-03-07 18:07:14.000000000 +0000 @@ -7,7 +7,7 @@ * OMG mars/2008-12-20 * http://www.omg.org/docs/ptc/09-01-03.pdf * - * $Id: packet-ziop.c 45471 2012-10-11 14:22:13Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-ziop.h wireshark-1.10.6/epan/dissectors/packet-ziop.h --- wireshark-1.10.5/epan/dissectors/packet-ziop.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-ziop.h 2014-03-07 18:07:14.000000000 +0000 @@ -6,7 +6,7 @@ * Based on GIOP Compression FTF Beta 1 * OMG mars/2008-12-20 * - * $Id: packet-ziop.h 44860 2012-09-10 21:40:21Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/packet-zrtp.c wireshark-1.10.6/epan/dissectors/packet-zrtp.c --- wireshark-1.10.5/epan/dissectors/packet-zrtp.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/packet-zrtp.c 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ * IETF draft draft-zimmermann-avt-zrtp-22 * Copyright 2007, Sagar Pai * - * $Id: packet-zrtp.c 48430 2013-03-19 22:03:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/pidl/Makefile.am wireshark-1.10.6/epan/dissectors/pidl/Makefile.am --- wireshark-1.10.5/epan/dissectors/pidl/Makefile.am 2013-04-22 18:04:51.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/pidl/Makefile.am 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ # Makefile.am # -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/pidl/Makefile.in wireshark-1.10.6/epan/dissectors/pidl/Makefile.in --- wireshark-1.10.5/epan/dissectors/pidl/Makefile.in 2013-12-19 19:13:48.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/pidl/Makefile.in 2014-03-07 18:07:36.000000000 +0000 @@ -17,7 +17,7 @@ # Makefile.am # -# $Id: Makefile.am 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/pidl/mapi/mapicodes_enum.h wireshark-1.10.6/epan/dissectors/pidl/mapi/mapicodes_enum.h --- wireshark-1.10.5/epan/dissectors/pidl/mapi/mapicodes_enum.h 2013-04-22 18:04:48.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/pidl/mapi/mapicodes_enum.h 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ Copyright (C) Julien Kerihuel 2006 - $Id: mapicodes_enum.h 25096 2008-04-17 12:05:16Z sahlberg $ + $Id$ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru wireshark-1.10.5/epan/dissectors/pidl/mapi/mapi.idl wireshark-1.10.6/epan/dissectors/pidl/mapi/mapi.idl --- wireshark-1.10.5/epan/dissectors/pidl/mapi/mapi.idl 2013-04-22 18:04:48.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/pidl/mapi/mapi.idl 2014-03-07 18:07:14.000000000 +0000 @@ -3,7 +3,7 @@ Copyright (C) Julien Kerihuel 2007. - $Id: mapi.idl 25096 2008-04-17 12:05:16Z sahlberg $ + $Id$ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru wireshark-1.10.5/epan/dissectors/pidl/mapi/mapitags_enum.h wireshark-1.10.6/epan/dissectors/pidl/mapi/mapitags_enum.h --- wireshark-1.10.5/epan/dissectors/pidl/mapi/mapitags_enum.h 2013-04-22 18:04:48.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/pidl/mapi/mapitags_enum.h 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ Copyright (C) Julien Kerihuel 2006 - $Id: mapitags_enum.h 25096 2008-04-17 12:05:16Z sahlberg $ + $Id$ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru wireshark-1.10.5/epan/dissectors/pidl/rfr/rfr.idl wireshark-1.10.6/epan/dissectors/pidl/rfr/rfr.idl --- wireshark-1.10.5/epan/dissectors/pidl/rfr/rfr.idl 2013-04-22 18:04:49.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/pidl/rfr/rfr.idl 2014-03-07 18:07:14.000000000 +0000 @@ -5,7 +5,7 @@ Copyright (C) Julien Kerihuel 2008. - $Id: rfr.idl 28420 2009-05-19 23:22:59Z gerald $ + $Id$ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru wireshark-1.10.5/epan/dissectors/pidl/srvsvc.cnf wireshark-1.10.6/epan/dissectors/pidl/srvsvc.cnf --- wireshark-1.10.5/epan/dissectors/pidl/srvsvc.cnf 2013-04-22 18:04:51.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/pidl/srvsvc.cnf 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ # conformance file for SRVSVC # -# $Id: srvsvc.cnf 30630 2009-10-20 08:27:25Z stig $ +# $Id$ # MANUAL srvsvc_dissect_element_NetShareInfo_info1501_ diff -Nru wireshark-1.10.5/epan/dissectors/rpc_defrag.h wireshark-1.10.6/epan/dissectors/rpc_defrag.h --- wireshark-1.10.5/epan/dissectors/rpc_defrag.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/rpc_defrag.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* rpc_defrag.h * Declarations for RPC defragmentation * - * $Id: rpc_defrag.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/usb.c wireshark-1.10.6/epan/dissectors/usb.c --- wireshark-1.10.5/epan/dissectors/usb.c 2013-10-27 14:25:36.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/usb.c 2014-03-07 18:07:14.000000000 +0000 @@ -16,7 +16,7 @@ * Copyright (C) 2007 Ted Bullock * Copyright (C) 2012 Sony Mobile Communications AB * - * $Id: usb.c 52891 2013-10-27 14:19:23Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -45,6 +45,7 @@ { 0x0002, "Ingram" }, { 0x0003, "Club Mac" }, { 0x0004, "Nebraska Furniture Mart" }, + { 0x0011, "Unknown manufacturer" }, { 0x0053, "Planex" }, { 0x0079, "DragonRise Inc." }, { 0x0105, "Trust International B.V." }, @@ -1041,7 +1042,7 @@ { 0x0900, "Pinnacle Systems, Inc." }, { 0x0901, "VST Technologies" }, { 0x0906, "Faraday Technology Corp." }, - { 0x0908, "ShenZhen SANZHAI Technology Co.,Ltd" }, + { 0x0908, "Siemens AG" }, { 0x0909, "Audio-Technica Corp." }, { 0x090a, "Trumpion Microelectronics, Inc." }, { 0x090b, "Neurosmith" }, @@ -1935,6 +1936,7 @@ { 0x0ff6, "Core Valley Co., Ltd" }, { 0x0ff7, "CHI SHING Computer Accessories Co., Ltd" }, { 0x0ffc, "Clavia DMI AB" }, + { 0x0ffd, "EarlySense" }, { 0x0fff, "Aopen, Inc." }, { 0x1000, "Speed Tech Corp." }, { 0x1001, "Ritronics Components (S) Pte., Ltd" }, @@ -2601,6 +2603,7 @@ { 0x1b59, "K.S. Terminals Inc." }, { 0x1b5a, "Chao Zhou Kai Yuan Electric Co., Ltd." }, { 0x1b65, "The Hong Kong Standards and Testing Centre Ltd." }, + { 0x1b71, "Fushicai" }, { 0x1b72, "ATERGI TECHNOLOGY CO., LTD." }, { 0x1b73, "Fresco Logic" }, { 0x1b75, "Ovislink Corp." }, @@ -2769,6 +2772,7 @@ { 0x20df, "Simtec Electronics" }, { 0x20f4, "TRENDnet" }, { 0x2101, "ActionStar" }, + { 0x2149, "Advanced Silicon S.A." }, { 0x2162, "Creative (?)" }, { 0x2184, "GW Instek" }, { 0x21a1, "Emotiv Systems Pty. Ltd." }, @@ -2778,6 +2782,7 @@ { 0x2232, "Silicon Motion" }, { 0x2233, "RadioShack Corporation" }, { 0x2237, "Kobo Inc." }, + { 0x228d, "8D Technologies inc." }, { 0x22a6, "Pie Digital, Inc." }, { 0x22b8, "Motorola PCS" }, { 0x22b9, "eTurboTouch Technology, Inc." }, @@ -2894,14 +2899,15 @@ static const value_string usb_products_vals[] = { { 0x0001142b, "Arbiter Systems, Inc." }, { 0x00017778, "Counterfeit flash drive [Kingston]" }, + { 0x00117788, "Flash mass storage drive" }, { 0x00535301, "GW-US54ZGL 802.11bg" }, - { 0x00790006, "Generic USB Joystick" }, + { 0x00790006, "PC TWIN SHOCK Gamepad" }, { 0x00790011, "Gamepad" }, { 0x0105145f, "NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211]" }, { 0x01450112, "Card Reader" }, { 0x017c145f, "Trust Deskset" }, { 0x02000201, "MA180 UMTS Modem" }, - { 0x02046025, "CBM2080 Flash drive controller" }, + { 0x02046025, "CBM2080 / CBM2090 Flash drive controller" }, { 0x02046026, "CBM1180 Flash drive controller" }, { 0x02180301, "MIDI Port" }, { 0x02ad138c, "PVR Mass Storage" }, @@ -2956,6 +2962,7 @@ { 0x03eb2107, "AVR Dragon" }, { 0x03eb2109, "STK541 ZigBee Development Board" }, { 0x03eb210d, "XPLAIN evaluation kit (CDC ACM)" }, + { 0x03eb2110, "AVR JTAGICE3 Debugger and Programmer" }, { 0x03eb2122, "XMEGA-A1 Explained evaluation kit" }, { 0x03eb2310, "EVK11xx evaluation board" }, { 0x03eb2fe4, "ATxmega32A4U DFU bootloader" }, @@ -3198,6 +3205,7 @@ { 0x03f02504, "DeskJet F4200 series" }, { 0x03f02505, "ScanJet 3770" }, { 0x03f02512, "OfficeJet Pro L7300" }, + { 0x03f02514, "4-port hub" }, { 0x03f02517, "LaserJet 2410" }, { 0x03f0251d, "Gobi 2000 Wireless Modem" }, { 0x03f02524, "LP3065 30\" Monitor Hub" }, @@ -3323,6 +3331,7 @@ { 0x03f05017, "EWS UPD" }, { 0x03f05111, "PhotoSmart 3200 series" }, { 0x03f05211, "PhotoSmart 3300 series" }, + { 0x03f05307, "v165w Stick" }, { 0x03f05311, "OfficeJet 6300" }, { 0x03f05312, "Officejet Pro 8500A" }, { 0x03f05411, "OfficeJet 4300" }, @@ -3557,6 +3566,11 @@ { 0x04038372, "FT8U100AX Serial Port" }, { 0x04038a28, "Rainforest Automation ZigBee Controller" }, { 0x04038a98, "TIAO Multi-Protocol Adapter" }, + { 0x04038b28, "Alpermann+Velte TCI70" }, + { 0x04038b29, "Alpermann+Velte TC60 CLS" }, + { 0x04038b2a, "Alpermann+Velte Rubidium Q1" }, + { 0x04038b2b, "Alpermann+Velte TCD" }, + { 0x04038b2c, "Alpermann+Velte TCC70" }, { 0x04039133, "CallerID" }, { 0x04039135, "Rotary Pub alarm" }, { 0x04039e90, "Marvell OpenRD Base/Client" }, @@ -3591,6 +3605,7 @@ { 0x0403c8bc, "Alpermann+Velte Rubidium S1" }, { 0x0403c8bd, "Alpermann+Velte Rubidium T1" }, { 0x0403c8be, "Alpermann+Velte Rubidium D1" }, + { 0x0403c8bf, "Alpermann+Velte TC60 RLV" }, { 0x0403cc48, "Tactrix OpenPort 1.3 Mitsubishi" }, { 0x0403cc49, "Tactrix OpenPort 1.3 Subaru" }, { 0x0403cc4a, "Tactrix OpenPort 1.3 Universal" }, @@ -3863,6 +3878,7 @@ { 0x040a4000, "InkJet Color Printer" }, { 0x040a4021, "Photo Printer 6800" }, { 0x040a4022, "1400 Digital Photo Printer" }, + { 0x040a402e, "605 Photo Printer" }, { 0x040a4034, "805 Photo Printer" }, { 0x040a4056, "ESP 7200 Series AiO" }, { 0x040a4109, "EasyShare Printer Dock Series 3" }, @@ -4533,6 +4549,7 @@ { 0x043e7013, "MP3 Player" }, { 0x043e7040, "LG Electronics Inc. T54" }, { 0x043e70b1, "LG Electronics Inc. UP3" }, + { 0x043e70d7, "Mouse Scanner LSM-150 [LG Smart Scan Mouse]" }, { 0x043e70f5, "External HDD" }, { 0x043e8484, "LPC-U30 Webcam II" }, { 0x043e8585, "LPC-UC35 Webcam" }, @@ -4574,6 +4591,7 @@ { 0x044fb10a, "T.16000M Joystick" }, { 0x044fb203, "360 Modena Pro Wheel" }, { 0x044fb300, "Firestorm Dual Power" }, + { 0x044fb303, "FireStorm Dual Analog 2" }, { 0x044fb304, "Firestorm Dual Power" }, { 0x044fb307, "vibrating Upad" }, { 0x044fb30b, "Wireless VibrationPad" }, @@ -5002,6 +5020,7 @@ { 0x045e076d, "LifeCam HD-5000" }, { 0x045e0772, "LifeCam Studio" }, { 0x045e0779, "LifeCam HD-3000" }, + { 0x045e0780, "Comfort Curve Keyboard 3000" }, { 0x045e0797, "Optical Mouse 200" }, { 0x045e930a, "ISOUSB.SYS Intel 82930 Isochronous IO Test Board" }, { 0x045effca, "Catalina" }, @@ -5284,12 +5303,14 @@ { 0x046dc061, "RX1500 Laser Mouse" }, { 0x046dc062, "M-UAS144 [LS1 Laser Mouse]" }, { 0x046dc063, "DELL Laser Mouse" }, + { 0x046dc064, "M110 corded optical mouse (M-B0001)" }, { 0x046dc066, "G9x Laser Mouse" }, { 0x046dc068, "G500 Laser Mouse" }, { 0x046dc069, "M500 Laser Mouse" }, { 0x046dc06a, "USB Optical Mouse" }, { 0x046dc06b, "G700 Wireless Gaming Mouse" }, { 0x046dc06c, "Optical Mouse" }, + { 0x046dc077, "M105 Optical Mouse" }, { 0x046dc101, "UltraX Media Remote" }, { 0x046dc110, "Harmony 785/885 Remote" }, { 0x046dc111, "Harmony 525 Remote" }, @@ -5300,6 +5321,7 @@ { 0x046dc124, "Harmony 300 Remote" }, { 0x046dc125, "Harmony 200 Remote" }, { 0x046dc126, "Harmony Link" }, + { 0x046dc12b, "Harmony Touch Remote" }, { 0x046dc201, "WingMan Extreme Joystick with Throttle" }, { 0x046dc202, "WingMan Formula" }, { 0x046dc207, "WingMan Extreme Digital 3D" }, @@ -5329,12 +5351,18 @@ { 0x046dc225, "G11/G15 Keyboard / G keys" }, { 0x046dc226, "G15 Refresh Keyboard" }, { 0x046dc227, "G15 Refresh Keyboard" }, + { 0x046dc228, "G19 Gaming Keyboard" }, + { 0x046dc229, "G19 Gaming Keyboard Macro Interface" }, { 0x046dc22a, "Gaming Keyboard G110" }, { 0x046dc22b, "Gaming Keyboard G110 G-keys" }, { 0x046dc22d, "G510 Gaming Keyboard" }, { 0x046dc22e, "G510 Gaming Keyboard onboard audio" }, { 0x046dc245, "G400 Optical Mouse" }, { 0x046dc246, "Gaming Mouse G300" }, + { 0x046dc248, "G105 Gaming Keyboard" }, + { 0x046dc24a, "G600 Gaming Mouse" }, + { 0x046dc24d, "G710 Gaming Keyboard" }, + { 0x046dc24e, "G500s Laser Gaming Mouse" }, { 0x046dc281, "WingMan Force" }, { 0x046dc283, "WingMan Force 3D" }, { 0x046dc285, "WingMan Strike Force 3D" }, @@ -5694,6 +5722,7 @@ { 0x04800014, "InTouch Module" }, { 0x0480a006, "External Disk 1.5TB" }, { 0x0480a007, "External Disk USB 3.0" }, + { 0x0480a009, "Stor.E Basics" }, { 0x0480d010, "External Disk 3TB" }, { 0x0482000e, "FS-1020D Printer" }, { 0x0482000f, "FS-1920 Mono Printer" }, @@ -6425,6 +6454,7 @@ { 0x04a931e4, "Canon PowerShot SX20 IS" }, { 0x04a931e5, "Digital IXUS 200 IS" }, { 0x04a931e6, "Canon PowerShot SD940 IS" }, + { 0x04a931e7, "SELPHY CP790" }, { 0x04a931ea, "Canon Rebel T2i" }, { 0x04a931ee, "SELPHY ES40" }, { 0x04a931ef, "PowerShot A495" }, @@ -6487,11 +6517,13 @@ { 0x04a9325c, "Canon PowerShot SX500IS" }, { 0x04a9325f, "PowerShot SX280 HS" }, { 0x04a93260, "PowerShot SX270 HS" }, + { 0x04a93262, "PowerShot A2600" }, { 0x04a93264, "PowerShot A1400" }, { 0x04a93265, "Powershot ELPH 130 IS / IXUS 140" }, { 0x04a93268, "PowerShot ELPH 330 HS / IXUS 255 HS" }, { 0x04a93271, "PowerShot A2500" }, { 0x04a93276, "PowerShot SX170 IS" }, + { 0x04a93277, "PowerShot SX510 HS" }, { 0x04a9327d, "Powershot ELPH 115 IS / IXUS 132" }, { 0x04ad2501, "Bluetooth Device" }, { 0x04b00102, "Coolpix 990" }, @@ -6650,6 +6682,7 @@ { 0x04b34427, "Portable CD ROM" }, { 0x04b34482, "Serial Converter" }, { 0x04b34485, "Serial Converter" }, + { 0x04b34524, "40 Character Vacuum Fluorescent Display" }, { 0x04b34525, "Double sided CRT" }, { 0x04b34535, "4610 Suremark Printer" }, { 0x04b34550, "NVRAM (128 KB)" }, @@ -6976,6 +7009,7 @@ { 0x04c510fe, "S500" }, { 0x04c51140, "FOMA F903iX HIGH-SPEED" }, { 0x04c51150, "fi-6230" }, + { 0x04c5201d, "SATA 3.0 6Gbit/s Adaptor [GROOVY]" }, { 0x04c80720, "Digital Color Camera" }, { 0x04c80721, "e-miniD Camera" }, { 0x04c80722, "e-mini" }, @@ -6985,6 +7019,7 @@ { 0x04c80729, "Revio C2 Digital Camera" }, { 0x04c8072c, "Revio KD20M" }, { 0x04c8072d, "Revio KD410Z" }, + { 0x04ca004f, "SK-9020 keyboard" }, { 0x04ca1766, "HID Monitor Controls" }, { 0x04ca2004, "Bluetooth 4.0 [Broadcom BCM20702A0]" }, { 0x04ca9304, "Hub" }, @@ -7307,6 +7342,7 @@ { 0x04e65151, "SCR338 Keyboard Smart Card Reader" }, { 0x04e65292, "SCL011 RFID reader" }, { 0x04e65410, "SCR35xx Smart Card Reader" }, + { 0x04e65591, "SCL3711-NFC&RW" }, { 0x04e6e000, "SCRx31 Reader" }, { 0x04e6e001, "SCR331 SmartCard Reader" }, { 0x04e6e003, "SPR532 PinPad SmartCard Reader" }, @@ -7590,6 +7626,7 @@ { 0x04f20760, "Acer KU-0760 Keyboard" }, { 0x04f20841, "HP Multimedia Keyboard" }, { 0x04f20860, "2.4G Multimedia Wireless Kit" }, + { 0x04f21121, "Periboard 717 Mini Wireless Keyboard" }, { 0x04f2a001, "E-Video DC-100 Camera" }, { 0x04f2a120, "ORITE CCD Webcam(PC370R)" }, { 0x04f2a121, "ORITE CCD Webcam(PC370R)" }, @@ -11848,7 +11885,7 @@ { 0x08ffffff, "Sensor (Emulator)" }, { 0x09010001, "Hard Drive Adapter (TPP)" }, { 0x09010002, "SigmaDrive Adapter (TPP)" }, - { 0x09082701, "Spy Pen VGA" }, + { 0x09082701, "ShenZhen SANZHAI Technology Co.,Ltd Spy Pen VGA" }, { 0x090a1001, "T33520 Flash Card Controller" }, { 0x090a1100, "Comotron C3310 MP3 player" }, { 0x090a1200, "MP3 player" }, @@ -14245,6 +14282,7 @@ { 0x0fe9db11, "FusionHDTV DVB-T (MT352+Thomson7579) (initialized)" }, { 0x0fe9db78, "FusionHDTV DVB-T Dual Digital 4 (ZL10353+xc2028/xc3028) (initialized)" }, { 0x0ffc0021, "Nord Stage 2" }, + { 0x0ffdff00, "OEM" }, { 0x10030003, "SD14" }, { 0x10030100, "SD9/SD10" }, { 0x10041fae, "U8120 3G Cellphone" }, @@ -16180,6 +16218,7 @@ { 0x1b528101, "Camera V1" }, { 0x1b528102, "Recovery / Camera V2" }, { 0x1b528103, "Camera V3" }, + { 0x1b713002, "USBTV007 Video Grabber [EasyCAP]" }, { 0x1b731000, "xHC1 Controller" }, { 0x1b753072, "AirLive WN-360USB adapter" }, { 0x1b758171, "WN-370USB 802.11bgn Wireless Adapter [Realtek RTL8188SU]" }, @@ -16554,6 +16593,8 @@ { 0x20df0001, "Entropy Key [UDEKEY01]" }, { 0x20f4648b, "TEW-648UBM 802.11n 150Mbps Micro Wireless N Adapter [Realtek RTL8188CUS]" }, { 0x21010201, "SIIG 4-to-2 Printer Switch" }, + { 0x2149211b, "Touchscreen Controller" }, + { 0x21492703, "TS58xxA/TC56xxA [CoolTouch]" }, { 0x21622031, "Network Blaster Wireless Adapter" }, { 0x2162500c, "DE5771 Modem Blaster" }, { 0x21628001, "Broadxent BritePort DSL Bridge 8010U" }, @@ -16573,6 +16614,7 @@ { 0x22321037, "WebCam SC-03FFM12339N" }, { 0x22336323, "USB Electronic Scale" }, { 0x22374161, "eReader White" }, + { 0x228d0001, "Terminal Bike Key Reader" }, { 0x22a6ffff, "PieKey \"beta\" 4GB model 4E4F41482E4F5247 (SM3251Q BB)" }, { 0x22b80001, "Wally 2.2 chipset" }, { 0x22b80002, "Wally 2.4 chipset" }, diff -Nru wireshark-1.10.5/epan/dissectors/x11-declarations.h wireshark-1.10.6/epan/dissectors/x11-declarations.h --- wireshark-1.10.5/epan/dissectors/x11-declarations.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/x11-declarations.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It was automatically generated by ../../tools/process-x11-fields.pl. */ -/* $Id: x11-declarations.h 47837 2013-02-23 11:21:20Z alagoutte $ */ +/* $Id$ */ /* * Copyright 2000, Christophe Tronche diff -Nru wireshark-1.10.5/epan/dissectors/x11-enum.h wireshark-1.10.6/epan/dissectors/x11-enum.h --- wireshark-1.10.5/epan/dissectors/x11-enum.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/x11-enum.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It was automatically generated by ../../tools/process-x11-xcb.pl using xcbproto version 1.8-2-gc0d65da */ -/* $Id: x11-enum.h 47837 2013-02-23 11:21:20Z alagoutte $ */ +/* $Id$ */ /* * Copyright 2008, 2009 Open Text Corporation diff -Nru wireshark-1.10.5/epan/dissectors/x11-extension-errors.h wireshark-1.10.6/epan/dissectors/x11-extension-errors.h --- wireshark-1.10.5/epan/dissectors/x11-extension-errors.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/x11-extension-errors.h 2014-03-07 18:07:14.000000000 +0000 @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It was automatically generated by ../../tools/process-x11-xcb.pl using xcbproto version 1.8-2-gc0d65da */ -/* $Id: x11-extension-errors.h 47837 2013-02-23 11:21:20Z alagoutte $ */ +/* $Id$ */ /* * Copyright 2008, 2009 Open Text Corporation diff -Nru wireshark-1.10.5/epan/dissectors/x11-extension-implementation.h wireshark-1.10.6/epan/dissectors/x11-extension-implementation.h --- wireshark-1.10.5/epan/dissectors/x11-extension-implementation.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/x11-extension-implementation.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It was automatically generated by ../../tools/process-x11-xcb.pl using xcbproto version 1.8-2-gc0d65da */ -/* $Id: x11-extension-implementation.h 47837 2013-02-23 11:21:20Z alagoutte $ */ +/* $Id$ */ /* * Copyright 2008, 2009 Open Text Corporation diff -Nru wireshark-1.10.5/epan/dissectors/x11-fields wireshark-1.10.6/epan/dissectors/x11-fields --- wireshark-1.10.5/epan/dissectors/x11-fields 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/x11-fields 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ # # Copyright 2000, Christophe Tronche # -# $Id: x11-fields 43538 2012-06-28 23:18:38Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/dissectors/x11-glx-render-enum.h wireshark-1.10.6/epan/dissectors/x11-glx-render-enum.h --- wireshark-1.10.5/epan/dissectors/x11-glx-render-enum.h 2013-04-22 18:05:17.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/x11-glx-render-enum.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It was automatically generated by ../../tools/process-x11-xcb.pl using mesa version snb-magic-14719-g2fa9e4c */ -/* $Id: x11-glx-render-enum.h 47837 2013-02-23 11:21:20Z alagoutte $ */ +/* $Id$ */ /* * Copyright 2008, 2009 Open Text Corporation diff -Nru wireshark-1.10.5/epan/dissectors/x11-keysym.h wireshark-1.10.6/epan/dissectors/x11-keysym.h --- wireshark-1.10.5/epan/dissectors/x11-keysym.h 2013-04-22 18:05:15.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/x11-keysym.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ /* x11-keysym.h * - * $Id: x11-keysym.h 44638 2012-08-23 17:18:26Z wmeier $ + * $Id$ * * Put here so as to make packet-x11.c lighter. See packet-x11.c * This .h file should be included *only* in packet-x11.c diff -Nru wireshark-1.10.5/epan/dissectors/x11-register-info.h wireshark-1.10.6/epan/dissectors/x11-register-info.h --- wireshark-1.10.5/epan/dissectors/x11-register-info.h 2013-04-22 18:05:16.000000000 +0000 +++ wireshark-1.10.6/epan/dissectors/x11-register-info.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It was automatically generated by ../../tools/process-x11-fields.pl. */ -/* $Id: x11-register-info.h 47837 2013-02-23 11:21:20Z alagoutte $ */ +/* $Id$ */ /* * Copyright 2000, Christophe Tronche diff -Nru wireshark-1.10.5/epan/doxygen.cfg.in wireshark-1.10.6/epan/doxygen.cfg.in --- wireshark-1.10.5/epan/doxygen.cfg.in 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/doxygen.cfg.in 2014-03-07 18:07:15.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: doxygen.cfg.in 41594 2012-03-16 03:39:51Z guy $ +# $Id$ # @configure_input@ # The PROJECT_NAME tag is a single word (or a sequence of words surrounded diff -Nru wireshark-1.10.5/epan/dtd_grammar.lemon wireshark-1.10.6/epan/dtd_grammar.lemon --- wireshark-1.10.5/epan/dtd_grammar.lemon 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/dtd_grammar.lemon 2014-03-07 18:07:15.000000000 +0000 @@ -6,7 +6,7 @@ * * Copyright 2005, Luis E. Garcia Ontanon * -* $Id: dtd_grammar.lemon 48338 2013-03-16 08:52:09Z etxrab $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dtd.h wireshark-1.10.6/epan/dtd.h --- wireshark-1.10.5/epan/dtd.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/dtd.h 2014-03-07 18:07:15.000000000 +0000 @@ -6,7 +6,7 @@ * * Copyright 2005, Luis E. Garcia Ontanon * - * $Id: dtd.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dtd_parse.c wireshark-1.10.6/epan/dtd_parse.c --- wireshark-1.10.5/epan/dtd_parse.c 2013-12-19 19:21:24.000000000 +0000 +++ wireshark-1.10.6/epan/dtd_parse.c 2014-03-07 18:14:07.000000000 +0000 @@ -678,7 +678,7 @@ * * Copyright 2004, Luis E. Garcia Ontanon * - * $Id: dtd_parse.l 48338 2013-03-16 08:52:09Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dtd_parse.h wireshark-1.10.6/epan/dtd_parse.h --- wireshark-1.10.5/epan/dtd_parse.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/dtd_parse.h 2014-03-07 18:07:15.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright 2004, Luis E. Garcia Ontanon * -* $Id: dtd_parse.h 43538 2012-06-28 23:18:38Z darkjames $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dtd_parse.l wireshark-1.10.6/epan/dtd_parse.l --- wireshark-1.10.5/epan/dtd_parse.l 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/dtd_parse.l 2014-03-07 18:07:15.000000000 +0000 @@ -29,7 +29,7 @@ * * Copyright 2004, Luis E. Garcia Ontanon * - * $Id: dtd_parse.l 48338 2013-03-16 08:52:09Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dtd_preparse.c wireshark-1.10.6/epan/dtd_preparse.c --- wireshark-1.10.5/epan/dtd_preparse.c 2013-12-19 19:21:23.000000000 +0000 +++ wireshark-1.10.6/epan/dtd_preparse.c 2014-03-07 18:14:07.000000000 +0000 @@ -609,7 +609,7 @@ * * Copyright 2004, Luis E. Garcia Ontanon * - * $Id: dtd_preparse.l 48338 2013-03-16 08:52:09Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/dtd_preparse.l wireshark-1.10.6/epan/dtd_preparse.l --- wireshark-1.10.5/epan/dtd_preparse.l 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/dtd_preparse.l 2014-03-07 18:07:15.000000000 +0000 @@ -38,7 +38,7 @@ * * Copyright 2004, Luis E. Garcia Ontanon * - * $Id: dtd_preparse.l 48338 2013-03-16 08:52:09Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/eap.h wireshark-1.10.6/epan/eap.h --- wireshark-1.10.5/epan/eap.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/eap.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Extenal definitions for EAP Extensible Authentication Protocol dissection * RFC 2284, RFC 3748 * - * $Id: eap.h 48641 2013-03-29 17:43:14Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/emem.c wireshark-1.10.6/epan/emem.c --- wireshark-1.10.5/epan/emem.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/emem.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Wireshark memory management and garbage collection functions * Ronnie Sahlberg 2005 * - * $Id: emem.c 48434 2013-03-20 00:04:01Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/emem.h wireshark-1.10.6/epan/emem.h --- wireshark-1.10.5/epan/emem.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/emem.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for Wireshark memory management and garbage collection * Ronnie Sahlberg 2005 * - * $Id: emem.h 48630 2013-03-28 21:19:58Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/enterprise-numbers wireshark-1.10.6/epan/enterprise-numbers --- wireshark-1.10.5/epan/enterprise-numbers 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/enterprise-numbers 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ PRIVATE ENTERPRISE NUMBERS -(last updated 2013-04-10) +(last updated 2014-03-01) SMI Network Management Private Enterprise Codes: @@ -290,9 +290,9 @@ Laurie Collinsworth ljc1&cornell.edu 69 - LMS + Michael Sabo L. Michael Sabo - Sabo&DOCKMASTER.NCSC.MIL + michael.sabo&dbnetworks.com 70 Locus Computing Corp. Arthur Salazar @@ -428,7 +428,7 @@ 103 Lockheed Martin David Rageth - dave&lmco.com + david.a.rageth&lmco.com 104 Micro Technology Mike Erlinger @@ -598,9 +598,9 @@ Keith Hogan keith%penril&uunet.uu.net 146 - American Airlines - Bill Keatley - ---none--- + American Airlines, Inc. + Dan Glass + dan.glass&aa.com 147 Sequent Computer Systems Louis Fernandez @@ -1454,9 +1454,9 @@ Patrick Klos patrickk&numega.com 360 - Morgan Stanley & Co. Inc. - Victor Kazdoba - vsk&katana.is.morgan.com + Morgan Stanley & Co. International PLC + Jake Scott (PEN Managers) + oids&morganstanley.com 361 Integrated Business Network Michael Bell @@ -2787,7 +2787,7 @@ +27-11-806-1000 693 Regionales Rechenzentrum Erlangen - Peter Rygus + Frank Tröger verzeichnisdienst&rrze.uni-erlangen.de 694 SAP AG @@ -2867,8 +2867,8 @@ doron&lanart.com 713 University of Stellenbosch - Graham Phillips - phil&cs.sun.ac.za + Andries Nieuwoudt + apcn&sun.ac.za 714 Wyse Technology Bill Rainey @@ -5447,8 +5447,8 @@ john&peri.com 1358 Freddie Mac - John Rosner - john_rosner&freddiemac.com + Bruce E. Cochran + Bruce_Cochran&freddiemac.com 1359 Digital Equipment bv Henk van Steeg @@ -6515,8 +6515,8 @@ fino.napoleone&blockade.com 1625 Nixu Oy - Pekka Nikander - Pekka.Nikander&nixu.fi + Tuomas Mettanen + sysadmin-root&nixu.com 1626 Australian Software Innovations (Services) Pty. Ltd. Andrew Campbell @@ -6746,9 +6746,9 @@ Raul Montalvo raul.montalvo&datalabsinc.com 1683 - Occidental Petroleum Services, Inc. - Glenn A. Blakley - glenn_blakley&oxy.com + Occidental Petroleum Corporation + Howard D. Heerwagen + admin_oxy&oxy.com 1684 Rijnhaave Internet Services Thierry van Herwijnen @@ -6850,8 +6850,8 @@ Tony Churchill tchurchill&gresham.co.uk 1709 - Science Applications International Corp. (SAIC) - Network Information Center + Leidos, Inc. (Formerly SAIC) + John Brady (Network Information Center) nic&net.saic.com 1710 Acclaim Communications @@ -7878,8 +7878,8 @@ Cherice Jobmann CJOBMANN&INNOVAWIRELESS.COM 1966 - Perle Systems Limited Moti - Renkosinski + Perle Systems Limited + Moti Renkosinski mrenkosinski&perle.com 1967 inktomi corporation @@ -8159,8 +8159,8 @@ nic-tc&oreilly.com 2036 Quantum Corporation - Carsten Prigge - carsten.prigge&quantum.com + Robert Metcalf + robert.metcalf&quantum.com 2037 Ernst and Young LLP Neil Forrester @@ -8499,8 +8499,8 @@ alan_hayes&faa.dot.gov or enet&faa.dot.gov 2121 Technical Communications Corporation - Bill Long - billlong&tiac.net + John Maher + jmaher&tccsecure.com 2122 REZO+ Artur Silveira da Cunha @@ -11746,9 +11746,9 @@ Russell Jansch russell.jansch&citicorp.com 2935 - Pathlight Technology Inc. - Michael Hammond - mikeh&pathlight.com + Quantum Corp. (previous was 'Pathlight Technology Inc.') + Carsten Prigge + carsten.prigge&quantum.com 2936 Prominence Dot Com, Inc. Jim McNee @@ -15058,7 +15058,7 @@ Jim Gulley jgulley&veramark.com 3764 - Quantum Corporation (previous was 'Advanced Digital Information Corporation') + Quantum Corporation (previous was 'Advanced Digital Information Corporation') Carsten Prigge carsten.prigge&quantum.com 3765 @@ -15123,8 +15123,8 @@ Rd&kingmax.com.tw 3780 Level 3 Communications, Inc. - Randy Weiche - Randy.Weiche&Level3.com + Teri Blackstock + Teri.Blackstock&Level3.com 3781 WXN, Inc. Matt Wixson @@ -16546,9 +16546,9 @@ Joerg Paulus tech&nicetec.de 4136 - UQAM - Abraham - m135030&er.uqam.ca + UQAM | Université du Québec à Montréal + Stéphane Talbot + talbot.stephane&uqam.ca 4137 GAURI Info-Comm.Inc. Se Youn Ban @@ -19774,9 +19774,9 @@ Ron Piper ronnipiper&hotmail.com 4947 - Grass Valley Group, Inc. - Robert Rhodes - robert.j.rhodes&grassvalleygroup.com + Grass Valley USA, LLC + Christopher John + Christopher.john&grassvalley.com 4948 MIGROS Andreas Brodmann @@ -20487,8 +20487,8 @@ rhocking&symtrex.com 5127 Western Digital Corporation - Gary Darbyshire - Gary.Darbyshire&wdc.com + Shola Agbelemose + shola.agbelemose&wdc.com 5128 Saitama University Far Laboratory Hassan Hajji @@ -20778,9 +20778,9 @@ John W. Markham jmarkham&enflex.net 5202 - Helsinki University of Technology - Markku Kuula - tietohallintojohtaja&tkk.fi + Aalto University (previous was 'Helsinki University of Technology') + Niko Suominen + niko.suominen&aalto.fi 5203 The Naqvi Group Shams Naqvi @@ -23839,8 +23839,8 @@ dzubur&vams.com 5969 Lightspeed Systems - Vinita Ramnani - vinita&lightspeedsystems.com + Bradley White + NOC&lightspeedsystems.com 5970 CSIRO John Morrissey @@ -24923,8 +24923,8 @@ michael.six&technotrend.de 6240 Bryttan, Ltd. - Rusty Bryttan - rusty&bryttan.com + J R Bryttan + net-admin&bryttan.com 6241 Calvin College Brian J. Baas @@ -27459,8 +27459,8 @@ michael&newearth.org 6876 VMware Inc. - Ben Verghese - verghese&vmware.com + Michael MacFaden + mrm&vmware.com 6877 Evergreen Internet Jeff Huff @@ -27894,9 +27894,9 @@ Serge Zloto serge&i-fovea.com 6985 - Prism Software, Inc. + Jumpy Cat Systems, Inc. (previous was 'Prism Software, Inc.') Peter Shiner - p.shiner&computer.org + peter.shiner&gmail.com 6986 Kiodex, Inc. Richard Seroka @@ -27907,8 +27907,8 @@ stefanp-iana-oid&WRonline.de 6988 University of Northern British Columbia - Patrick Mann - mann&unbc.ca + Nicholas Waller + operations&unbc.ca 6989 Extel Communications Pty Ltd David Chiam @@ -28183,7 +28183,7 @@ ishamir&senterprise.com 7057 SuSE Linux AG - Carsten Hoeger + Ralf Haferkamp suse-oid&suse.de 7058 BB4 Technologies Inc @@ -36903,8 +36903,8 @@ alexanderk&fundtech.com 9237 Newisys - Dzuy Nguyen - dzuy.nguyen&newisys.com + Daniel Kelley + daniel.kelley&newisys.com 9238 Imagine Broadband Limited Shaf Girach @@ -38360,7 +38360,7 @@ 9601 Keewaytinook Okimakanak Adi Linden - adi&adis.on.ca + adilinden&knet.ca 9602 Zoftech Inc. Dustin Norman @@ -39159,7 +39159,7 @@ s-weber&init8.net 9801 ISIS Frontier Communications - Jared Spiegel + Kitt Diebold isis_system&frontiernet.net 9802 IUFM de Rouen @@ -40222,9 +40222,9 @@ Beretta Eugenio e.beretta&dmtonline.com 10067 - DVTel - Sigal Alon - sigal&dvtel.co.il + DVTEL Inc. + Gil Fishman + camera&dvtel.com 10068 E-OfficeServices Ltd. Ashley Unitt @@ -41491,8 +41491,8 @@ a.pirard&ulg.ac.be 10384 Virginia Commonwealth University - John E. Fritz - jefritz&vcu.edu + Jim Toth + jnf&vcu.edu 10385 Westronic Systems, Inc. Tim Radke @@ -43367,8 +43367,8 @@ kai.heikola&kuulalaakeri.fi 10853 LTC Sp z o.o. - Robert Jaros - rjaros&finn.pl + PrzemysÅ‚aw Sztoch + psztoch&finn.pl 10854 Lviv National Polytechnical University Adrian Pavlykevych @@ -44658,9 +44658,9 @@ Paul Collis paulc&epic.co.uk 11176 - Extelligence + Objective Pathology Services Limited (previous was 'Extelligence') Kemp Watson - kemp&extelligence.net + hostmaster&objectivepathology.com 11177 Grapevine Interactive (Pty) Ltd Mike Schronen @@ -45478,9 +45478,9 @@ Tom Cox tom.cox&retek.com 11381 - Rogers Shared Services - Yuri Kopylovski - ykopylov&rci.rogers.com + Rogers Communications Inc + Pieter Hoogenboom + Pieter.Hoogenboom&rci.rogers.com 11382 RR Enterprises Yildiray Ozen @@ -45586,9 +45586,9 @@ Steven Lotito steven.lotito&alumni.pitt.edu 11408 - Wuhan FiberHome Networks Co, Ltd + Wuhan FiberHome Networks Co., Ltd Hairong Wan - hrwan&wri.com.cn + whr&fhn.com.cn 11409 adequate systems GmbH Klaus Garms @@ -48284,7 +48284,7 @@ 12182 Astrium (UK) Kevin Rees - kevin.rees&astrium-space.com + kevin.rees&astrium.eads.net 12183 Baldwin Hackett & Meeks, Inc. Scott Boje @@ -49002,9 +49002,9 @@ Josan Lin josanl&kgex.com.tw 12362 - Lombard Odier Darier Hentsch & Cie + Lombard Odier & Cie Marc BERNEY - marc.berney&lodh.com + m.berney&lombardodier.com 12363 net-labs Systemhaus GmbH Ulrich Eck @@ -51043,8 +51043,8 @@ abu&netzwerker.de 12872 DTE Energy - Brian Sullivan - sullivanbj&dteenergy.com + Ronald Atkinson + atkinsonr&dteenergy.com 12873 E.C.C. sa Stefaan A Eeckels @@ -52774,8 +52774,8 @@ Marius-Julian Tamas Marius-Julian.Tamas&t-systems.com 13305 - Berne University of Applied Sciences - Wolfram Strauss + BFH Berne University of Applied Sciences (previous was 'Berne University of Applied Sciences') + Philipp Plüss ldapmaster&bfh.ch 13306 University of Montana @@ -55412,8 +55412,8 @@ dcanazza&rvr.it 13964 SWCS Chan Pak Sha School - Pui-Wa Wan - puiwa&cpss.edu.hk + Anderson Tung + noc-admin&cpss.edu.hk 13965 tpgpost Ronald van Aalst @@ -55559,9 +55559,9 @@ M. Kabrianis info&interzone.gr 14001 - DRS Flight Safety and Communications - Jason Zhang - jzhang&drs.ca + DRS Technologies Canada Ltd. (previous was 'DRS Flight Safety and Communications') + Nikola Vladisavljevic + nvladisa&drs.ca 14002 University of Wisconsin - Whitewater Bradley Schwoerer @@ -55647,7 +55647,7 @@ Artur Stepien muczachan&hell.pl 14023 - Mistral Internet Group + KCOM Service Provider Network (previous was 'Mistral Internet Group') Phil Edwards phil.edwards&kcom.com 14024 @@ -56293,7 +56293,7 @@ 14184 Getabigger Network David J Blackburn - blkburn&hotmail.com + admin&getabigger.net 14185 CYBER SERVICE Maciej Skalski @@ -56472,8 +56472,8 @@ ldap-oid&flanderselectric.com 14229 University of Arkansas-Fayetteville - David Merrifield - dlm&uark.edu + Elon Turner + uarktech&uark.edu 14230 Engine GmbH & Co. KG Thomas Warnick @@ -56764,8 +56764,8 @@ smi&promed.com.au 14302 papiNet.org - Arthur Coleman - standards.admin&papinet.org + Tom Meniga + tom.meniga&papinet.org 14303 Nextgen, Inc. Akio Nonaka @@ -57283,9 +57283,9 @@ Irwan Budiman irwanhadi&bpkpenabur.or.id 14432 - SkySoft Pty Ltd - Daniel Pocock - daniel&skysoft.com.au + Reserved + Updated 2013-08-09 + ---none--- 14433 China Financial Certification Authority Zhiyuan Shao @@ -61752,8 +61752,8 @@ support&xcache.com 15550 La Sierra University - Brian Friday - bfriday&lasierra.edu + Marc Thomas + ianaoid&lasierra.edu 15551 Object Engineering GmbH Andi Koch @@ -63135,9 +63135,9 @@ Alessandro Kenji Urakawa alessandro&4linux.com.br 15896 - Rostov State University, Computer Center - Oleg Sharoiko - os&rsu.ru + Southern Federal University (previous was 'Rostov State University, Computer Center') + Andrey Berezovskiy + noc&r61.net 15897 Guangzhou GaoU S & T Development Co. Ltd. Jiming Pan @@ -68823,9 +68823,9 @@ Philippe Hebert philippe&massiveego.com 17318 - M5T Centre d'Excellence en Telecom Inc. - Pascal Doré - pdore&m5t.com + Media5 Corporation (previous was 'M5T Centre d'Excellence en Telecom Inc.') + Christian Beaulieu + cbeaulieu&media5corp.com 17319 JC Computing James Anderton @@ -69400,8 +69400,8 @@ qp123&mail.com 17462 Akamai Technologies, Inc. - Robert Moore - rmoore&akamai.com + Erik Nygren + iana-poc&akamai.com 17463 Demarc Security, Inc. Marc Wilson @@ -71803,9 +71803,9 @@ Jan Eide jan.eide&no.jotankers.com 18063 - Tratec Telecom b.v. - Marco Doyer - marco.doyer&tratec.nl + Technetix BV (previous was 'Tratec Telecom b.v.') + Gert Bronkhorst + Gert.Bronkhorst&technetix.com 18064 Marek Walther Marek Walther @@ -72065,7 +72065,7 @@ 18128 Komos Jun Kawai - kwj&komos.org + oid-contact&komos.org 18129 Yorkshire Building Society Darren Mason @@ -74203,9 +74203,9 @@ Mathias Kettner mk&mathias-kettner.de 18663 - SCA Graphic Laakirchen AG - Dipl. Ing. Walter Spanlang - walter.spanlang&sca.com + Laakirchen Papier AG + Walter Spanlang + walter.spanlang&heinzelpaper.com 18664 IPnP Oleg Antoshin @@ -74448,8 +74448,8 @@ jon&digicastnet.com 18724 EDJ Enterprises, Inc. - David Courtney - dcourtney&edj.com + Jason Gouldie + jgouldie&edj.com 18725 Paycom Billing Services, Inc. Clarke Retzer @@ -75232,8 +75232,8 @@ jtarrio+iana&alfa21.com 18920 Agencia Notarial de Certificacion - Santi Casas - scasas¬ariado.org + Enric Hernández + ehernandez¬ariado.org 18921 NextiraOne Deutschland GmbH Harald Gläser @@ -76119,9 +76119,9 @@ Colin Stenhouse questit&questapartments.com.au 19142 - ScriptaWorks s.r.l. + Carlo Strozzi (previous was 'ScriptaWorks s.r.l.') Carlo Strozzi - info&scriptaworks.com + carlo&strozzi.it 19143 SecureAge Technology Teow-Hin Ngair @@ -76347,9 +76347,9 @@ M. Wortmann kontakt&activ-net.de 19199 - SHC Netzwerktechnik + SHC Netzwerktechnik GmbH Hans Lang - hal&shcnet.de + hal&shc.eu 19200 MMG Hans Lang @@ -76364,8 +76364,8 @@ nrtrinidad&eastern.com.ph 19203 DAI-Labor - Jens Bräuer - jens.braeuer&dai-labor.de + Sahin Albayrak + admins&dai-labor.de 19204 Milano Medien GmbH Alexander Gräf @@ -77998,8 +77998,8 @@ kaj.niemi&basen.net 19611 trustsec IT solutions GmbH - Andreas Vögele - voegele&trustsec.de + Frank Kirschner + fk&trustsec.de 19612 Wyncote.net Dan Mascenik @@ -81499,9 +81499,9 @@ Conny Brunnkvist conny&fuchsia.se 20486 - Chyron Corporation - David J. Ruedeman - djr&chyron.com + ChyronHego Corporation (previous was 'Chyron Corporation') + Minuk Choi + minuk.choi&chyronhego.com 20487 AXT Systems Pty Limited Geoff Swan @@ -81981,7 +81981,7 @@ 20606 CLINIQUES UNIVERSITAIRES SAINT-LUC MATTON JL - jean-louis.matton&clin.ucl.ac.be + jean-louis.matton&uclouvain.be 20607 University of Angers François Kermarec @@ -84213,8 +84213,8 @@ pvillarr&expertis.com.mx 21164 Legacy Health System - Josh Levine - jlevine&lhs.org + Jeffrey Mills + jmills&lhs.org 21165 Tidal Networks Jeff Prince @@ -84922,7 +84922,7 @@ 21341 Corner Banca SA Oscar Armanini - sun&corner.ch + unix&corner.ch 21342 EpiSoftware Ltd. Martin Zdila @@ -85216,9 +85216,9 @@ Harjit S. Batra HBatra&HBatra.com 21415 - Option Germany GmbH - Tom Hauspy - t.hauspy&option.com + Option nv + Axel Schollaert + a.schollaert&option.com 21416 Centre Hospitalier de la Côte Basque AGUERRETCHE Jean-Marc @@ -86217,7 +86217,7 @@ miancris&sapec.es 21665 VSB - Technical University of Ostrava - Jan Vavricek + Radomir Orkac oidmaster&vsb.cz 21666 ToutProgrammer.com @@ -86582,7 +86582,7 @@ 21756 SOFTEC sa Denis Gervalle - dge&softec.st + support&softec.lu 21757 Digicadd Computacao Grafica LTDA Albener Pessoa @@ -88806,7 +88806,7 @@ Ian J. Kennedy ijkennedy&afblakemore.com 22312 - Facultés Universitaires Saint-Louis (FUSL) + Université Saint-Louis - Bruxelles (USL-B) (previous was 'Université Saint-Louis (USL-B)') Axel Luttgens luttgens&fusl.ac.be 22313 @@ -89452,9 +89452,9 @@ Engineering Dept. sysnet&boingo.com 22473 - Teledyne Controls wichta, Inc. - Kenneth E. King - kking&teledyne.com + Teledyne Controls + Nataliya Chervonaya + nchervonaya&teledyne.com 22474 Asylum Telecom, Ltd. Janos Geller @@ -89566,7 +89566,7 @@ 22501 UAB Skaitmeninio sertifikavimo centras Moudrick M. Dadashov - md&e-net.lt + md&ssc.lt 22502 DaVita, Inc. George Lin @@ -92884,8 +92884,8 @@ bkoger&mcdaniel.edu 23330 CommScope Inc. of North Carolina - Ian Dancel - idancel&commscope.com + Robert Smith + rsmith&commscope.com 23331 Johnson Bible College Josh Kelley @@ -93373,8 +93373,8 @@ roger.carlsen&2wglobal.com 23452 SunGard Availability Services - Mat Gardam - matthew.gardam&sungard.com + Mike Simkins + mike.simkins&sungard.com 23453 KungFoo Hubert Iwaniuk @@ -93685,8 +93685,8 @@ claudio.russo&appix.it 23530 State of Alaska, Enterprise Technology Services - Jubal Skaggs - jubal_skaggs&admin.state.ak.us + Luke Kreuzenstein + luke.kreuzenstein&alaska.gov 23531 Practeo SA Marc Hauswirth @@ -96046,9 +96046,9 @@ Ettore Simone ettore.simone&esimone.net 24120 - Jsdaav Internet Solutions - Bennie Joubert - jsdaav&jsdaav.za.net + JSDAAV INTERNET SOLUTIONS CC + BENNIE JOUBERT + bennie.joubert&jsdaav.com 24121 Centro Nacional de Infromación y Comunicación Educativa Juan Pérez @@ -96931,8 +96931,8 @@ fines&macalester.edu 24341 Pontis Inc. - Evyatar Kafkafi - evyatar&pontis.com + Alex Sokolov + alex.sokolov&pontis.com 24342 FIO Labs, LLC Robert Allen @@ -97942,9 +97942,9 @@ Jose Manuel Payan del Rio support&think-zone.com 24594 - Ilisys Web Hosting Pty Ltd - Mark Terrill - mark.terrill&ilisys.com.au + MYOB Australia E1 Pty Ltd (previous was 'Ilisys Web Hosting Pty Ltd') + Peter Hallam + peter.hallam&myob.com 24595 safari video networks llc. ben thielsen @@ -98908,8 +98908,8 @@ sratcliffe&ska.ac.za 24835 University of Ostrava - Miroslav Dvorak - Miroslav.Dvorak&osu.cz + Alice Vixie + alice.vixie&osu.cz 24836 Johannes Kapune GbR Johannes Kapune @@ -99591,9 +99591,9 @@ Ondrej Sevecek ondra&sevecek.com 25006 - SITRONICS Telecom Solutions, Czech Republic a.s. + NVision Czech Republic a.s. (previous was 'SITRONICS Telecom Solutions, Czech Republic a.s.') Jan Aftanas - jan.aftanas&sitronicsts.com + jaftanas&nvision-group.com 25007 Precesamiento Digital y Sistemas S.L. JOSE VALLADARES @@ -99723,9 +99723,9 @@ David Boone David.Boone&dhha.org 25039 - infinity-3 GmbH + vitroconnect systems GmbH (previous was 'infinity-3 GmbH') Christian Kleinewaechter - christian.kleinewaechter&infinity-3.de + christian.kleinewaechter&vcsys.de 25040 Keytronix GmbH. Marcello Presulli @@ -100107,9 +100107,9 @@ Kenji Terao terao&comdesign.co.jp 25135 - Ministerul Comunicatiilor si Tehnologiei Informatiei - Viorel Gaftea - viorel.gaftea&mcti.ro + Ministerul pentru Societatea InformaÈ›ională (previous was 'Ministerul Comunicatiilor si Tehnologiei Informatiei') + Augustin Jianu + augustin.jianu&msinf.ro 25136 Haute Ecole Arc Romain Voumard @@ -102119,8 +102119,8 @@ jad&casolinc.com 25637 Police Bruxelles CAPITALE Ixelles - ZP 5339 - Christophe MACQ - christophe&macq.org + Frédéric Devos + freddevos&gmail.com 25638 Uniadex, Ltd. Masatsugu Fujita @@ -105421,8 +105421,8 @@ michael.loos&kpconsult.de 26462 LANCK Telecom (Express TeleService Corp.) - Igor A. Koulatov - i.koulatov&lancktele.com + Konstantin Chervyakov + k.chervyakov&lancktele.com 26463 Wyless plc Iftikhar Ahmad Dar @@ -106002,8 +106002,8 @@ alberto.villar&vidactive.com 26607 Isco International - Paul Becke - paul.becke&iscointl.com + Mikhail Galeev + mikhail.galeev&iscointl.com 26608 Wavelength Corporation, Inc. Network Operations Center @@ -106171,9 +106171,9 @@ Ray Frush ray.frush&avagotech.com 26649 - Tyco Healthcare + Covidien (previous 'Tyco Healthcare') Joseph W. Davis - OID.Admin&tycohealthcare.com + OID.Admin&covidien.com 26650 Pandora Media Inc. James Erickson @@ -106639,9 +106639,9 @@ Holger Kaelberer root&math.uni-bielefeld.de 26766 - .vantronix GmbH - Reyk Floeter - reyk&vantronix.net + .vantronix secure systems + Mike Belopuhov + support&vantronix.net 26767 Alcatel-Lucent TMC (previous was 'Alcatel SOC') Denis Poirier @@ -107420,8 +107420,8 @@ gerencia.redes&vem.aero 26961 TantaComm Systems - David Arthur - darthur&tantacomm.com + Nicholas Morris + nmorris&tantacomm.com 26962 KPMG International Reede Taylor @@ -108860,7 +108860,7 @@ S. Ohara baw&kingsbury.com 27321 - Ready Technology Limited + Ready Technology (UK) Limited Daniel Pocock iana.contact&readytechnology.co.uk 27322 @@ -110869,8 +110869,8 @@ service&unihost.eu 27822 Comtech Mobile Datacom - John Fossaceca - john.fossaceca&comtechmobile.com + Wayne Sheh + cmdcit&comtechmobile.com 27823 Marienfeld Multimedia GmbH Philip Steinkuehler @@ -111280,9 +111280,9 @@ Christophe SIMON titof3000&hotmail.com 27925 - medi.com J. Jaronski T. Licznerski sp. j. - Tomasz Licznerski - oprogramowanie&medi.com.pl + OPTOPOL Technology S.A. (previous was 'medi.com J. Jaronski T. Licznerski sp. j.') + Patryk Woźniak + p.wozniak&optopol.com.pl 27926 Future Voice Technology Daniel Cooper @@ -111352,9 +111352,9 @@ Martin Mudroch noc&sps-ul.cz 27943 - VimpelCom - Danila Pastukhov - dpastukhov&beeline.ru + VimpelCom Ltd. + Sergey Dorofeev + oid&beeline.ru 27944 3Leaf Networks Dwayne Shows @@ -112916,9 +112916,9 @@ Simon Niechzial simon&niechzial.de 28334 - pulz8 Communications ApS - Alexander Høgh Eriksen - info&pulz8.com + Siemens A/S (previous was 'pulz8 Communications ApS') + Simon Staudt + simon.staudt&siemens.com 28335 Xworks NZ Limited Kevin Buckle @@ -113412,7 +113412,7 @@ Michael Bessey m.bessey&ntta.com 28458 - Nokia Siemens Networks + Nokia Solutions and Networks (previous was 'Nokia Siemens Networks') Jarno Toropainen jarnotoropainen&gmail.com 28459 @@ -114804,9 +114804,9 @@ Sean Whitney sean&visionary-networks.com 28806 - Children's Hospital, Inc. + Nationwide Children's Hospital (previous was 'Children's Hospital, Inc.') Brian Baacke - baackeb&chi.osu.edu + Brian.Baacke&NationwideChildrens.org 28807 Mullins Household Matthew Mullins @@ -119460,7 +119460,7 @@ Naoto Morishima root&morishima.net 29970 - Zervina Technologies LLC + Zervina Technologies LLC Rich Vaughn rvaughn&zervina.com @@ -120037,9 +120037,9 @@ Hai Zaar haizaar&gmail.com 30114 - SOLVIS Ltd - Nick Meakin - nick.meakin&solvis.ch + Reserved + Updated 2013-05-02 + ---none--- 30115 Damien Degois Damien Degois @@ -120874,8 +120874,8 @@ cole.moody&ibec.net 30323 Eigen LLC - Daniel Elven - daniel.elven&eigen.com + Troy DesBiens + troy.desbiens&eigen.com 30324 Interface Masters, Inc. Ben Askarinam @@ -121738,8 +121738,8 @@ scharl&weblyzard.com 30539 Sappi Fine Paper - Richard Bucknam - richard.bucknam&sappi.com + Matt Oberpriller + matt.oberpriller&sappi.com 30540 Zymeworks Inc. Luke Cyca @@ -122257,9 +122257,9 @@ w.h.v.petersen w.vanpetersen&brcontrols.com 30669 - RFSAT Ltd + Research for Science, Art and Technology (RFSAT) Ltd Dr. Artur Krukowski - Artur.Krukowski&rfsat.com + RTD&rfsat.com 30670 Vololink Pty Ltd Milan Prosenica @@ -122517,9 +122517,9 @@ Don Larsen DonLarsen&UmpquaBank.com 30734 - Seven-F + Florian Sailer (previously was 'Seven-F') Florian Sailer - florian.sailer&seven-f.at + florian.sailer&outlook.com 30735 BLUECOARA Networks Hideo NAKAMITSU @@ -123326,8 +123326,8 @@ rwagner&rwy.com 30936 Texas State University - Brad Helbig - bh28&txstate.edu + Mark Hughes, Technology Resources + es-idm-admins&txstate.edu 30937 Communications-Electronics Solutions Pty Ltd Michael McMahon @@ -127673,9 +127673,9 @@ Hausen Lo hausen_lo&pegatroncorp.com 32023 - XeNSiiS - XeNSiiS Administrator - admin&xensiis.net + American Clean Air, Inc. (previous was 'XeNSiiS') + Jeff Doyle + webmaster&americancleanair.net 32024 Applied Polymorphism Khaled Atiyeh @@ -128449,9 +128449,9 @@ motomichi tanaka mtanaka&sios.com 32217 - BÖWE Systec AG + BÖWE Systec GmbH Wolfgang Meinelt - meinelt.mailcom&boewe-systec.de + wolfgang.meinelt&boewe-systec.com 32218 tedman.com Ted Leung @@ -130014,8 +130014,8 @@ goldan&hot.pl 32608 Federal Home Loan Bank - Matthew Lee - mlee&fhlbdm.com + Stephen Morrow + smorrow&fhlbdm.com 32609 Development Consultants Incorporated Kauser Kabealo @@ -130302,7 +130302,7 @@ areid&zinc-solutions.com 32680 Rentabiliweb Group - Cedric Tabary + Julien Mangeard admin&rentabiliweb.com 32681 Atwal Inc @@ -130389,7 +130389,7 @@ Dominik Pekarek dominik.pekarek&loyaltypartner.com 32702 - Joint Stock Company "NPO RusBITech" + Joint Stock Company "NPO RusBITech" Vladimir Podobaev rusbitech_cct&mail.ru @@ -130798,9 +130798,9 @@ Csaba Oravecz oravecz&nytud.hu 32804 - Siemens Enterprise Communications GmbH & Co. KG - Andrew Hutton - andrew.hutton&siemens-enterprise.com + Unify GmbH & Co. KG (formerly 'Siemens Enterprise Communications GmbH & Co. KG') + Michael Tietsch + michael.tietsch&unify.com 32805 CR Host Jose Romeiro Filho @@ -131074,9 +131074,9 @@ Subu Ayyagari subu.ayyagari&gmail.com 32873 - KONE Deursystemen - Bob van der Putten - bob.van.der.putten&kone.com + KONE Corporation + Jani Hautakorpi + jani.hautakorpi&kone.com 32874 Novatium Solutions Private Limited Venu Gopala Raju Kanumuri @@ -131703,7 +131703,7 @@ eto&bss.vrn.ru 33030 Timico Ltd - Ben White + Paul Sherratt networks&timico.net 33031 C.G.C.,a.s. @@ -131886,9 +131886,9 @@ Jens Thomas info&linux-systeme-thomas.de 33076 - Virtual Internet Service Provider + SCORE42 SAS (previous was 'Virtual Internet Service Provider') RAKOTOMALALA Renaud - rrakotom&corp.visp.fr + renaud.rakotomalala&score42.eu 33077 InformSvyazStroi, Ltd. Aleksei Miheev @@ -131899,8 +131899,8 @@ dschaper&ganymeade.com 33079 EmblaCom Oy - Mikko Tiainen - mikko.tiainen&emblacom.com + Niclas Svahnström + niclas.svahnstrom&emblacom.com 33080 Drexler Hard- und Software e.K. Kai Edinger @@ -134468,7 +134468,7 @@ 33721 Thrane & Thrane Finn Berthelsen - fb&thrane.com + finn.berthelsen&cobham.com 33722 MC SECURITY Co., Ltd. Jonghee Park @@ -135042,9 +135042,9 @@ Adam Bielak PKIAdmin&praktiker.com 33865 - Squad 17 Limited + Atukorala Holdings Ltd. (previous was 'Squad 17 Limited') Uditha Atukorala - info&squad17.com + info&aholdings.biz 33866 Lionic Corp. Roger Chien @@ -136154,9 +136154,9 @@ Ed Yampratoom edy&bot.or.th 34143 - Absilion AB + Netrounds Solutions AB (previous was 'Absilion AB') Norbert Vegh - norbert.vegh&absilion.com + norbert.vegh&netrounds.com 34144 Böhler Edelstahl GmbH & CoKG Josef Scheiber @@ -137362,7 +137362,7 @@ Flavio Poletti flavio.poletti&stsconsulting.it 34445 - Capgemini BAS b.v. ( Netherlands ) + Capgemini Nederland B.V. ( Netherlands ) Renato Bianchessi renato.bianchessi&capgemini.com 34446 @@ -139002,9 +139002,9 @@ Yonadav Leitersdorf yonadav&indeni.com 34855 - MobileTick Ltd, + Votiro Ltd. (previous was 'MobileTick Ltd') Aviv Grafi - aviv&mobiletick.com + aviv&votiro.com 34856 ALTAVIA SA François ROUSSEAU @@ -140300,11 +140300,11 @@ 35179 danzuck Daniel Zuck - iana&danzuck.de + iana&danzuck.ch 35180 Mark Domansky Consulting Mark Domansky - mark-oid&sagewolf.com + mark&sagewolf.com 35181 Techubs Network Hui Kam Choi @@ -140910,7 +140910,7 @@ Lineu Paiva lineu&farn.br 35332 - Alticast Corp. + Alticast Corp. Younggi Hong nari&alticast.com @@ -141528,8 +141528,8 @@ tech&dnacorp.net 35486 Television New Zealand Ltd - Norm Cross - norm.cross&tvnz.co.nz + Mark Potter + noc&tvnz.co.nz 35487 The Salvation Army USA Western Territory Doug Neely @@ -142303,9 +142303,9 @@ Rémi TILLY remi.tilly&grita.fr 35680 - Bloom Digital Platforms + AdGear Technologies Inc. (previous was 'Bloom Digital Platforms') Mina Naguib - mina.naguib&bloomdigital.com + mina.naguib&adgear.com 35681 Zenith System Solutions Vikram Dhaddha @@ -143188,8 +143188,8 @@ ralf.fischer&dumontnet.de 35901 Al-Quds University - Sufyan Aqtam - saqtam&itce.alquds.edu + Marwan Rabie + marwan&alquds.edu 35902 OpenHeadend Christophe Massiot @@ -143333,7 +143333,7 @@ 35937 Víctor Román Archidona Víctor Román Archidona - contacto&victor-roman.com + contacto&victor-roman.es 35938 Omnibond Systems LLC. Boyd Wilson @@ -143987,9 +143987,9 @@ Paul Beyer pbeyer&wwf.org.uk 36101 - SMK Software + South Patron (previous was 'SMK Software') Durand Miller - info&smksoftware.com + info&southpatron.com 36102 Paramatrix Technologies Pvt. Ltd. Raghu Prasad @@ -144241,7 +144241,7 @@ 36164 Videoswitch S.R.L. Marcelo Javier Indarramendi - marcelo.indarramendi&videoswitch.tv + soporte&videoswitch.tv 36165 Learning Objects, Inc. Jessica Murray @@ -144755,9 +144755,9 @@ Karsten Krispin info&kulthauskante.de 36293 - Smartlink Network Systems LImited + Smartlink Network Systems Limited Deepak P Chodankar - deepakc&digilink.in + deepak.chodankar&smartlink.co.in 36294 MSO Link Tito Johnson @@ -144803,9 +144803,9 @@ Kaoru Miyauchi miya&kandcnet.com 36305 - WoSign eCommerce Services Ltd. + WoSign CA Limited (previous was 'WoSign eCommerce Services Ltd.') Richard Wang - richard&wosign.com + ca&wosign.com 36306 University of Teesside UNIX Team (Bill Taylor) @@ -146847,7 +146847,7 @@ Jeff Forsyth jeff.forsyth&savingssociety.com 36816 - Beijing Yunshengfa Technologies Co., Ltd + Beijing Abloomy Technologies Co., Ltd (previous was 'Beijing Yunshengfa Technologies Co., Ltd') Ou Zhongyun zhongyun.ou&abloomy.com.cn 36817 @@ -147019,9 +147019,9 @@ Rory Prendergast oid.admin&thq.com 36859 - BreakingPoint Systems - Brent Cook - bcook&breakingpoint.com + Ixia (previous was 'BreakingPoint Systems') + Kris Raney + kraney&ixiacom.com 36860 True Value Company Eric Tuttleman @@ -149916,8 +149916,8 @@ oid-admin&theobroma-systems.com 37583 Surescripts, LLC - Pete Palmer - pete.palmer&surescripts.com + Jim Martin + security&surescripts.com 37584 Gary Hawkins Gary Hawkins @@ -151979,8 +151979,8 @@ Besstremyannyy Sergey master&donjust.ru 38099 - Transglobal Secure Collaboration Program (TSCP) - Stephen Howard + Transglobal Secure Collaboration Participation Inc. (TSCP) + Keith Ward support&tscp.org 38100 CAMI Research Inc. @@ -152463,9 +152463,9 @@ Md. Nazrul Islam nazrul&therapservices.net 38220 - IZAO Greenwall Systems + Private Unitary Enterprise on Rendering Services "Greenwall Systems" (previous was 'IZAO Greenwall Systems') Mikhail Kuznetsov - tech.support&greenwall.by + info&greenwall.by 38221 IP Gorshkov Yuri Valerevich Yuri V. Gorshkov @@ -152712,8 +152712,8 @@ info&1st-setup.nl 38282 Italtelec S.p.A. - Andres Garcia - technical&italtelec.com + Giacomo Burdi + g.burdi&italtelec.com 38283 MobiWork LLC Herve RIVERE @@ -153491,9 +153491,9 @@ Holger Schmidt itinfo&prosozial.de 38477 - Aaxeon Technologies, LLC. + Antaira Technologies, LLC. (previous was 'Aaxeon Technologies, LLC.') Peter Szyszko - peter.szyszko&aaxeon.com + peter.szyszko&antaira.com 38478 VerticalCue Design LLC John Vrbanac @@ -154128,8 +154128,8 @@ dmcclain&falconsteel.com 38636 Starfish Technologies Limited - Andrew Dix - andrew&starfish.tv + Graham Neden-Watts + graham&starfish.tv 38637 U2 Systems Tony Ching @@ -156164,7 +156164,7 @@ ydmoon&ntnextouch.com 39145 Innovative Circuit Technology Ltd. - Kevin Bolster + Natalia Bolster technical.contact&ictcorporate.com 39146 Watchdog Software Pty Limited @@ -156424,8 +156424,8 @@ hostmaster&plexus.com 39210 Impulse Point LLC - Andrew Tams - atams&impulse.com + Andrew Cohen + acohen&impulse.com 39211 Positronics Enterprise Limited Kelvin Chan @@ -157849,7 +157849,7 @@ 39566 Idealo Internet GmbH Marc Schildt - marc.schildt&idealo.de + ldap-oid&idealo.de 39567 DJIGZO Martijn Brinkers @@ -158285,7 +158285,7 @@ 39675 Vast Array Corporation Benjamin F. Beideman - ben&vastarraycorp.com + benjamin.beideman&vastarraycorp.com 39676 Pason Systems Corp. Abudy Charanek @@ -159075,9 +159075,9 @@ Luis Garcia lgarcia&ausiasmarch.net 39873 - Ember Corporation + Silicon Labs (previous was 'Ember Corporation') Robert Power - robert.power&ember.com + robert.power&silabs.com 39874 Asmlab Limited Semen Makhorkin @@ -161272,8 +161272,8 @@ admin&adorsys.de 40422 Solutionary, Inc. - Abigail Edwards (Systems Department) - aedwards&solutionary.com + Steve Madel (Systems Department) + SteveMadel&solutionary.com 40423 Osceola County Board of County Comissioners David Lomen @@ -162279,9 +162279,9 @@ Sergey S. Kovalev sysadmin&unigine.com 40674 - SAIT Zenitel + SAIT (previous was SAIT Zenitel) Koen Verdijck - koen.verdijck&saitzenitel.com + koen.verdijck&sait.net 40675 geiger BDT GmbH Maximilian Barth @@ -163151,7 +163151,7 @@ Dan Nguyen dan&lyntec.com 40892 - Abimus + abimus Patrik Karisch office&abimus.com 40893 @@ -164608,7 +164608,7 @@ contact&maui-systems.co.uk 41256 NormanStudios - julien Bastidon + Fabien Charbonnier systeme&normanstudios.fr 41257 SignOn @@ -165333,7 +165333,7 @@ 41437 Geoffroy Gramaize Geoffroy Gramaize - geoffroy.gramaize&free.fr + geoffroy.iana&gramaize.eu 41438 HITOTEK Co.,Ltd Evane Yuan @@ -165347,9 +165347,9 @@ Mark Krämer mkraemer&stabilus.com 41441 - School of Medicine, Tohoku University - Naoki Nakamura - nakamura&med.tohoku.ac.jp + Tohoku University + Futoshi Arima + arima&bureau.tohoku.ac.jp 41442 Berger Gunkel IT Systeme GmbH Andreas Berger @@ -165767,7 +165767,7 @@ Reid Nilson reid.nilson&gmail.com 41546 - Innologija JSC + Innologica JSC Yordan Yordanov yordan.yordanov&innologica.com 41547 @@ -165945,7 +165945,7 @@ 41590 Wirtschaftsagentur Wien. Ein Fonds der Stadt Wien. Ruediger Swoboda - swoboda&wirtschaftsagentur.at + administrator&wirtschaftsagentur.at 41591 Sipi srl Lorenzo Balliana @@ -166006,6 +166006,6990 @@ Georgia's Own Credit Union Thomas Stratton tastratton&georgiasown.org +41606 + centrotherm photovoltaics AG + Martin Schmidt + ctpki&ngmail.eu +41607 + One IP + Ron Arts + ron.arts&oneip.nl +41608 + EFP Rotenberg LLP + Craig Julien + cjulien&efprotenberg.com +41609 + Kjempekjekt AS + Sondre Eikanger Kvalø + iana&kjempekjekt.no +41610 + Aspectra AG + Thomas Sauter + thomas.sauter&aspectra.ch +41611 + Bank Vontobel AG + Pierre-Olivier Mangin + seadmin&vontobel.ch +41612 + Swisscom Energy Solution AG + Bruno Hostalery + bruno.hostalery&be-smart.ch +41613 + Controles S.A. + Alvaro Delacoste + adelacoste&controles.com +41614 + Eagleville Hospital + Richard Mitchell + rmitchell&eagleville.org +41615 + Manhattan College + Robert Moran + software&manhattan.edu +41616 + Weeo Group + Jerome Herman + jerome.herman&weeo.fr +41617 + Sparta Consulting + Ben Tallman + btallman&spartaconsulting.com +41618 + OJSC Bank SGB + Eduard Shcherbakov + ed&severgazbank.ru +41619 + Hospitality Alliance AG + Katharina Störmer + katharina.stoermer&ramada.de +41620 + Eric Lakin + Eric Lakin + elakin&infohell.net +41621 + Ministerio de Gobierno y Reforma del Estado + Lucila Wilde + internet&santafe.gov.ar +41622 + XOR Media, Inc. + Ralph Beck + ralph.beck&xor-media.com +41623 + One Tech Inc. + OID Admin - Murat Kilic + oidadmin&onetechinc.com +41624 + Bell Aliant + Greg Desveaux + gregory.desveaux&bellaliant.ca +41625 + Mended Duck Computer Services + Adam Kittilson + accounts&mendedduck.com +41626 + Geller & Company LLC + Omar Pena + opena&gellerco.com +41627 + Cenwell LTD + Justin Shen + justin&cenwell.com.tw +41628 + Learning Media Ltd + Richard Parratt + richardparratt&learningmedia.co.nz +41629 + Chakra Network Solutions Private Limited + S.Sree hari nagarajan + sree&chakranetwork.com +41630 + SENSEMATIX + Jothi Kumar + jothi&sensematix.com +41631 + Tasneem electronics LLC + Mr. Ayman Narmug + ayman&usg-jo.com +41632 + PT.Bina Buana Raya + Irwan Sulistiyono + irwan&bbr.co.id +41633 + Certivox Ltd. + Stoyan Petkov + system&certivox.com +41634 + EDV Beratung Haag + Peter Haag + Peter&haagmail.de +41635 + NBC Elettronica Group Srl + Mr. Paolo Soldarelli + elettronica&nbc-el.it +41636 + Tolaris.com + Tyler Wagner + admin&tolaris.com +41637 + Talia Ltd + Tyler Wagner + helpdesk&talia.net +41638 + Socus networks + Blake Wu + bwu&socusnetworks.com +41639 + SVSI + Greg Wirth + gwirth&svsiav.com +41640 + Laconisoft LLC + Bret Ewin + R8pBsn1Jfva5TPFQ&laconisoft.com +41641 + Colglazier Clinic + Clifford Colglazier + acolglaz&gpcom.net +41642 + ThinKom Solutions, Inc. + Stuart B. Coppedge + Stuart.Coppedge&thinkom.com +41643 + RCG Creations Limited + Craig Goodenough + craig&rcgcreations.com +41644 + Cinegy GmbH + Jan Weigner + jan&cinegy.com +41645 + Sinogram Technology (Beijing) Co., Ltd. + enhe wu + jealtw&hotmail.com +41646 + QUADROtech Solutions AG + Michel Zehnder + michel.zehnder&quadrotech-it.com +41647 + SpectrAp + Samsonov Konstantin N. + samsonov&spectrap.ru +41648 + Shenzhen SDGI Optical Network Technologies Co,. Ltd. + Zeng Dezhong + zengdz&sdgi.com.cn +41649 + Schnoor Industrieelektronik GmbH & Co. KG + Henry Koplien + entwicklung&schnoor-ins.com +41650 + Engisoft + David Acevedo + d.acevedo&engisoft.com +41651 + Dapesco S.A. + Lorenzo BERNARDI + lbi&dapesco.com +41652 + IdentSign + James Burton + james.burton&identsign.com +41653 + GETCO Europe Ltd + Duncan Gibb + dgibb&getcollc.com +41654 + EAL (Apeldoorn) BV + Jaap Jansen + jaap.jansen&eal.nl +41655 + CardSmart Technologies + James Wiley + jimwiley&yourcardsolution.com +41656 + 2024Sight INC. + Anton Hofland + anton.hofland&2024sight.com +41657 + Bressner Technology + Dr. Olaf Holthausen + olaf.holthausen&bressner.de +41658 + United Business Media + Michael Buglass + michael.buglass&ubm.com +41659 + Datasat Technologies Ltd + Alex Brown + alex.brown&datasattechnologies.com +41660 + SciVisum Ltd + Deri Jones + snmp.mib&scivisum.co.uk +41661 + SEKAS GmbH + Michael Rosenberger + webmaster&sekas.de +41662 + Capio S:t Görans Sjukhus AB + Nicklas Johannesen + nicklas.johannesen&capiostgoran.se +41663 + Philippe Bonatti + Philippe Bonatti + philippe&bonatti.ch +41664 + Costaneira - Arno Johann S/A Comércio de Material de Construção + Flávio Johann + flavio.johann&costaneira.com.br +41665 + George Flemming LLC + George Flemming + George&gflemming.com +41666 + Government of Yukon + Richard Wieser + registrar&gov.yk.ca +41667 + Park Bench Software + Paul Messias + pmessias&parkbenchsoftware.com +41668 + The Evergreen State College + Dan Scherck + netservices&evergreen.edu +41669 + Spiros Iliadis + Spiros Iliadis + spiros&iliadis.me +41670 + AddOn Holding Gmbh + Bernd Burkhardt + burkhardt&addon.de +41671 + Atelier WW Architekten SIA AG + Klaus Leuders + klaus.leuders&atelier-ww.ch +41672 + TECMASUR CIA. LTDA. + SANTIAGO REINO + sreino&tecmasur.com.ec +41673 + Lapsum + Rafael de la Torre Consuegra + rdelatorre&lapsum.com +41674 + WAS.ch GmbH + Dominik Fässler + info&was.ch +41675 + ArmOwl LAB (Roman V. Kosinskiy) + Roman V. Kosinskiy + armowl&list.ru +41676 + Gordon Broom + Gordon Broom + gjbroom&thebrooms.ca +41677 + Nicholas Brown + Nicholas Brown + nick&anatoll.org +41678 + SIBOAVANCE + Pablo Baena + pbaena&siboavance.com.co +41679 + OVNETAP + Radomir Ochtyra + radomir.ochtyra&ovnetap.com +41680 + Media Netwerk AS + Stig Christian Aske + stigchristian&netwerk.no +41681 + Chudyk Cloud Services + Gerald Chudyk + gerald&chudyk.com +41682 + ASSEMBLY Organizing Oy + Jaakko Vallo + jaakko.vallo&assemblytv.net +41683 + Nebula Media Solutions Ltd. + Peter Jones + peter.jones&nebula-media.co.uk +41684 + Pyzuka + Jeroen Dekkers + iana&pyzuka.nl +41685 + nfotex Informationstechnologie Dienstleistungs GmbH + Raphael Wegmann + wegmann&psi.co.at +41686 + Uzin Utz AG + Andreas Koegel + andreas.koegel&uzin-utz.com +41687 + Cold Crossing + David Klann + dklann&coldcrossing.com +41688 + EOS Sistemi s.r.l. + Tiziano Martelli + tiziano&eos.it +41689 + Thüga Aktiengesellschaft + Christoph Mayer + hostmaster&thuega.de +41690 + Dension Audio Systems + Tibor Fábi + tfabi&dension.com +41691 + Horizon Forest Products, LLP + Jimmy Dixon + jimmy.dixon&horizonforest.com +41692 + Renee Marie Jones + Renee Marie Jones + rmj&renee-jones.com +41693 + Nyingma Association of Mangalam Organizations - Communications And Network Infrastructure + Lee Brown + Administrator&RatnaLing.Org +41694 + Christians Against Poverty + Doug Targett + dougtargett&capuk.org +41695 + Translational Centre for Regenerative Medicine (TRM) + Steffen Loeb + pki&trm.uni-leipzig.de +41696 + Actia Systems España SAU + Jonathan Redondo + jredondo&actiasystems.com +41697 + European Central Bank + Dominique Dubois + dgisopsec&ecb.int +41698 + Lucas-Consulting + Andreas Lucas + andreas&lucas-consulting.net +41699 + LGS Innovations + Bobby Dimmette + bjd&lgsinnovations.com +41700 + eyeReturn Marketing Inc. + Kenneth Voort + kvoort&eyereturn.com +41701 + Jarvis Ford + Craig Williams (IT Manager) + it&jarviscars.com.au +41702 + Levart Distribution Systems Pty. Ltd. + Andrew Simmonds + andrew&levart.com.au +41703 + ATM-12 + Vitaly Bodin + vitbo&atm12.ru +41704 + Neoflow. Co., Ltd. + Daisuke Ota + daisuke&neoflow.jp +41705 + Institutul de Dezvoltare a Societatii Informationale + Andrei Rusu + andrei.rusu&idsi.md +41706 + Trollhattan Stad IT + Magnus Danhage + magnus.danhage&trollhattan.se +41707 + Solbox Inc. + Han Soo Yoo + zhsyoo&solbox.com +41708 + Superior Access Solutions, Inc. + Dave Werdin + dwerdin&sa-solutions.com +41709 + EAP Technologies, Inc. + Roland Alden or Brenda Cundy + ralden&ralden.com +41710 + ATES Networks + Alexandre Ioachim + aioachim&atesnetworks.com +41711 + Dossia + Steve Allman + steve.allman&dossia.org +41712 + ISTHARI + JOSE FELIX HERNANDEZ BARRIO + jose.hernandez&isthari.com +41713 + Melet.com + John Melet + john&melet.com +41714 + Azuki Systems, Inc. + Keith Bilafer + keith.bilafer&azukisystems.com +41715 + Universal Cinema Services Co., Ltd. + Tang Liguo + lgtang&sina.com +41716 + Rational Retention, LLC + Konstantin Mertsalov + support&rationalretention.com +41717 + Blekinge Institute of Technology + Patrik Arlos + patrik.arlos&bth.se +41718 + Ouroboros + Claude Dehais + cdehais&ouroboros.fr +41719 + Qosmotec GmbH + Axel C. Voigt + acv&qosmotec.com +41720 + Saisei Networks Inc + John Harper + john&saiseinetworks.com +41721 + International Communications Corporation INC + Keith Alexis + keith.alexis&intcomcorp.com +41722 + Information Networks Ltd. + Dmitry G Shin + dmitry.s&hsdn.org +41723 + XGEN - Web Business + Fabiano Cainelli + xgen.snmp&xgen.com.br +41724 + Chengdu SKSpruce Technology Inc. + kai zhang + kaizhang&skspruce.net +41725 + Tere.com Networks OÃœ + Toomas Vendelin + iana&vendelin.com +41726 + Dr. Sulaiman Al Habib Medical Group + Irshad Ismail + irshad.ismail&drsulaimanalhabib.com +41727 + Sabatier Geolocalisation + Damien CABROL + damien.cabrol&geolocalisation-sabatier.fr +41728 + athenahealth, Inc. + Ben Whittaker + vendorcontact&athenahealth.com +41729 + United Equitable Group, Ltd. + Matthew Morrow + mmorrow&ueg1.com +41730 + Arab States Research and Education Network, GmbH + Ola Adnan Samara + info&asrenorg.net +41731 + Prodware Deutschland AG + René Büdinger + r.buedinger&prodware.de +41732 + Mathias Haimerl 3S + Mathias Haimerl + webmaster&haimi.de +41733 + Parallel Wireless + Sumit Garg + sgarg¶llelwireless.com +41734 + V10 Networks + Jeff Leung + oid.admin&v10networks.ca +41735 + Teletech Pty. Ltd. + Sean Gallagher + sean&teletech.com.au +41736 + Beatrice Wireko IT + Ottmar Erbes + mail&wireko.com +41737 + Bryan Health + Brad Znamenacek + bradz&bryanhealth.org +41738 + Algo Communication Products Ltd. + Steve Ansell + steve&algosolutions.com +41739 + Five9, Inc. + Darin Fisher + darin.fisher&five9.com +41740 + TheGunns.net + William Gunn + postmaster&thegunns.net +41741 + Ittim Technology Co.Ltd + Zheng Dajun + zhengdj&ittim.cn +41742 + IMEC + Julien Beauviala + julien&imec-archives.com +41743 + eKing Technology Co., Ltd. + Liang Dai + liang.dai&hnair.com +41744 + Z3 Technology + Bruno Marchevsky + brunomarchevsky&z3technology.com +41745 + FrozenWarrior.com + Bret Olmsted + bret&frozenwarrior.com +41746 + Chengdu Kingtype Digital TV Equipment Co., Ltd. + Junyu Xue + ywlizhen&163.com +41747 + Oliver Solutions + David Ganor + david&oliver-solutions.com +41748 + CensorNet Ltd + Dan Searle + dan&censornet.com +41749 + Owens State Community College + Martin Stroud + martin_stroud&owens.edu +41750 + Head Department for Statistics and Information Technologies of State Customs Committee + Aleksandr Voloschuk + aleksandr.voloschuk&customs.gov.az +41751 + ROBIN'S + Radhakrishnan Nagarajan + robinblr.arts&gmail.com +41752 + ZAO "NPK Rotek" + Sergei Shirokov + sergo&rotek.ru +41753 + Greg Waterhouse + Greg Waterhouse + gregw&rgweb.org +41754 + Daniel Sage + Daniel Sage + daniel&sterksoft.com +41755 + Lastline, Inc. + Ludovico Cavedon + cavedon&lastline.com +41756 + REVCORD - Revolutionizing Voice Recording + Vasanth Neelamagam + vasanth&revcord.com +41757 + Prism Systems, Inc. + Alex Lynch + alynch&prismsystems.com +41758 + Axham Corporation + Vijay Varadan + admin&axham.com +41759 + Open Computing Facility + Dara Adib + gm&ocf.berkeley.edu +41760 + TibetSystem Co.,Ltd. + Kwon Tae Un + nadakwon&tibetsystem.com +41761 + Atea Sverige AB + Martin Arnsrud + martin.arnsrud&atea.se +41762 + Mayak LTD + Victor Shachnev + its&slata.com +41763 + JSC «BystroBank» + Alexander V. Litvinoff + lav&bystrobank.ru +41764 + ETAT DE FRIBOURG + Simon Ecoffey + simon.ecoffey&fr.ch +41765 + Troyer AG + Michael Saxl + michael.saxl&troyer.it +41766 + Flow-Data, Inc + Keith Thomson + keitht&flow-data.com +41767 + IDSS AB + Claes Wikholm + info&idss.se +41768 + Beijing Telesound Electronics Co., Ltd. + Jiapeng Lu + lujiapeng&telesound.com.cn +41769 + IS4IT GmbH + Lothar Haeger + lothar.haeger&is4it.de +41770 + Ascendi + Bruno Cacheira + bcacheira&ascendi.pt +41771 + Fundamental Games + Kenneth Noland + ken.noland&fundamentalgames.com +41772 + Auth-servers + Warren Kumari + warren&kumari.net +41773 + TelVue Corporation + Jesse Lerman + jlerman&telvue.com +41774 + Health Research, Inc. + Mike Varney + mlv03&healthresearch.org +41775 + Global Solutions Tecnologia da Informação LTDA + Fernando de Oliveira Carvalho + global&glsolutions.com.br +41776 + IACIT Soluções Tecnológicas LTDA + gustavo hissi + gustavo.castro&iacit.com.br +41777 + GSE Environmental, LLC + Jeff Johnson + jjohnson&gseworld.com +41778 + Lake Avenue Congregational Church of Pasadena + Emil Tulcan + infosys&lakeave.org +41779 + QualityLogic Inc. + Kai Zuber + sysadmin&qualitylogic.com +41780 + Telesphere Networks Ltd + Larry Low + llow&telesphere.com +41781 + Digby Wells Environmental + Clint Naude + clint.naude&digbywells.com +41782 + Pacific Design Enginering + Bill Moats + moats&pde.com +41783 + Geolink Satellite Services + Julien Leroux + julien.leroux&geolink.com +41784 + ifbyphone, Inc. + Marcus Lewin + mlewin&ifbyphone.com +41785 + Mary Washington Healthcare + Douglas Hanback + douglas.hanback&mwhc.com +41786 + Ryu project + Isaku Yamahata + yamahata&valinux.co.jp +41787 + HyperMatrix Solutions Ltd. + Hiren Shah + admin&hypermatrix.com +41788 + kuederli.net + Urs P. Kuederli + urs&kuederli.com +41789 + AlTaysir for Information Systems Security Consulting LLC + Aladdin Dandis + aladdin.d&secrivacy.com +41790 + I-CONCEPT + TASSOS FRAGOS + t.fragos&i-concept.gr +41791 + eSPe + Karsten Pohle + k.pohle&gmx.net +41792 + Alrayyan for media and marketing co + Mahmoud Albatarni + mahmoud.albatarni&alrayyan.qa +41793 + North East Independent School District + Brian Harrell + bharre&neisd.net +41794 + High Point PC Solutions + Daniel T. Harrison + highpointpc2&gmail.com +41795 + Net Consulting UK Ltd + Glenn Morgan + glenn.morgan&netconsulting.co.uk +41796 + EleSy + Alexandr Makarov + Alexandr.Makarov&elesy.ru +41797 + STC Systema + Mikhail Maslennikov + mikhailmaslennikov&yandex.ru +41798 + astozi + Tomasz Zieba + tomasz.zieba&astozi.pl +41799 + William Hill + Peter Morgan + peter.morgan&williamhill.com +41800 + GaHIN (Georgia Health Information Network) + Himabindu Bolisetty + bindu&careevolution.com +41801 + Prattville Water Works Board + Neil Harris + nharris&pwwb.com +41802 + Talkpath LLC + Steven Platt + splatt&talkpath.com +41803 + On Center Software, Inc. + Brandon Davis + brandon.davis&oncenter.com +41804 + Austrian Federal Ministry of Science and Research + Klemens Urban + klemens.urban&bmwf.gv.at +41805 + Guidance Solutions, Inc. + Jon Larsen + jlars&guidance.com +41806 + Viastorage + Guillaume VERNAT + gvernat&coffreo.com +41807 + GuiZhou BC&TV Information Network Co.,LTD + XiangLong Hou + houxianglong&coship.com +41808 + Administration of Municipal Formation of the City-Hero of Novorossiysk + Dmitry Kirienko + uprav.it&gmail.com +41809 + Dismuntel S.A.L. + Josep Enric Rosell Carbonell + jerosell&dismuntel.com +41810 + Credit Agricole Bank, PJSC + Sergii Plakhota + Sergii.PLAKHOTA&credit-agricole.com.ua +41811 + Spital Männedorf AG + Bruno Baldauf + b.baldauf&spitalmaennedorf.ch +41812 + Rouis Labs + Khalifa Rouis + labs&rouis.net +41813 + Anhui comhigher tech co.,ltd + Sun Xinya + xinyasun&tsinghua.edu.cn +41814 + Hubei University Of Automotive Technology + Lan JianPing + ljp_1984&126.com +41815 + Fraunhofer-Institut fuer Software- und Systemtechnik ISST + Ralf Nagel + ralf.nagel&isst.fraunhofer.de +41816 + Blissful Living Foundation + Bruno Lago + admin&blissful.im +41817 + Cooper Gitiesse + Maurizio Cannella + Maurizio.Cannella&cooperindustries.com +41818 + Quotient, Inc. + Rob Payne + rpayne"ient-inc.com +41819 + IPNetwork + Ingo Peukes + admin&ipnetwork.de +41820 + Kanton Basel-Landschaft + Claude Tomek + claude.tomek&bl.ch +41821 + Frantovo.cz + Frantisek Kucera + iana-contact&frantovo.cz +41822 + Project FiFo + Heinz N. Gies + heinz&licenser.net +41823 + Miaozhen Systems + Chi Song Tao + cst&miaozhen.com +41824 + Université Gaston Berger + Moussa Diagne + moussa.diagne&ugb.edu.sn +41825 + Agilord Ltd. + Istvan Soos + istvan.soos&agilord.com +41826 + Prognus Soluções Livres em TI + William Fernando Merlotto + william&prognus.com.br +41827 + Novantum BV + Ron Arts + ron.arts&novantum.com +41828 + NySoft Argentina SRL + Leonardo Bracco + leonardo&nysoft.com.ar +41829 + MEDDATA + SAIT SARI + sait&meddata.com.tr +41830 + PicoCELA Inc. + Hiroshi Furukawa + info&picocela.com +41831 + Bitbase AS + Stig Christian Aske + stigchristian&bitbase.no +41832 + Private Entrepreneur Kutsevol Maxym + Maxym Kutsevol + max&kutsevol.com +41833 + Paree BV - Elektro Telecom + Erik de Jong + erik.de.jong&paree.nl +41834 + BRAM Technologies + Dmitry Repkin + rd&bram.tv +41835 + JDL Digital Systems Inc. + Yanda Ma + yanda&airshipvms.com +41836 + bct electronic GesmbH + Peter Meerwald + p.meerwald&bct-electronic.com +41837 + Evan-Moor Corp + Eric Lindquist + administrator&evan-moor.com +41838 + Dynamic Network Services Inc. + Josh Bradley + jbradley&dyn.com +41839 + Prism-IPX Systems, LLC + Russell Friery + rfriery&prism-ipx.com +41840 + University of the Philippines Manila + Diosdado B. Calmada + dbcalmada&post.upm.edu.ph +41841 + Zhuhai Bluemax Broadband Electronic Co.,Ltd + Chen Guoxiang + cgx613&163.com +41842 + Novosibirsk State University + Adamansky Anton + adamansky&post.nsu.ru +41843 + Uni-Film-Club Dortmund + Fabian Schlenz + fabian&ufc.tu-dortmund.de +41844 + PERF-IT B.V. + René de Theije + info&perf-it.eu +41845 + Bitcarrier S.L. + Martin Mendez + info&bitcarrier.com +41846 + Chinasoft International Co., Ltd. + Meng Gang + knight.meng&chinasofti.com +41847 + EDALab s.r.l. + Stefano Cailotto + stefano.cailotto&edalab.it +41848 + TOVEK + Ludovit Kontsek + support&tovek.cz +41849 + CIDON + Julio Cidon + julio&cidon.es +41850 + DaySequerra Corporation + David V. Day + david&daysequerra.com +41851 + zeb/rolfes.schierenbeck.associates gmbh + Patrick Haubold + webmaster&zeb.de +41852 + Peregrine Capital Management + TJ Cornish + domain.admin&peregrine.com +41853 + RAMI + LOUCHART PASCAL + plouchart&ramiaudio.com +41854 + W.J. Bradley + Adam Steed + adam.steed&wjbradley.com +41855 + Logol + Sergey Beloff + admin&logol.ru +41856 + Grand Valley State University + Jason Kunnen + dnsadmin&gvsu.edu +41857 + AGENCE NATIONALE DES INFRASTRUCTURES NUMERIQUES ET DES FREQUENCES + MASSAMBA AIME MARTIAL + info&aninf.ga +41858 + The Trade Desk, Inc. + Ryan Reynolds + ryan.reynolds&thetradedesk.com +41859 + Hidden Design Kft. + Viktor LOOSZ + efpe&hidden.hu +41860 + Oryon TI + Joel Franco Guzman + joel&oryonti.com.br +41861 + Tucker Ellis LLP + Lee K. Harris + lee.harris&tuckerellis.com +41862 + Metawell + Ralf Krieg + postmaster&metawell.com +41863 + Mongoose GFX + Andrew Hughes + andrewhughes&mongoosegfx.co.nz +41864 + EyeKor LLC. + Yijun Huang + yhuang&eyekor.com +41865 + Monitor Business Machines Ltd + Andrew Hughes + andrew.hughes&monitorbm.com +41866 + Hitachi-LG Data Storage, Inc. + Yong Hyun, Ahn + anyong&hlds.co.kr +41867 + yinyuetai + taotan + tao.tan&yinyuetai.com +41868 + elecom co., ltd. + kosuke okada + Kosuke_Okada&elecom.co.jp +41869 + Selex Gematronik GmbH + Andre Weipert + a.weipert&gematronik.com +41870 + Notartel S.p.A + Carmine Cesarano + ccesarano¬ariato.it +41871 + Sonifex Ltd + Adam Borowski + adam&sonifex.co.uk +41872 + Masdar PV GmbH + Peter Kruse + pkruse&masdarpv.com +41873 + Institut Superieur d'Electronique de Paris (ISEP) + Christophe Boyanique + admsys-iana-pen&isep.fr +41874 + LLC "ANTE-MEDIAM" + Valentyn Shapoval + valshµsoft.com +41875 + Esselte IPR AB + David Block + dblock&esselte.com +41876 + FOXCOMM NETWORKS + Grigory Korotov + g.korotov&foxcomm.ru +41877 + Orban + Greg Ogonowski + greg&indexcom.com +41878 + Tobias & Tobias + Ian Taylor + ian.taylor&tobias.tv +41879 + Mind Labs + Vyacheslav Pogoreltsev + sysadm&mind.com +41880 + MIcrotel Innovation S.r.l. + Adelio De Bernardi + adelio.debernardiµtelinnovation.com +41881 + Korbitec (Pty) Ltd. + Ricky Burrell + korbitec&gmail.com +41882 + KLU Consulting / KÅkua Lolo Uila + Michael V. David + michael&mvdavid.com +41883 + Trojan Technologies + Rob Marles + is-admin&trojanuv.com +41884 + Katherine Shaw Bethea Hospital + David Ginn + dginn&ksbhospital.com +41885 + NDsoftware + kenji murakami + kenji&ndsoft.co.jp +41886 + Beijing Sapling Technology Co.,Ltd + Jikun + jikun&sapling.com.cn +41887 + ENSCO, Inc. + Devin Whelan + ist.ca&ensco.com +41888 + URZ Friedrich-Schiller-Universität Jena + Thomas Sesselmann + thomas.sesselmann&uni-jena.de +41889 + Nine Internet Solutions AG + Nils Caspar + nils.caspar&nine.ch +41890 + Cuyahoga Community College District + David Mastny + information.security&tri-c.edu +41891 + Holland LP + Tim Rushing + hollandit&hollandco.com +41892 + BIFIT Service + Dmitrij Kovalevskij + kovalevsky&bifit.ua +41893 + DBM S.r.l. + Matteo Piva + matteo.piva&dbmsrl.com +41894 + Logistica Integral + Ernesto Pareja + epareja2&gmail.com +41895 + Alliance Data + Mark Mishler + mark.mishler&alliancedata.com +41896 + Alberta Electric System Operator + Leo Li + leo.li&aeso.ca +41897 + Inovar + Dan Parker + dan.parker&inovar.com +41898 + Australian Nuclear Science Technology Organization + Daniel Matusch + dm&ansto.gov.au +41899 + YU JYA TECHNOLOGY CO., LTD. + Steve Chen + steve.chen&azuretec.com +41900 + Ministry of Interior, Bulgaria + Valentin Velkov + v3&mvr.bg +41901 + CSG SCIENCE&TECHNOLOGY CO., LTD.HEFEI + BING LU + support&csgnet.cn +41902 + Gemeindeverwaltung Landquart + Matthias Hirschmann + mhirschmann&baggenstos.ch +41903 + ETL Solutions Ltd. + Martin Pegler + sysadmin&etlsolutions.com +41904 + Impala Editores, SA + Ricardo Matos + ricardo.matos&impala.pt +41905 + Great-West Life + Ronald Hewson + ron.hewson&investorsgroup.com +41906 + VeriSign, Inc. + Danny McPherson + dmcpherson&verisign.com +41907 + LoudCell Technologies Pvt Ltd. + Yogesh Sharma + yogesh&loudcell.com +41908 + HanKeInfo + Alfred Huang + alfredhuang&hankeinfo.com.cn +41909 + AventuraHQ, Inc + Adam Williams + adam.williams&aventurahq.com +41910 + Zentyal + Jose Antonio Calvo + jacalvo&zentyal.com +41911 + Great Plains Manufacturing, Inc. + John Woods + jwoods&greatplainsmfg.com +41912 + International Electrotechnical Commission + Herbert Falk + herb&sisconet.com +41913 + Tecsys do Brasil Industrial Ltda + Rodolfo Vidal + rodolfo&tecsysbrasil.com.br +41914 + Bradford Robotic Telescope + Dan Hedges + admin&telescope.org +41915 + Southwestern Energy Co. + Tom LeClare + tom_leclare&swn.com +41916 + vIPtela Inc. + Ramesh Prabagaran + ramesh&viptela.com +41917 + Leica Geosystems AG + Armin Märk + webteam&leica-geosystems.com +41918 + CIT Telecom-Service JSC + Egor Duda + iana&corpit.ru +41919 + Ugobame Uchibeke + Ugobame Uchibeke + uchi4jah&gmail.com +41920 + Shenzhen Integrated Electronic Systerms Lab Co.,Ltd. + DuMin + duolaheimeng123&163.com +41921 + Beijing Infomedia Electronic Technology Co., Ltd + Xuhu + evchnil&263.net +41922 + GuangDong Super Telecom Co,Ltd. + tom.liu + tom.liu&sts.cn +41923 + Patrick Sczepanski + Patrick Sczepanski + patrick&sczepanski.com +41924 + Digital Value SL + Juanjo Garcia + juanjo&digitalvalue.es +41925 + Nufarm Limited + Geoff Aldred + admin.it&au.nufarm.com +41926 + Finecom Telecommunications AG + Erich Hohermuth + erich.hohermuth&finecom.ch +41927 + FORO-tele + Maxim Struchok + max&foro-tele.com +41928 + Muir Matheson Ltd + Blair Moir + blair.moir&muir-matheson.com +41929 + Jung, DMS & Cie. AG + Christian Bauer + christian.bauer&jungdms.de +41930 + Nautronix Limited + Iain MacMillan + Iain.MacMillan&nautronix.co.uk +41931 + CMC Electronics + Joel Savard + joel.savard&cmcelectronics.ca +41932 + HSC Brasil + Junior Cunha + junior.cunha&hscbrasil.com.br +41933 + Aligera + Wagner Müller Gegler + wagner&aligera.com.br +41934 + NKI AS + Christian Skarby + csk&nki.no +41935 + Indian River County Sheriff + Andy Collier + acollier&ircsheriff.org +41936 + Marway Power Solutions + Greg Willits + gwillits&marway.com +41937 + Escola Agricola de Jundiai - EAJ/UFRN + Thiago Dutra + thiago&eaj.ufrn.br +41938 + INCEPTRUM Technologies Inc. + Dmitry Kursov + dmitry.kursov&inceptrum.com +41939 + Tralix México S. de R.L. de C.V. + Dario Morales López + dario.morales&tralix.com +41940 + Bradbury School + Christopher Chan + christopher.chan&bradbury.edu.hk +41941 + StuStaNet e. V. + Markus Kaindl + vorstand&stustanet.de +41942 + Lettergen + Vincent Van der Kussen + it&btr-services.be +41943 + Bartec GmbH + Ralf Bauermeister + ralf.bauermeister&bartec.de +41944 + Virginia Department of Behavioral Health and Developmental Services + Marcie Stidham Stout + marcie.stidham&dbhds.virginia.gov +41945 + Institution Solutions + Jerome Haltom + jhaltom&isillc.com +41946 + The Information Architecture Institute + Dorian Taylor + iana-pen&iainstitute.org +41947 + Unidem Sales Inc + Nicholas Linn + nicklinn&michebag.ca +41948 + Job Snijders + Job Snijders + job&instituut.net +41949 + Danmagi + Julius Sloth + jsloth&danmagi.com +41950 + DTI Solutions + Marc Devault + itlicensing&dtisoft.com +41951 + Quarles & Brady, LLP + Rich Raether + itops&quarles.com +41952 + Asad Ahmed + Asad Ahmed + mdasadahmed&gmail.com +41953 + JSC "ESC of EVRAAS" + Andrew Shulga + shulga&evraasgr.ru +41954 + Polewall Norge AS + Michael Gallagher + Mjg&polewall.com +41955 + Jansen AG + Gerry Harzl + gerry.harzl&jansen.com +41956 + Fellig + Philipp Schafft + team&fellig.org +41957 + Olfeo + Julien Pinon + jpinon&olfeo.com +41958 + Prime Rate Ltd. + Szabolcs Gyuris + gyszabolcs&primerate.hu +41959 + Earlham College + Randy Schultz + schulra&earlham.edu +41960 + easygo + Kurt Stieger + pen&easygo.at +41961 + IntraCom Systems, LLC + John Jurrius + snmp&intracomsystems.com +41962 + 3ZTelecom Inc. + Enzo Dalmazzo + faisal.sikder&gmail.com +41963 + WebAmphibian.Com + Roland Stolfa + rstolfa&yahoo.com +41964 + Ozona Consulting, S.L. + Fernando Vázquez Vázquez + ssii&ozona.es +41965 + Mano Namai UK + Valerij Prusakov + valerij.prusakov&gmail.com +41966 + Applied Card Technologies Ltd. + Nick Wilson + nick.wilson&weareact.com +41967 + Pivot Point Security + Michael Gargiullo + michael.gargiullo&pivotpointsecurity.com +41968 + EPCOTS + Alaa AADIL + alaa.aadil&epcots.fr +41969 + Enero Solutions, inc. + François Trahan + ftrahan&enerosolutions.com +41970 + Orion Networks International, Inc. + David Smith + d.smith&orionni.com +41971 + Touch Tecnologia e Informática LTDA + Rodrigo Vieira Couto + rcouto&touchtec.com.br +41972 + Poznan University of Life Sciences + Robert Stanislawiak + robert.stanislawiak&up.poznan.pl +41973 + Generation Tech + Ken McDonald + ken&generationtech.org +41974 + Auf nach Mallorca GmbH + Benjamin Behringer + benjamin.behringer&auf-nach-mallorca.info +41975 + ALNET ELEKTROMEKANIK LTD + METIN YAZICI + metin&alnet.com.tr +41976 + Turvasana Tmi + Thor Kottelin + thor.kottelin&turvasana.com +41977 + Oakland County, Michigan + Rick Snook + snookr&oakgov.com +41978 + BEIJING DING QING TECHNOLOGY LTD. + Chen Kai(Mr.) + kai.chen&startechsoft.com +41979 + Mitsubishi Electric TOKKI Systems Corporation + Takashi Iwaki + taka-iwaki&west.melos.co.jp +41980 + Neo-Renaissance Studios + Shane Spinuzzi + rspinuzzi&neorenaissancestudios.com +41981 + AerVox + David Berrocal + david.berrocal&aervox.com +41982 + zetVisions AG + Sascha Winter + it-support&zetvisions.com +41983 + Vorboss Limited + Timothy Creswick + noc&vorboss.net +41984 + meterriblecrew.net + Andreas Wiese + aw-pen&meterriblecrew.net +41985 + Desvaux Labs + Pierre Desvaux + contact&desvaux.eu +41986 + deepearth.co.uk + Aubrey Stark-Toller + aubrey&deepearth.co.uk +41987 + BMO Capital Markets + Nina Pyron + nina.pyron&bmo.com +41988 + Van Wert County Hospital + Deb Point, Clinical Applications Coordinator + dpoint&vanwerthospital.org +41989 + Alphatron Security Systems + B.D. van der Have + b.van.der.have&alphatron.nl +41990 + Pelagicore AG + Robert Griebl + robert.griebl&pelagicore.com +41991 + Super-Visions + Christophe Fonteyne + christophe.fonteyne&super-visions.com +41992 + HOPPE Holding AG + Gerhard Kapeller + gerhard.kapeller&hoppe.com +41993 + Redactia + Quentin Armitage + Quentin.Armitage&redactia.co.uk +41994 + Jonas Kopp Systems Trust Network + Jonas Kopp + jonaskoppsystems&gmail.com +41995 + SIA-CE + Attila Foris + oid&fredhome.net +41996 + COM-TECH Italia S.p.A. + Stefano De Paoli + snmp&com-tech.it +41997 + Silversky Inc. + William Lewis + bill.lewis&silversky.com +41998 + Bumicom Telecommunicatie B.V. + Arnoud Mulder + arnoud.mulder&bumicom.nl +41999 + e2x Ltd. + Darren Beck + darren.beck&e2x.co.uk +42000 + National Mineral Resource University + Popov Mikhail + popov&spmi.ru +42001 + TechDivision GmbH + Philipp Dittert + p.dittert&techdivision.com +42002 + Hurrikane Systems + Mark Kubacki + kubacki&hurrikane.de +42003 + Akron Public Schools + Derek Lewis - Technology Services + core_support&akron.k12.oh.us +42004 + Gertec + Eduardo Santos + eduardo.santos&gertec.com.br +42005 + NHST MEDIA GROUP AS + Ole Kristian Klevstrand + okk&nhst.no +42006 + netis korea + yun hyung taek + yun0512&gmail.com +42007 + nikolakoco + Nikolche Kochovski + nikolakoco89&gmail.com +42008 + BumeBox, Inc. + Per Thomsen + pthomsen&bumebox.com +42009 + Riava Networks Inc. + Aki Tsuzuku + aki&riava.net +42010 + Luxul Corporation + Clark Roundy + croundy&luxul.com +42011 + ISAAC Software Solutions B.V. + Martijn Grendelman + admin&isaac.nl +42012 + Mangold Technologies + Michael Pfeuffer + pfeuffer&mangoldtechnologies.com +42013 + Registro General de la Propiedad de Guatemala + Laura Maria Marroquin Cortez + lcortez&rgp.org.gt +42014 + Francois Trahan + François Trahan + francois.trahan&gmail.com +42015 + Weilhammer Networks + Robert Weilhammer + robert&weilhammer.com +42016 + Kingman Regional Medical Center + Chris Jones + cjones&azkrmc.com +42017 + MailMak ApS + Tommy Holm Jakobsen + thj&mailmak.com +42018 + numo labs Pty. Ltd. + Reza Monavari + admin&numolabs.com +42019 + Fort-Telecom + Alexandr Belyaev + ABelyaev&fort-telecom.ru +42020 + Piter Gaz JSC. + Maxim Y. Evdolyuk + itsupport_prof&petergaz.com +42021 + VoiceCom SA + Valentin Zahariev + vzahariev&voicecom.bg +42022 + ITUS JAPAN + kijong lee + support&itus.co.jp +42023 + Thetus Corporation + Sam Alpher + salpher&thetus.com +42024 + Cibertec Internacional + Miguel Quesada + mquesadab&cibertec.com +42025 + Koji Komatsuzaki + Koji Komatsuzaki + kojikomatsuzaki&gmail.com +42026 + TSTREAM CO.,LTD. + Yongjae Lee + yjlee&tstream.co.kr +42027 + Sanctum Networks (P) Ltd. + Girish Vinayak Gulawani + girish&sanctumnetworks.com +42028 + Arnel limited + Gary Bowyer + gbowyer&arnel.co.uk +42029 + Amigo Software + Junaid Abid Ali + junaid.ali&amigo-software.com +42030 + Ghost Software + Junaid Abid Ali + junaid.ali&ghost-software.com +42031 + 42 + Kevin 'Ether' Boulain + iana&staff.42.fr +42032 + swisspartners Investment Network AG + Othmar Büeler + it&swisspartners.com +42033 + IslaLink + Javier Valero + javier.valero&islalink.es +42034 + Intemo Technologies + Victor Palacio Tarrega + vpalacio&intemotechnologies.com +42035 + Zedge + Thomas Tinglum + thomas&zedge.net +42036 + LOYTEC electronics GmbH + Thomas Rauscher + trauscher&loytec.com +42037 + Stadt Augsburg + Manfred Gundel + netze.it&augsburg.de +42038 + Sanquin Bloedvoorziening + Rik Hulleman + r.hulleman&sanquin.nl +42039 + Laboratoire Jacques Louis Lions + Altaïr S. Pelissier + altair.pelissier&ljll.math.upmc.fr +42040 + Nasuni Corporation + Rob Mason + iana&nasuni.com +42041 + Vänerhamn AB + Kristian Holmqvist + kristian.holmqvist&vanerhamn.se +42042 + Inca Telecom S.A.C. + Antonio Franco + antonio.franco&incatelecom.com +42043 + DingLi Communications Corp., Ltd. + Ding Li + wancheng.li&dinglicom.com +42044 + GMQ Consulting AB + Ola Eriksson + service&gmq.se +42045 + Logical Tools s.r.l. + Mr. Fabio Pucitta + info&logicaltools.com +42046 + DigitalSign - Certificação Digital Ltda + Fernando Moreira + suporte&digitalsigncertificadora.com.br +42047 + twis.la (Clement Martin) + Clement Martin + twisla&twis.la +42048 + Circle of Life Hospice + Matthew Dickson + sysadmin&nwacircleoflife.org +42049 + Achkey Ltd + Hugo Jobling + hugo.jobling&achkey.com +42050 + China Security & Surveillance Technology,Inc. + chen yiliang + yiliang.chen&csst.com +42051 + Skyward Information System Co.,LTD. + Yasushi Sonegawa + sone&shinetsu.jp +42052 + vitapublic GmbH + Christian Bode + hostmaster&vitapublic.de +42053 + MEDvision360 + Ralph van Etten + ralph&medvision360.com +42054 + Stadler Bussnang AG + Andreas Buechi + andreas.buechi&stadlerrail.com +42055 + West Lothian Council + Jamie Girdwood + jamie.girdwood&westlothian.gov.uk +42056 + MultiToll Solutions SAS + Hugues-Olivier Yar + normes&multitoll.fr +42057 + cegedim + Samuel Mutel + monitoring-admin&cegedim.com +42058 + Lomnido, s.r.o. + Roman Szabados + Roman.Szabados&Lomnido.com +42059 + MED2020 Health Care Software Inc. + Michael Chiviendacz + michael.chiviendacz&med2020.ca +42060 + Egon Braun + Egon Braun + egonbraun&gmail.com +42061 + SquareTwo Financial + John-Thomas Gaietto + jtgaietto&squaretwofinancial.com +42062 + CyberTransJapan Co., Ltd. + Takashi Takesue + info&cybertrans-jp.com +42063 + Guidoon SAS + Cyril Tata + cyril.tata&guidoon.com +42064 + Royse City ISD + Tony Liptrap + liptrapt&rcisd.org +42065 + Iberia + Javier Pardo + jpardo&iberia.es +42066 + dbSpectra + Hal Asbridge + halasbridge&aksolutions.com +42067 + Bayerische Staatsforsten AoeR + Markus Schneider + markus.schneider&baysf.de +42068 + UBM Drecker GmbH + Pascal Drecker + pascal.drecker&ubm.de +42069 + The Comptroller General’s Department + Ms. Rattanaporn Ussavanuphap + ratanaus&cgd.go.th +42070 + German Aerospace Center; Institute of Communications and Navigation + Hartmut Brandt + hartmut.brandt&dlr.de +42071 + Sprecher Automation GmbH + Helmut Feichtinger + pen-admin&sprecher-automation.com +42072 + Homes and Communities Agency + Jon Walker + jon.walker&hca.gsi.gov.uk +42073 + DatASE + Martin Pegler + martin&datase.co.uk +42074 + Deltenna Limited + Sean Godwin + sean.godwin&deltenna.com +42075 + BAFO Technologies Corp + Jerry Chang + jerry_chang&bafo.com.tw +42076 + saltation GmbH & Co. KG + Matthias Hörmann + mhoermann&saltation.de +42077 + sRatio + John P. Birck + it&sratio.com +42078 + Recursoft.org + Michael Dahlberg + dahlberg&recursoft.org +42079 + Army Emergency Relief + Julius Asante + julius.asante.ctr&aerhq.org +42080 + Dajar + Mateusz Kijowski + mateusz.kijowski&dajar.pl +42081 + TravailPrive + Mateusz Kijowski + m.kijowski&travailprive.eu +42082 + Travis Perkins PLC + Craig Butler + craig.butler&travisperkins.co.uk +42083 + JS Networking Lab + Jason Stultz + stultzjason&gmail.com +42084 + Mike Mackintosh + Mike Mackintosh + mike.mackintosh&zyp.io +42085 + Prolateral Consulting Ltd + Ian Chilvers + Ian.Chilvers&prolateral.com +42086 + Vossloh Cogifer + Guy Bourgin + Guy.Bourgin&vcsa.vossloh.com +42087 + Business Insurance Direct + Sears Young + sears.young&bizdirect.co +42088 + Legal & General Nederland + Wijnand Westra + beheer&landg.nl +42089 + Rambler Internet Holding LLC + Anes Mukhametov + noc&rambler-co.ru +42090 + Aleat shpk + Elton TORO + elton.toro&aleat.com +42091 + Tritech International Limited + Allan Leeming + postmaster&tritech.co.uk +42092 + Serttel LTDA + Bruno Figueirôa + bruno.figueiroa&serttel.com.br +42093 + Expand + Pablo Alsina + palsina&expand.com.uy +42094 + Bfabric.org + Marco Schmidt + ianapen&bfabric.org +42095 + NII SOKB Ltd + Technical Center, Michael Rubashenkov + saferoute&niisokb.ru +42096 + IQnet Ltd + Dragan Vlahovic + dragan&iqnet.co.rs +42097 + IT2u Czech s.r.o. + Dusan Purr + dusan.purr&it2u.cz +42098 + Fahrzeugsystemdaten GmbH + Erik Hennig + erik.hennig&fsd-web.de +42099 + Smart Green Labs S.L. + Carlos Losada + closada&itelsis.com +42100 + DV Industrial Computer Ltd. + Alexander Mruga + am&inpc.com.ua +42101 + iTEL + Alexander Terlanov + alex&tg.lv +42102 + Communications Audit UK Ltd + Paul Thomson + paul.thomson&commsaudit.com +42103 + hmcw gmbh + Richard Wachler + rw&hmcw.de +42104 + wi2be Tecnologia S/A + Albary Franco Pimpao Junior + albary&wi2be.com +42105 + WebControl + Pavel Nesterov + nesterov&web-control.ru +42106 + 'MIGHTY APPARATUS FOR RADIOBRODCASTING AND TV" Joint-Stock Company + Aleksandr Khizhnichenko + mart&mart2.spb.su +42107 + South Carolina Department of Revenue + Rick Gibson + rick.gibson&sctax.org +42108 + HRSoftworks + Brad Held + bheld&hrsoftworks.com +42109 + Linux Based Systems Design, Ltd + Nigel Kukard + nkukard&lbsd.net +42110 + API Digital Communications Group, LLC + Chris Adams + cadams&api-digital.com +42111 + Inovonics, Inc. + Josh McAtee + josh&inovonicsbroadcast.com +42112 + Kakapo Technologies Ltd. + Gevan Dutton + gevan&kakapo.co.nz +42113 + STAsoft.net + Stanislav V. Korsakov + sta&stasoft.net +42114 + Finnish Institute of Occupational Health + Teemu Suurnäkki + teemu.suurnakki&ttl.fi +42115 + CommerceWest Bank + Chuck Charlton + ccharlton&cwbk.com +42116 + AIG + Muneer Baddad + muneer.baddad&aig.com +42117 + Oman Telecommunications Company (S.A.O.G) + Dinesh.S.Devan + dinesh.devan&omantel.om +42118 + IDentAcc + Steffen Koehler + skoehler&identacc.de +42119 + TRACT cjsc + Alexander Golenshin + agolenshin&tract.ru +42120 + Multimatic Inc. + Michael Scott + mscott&multimatic.com +42121 + Michigan Public Health Institute + Joshua Coons + jcoons&mphi.org +42122 + Yurur + Burhan Yurur + bur.han&yurur.net +42123 + Shanghai Xinyou Information Technology Co., Ltd. + Vincent Chen + newpomelo&163.com +42124 + YN-IT + Yosef Nesirat + info&yn-it.de +42125 + CK Engineering Ltd + Dzina Ilya + idzina&dics.ua +42126 + NOVARCHIVE + Nathalie Pinto + pbezamat&novarchive.fr +42127 + SYMCOM INC + Kris Jensen + kris.jensen&symcom.com +42128 + KUL Elektronik Teknolojileri Ltd. + Basri KUL + kulelektronik&gmail.com +42129 + Continental Graphics Corp + Andrew Graham + hostmaster&cdgnow.com +42130 + Skylink Technology Inc. + Alan Meeh + ameeh&skylinktechnology.com +42131 + Westmont College + John Rodkey + rodkey&westmont.edu +42132 + Applied Security GmbH + Volker Roethel + pki&apsec.de +42133 + GoS Networks Ltd. + Graham Willmott + graham.willmott&gosnetworks.com +42134 + ScaleArc + Deepak Patel + deepak.patel&scalearc.com +42135 + TRUSTe + Robert Bruce Carleton + bcarleton&truste.com +42136 + Ultra Electronics Airport Systems + Stuart Jones + stuart.jones&ultra-as.com +42137 + Unipagos S. de R.L. de C.V. + Paul Coppinger + pc&unipagos.com.mx +42138 + Virtualmaster, s.r.o. + Josef Liska + josef.liska&virtualmaster.com +42139 + Internet Corporation for Assigned Names and Numbers + Tomofumi Okubo + tomofumi.okubo&icann.org +42140 + Bitfabrik GmbH & Co. KG + Peter Schillerwein + peter.schillerwein&bitfabrik.de +42141 + Laboratoire d'Informatique Paris Nord + Mr Mamadou Sow + mamadou.sow&lipn.univ-paris13.fr +42142 + The Faculty of Advocates + Mark Beecham + mark.beecham&advocates.org.uk +42143 + Moose Beast Software + Gary Bourke + gary.bourke&moose-beast.com +42144 + cycos AG + Volker Fenners + Volker.Fenners&cycos.com +42145 + PRIME Apparatus + Cliff Wheatley + cliff.wheatley&gmail.com +42146 + EntobilSoft, Inc. + Soonmi Lee + tensal.smlee&entobilsoft.com +42147 + Pepperl+Fuchs GmbH + Dr. Ilja Wettengel + iwettengel&de.pepperl-fuchs.com +42148 + The Geneva Foundation + Jason McKinney + jmckinney&genevausa.org +42149 + Cloud Life Software, LLC + Michael Milom + msmilom&cloudlifesoftware.com +42150 + AffiniInternational B.V. + Gerard Juyn + iana&affinii.nl +42151 + Net Business Pty Ltd + Neil Robinson + neil&netbusiness.com.au +42152 + Itransition + Vadzim Kuzmich + v3.kuzmich&itransition.com +42153 + Chuden CTI Co.,Ltd. + Masashi Kamei + Kamei.Masashi&cti.co.jp +42154 + oak3 GmbH + Thomas Jakobi + tj&oak3.com +42155 + Evolution Racingteam Saar + Eric Scheid + eric&rainerscheid.de +42156 + NeoLab-Systems S.A.R.L. + Didier PRALON + contact&neolab-systems.fr +42157 + CERTIFIRMA, SOCIEDAD ANONIMA + David Elizondo + david&certifirmas.com +42158 + NetAgent Co., Ltd. + Packet Black Hole Technical Support Services (Sugiura Takayuki) + pbh-support&netagent.co.jp +42159 + AT-Biotech Traceability Information Systems, S.L.U. + Juan Gómez + jgomez&at-biotech.com +42160 + Iverdahl Systems + M.V. de Jong + mvdejong&luna.nl +42161 + GIE AGIRC-ARRCO + Stephane Barban + sbarban&agirc-arrco.fr +42162 + NAKAYO ELECTRONICS CO.,LTD + Masafumi Sueyoshi + sueyoshi&es.nakayo.co.jp +42163 + EBS Service Company Limited + Dimitrije Miljevic + dimitrije.miljevic&ebs.com +42164 + Ministério Público do RS + Fabiano Martins + fmartins&mp.rs.gov.br +42165 + Pi-Coral Inc. + Robert Snyder + mib-contact&pi-coral.com +42166 + Saint Josephs Hospital, Yonkers + Deborah DiBernardo + deborah.dibernardo&saintjosephs.org +42167 + Data Tote + Jim Tambling + jim.tambling&datatote.co.uk +42168 + blackchair Ltd + Austen Jackson + austen.jackson&theblackchair.com +42169 + The Coca-Cola Company + Thorsten Hofrichter + thofrichter&coca-cola.com +42170 + Tiger Computing Ltd. + Chris Boot + info&tiger-computing.co.uk +42171 + Gravitate + Boris Putanec + hostmaster&gravitate.com +42172 + Strencom + James Waite + james.waite&strencom.net +42173 + Adiczion SARL + Christophe CRIER + ccr&adiczion.com +42174 + ThiemoNet + Thiemo Nordenholz + oidreg&service.thiemo.net +42175 + REFER Telecom, S.A. + Pedro Miguel Oliveira Simões + posimoes&refertelecom.pt +42176 + eBernd + Bernd Hofmann + iana&ebernd.com +42177 + Anuta Networks, Inc. + Praveen Vengalam + praveen&anutanetworks.com +42178 + Nym Networks + Jakob Borg + jakob&nym.se +42179 + Sonora Quest Laboratories + Bryan Seminara + webmaster&sonoraquest.com +42180 + Kantonsspital Winterthur + Matthias Spühler + matthias.spuehler&ksw.ch +42181 + Wavecom - Soluções Rádio S.A. + Bruno Antunes + bantunes&wavecom.pt +42182 + Speed and Function + Nick Gluzdov + gluzdov&gmail.com +42183 + Digitus Biometrics + Chris Marsden + cmarsden&digitus-biometrics.com +42184 + ECG Management Consultants, Inc. + John Murphy + support&ecgmc.com +42185 + DEMTECH + Jean DEMARTINI + jean.demartini&demtech.net +42186 + National Cement Company, Inc. + Valentin Stoilov + domreg&natcem.com +42187 + Podomatic, Inc + Justin Dossey + jbd&podomatic.com +42188 + MATRIXGROUP (CMS) PTY LTD + Julian McDonnell + julianm&matrixgroup.com.au +42189 + JRTwine Software, LLC + James R. Twine + jtwine&jrtwine.com +42190 + Genowise + Lixin Zhou + zhou.lixin&gmail.com +42191 + TotalServe Pty Ltd + Michael Pasqualone + support&totalserve.net.au +42192 + IDF Connect, Inc. + Richard Sand + rsand&idfconnect.com +42193 + Alpha Networks S.A. + Xavier Sacré + xavier.sacre&alphanetworks.be +42194 + Matthews Midrange Consulting, Inc. + Gene Matthews + gene&mmc-inc.com +42195 + Tektorque, Lda + Emanuel Fernandes + efernandes&tektorque.com +42196 + Cauldron Development LLC + Joseph Coffland + joseph&cauldrondevelopment.com +42197 + Coffee Bean Software Pty Ltd + Mike Ciavarella + snmp-pen-contact&cbsoft.com.au +42198 + IO-Power Technology Co., Ltd. + Jacky Cheng + jacky&io-power.com.tw +42199 + Foothills Rural Telephone Cooperative Corporation Inc. + Matthew Bailey + matthew&foothills.coop +42200 + Ecil Informática Indústria e Comercio LTDA + Alberto Ferreira da Silva + alberto&ecilenergia.com.br +42201 + Schenker, Inc. + Brian Klauss + brian.klauss&dbschenker.com +42202 + FreeTel, s.r.o. + Jaroslav StÅ™eÅ¡tík + info&freetel.cz +42203 + TRAÇOTOPÃZIO - INFORMÃTICA UNIPESSOAL LDA + Fernando Hackbart + tracotopazio.informatica&gmail.com +42204 + Kumoya Network + Hiroki Otsuka + otsuka&kumoyanet.com +42205 + Dooks Computer Services Ltd. + Alexey Maslennikov + alexey&dooks-it.com +42206 + Proelse + Jesus Manuel Conejo Sarabia + jmconejo&proelse.es +42207 + Commission Scolaire de la Pointe-de-l'Ile + Robert Mc Cready + robert-mccready&cspi.qc.ca +42208 + itecPlus GmbH + Reiner Winter + reiner.winter&itecplus.de +42209 + CharlesRead Dot Com + Charles Read + charles&charlesread.com +42210 + Beenius d.o.o. + Miha Cerar + miha.cerar&beenius.tv +42211 + SHENZHEN HUAXUNARK TECHNOLOGY Co. Ltd. + Sun Rongjun + zhangming&huaxunchina.cn +42212 + CareCenter Software GmbH + Christoph Hatzenberger + hatzenberger&carecenter.at +42213 + troydenton.ca + Troy Denton + trdenton&gmail.com +42214 + Kaplan Bilisim Teknolojileri Yazilim ve Ticaret Ltd. + Yasin KAPLAN + yasin.kaplan&kaplansoft.com +42215 + Alerant Inc. + Peter Nagy + nagy.peter&alerant.hu +42216 + BlueCorner + Rueben Van Mol + rueben.vanmol&enovates.com +42217 + Khoo Software Solutions + Eddie Khoo + software&khoo.id.au +42218 + ValleyCare Health System + Jenny Yiu + jyiu&valleycare.com +42219 + UniCredit Luxembourg S.A. + Michael WALDINGER + PrivateEnterpriseNumber&unicreditgroup.lu +42220 + TELEDATA IT-Lösungen GmbH + Roman Gross + support&teledata-nahdran.de +42221 + Syl Research Limited + Adrian John + adrian.john&sylsemantics.com +42222 + Integrated Systems Technology, Inc. + Nathan Schlutter + NSchlutter&IntSysTek.com +42223 + Archive Analytics Ltd + John Burns + John.Burns&ArchiveAnalytics.com +42224 + Fraunhofer Portugal Research Center for Assistive Information and Communication Solutions (Fraunhofer AICOS) + Carlos Alexandre Teixeira do Amaral Resende + carlos.resende&fraunhofer.pt +42225 + Amco Marketing + Kate Gray + kate&amcomarketing.com +42226 + Evolve Media LLC + Richard Kruszewski + sysadmins&evolvemediallc.com +42227 + Max-Planck-Institut fuer Mikrostrukturphysik + Frank Mueller + frank.mueller&mpi-halle.mpg.de +42228 + Center Group + Dinar Rakhimbaev + rakhimbaev&cg.ru +42229 + Coriant R&D GmbH + Peter Litz + peter.litz&coriant.com +42230 + HiProCall GmbH + Lothar Schmitt + L.Schmitt&hiprocall.de +42231 + AlfaTrein Ltd + Vladimir Isaev + isaevv_r&alfatrein.ru +42232 + Fanzz + Shawn Waters + iana-pen&fanzz.com +42233 + Sigma Designs Inc. + Edmund Lee + edmund_lee&sigmadesigns.com +42234 + Knotice, Ltd. + Ron Cuirle + rcuirle&knotice.com +42235 + Tresorit Kft. + Istvan Lam + lam&tresorit.com +42236 + RDT Ltd + Holger Hasenstrauch + itsupport&rdt.co.uk +42237 + Texas A&M University-Central Texas + Steven Blum + steven.blum&ct.tamus.edu +42238 + Grenville Mutual Insurance Company + Andrew Asquith + itservices&grenvillemutual.com +42239 + Aspira Networks, Inc + Bart Wyatt + iana-admin&aspiranetworks.com +42240 + Keyano College + Hasan Mehdi + hasan.mehdi&keyano.ca +42241 + Geoquip Worldwide + Paul Renham + paul.renham&geoquip.com +42242 + znets + DESCOMBES Thierry + thierry.descombes&gmail.com +42243 + DLA Piper LLP (US) + Don Krtanjek + donald.krtanjek&dlapiper.com +42244 + ITS Express, Inc. + Mark Schulting + mschulting&itsexpress.com +42245 + Tagged, Inc. + Corey Hickey + chickey&tagged.com +42246 + OnePIN, Inc. + Marcin Nowak + it&onepin.com +42247 + Aleph01 + David Rouillon + contact&aleph01.com +42248 + SAIV + Giovanni Lovato + giovanni.lovato&saiv.it +42249 + Claritech SRL + Cristian Croitor + cristian&claritech.ro +42250 + HFC Technics Ltd. + Gergely Peter, Tamas + g.tamas&hfctechnics.hu +42251 + FutureTek, Inc. + In Hyun, Cho + xtra72&gmail.com +42252 + Pflegeheim Alexander Beer GmbH & Co KG + Martin Schneider + m.schneider&pflegeheim-beer.at +42253 + Zalando GmbH + Hanno Hecker + sysop&zalando.de +42254 + Inline Telecom Solutions + Dmitriy Pustovalov + d_pustovalov&inlinetelecom.ru +42255 + The All England Lawn Tennis Club (Championships) Limited + Paul Beyer + it-alerts&aeltc.com +42256 + McGuireWoods LLP + Stephen Hogan + shogan&mcguirewoods.com +42257 + Cambridge Major Laboratories, Inc. + Joe Nolan + j.nolan&c-mlabs.com +42258 + ooblick.com + Andrew Arensburger + iana&ooblick.com +42259 + Green Energy Options Ltd + Adrian van den Heever + geo.pen&greenenergyoptions.co.uk +42260 + Bent Vector + Rob Targosz + rtargosz&bentvector.com +42261 + Sayegh & John e-Trolley GbR + Nabil Sayegh + internet&e-trolley.de +42262 + TechRede, LLC + Shannon Fritz + pen&techrede.net +42263 + Servas + Matteo Pedani + matteo&servas.it +42264 + Fabien Debuire + Fabien Debuire + debuire.fabien&gmail.com +42265 + Thunder Software Technology Co., Ltd. + zhangqiang + zhangqiang&thundersoft.com +42266 + Otto (GmbH & Co KG) + Timo Gloeden + timo.gloeden&otto.de +42267 + SARL Mixcom + Philippe Rolland + mibadmin&mixcom.fr +42268 + MEWA Textil-Service AG & Co. Management OHG + Hagen Block + Hagen.Block&mewa.de +42269 + Rigspolitiet (Danish National Police) + Peter Thiim + pth013&politi.dk +42270 + Azienda Unita' Sanitaria Locale di Parma + Domenico Ielo + dielo&ausl.pr.it +42271 + Fixious Global Indonesia + Feny Suharyono + fenk&fixious.com +42272 + Howard University Hospital + Bernie Galla + bgalla&huhosp.org +42273 + AMPER + David Marza + david.marza&eronline.com +42274 + Nexusguard Limited + Juniman Kasman + juniman&nexusguard.com +42275 + Advanced MR Analytics AB + Jonatan Lindström + pen&amraab.se +42276 + Infragear Inc + Livio Ceci + livio&infragear.com +42277 + CSW.IO + Robert Van Kleeck + rob&csw.io +42278 + Precitel SA + Jim Liener + jml&precitel.com +42279 + SensMaster S/B + Martin Harnevie + martin&sensmaster.net +42280 + SatExpander + Dan Peleg + dan.peleg&satexpander.com +42281 + InfoBridge Solutions + Naimish Dayah + naimish&infobridge.co.uk +42282 + Pragmatix Services Private Limited + Sandeep Singh Sandhu + sandeep.sandhu&pragmatixservices.com +42283 + Berwick Area School District + Dave Lovette + dlovette&berwicksd.org +42284 + Kai van Es + Kai van Es + kai.vanes&gmail.com +42285 + FCS Computer Systems Sdn Bhd + David Hutt + david.hutt&fcssolution.com +42286 + Connectem Inc. + Heeseon Lim + heeseon&connectem.net +42287 + UAP inc. + Pierre Ouellet + is-admin&uapinc.com +42288 + Sportech Inc. + Andrew Hall + andrew.hall&sportech.net +42289 + NetTech Associates LLC + Dean Thuline + deant&ntaglobal.com +42290 + LLC Sysvisor + Aleksey Tretyakov + sysvisor&mail.ru +42291 + DWANGO MOBILE Co., Ltd. + Masahiro Honma + infra1&dwango.co.jp +42292 + SL Audio A/S + Thomas Birkelund + tbi&lyngdorf.com +42293 + North-West Customs-Logistical Service Co. Ltd. + Maksim Andrukhovich + uc&sztls.ru +42294 + S. & A.S. Ltd. + Ziad Boustany + ziad&sascontrollers.com +42295 + imzadi.de Network + Anna Christina Naß + christina&imzadi.de +42296 + Impero Solutions Ltd + Richard Moscone + rmoscone&imperosoftware.com +42297 + Fraunhofer-Institut fuer Kommunikation, Informationsverarbeitung und Ergonomie FKIE + Steffen Grathwohl + steffen.grathwohl&fkie.fraunhofer.de +42298 + Smoothwall Ltd + Daniel Barron + daniel.barron&smoothwall.net +42299 + Johnson Financial Group + Hank Ollanketo + hollanketo&johnsonbank.com +42300 + Ministère de la santé et des serveurs sociaux + Mathieu Alain + mathieu.alain&msss.gouv.qc.ca +42301 + turleyclan.com + Edward Lawrence Turley + ed-and-ale&sbcglobal.net +42302 + Beijing ForEase Times Technology Co., Ltd. + Jonsen Yang + yangmingmao&forease.net +42303 + TE-SYSTEMS GmbH + Oliver Koerber + info&te-systems.de +42304 + it & synergy GmbH + Martin Koeditz + martin.koeditz&it-syn.de +42305 + Lupus alpha Asset Management + Matthias Biedenkapp + group-adminmanager&lupusalpha.de +42306 + CANARIE Inc. + Chris Phillips + iana&canarie.ca +42307 + Wildcard UK Ltd + Lee Johnston + lee&wildcard.net.uk +42308 + IndexUniverse, LLC + Fernando Rivera + frivera&indexuniverse.com +42309 + Skale, Inc. + Jared Brank + jared.brank&skalenetworks.com +42310 + Matrix Switch Corporation + Element Green + element&matrix-switch.tv +42311 + X-Centric Solutions + Justin Knash + jknash&x-centric.com +42312 + Hangzhou Zailing Electronic Technology Co., LTD + Jing Kuo + jingkuo&zailingtech.com +42313 + Synergy Tecnologia + Mauricio Strasburg + mauricio&synergy.com.br +42314 + D2D Technologies, LLC + Steve Doll + steve.doll&d2dtechnologies.com +42315 + Mobisante, INC + David M. Zar + david.zar&mobisante.com +42316 + Pragmatech + Valentine Sinitsyn + v.sinitsyn&pragmatech.ru +42317 + inVentia + Marcin Dutka + marcind&inventia.pl +42318 + Recognition Technologies, Ltd + Alexander Sein + a.sein&recognize.ru +42319 + 777 Technology Solutions Limited + Andrew Heron + Andrew.Heron&777T-S.COM +42320 + Unassigned + Removed 2013-08-27 + ---none--- +42321 + Mother Lode Holding Company + Ryan Murphy + rmurphy&mlhc.com +42322 + TrakSystems + Remy Mudingay + mudingay&trak-systems.com +42323 + Demma + Mark Hodge + markh&demma.co.uk +42324 + Powercode LLC + Simon Westlake + simon&powercode.com +42325 + Dialight, Inc. + Robert Henson + rhenson&dialight.com +42326 + ICON Americas + Sergio Samayoa + sergiosamayoa&icon.com.gt +42327 + IEEE Student Branch Passau + Alexander Böhm + boehm&computer.org +42328 + Nementis + Antonello Giuseppe Bianchi + antonello&nementis.eu +42329 + ipowertec + zhoumou + zhoumou&gmail.com +42330 + Deltapath Commerce And Technology Limited + Yip Yue Hong + hong&deltapath.com +42331 + Polarlink + Chenfeng Liang + chenfeng.liang&polarlink.com.tw +42332 + Vaillant Group + Dr. Thomas Demuth + thomas.demuth&vaillant-group.com +42333 + Aliter Technologies, a.s. + Milan Gottstein + milan.gottstein&aliter.com +42334 + Relmek co., Ltd + plato lin + plato&relmek.com.tw +42335 + iQ Consult Pty Ltd + Benjamin Johns + bjohns&iqconsult.com.au +42336 + ADITO Software GmbH + Tobias Feldmann + administrator&adito.de +42337 + New York State Workers' Compensation Board + Salvatore Galazzo + salvatore.galazzo&its.ny.gov +42338 + Anywhere.24 Technologies GmbH + Marc Aigner + subscriptions&anywhere24.com +42339 + Sabtech + Bryan Ly + lyb&sabtech.com +42340 + Open Standard Digital-IF Interface + Herald Beljour + herald.beljour&us.army.mil +42341 + Tucson Airport Authority + Robert Maudsley + rmaudsley&flytucson.com +42342 + Guangdong Cable Corporation Limited + Wangga + wga&gdcatv.com.cn +42343 + James Hurley + James Hurley + hurleyjames6&gmail.com +42344 + Puli Space Technologies Ltd. + Attila Bárdi + attila.bardi&pulispace.com +42345 + Fluidic, Inc., d/b/a Fluidic Energy + Bruce Weber + snmp-admin&fluidicenergy.com +42346 + E-SIGN S.A. + FLAVIO TAPIA + ftapia&e-sign.cl +42347 + Toyou Feiji Electronics Co., Ltd. + Wang Daobang + wangdb&toyou.com.cn +42348 + RUSNANO + Ivan Kostukov + licensing&rusnano.com +42349 + Noack Group + Christian Dergovics + ianapen&noackgroup.com +42350 + Trebing & Himstedt Prozessautomation GmbH & Co. KG + Dr. Christopher Anhalt + canhalt&t-h.de +42351 + Champs Libres SCRLFS + Julien Fastré + julien&fastre.info +42352 + Hanweck Associates LLC + Gerald Hanweck + jhanweck&hanweckassoc.com +42353 + LottSpot + James Lott + james&lottspot.com +42354 + Trackprotect B.V. + Jair Römer + jair.romer&rhosound.com +42355 + ABCTec + João Souza + joao&abctec.com.br +42356 + Electronic Media Services Ltd + Andrew Lambert + sysadmin&ems-uk.com +42357 + CHILLI MINT LABS LIMITED + BEN DURKIN + support&chillimintlabs.com +42358 + IP2I + HERVE PAPIN + herve.papin&ip2i.fr +42359 + Versa Networks, Inc + Shiva Shenoy + shiva&versa-networks.com +42360 + Skybox Imaging, Inc. + Evan Tidd + evan&skybox.com +42361 + rahont + Ivan Raduntsev + pen-data&rahont.org +42362 + spacefrogg.net + Michael Raitza + s-pen&spacefrogg.net +42363 + Dematis + ludwig schubert + ludwig.schubert&dematis.com +42364 + Optoscape Optical Electronic Tech.Co.,Ltd + maiyuan + yuan.mai&optoscape.com +42365 + H & M Hennes & Mauritz AB + Emil Linder + hm_it_infra&hm.com +42366 + WxBR Wireless Broadband Soluctions + Arnaldo Verdibello + averdibello&wxbr.com.br +42367 + Gedomo GmbH + Hannes Hörting + H.hoerting&gedomo.com +42368 + Azuru Networks + Liam McSherry + team&azuru.me +42369 + Softel ltd + Stanislav Georgiev + s.georgiev&softel.bg +42370 + ADRIATIC SLOVENICA d.d. + Mitja Trtnik + mitja.trtnik&adriatic-slovenica.si +42371 + PA CSS (Pennsylvania eHealth Partnership Authority’s Community Shared Services) + Himabindu Bolisetty + bindu&careevolution.com +42372 + Banterra + Michael Goff + mhgoff&banterra.com +42373 + Kliniken des MTK GmbH + Mathias Rockel + mrockel&kliniken-mtk.de +42374 + Inmar Enterprises + Matt Aloi + Matt.aloi&inmar.com +42375 + Unassigned + Removed 2013-09-06 + ---none--- +42376 + Xyne GmbH + Ulrich Weber + uw&xyne.com +42377 + MBD Consulting, LLC + Timothy Sawyer + tim.sawyer&mbdsolus.com +42378 + FOSS-Group GmbH + Beat Stebler + beat.stebler&foss-group.de +42379 + Danske Fragtmænd A/S + Lars Pedersen + dflpn&fragt.dk +42380 + IDFocus + Mark I. van Reijn + mvreijn&idfocus.nl +42381 + Human Brain Project + Carlos Aguado + bbp.administrator&epfl.ch +42382 + iSystems e.U. + Peter Danzmayr + iana&isystems.at +42383 + Horizon Fuel Cell Technologies + Richard Clint Escamilla + richardclint&horizonfuelcell.com +42384 + Tecnologías Inteligentes y Modelación de Sistemas, S.A de C.V. + Roberto Hiribarne Guedes + hiribarne&gmail.com +42385 + AIC Inc. + Jack Hsu + jack.hsu&aicipc.com.tw +42386 + dylanharris.org + Dylan Harris + mail&dylanharris.org +42387 + CompuTEK Industries + Dwight Spencer + support&dapla.net +42388 + TEL-STER sp. z o.o. + Tomasz Lis + Tomasz.Lis&tel-ster.pl +42389 + Ital-Mec s.r.l. + Alessandro Fiani + a.fiani&ital-mec.com +42390 + Oslo KFUMs Sjøkorps + Ragnar Storstrøm + sjefen&sjokorpset.no +42391 + Eastern Informatics, Inc. + Mike Henderson + mike&easterninformatics.com +42392 + FOXTER Cia Imobiliária + Frederico Pandolfo + frederico&foxter.net.br +42393 + Teledata Comunicaciones S.A. + Jorge Barattini + jorgito&teledata.com.uy +42394 + Synapse + Gre7g Luterman + greg.luterman&synapse-wireless.com +42395 + EPM + Travis Meier + TravisM&epm.co.za +42396 + xsinfosol pvt ltd + Amit Pasari + amit&xsinfosol.com +42397 + Grandstream Networks, Inc. + Xiaofeng Xu + xxu&grandstream.com +42398 + KnCMiner AB + Marcus Erlandsson + marcus&kncminer.com +42399 + Garuda Permata Saputra, CV. + Stephanus Bagus Saputra + shimaiqiwang&yahoo.com +42400 + TD Tech Ltd. + Zhang Hehua + tdtechianaoid&gmail.com +42401 + CanTech s.r.o. + Frantisek Hertl + hertl&cantech.cz +42402 + Spec S.A. + Toni Beleta + abeleta&grupospec.com +42403 + Ivane Javakhishvili Tbilisi State University + Mikheil Makhviladze + Mikheil.makhviladze&tsu.ge +42404 + Vadacom Limited + Nic Bellamy + snmp&vadacom.co.nz +42405 + Roambotics, Inc. + Scott Menor + scott&roambotics.com +42406 + SATO Corporation + Konosuke Haraguchi + hara2772&pn.sato.co.jp +42407 + iGrid S.L. + David Bru i Bru + david.bru&igrid-td.com +42408 + HealthSafe24 + Friedhelm Matten + friedhelm.matten&healthsafe24.de +42409 + TopMenu.com + Justin Kaufman + jk&topmenu.com +42410 + Blue Denim Consulting Group Inc. + Shawn Brant + bluedenim&bdenim.ca +42411 + Niklaus Ltd. + Dmitry Grunin + dgrunin&niklaus.ru +42412 + Osorno Enterprises Inc. + Dr. H. Peter Hombach + p.hombach&osorno.ca +42413 + PACSHealth, LLC + Steve Massey + steve.massey&pacshealth.com +42414 + Cloudacc Interactive, Inc. + Cheng Zhang + cheng.zhang&cloudacc-inc.com +42415 + Prince Rupert Grain Ltd. + Howard Hood + hhood&prgrain.bc.ca +42416 + Software Engineering Center (SEC) + Jamie C. Rizzo + Jamie.Rizzo&us.army.mil +42417 + A2Zlogix + Sami Fattah + sfattah&a2zlogix.com +42418 + GovSource Pty Ltd + Steve Capell + admin&govsource.com.au +42419 + NICEUC Communication Tech CO., LTD + young peng + supports&niceuc.com +42420 + Hebei SICON-EMI Power System Co., Ltd. + LiuYong + xltyt&qq.com +42421 + OpenVox Ltd. + Miao Lin + lin.miao&openvox.cn +42422 + ALLWIN Network Corp. + Michael Kuo + michael&allwin.com.tw +42423 + Republic of Azerbaijan Ministry of Foreign Affairs + Mr. Talib Talibli + t_talibli&mfa.gov.az +42424 + International Card Services BV (ICS) + Erik Uyttenbroek + euyttenbroek&icscards.nl +42425 + Thiesen Hardware- & Software-Design GmbH + Erik Habicht + e.habicht&thiesen.com +42426 + Institut Paul Bocuse + David Dessertine + david.dessertine&institutpaulbocuse.com +42427 + New York Community Bancorp + Nathan Arlington + nathan.arlington&mynycb.com +42428 + Bharti Airtel Limited + Ravinder Bhardwaj + ravinder.bhardwaj&airtel.com +42429 + Hidden Authentication and Trust service + Filigranowy Dragon + filigranowy.dragon&riseup.net +42430 + University of Massachusetts + James Barbieri + jbarbieri&umassp.edu +42431 + Chelyabinsk palace of pioneers and pupils named after Krupskaya N.K. + Dmitry Merzlov + admin&chel-dpsh.ru +42432 + lepassepresent.com + Nathalie Bezamat + nb&lepassepresent.com +42433 + Parliamentary Commissioner for Administrative Investigations + Devin Simpson + devin.simpson&ombudsman.wa.gov.au +42434 + BOMATEC AG + Markos Pliakas + markos.pliakas&bomatec.ch +42435 + LEONHARD KURZ Stiftung & Co. KG + Markus Bergner + postmaster&kurz.de +42436 + Ojsc NIAEP + Roman Kluev + sam&niaep.ru +42437 + Deltek, Inc. + Rich Ronston + security&deltek.com +42438 + Saratoga Speed Inc. + Julian Ratcliffe + julian.ratcliffe&saratoga-speed.com +42439 + Stephan Seitz + Stephan Seitz + s.seitz&secretresearchfacility.com +42440 + IQ Devices + Steve Rogers + steverogers&iqdevices.com +42441 + Uniscon universal identity control GmbH + Arnold Monitzer + contact&uniscon.de +42442 + Hochschule der Medien Stuttgart + Engster, Florian + hostmaster&hdm-stuttgart.de +42443 + Genesis Integration + Manuel Deschambault + themactech&me.com +42444 + Oriental Cambridge Education Group + Wang Bin + wangbin&dfjq.com.cn +42445 + InterASIA Solutions Inc. + Rickie Yang + rickie_yang&int-asia.com.tw +42446 + Beijing Hesun Technologies Co.Ltd. + liming zhang + zhangliming&hesuns.com +42447 + FreeSoft Nyrt. + Frigyes Bato + fbato&freesoft.hu +42448 + Taisis Integration And Consulting Services sl + Rafael Fernández + rafael.fernandez&taisis.com +42449 + InvestLab Technology, LLC + Robert Philipp + rphilipp&investlab.com +42450 + Mutual Aid Labs, LLC + Ryan Wessels + ryan.wessels&mutualaidlabs.com +42451 + Rizotec + Liran Kessel + liran&rizotec.com +42452 + IRIS-RFID + JEREMY LE GALL + admin-reseau&iris-rfid.com +42453 + Drawersteak Research + Andrew Zonenberg + azonenberg&drawersteak.com +42454 + Funkring.net + Martin Reisenhofer + martin.reisenhofer&funkring.net +42455 + FOBAS Consulting, Inc. + Satoru Matsushita + smatsush&fobas.jp +42456 + VM Farms + Justin Good + justin&vmfarms.com +42457 + Palluc + Joan Vicent Carbonell Blasco + joan&palluc.com +42458 + TigerLead Solutions + Andrew Kerr + ops&tigerlead.com +42459 + Esdenera Networks GmbH + Reyk Floeter + reyk.floeter&esdenera.com +42460 + SYS'TRONICS Co., Ltd. + kwang young lee + kylee&systronics.kr +42461 + Innosonix GmbH + Markus Baetz + markus&innosonix.de +42462 + David Ouagne + David Ouagne + david.ouagne&gmail.com +42463 + TLS Corp. + Ioan Rus + ioan.rus&telosalliance.com +42464 + binarycube + Chris Thornhill + chris&binarycube.com +42465 + Xerx Software Ltd + William Wirth-Torres + williamwirth-torres&hotmail.com +42466 + Kratos Defense and Security Solutions, Inc. + Scott Brawner + scott.brawner&kratosdefense.com +42467 + Lucipher + Pieter van Beek + pieter&lucipher.net +42468 + Jorge Cavallin + Jorge Cavallin + jecavallin&hotmail.com +42469 + Infobahn SA + Bertrand Dufresne + info&infobahn.ch +42470 + Voippartners s.r.l. + Simone Freddio + simone.freddio&voippartners.it +42471 + HOTCITY S.A. + Guillaume-Jean Herbiet + gherbiet&hotcity.lu +42472 + SC-IT GmbH + Tobias Peter + hostmaster&sc-it.de +42473 + Action Technology Ltd. + Xie Zhenye + xiezhenye&actionsky.com +42474 + Toro Development Ltd. + Wilson Liu + wilson.liu&toro-asia.com +42475 + Dewar Electronics Pty Ltd + Delia Jones + delia&dewar.com.au +42476 + Border 6 + Mateusz Viste + mateusz.viste&border6.com +42477 + OneNeck IT Services Corporation + Paul Zalewski + Paul.Zalewski&OneNeck.com +42478 + Proteus Sensor + Avarachan Cherian + contact&proteussensor.com +42479 + Metropolitan Wireless International Pte Ltd + Sun Yong + sunyong&mwi.com.sg +42480 + Grenland Data as + Stian Viddal + stian.viddal&gda.no +42481 + Teletronix + Samuel Dionísio de Oliveira + samuel&teletronix.com.br +42482 + DocuSign, Inc. + Tom Thokey + tom.thokey&docusign.com +42483 + Pioneer Bank + David Paul + dpaul&bankwithpioneer.com +42484 + Ultrix Sistemas de Informação + Henry Fernandez + henry&ultrix.srv.br +42485 + Christian Scholz + Christian Scholz + scholz.christian&berlin.de +42486 + Nuolezio + Bastien Le Querrec + bastien&nuolezio.org +42487 + Shenzhen Philorise co.ltd. + Ke huimin + kehuimin&philorise.cn +42488 + Element d.o.o + Ivo Elezovic + ivo&element.hr +42489 + Preferred Credit, Inc. + Steve Halvorson + comp&preferredcredit.com +42490 + Intesi Group SpA + Emanuele Cisbani + ecisbani&intesigroup.com +42491 + Racktop Systems + Eric Bednash + netops&racktopsystems.com +42492 + Far Bank Enterprises + Christopher Kent + it&farbank.com +42493 + City of Waukesha + Greg Vanness + gvanness&ci.waukesha.wi.us +42494 + Beckwith Electric Co. Inc + Thaichong Li + tli&beckwithelectric.com +42495 + O2 Systems Limited + Pranilesh Chand + support&o2systems.co.nz +42496 + GlobalNaz IT + Brad Firestone + iana&globalnaz.org +42497 + Brookhaven Retreat, LLC + Ken Barnt + bhadmin&brookhavenretreat.com +42498 + Guenter Zimmermann + Guenter Zimmermann + guenterzim&gmail.com +42499 + Orlov-Miller + Alexander Orlov + 673564&gmail.com +42500 + Deoca Ltd. + Joe Sloan + joe.sloan&deoca.com +42501 + Oto IT Limited + Lee Marsden + lee&otoit.co.uk +42502 + CellOS Software Limited + David Lynes + dlynes&cellossoftware.com +42503 + XJ Group Corporation + Wu ShuangHui + wushuanghui&xjgc.com +42504 + SOKRAT Ltd. + Eugene Burlakov + jean&sokrat.ru +42505 + Denkovi Assembly Electronics LTD + Borislav Denkov + support&denkovi.com +42506 + Gostcomp Oliwer Godlewski + Kamil Bugaj + bugaj.kamil&gostcomp.pl +42507 + HeuleSoft + Daniel Heule + daniel.heule&heulesoft.ch +42508 + Shepherd Group Built Environment Information Systems (SGBE IS) + Steve Burton + sburton&shepherdbe.com +42509 + net4home GmbH + Oliver Koerber + info&net4home.de +42510 + Cape Fear Valley Health System + Sam Atchley + satchley&capefearvalley.com +42511 + maxrosin.com + Max Rosin + iana-pen&hackrid.de +42512 + Suchocki IT + Marcin Suchocki + marcin&suchocki.it +42513 + Ymax Communications + Gregory Lynn Wood + greg.wood&ymaxcorp.com +42514 + SHENZHEN HXWK TECHNOLOGIES,CO LTD + Huayong Ding + hding&hxtcpip.com +42515 + Liberty Global Services B.V. + Silvia Baumann / James Kennedy + ripe&libertyglobal.com +42516 + Orderman GmbH + Alexander Uzsoki + Alexander.Uzsoki&orderman.com +42517 + Fundación Centro de Estudios de Física del Cosmos de Aragón + Luis Guillén Civera + lguillen&cefca.es +42518 + ZPE Systems, Inc + Livio Ceci + livio.ceci&zpesystems.com +42519 + BrainLogical Software Development + Andreas Röne + roene&brainlogical.de +42520 + LifeSafety Power, Inc. + Guang Liu + gliu&lifesafetypower.com +42521 + Assystem France + François LEGAL + franlegal&assystem.com +42522 + Velin V. Pavlov + Velin V. Pavlov + velin.v.pavlov&gmail.com +42523 + Leibniz-Institut fuer Analytische Wissenschaften -ISAS- e.V. + Peter Lampen + it&isas.de +42524 + Townet srl + Franco Marchetti + franco&townet.it +42525 + Werkbank Multimedia GmbH + Sascha Gresk + gresk&werkbank.com +42526 + elgris UG + Elwin Veenendaal + info&elgrispower.com +42527 + WTG Technologies Ltd + Raymond Edah + iana-en&wtg.co.uk +42528 + Slovak Hydrometeorological Institute (SHMU) + Roman Zehnal + Roman.Zehnal&shmu.sk +42529 + New Jersey Office of Information Technology + Timothy Gansert + timothy.gansert&oit.state.nj.us +42530 + SSQ Financial Group + Remy Jobin + remy.jobin&ssq.ca +42531 + Security Industry Association + Joseph Gittens + jgittens&securityindustry.org +42532 + Holysee Vatican Library + Mr.Gabriele Giulimondi + gabriele&giulimondi.it +42533 + BIOVELA, UAB + Sergej Pokusajev + Sergej&biovela.lt +42534 + CAFAT + GUYAUX Pierre + securiteinfo&cafat.nc +42535 + ictjob + Frederic Lepere + info&ictjob.be +42536 + Hanover Displays Ltd. + David Glendining + dglendining&hanoverdisplays.com +42537 + SnmpStack + Jason Patterson + jasonp&snmpstack.com +42538 + artnet world wide + Muhammad Elsaiedy + melsaiedy&artnet.com +42539 + Trumpet, Inc + Richard Mixon + RNMixon&CustCo.biz +42540 + Zimpel Events And Communications PTY Ltd. + Maik Zimpel + maik&zimpel.co.za +42541 + My Telecom Holdings Pty Ltd + Timothy Sheahan + sheahant&mytelecom.com.au +42542 + Voillo Solutions Ltd. + Taneem Ahmed + tahmed&voillo.com +42543 + Simpson University + Curt Dodds + cdodds&simpsonu.edu +42544 + ALLENGERS GLOBAL HEALTHCARE PRIVATE LIMITED + MADHUR GOYAL + madhur.goyal&allengers.net +42545 + CSC Telecom + Viktor Svecov + noc&csc.lt +42546 + tyntec GmbH + Sven Neuhaus + neuhaus&tyntec.com +42547 + OrecX LLC + Ralph Atallah + ratallah&orecx.com +42548 + gloops, Inc. + Kenichi Matsudo + system&gloops.com +42549 + F.S.P. Filofarm + Grzegorz Rybicki + grybicki&filofarm.pl +42550 + SFS services AG + Marco Grünenfelder + grue&sfsservices.biz +42551 + CRFS Limited + Steve Williamson + swilliamson&crfs.com +42552 + Hrvatski zavod za telemedicinu + Zoran Zorica + zoran.zorica&ztm.hr +42553 + TeknoUnit + Alexander Fedorov + service&teknounit.com +42554 + Dynamic Quest, INC + Jen Wong + jwong&dynamicquest.com +42555 + Faculty of Information Technology and Applied Mathematics, BelSU + Mikhalev Oleg + systemarchitect.sentinel&gmail.com +42556 + Visao Tecnologia em Transmissao de Dados Ltda + Arthur Girardi + noc&visao.psi.br +42557 + Unico Data AG + Stefan Beckmann + oid&unico.ch +42558 + Canis Lupus LLC + Benjamin Nelms + alpha&canislupusllc.com +42559 + AppEnsure + Sri Chaganty + sri&appensure.com +42560 + Kirovohrad Volodymyr Vynnychenko State Pedagogical University + Maksym Nazarenko + sysadmin&kspu.kr.ua +42561 + ZAO "MD Project 2000" + Alexander Bikov + it&mospmc.ru +42562 + Universidad Pública de Navarra (UPNA) + Javier Echeverría Martorell + secretaria.general&unavarra.es +42563 + Kaleidescape, Inc. + John Sykes + internetregistrar&kaleidescape.com +42564 + KO4BB Electronics + Didier Juges + didier&ko4bb.com +42565 + Weirton Medical Center + Mike Contumelio + michael.contumelio&weirtonmedical.com +42566 + ClearBearing, Inc. + Zack Colgan + tech&clearbearing.com +42567 + David Spinella + David Spinella + spinella.david&verizon.net +42568 + Andreas Vavra + Andreas Vavra + andi&compass.at +42569 + Miesepies + Michel Vissers + iana&miesepies.nl +42570 + Independent Bank Corporation + Chris Michaels + cmichaels&ibcp.com +42571 + Cybera, Inc + Scott Wolfe + scott.wolfe&cybera.net +42572 + SAFELYLOCKED, LLC + Tuomas Siren + iana-pen-contact&safelylocked.com +42573 + Sun Nuclear Corporation + Mark Paradis + mparadis&sunnuclear.com +42574 + Sydestep Ltd + Dr. Richard Petheram + it-admin&sydestep.com +42575 + e-business-systems SARL + Boris Wiethoff + boris.wiethoff&ebs.co.mz +42576 + Linpow SRL + Jorge Sbaco + sbaco.jorge&linpow.com.ar +42577 + Crosspoint SRL Romania + Viorel Dehelean + viorel&cpt.ro +42578 + Xcel Energy + Jeremy Rider + jeremy.m.rider&xcelenergy.com +42579 + sysmocom - systems for mobile communications GmbH + Harald Welte + hwelte&sysmocom.de +42580 + Statseeker + James Wells + james&statseeker.com +42581 + Regional Digital Telecommunication Company + Andrey Lygin + sysand&rdtc.ru +42582 + Interlink Ltd. + John Pate + jp&interlink.com.ua +42583 + DPII TELECOM & SERVICES + DELANCRAY Claire Isabelle + cidelancray&dpii-telecom.com +42584 + ROWA Group Holding GmbH + Thomas Hooge + hooge&rowa-group.com +42585 + TRIKOM Ltd. + Kropotov Alexander + alk&trikom.ru +42586 + DAG System + Roux Jean-Luc + jl.roux&dag-system.com +42587 + Investigaciones Medicas S.A. + Exequiel Arona + earona&im.com.ar +42588 + AGST Controles e Automação Ltda + Tiago dAvila + engenharia&agst.com.br +42589 + Swifttrip LLC + Alan Bunch + oids&swifttrip.com +42590 + AVB GmbH Wind Engineering + Boy Reese + b.reese&avb-germany.com +42591 + Forlani Impianti s.r.l. + Alessandro Forlani + snmp&forlani.it +42592 + TV 2/Danmark A/S + Mik Kay + administrator&tv2.dk +42593 + Gas Natural Informática, S.A. + Marc Xicoy Cirici + mxicoy&gasnatural.com +42594 + Fox Technologies + Peter Tornberg + peter.tornberg&foxt.com +42595 + Right Systems Inc + William Gunn + wg&rightsys.com +42596 + ATNet Services + Alexey Asemov + alex&alex-at.ru +42597 + Norberto Bensa - ENEABE + Norberto Bensa + nbensa&gmail.com +42598 + Tibero + Taikyoung Kim + taikyoung_kim&tibero.com +42599 + NIPPON TELEGRAPH AND TELEPHONE WEST CORPORATION + Masaki Minami + pen-contact&rdc.west.ntt.co.jp +42600 + Rejlers Oy + Mikko Sirén + mikko.siren&rejlers.fi +42601 + Sycada + George Tourkas + tourkas&sycada.com +42602 + Performr B.V. + Michel Stol + support&performr.com +42603 + Vorston + Michael Fyles + registration&vorston.net +42604 + Springfield Technical Community College + Gill Lapointe + helpdesk&stcc.edu +42605 + PLC International Inc + Carlos A Huerta + carlos.huerta2010&gmail.com +42606 + Urban-Software.de + Thomas Urban + ThomasUrban&urban-software.de +42607 + Brekford International + Michael Kniffen + mkniffen&brekford.com +42608 + Alan Seedhouse + Alan Seedhouse + alan.seedhouse&hotmail.co.uk +42609 + Boundary, Inc. + Cody Crawford + cody&boundary.com +42610 + Superior Power solutions (HK) Co.,Ltd + salvador trullols rico + sales&superiorpowersolution.com +42611 + Valdrea, LLC + Theodore Reed + teddy&valdrea.com +42612 + Koninklijke BAM Groep nv + Chris van Zwolle + informationsecurity&bamgroep.nl +42613 + POLYONE CORPORATION + Fatou Tounkara + fatou.tounkara&polyone.com +42614 + Tribal Chicken Australia + Thomas White + thomas&tribalchicken.com.au +42615 + eTRUST co., ltd. + Hideyuki Usui + h-usui&etrust.ne.jp +42616 + Pannonia Technologies + Matthias Endler + support&pantech.at +42617 + Alphion India Private Limited + K. Anjaneya Sharma + asharma&alphion.in +42618 + Kaaos Unlimited Oy + Jaakko Vallo + jaakko.vallo&kaaosunlimited.fi +42619 + PRYSM SARL + JEAN-MICHEL BELIN + support&prysm-software.com +42620 + Katalix Systems Ltd + James Chapman + jchapman&katalix.com +42621 + Elecdan + Moctar DIAKHITE + mdiakhite&elecdan.com +42622 + Hernic Ferro Chrome Pty Ltd + Francois Kaljee + francois.kaljee&hernic.co.za +42623 + Open Compute Project + Amber Graner + amber&opencompute.org +42624 + Whatever s.a. + Sylvain Munaut + netadm&whatever-company.com +42625 + Technology Toolbox LLC + Jeremy Jameson + jjameson&technologytoolbox.com +42626 + Blue Fire Capital + Carl Strickler + systems&bluefirecap.com +42627 + Vermont Department of Labor + Aaron Lewis + Aaron.Lewis&state.vt.us +42628 + Shenzhen HD Digital Tech Co., Ltd. + Damon LIU + rd&digihdtech.com +42629 + WaveNT Co.,Ltd. + Sung-Ho Yoon + yoonsh&wavenettech.com +42630 + Dona Ana County, New Mexico + Louis VanLandingham + louv&donaanacounty.org +42631 + Xellia Pharmaceuticals ApS + Niels Sillemann + Niels.sillemann&Xellia.com +42632 + Kompanija Dunav Osiguranje a.d.o. Beograd + Slobodan Babic + slobodan.babic&dunav.com +42633 + VOXXL + Mathieu Malaterre + mathieu.malaterre&voxxl.com +42634 + PSW GROUP GmbH & Co. KG + Christian Heutger + info&psw.net +42635 + RudiNet Ltd. + Rudi Ingebrethsen + frudi999&hotmail.com +42636 + SecuriPax + Nick Higham + nmh&securipax.dk +42637 + Cloudhouse Technologies + Mat Clothier + mat.clothier&cloudhouse.com +42638 + ARD-Sternpunkt + Dominique Mähler + dominique.maehler&ard-stern.de +42639 + Cellcrypt Ltd + Jim Buller + support&cellcrypt.com +42640 + Derek Lambert (CrEOF) + Derek Lambert + dlambert&dereklambert.com +42641 + Tri-State Generation and Transmission + Steve Wesling + swesling&tristategt.org +42642 + Stage Entertainment + Kyung Eigenraam + ict&stage-entertainment.com +42643 + NetSavia SA + Alejandro Ackermann + alejandro.ackermann&netsavia.com +42644 + New Leaf Publishing Group, Inc. + Tim Dudley + web&newleafpress.net +42645 + Ros Vicente (ITComp) + Ros Vicente + rosvicente&hotmail.com +42646 + Etherlive Ltd + John Storey + john.storeyðerlive.co.uk +42647 + Alliance Spacesystems, LLC + Eric Kuecherer + ekuecherer&alliancespacesystems.com +42648 + Blue Global Media + Keith Linneman + keith&blueglobalmedia.com +42649 + The LaSalle Technology Group + Matthew Augustine + mmaugust&lasalletech.com +42650 + Parque Tecnológico Itaipu - Paraguay + Luis Bení­tez + oidmaster&pti.org.py +42651 + willisss.com + Richard Willis + richard.willis&gmail.com +42652 + Sichuan Bihong Broadcast&Television New Technologies Co.,Ltd + Mo Zhenyang + mzy&scbhcatv.cn +42653 + Netcloud AG + Roberto Giana + no-mail-please-20131021&netcloud.ch +42654 + RCS & RDS SA + Iulian Liviu Ionescu + liviu.ionescu&rcs-rds.ro +42655 + On the Cusp Ltd. + Trevor Drawbridge + trevor&onthecusp.co.uk +42656 + Clear-Com + Erik M. Devane + Erik.Devane&ClearCom.com +42657 + Mixpo + Edward Charles + echarles&mixpo.com +42658 + Lakra Sintez Ltd. + Roman Leonovich + iana&lakra-sintez.ru +42659 + Robert Maxwell Professional Consulting + Robert "Bobby" Maxwell + bobby&rm-pc.com +42660 + Wildman & Morris + Robert Miller + bmiller&wildman-morris.com +42661 + Asian Pacific Telecommunications + David Oramas + david.oramas&aptel.com.au +42662 + Wuerzburger Versorgungs- und Verkehrs-GmbH + Andreas Reumann + andreas.reumann&wvv.de +42663 + Zhengwei-tech Co.,Ltd. + Wan Feng + wanf256&qq.com +42664 + Iromedica AG + Ines Salzer + administrator&iromedica.ch +42665 + WIRD AG + Alexandre Molari + info&wirdgroup.com +42666 + Affiliated Managers Group, Inc. + Matt Miarratani + matt.giarratani&amg.com +42667 + Northwest Multiple Listing Service + Michael Kimbley II + mkimbley&nwmls.com +42668 + ZIMT University of Siegen + Matthias Trute + trute&zimt.uni-siegen.de +42669 + HangZhou Chenxiao Technologies Co.,ltd + wangjianping + wangjianping&chenxiaotech.com +42670 + Sociedad Ibérica de Construcciones Eléctricas, S.A. + David Marín + dmarin&sice.com +42671 + Pinetron Co.,Ltd + Jeong-Ah Kim + foxrain&pinetron.co.kr +42672 + G. X. Clarke & Co. + Vladimir Yakovlev + yakovlev&gxclarke.com +42673 + SAIC, Inc. + Network Information Center c/o Barbara Shurtleff + nic&net.saic.com +42674 + TVH Group NV + Jan Keirse + jan.keirse&tvh.com +42675 + Comité Permanent des Médecins Européens + Constance Colin + constance.colin&cpme.eu +42676 + Servergy, Inc + Jack Smith + jack&servergy.com +42677 + Altertech s.r.o. + Sergiy Symonenko + div&altertech.com +42678 + Lakra Sibir Ltd. + Sergey Rusak + iana&lakra-sibir.ru +42679 + cne.at + Heinz Berger + hbb&cne.at +42680 + Randstad España, S.L. + Diego Miranda García + diego.miranda&randstad.es +42681 + Freeport of Riga Authority + Daniels Atkacuns + reg&rop.lv +42682 + Cyviz AS + Eirik Simonsen + simonsen&cyviz.com +42683 + Trans Data Management (TDM) + Reto Jaeger + reto.jaeger&trans-data.ch +42684 + Bump Networks, Inc. + Oleksii Kukhar + alex&bumpnetworks.com +42685 + Benjamin Huepeden IT + Benjamin Huepeden + info&huepeden.net +42686 + Siempelkamp Maschinen- und Anlagenbau GmbH & Co. KG + Gerd Sitato + gerd.sitato&siempelkamp.com +42687 + Meridian Health System + Bob Radvanski + BRadvanski&meridianhealth.com +42688 + STABILO International GmbH + Sebastian Meyer + sebastian.meyer&schwan-stabilo.com +42689 + Southern Methodist University + Jesse R. Miller + rbm&smu.edu +42690 + nGeniux LLC + Jason Denning + iana&ngeniux.com +42691 + Australia and New Zealand Banking Group Limited + Clint Cooper + clint.cooper&anz.com +42692 + Philotech + Hartwig Dirscherl + iana&philotech.net +42693 + AcroRed Technologies, Inc. + Raymond Lin + sales&acrored.com +42694 + LoopPay, Inc. + William Pago + william.pago&looppay.com +42695 + Beijing QTS Networks Technologies Co., Ltd + TerryChen + chengang&qtsnetworks.com +42696 + Indian Hotels Company Limited + Nivrutti Sutar/Vijay Mishra + datacentre&tajhotels.com +42697 + Activsolar + Vladimir Sadkov + sadkov&gmail.com +42698 + Qualitis Kft. + Nagy Attila + attila.nagy&qualitis.hu +42699 + Dorwin Enterprises + John Dorwin + jdorwin&gmail.com +42700 + ESP Credit Management + Aaron Caine + aaron&espcreditmanagement.com +42701 + thepickle.com, Inc. + Dan Rothstein + dan&thepickle.com +42702 + Altairis, s. r. o. + Michal A. Valasek + michal.valasek&altairis.cz +42703 + Locatrix Communications + Andrew Eross + eross&locatrix.com +42704 + Marco Displays + Cody Null + itdept&marcocompany.com +42705 + HVR Software + Steve Sheil + steve.sheil&hvr-software.com +42706 + Ministry of Internal Affairs - Kosova + Arben Osmani + arben.f.osmani&rks-gov.net +42707 + Corvinus University of Budapest + Csaba Toth + csaba.toth&uni-corvinus.hu +42708 + Teachers Assurance + Shane Lovett + slovett&teachersassurance.co.uk +42709 + CarWoo! Inc. + Tim Chen + tim&carwoo.com +42710 + Designs for Health, Inc. + Jonathan Walker + jwalker&ashley-martin.com +42711 + MEIRYO DENSHI CORPORATION + Kumiko Agata + Agata.Kumiko&meiryo.co.jp +42712 + Hanvit SI, Inc. + Jessie Kim + jessie&hanvitsi.com +42713 + HPS ICT&Mobile Solutions + Jan Baggen + ict&hps-solutions.nl +42714 + Beijing Joy and Success Technology Co., Ltd. + Ma hui + goldmh&139.com +42715 + tanum consult GmbH + Michael Schrader-Bölsche + noc&tanum-consult.de +42716 + LzLabs GmbH + Andrew Galewsky + andy.galewsky&lzlabs.ch +42717 + Prefeitura Municipal de Cachoeirinha - RS - Brasil + Ederson Souza + edersoncsouza&gmail.com +42718 + Vema, a.s. + Martin Ivanis + itadmins&vema.cz +42719 + CyberFX, Inc. + Adam Werner + adam.werner&cyberfxcorp.com +42720 + Bilgibim Bilgisayar Teknolojileri + Ahmet Oztuna + ahmet.oztuna&bilgibim.com.tr +42721 + Teck Resources Limited + Rob Labbe + rob.labbe&teck.com +42722 + Miraj Technology and Consulting Corporation + Shahn Karim + contactsk&mirajtc.com +42723 + Shouting Ground Technologies, Inc. + Bryan Holloway + admin&shout.net +42724 + Kernel Electronics Co Ltd + LI Man Lung + lml&kernelhk.com +42725 + Institut Teknologi Sepuluh Nopember + Kamas Muhammad + kamas&its.ac.id +42726 + ArcSoft Hangzhou CO.,LTD. + Liu Juan + lj1769&arcsoft.com +42727 + X-Company Pty Ltd + Stephen Reay + stephen&x-team.com +42728 + Tomaxx GmbH + Roger Wenham + roger.wenham&tomaxx.com +42729 + Private Iron and Steel Joint Stock Company "Donetsksteel" + Ergorchenkov Nikolay + postmaster&donetsksteel.com +42730 + Croda International Plc + A.W.J. van Strien + alfred.van.strien&croda.com +42731 + Statkraft SF + Harald Haugan + domains&statkraft.com +42732 + Southern Power Systems, Inc. + Matthew S. Fitzgerald + mfitzgerald&southernpwr.com +42733 + FSMLabs + Cort Dougan + cort&fsmlabs.com +42734 + Nextmove Technologies + Daniel Blackmer + daniel.blackmer&nextmovetech.com +42735 + dParadig + Daniel Alejandro Zuleta Zahr + dzuleta&dparadig.com +42736 + Haus der Barmherzigkeit + Thomas Schneider + thomas.schneider&hausderbarmherzigkeit.at +42737 + Zends + Alvaro Jose de Oliveira Junior + alvaro&zends.com.br +42738 + Vivint Wireless + Adam Augustine + b2b-iana-2013&vivw.net +42739 + Veolia Water Solutions & Technologies + Olivier PILLON + olivier.pillon&veoliawater.com +42740 + MaerdnGaming GbR + Dennis Katz + dennis.katz&maerdngaming.com +42741 + Nanjing Dong Xun Information Technology Co., Ltd. + Steven Mao + maofeng&dongxuntech.com +42742 + Winix Solutions LLC + Timothy Poschel + ianaspam&winix.com +42743 + Niederösterreichische Gebietskrankenkasse + Manfred Gram + Manfred.Gram&noegkk.at +42744 + Falabella + Nelson Eduardo Prado Villalobos + ext_neprado&falabella.cl +42745 + Jamdeo + John Tucker + jt&jamdeo.com +42746 + InterNetX GmbH + Carsten Schoene + carsten.schoene&internetx.com +42747 + Kik Interactive + Dan Hendry + dan.hendry&kik.com +42748 + MyOrg.at (Johannes Hackl) + Johannes Hackl + hannes&hackl-net.at +42749 + Utilidata, Inc + Sridhar Ramachandran + sri&utilidata.com +42750 + Umbrella ID + Björn Abt + bjoern.abt&psi.ch +42751 + Neowatt Energy Solutions Co. Pvt. Ltd. + Tausif Kazi + tausif.kazi&neowatt.co.in +42752 + AMEDTEC Medizintechnik Aue GmbH + Steffen Schmidt + dicom&amedtec.de +42753 + University of The Philippines Los Baños + Ludwig B. Tirazona + ljbtirazona&uplb.edu.ph +42754 + Enel Energy Electronic + Mehmet Ä°ÅŸlek + mislek&enel.com.tr +42755 + ATON GmbH + Marvin Schultz + marvin.schultz&atongmbh.de +42756 + Purdue Research Foundation + Kenneth L. Williams + klw&prf.org +42757 + Encana Corporation + Chris Wallace + chris.wallace&encana.com +42758 + C4B Com For Business AG + Bernhard Woköck + admin&c4b.de +42759 + Practicom B.V. + Dhr. Martin Spaans + registratie&practicom.net +42760 + PHOENIX PHARMA + Zoran Vojnovic + webmaster&phoenix.ba +42761 + Imavis srl + Aldo Brucale + aldo.brucale&imavis.com +42762 + ipex telecom LLC + Abdul Hakeem + alhakeem&ipextelecom.net +42763 + ShangHai Jeelan Information Technology Inc. + china wu + chinawu&jeelan.com +42764 + Smith College + Karla Borecky + kborecky&smith.edu +42765 + Muzeum Historii Zydow Polskich + Szymon Kowalczyk + pkit&jewishmuseum.org.pl +42766 + Typomedia Foundation + Philipp Speck + info&typomedia.org +42767 + Queensland Motorways Limited + Nathan Frankish + iana-pen&qldmotorways.com.au +42768 + Marcelo Leal + Marcelo Leal + msl&eall.com.br +42769 + Supermathie Networks + Michael Brown + michael&supermathie.net +42770 + Totalpost Services PLC + William Wright + hostmaster&totalpost.com +42771 + DGQoS + Mario Duchi + m.duchi&antgroup.it +42772 + Galkam PTY LTD + Glen L Kleidon + glenk&galkam.com.au +42773 + Transport for London + Gurmeet Sahotay + gurmeet.sahotay&tfl.gov.uk +42774 + Semtech Corporation + Ken Porter + kporter&semtech.com +42775 + Linx ICT Solutions + Muhammad Zeeshan Munir + zeeshan&linxsol.com +42776 + one2many BV + Peter ter Beek + peter.ter.beek&one2many.eu +42777 + Gosuncn Technology Group Co., Ltd + Yong Li + LiYong&gosuncn.com +42778 + Michael Offel (mflour.com) + Michael Offel + michael.offel&web.de +42779 + CJSC "NORSI-TRANS" + Maksim Zrazhevskii + zma&norsi-trans.ru +42780 + SEB DEVELOPPEMENT SAS + Olivier RADIX + iana&groupeseb.com +42781 + Bragg Communications Inc. + Curtis Wambolt + curtis.wambolt&corp.eastlink.ca +42782 + Ekrompt, JSC + Maxim Y. Evdolyuk + itsupport&ekromt.ru +42783 + workvslife.com + Brian Friday + ianaoid&workvslife.com +42784 + Pinnacle Foods Group, LLC + Neil Minichino + neil.minichino&pinnaclefoods.com +42785 + Syntaxjockey + Michael Frank + iana-pen&syntaxjockey.com +42786 + CNS Engineering + Bruno Couillard + bruno&bc5tech.com +42787 + Concentric Sky + Francisco Gray + it&concentricsky.com +42788 + artec technologies AG + Uwe Martens + uwe.martens&artec.de +42789 + SynQor, Inc. + Abram Dancy + dancy&synqor.com +42790 + Rebasoft + Kevin Wilkie + kevin.wilkie&rebasoft.net +42791 + Geo-Comm, Inc. + Neil Erickson + nerickson&geo-comm.com +42792 + Near East University + Senol Korkmaz + senol.korkmaz&neu.edu.tr +42793 + IntCache Technology Co.,Ltd + Jeffrey Hu + jeffrey.hu&intcache.com +42794 + LEX Media Concepts SRL + Daniel Neculai + daniel.neculai&lexmedia.ro +42795 + mrByte Tech Solutions + Lino Prahov + desarrollo&mrhouston.net +42796 + IQ Solutions S.A. + George Varakis + g.varakis&iqsolutions.gr +42797 + Freie ArbeiterInnen Union + Rudolf Rocker + rudolf.rocker&fau.org +42798 + HUENGSBERG AG + Daniel Kopp + dak&huengsberg.com +42799 + Alfstore + Rahmi Turhan + r.turhan&alfstore.com +42800 + Co-Nexus Communications Systems, Inc. + Mark Mullings + mark.mullings&co-nexus.com +42801 + Essai Inc + Richard Rebol + TechCon&essai.com +42802 + Rigel Engineering + Craig DeHaan + craig&rigel-eng.com +42803 + Valialsoft LLC + Svetoslav Petrov + iana&valialsoft.com +42804 + New Singularity International Technical Development Co.,Ltd. + Shiyong Teng + tengshiyong&ultrapower.com.cn +42805 + Cloudy IT + Jonathan Cyr + jon&cloudyit.com +42806 + WINFO Corp. + GuoWei + guowei&winfo.cc +42807 + City West Country Ltd + William Ross + william.ross&mercedes-benzsouthwest.co.uk +42808 + Arachnid Labs Ltd + Nick Johnson + nick&arachnidlabs.com +42809 + netbreaker IT-Service + Rico Koerner + it-service&netbreaker.de +42810 + Telesis, S.A. de C.V. + Roberto Currlin + ingenieria&telesis.com.sv +42811 + Enyx + Laurent de Barry + laurent.debarry&enyx.fr +42812 + ISD Dunaferr Co. Ltd. + Zoltan Gyimesi + gyimesi.zoltan&isd-dunaferr.hu +42813 + Polskie Sieci Elektroenergetyczne S.A. + Sebastian Klimczak + sebastian.klimczak&pse.pl +42814 + Inveo + Slawomir Darmofal + sdarmofal&inveo.com.pl +42815 + Tussa IKT AS + Stein-Are Smoge + stein-are.smoge&tussa.no +42816 + HACENTER + Alexander Demertash + alexander&hacenter.com.ua +42817 + IBM Platform Firmware Division + Rashmi Narasimhan + rashmin&us.ibm.com +42818 + Relative Variable Software + Eugene Bolshakov + pub&relvarsoft.com +42819 + Carante Groep + Sven Brocking + sbrocking&carantegroep.nl +42820 + Techsun + Myron Jiang + ph.china&hotmail.com +42821 + ACXIO + Patrice Collardez + pcollardez&acxio.fr +42822 + Tesc + Anibal Ricardo Salusso + anibal.salusso&tesc.com.br +42823 + Spilsby Internet Solutions + Terry Froy + tez&spilsby.net +42824 + Web.Cloud.Apps. GmbH + Daniel Boldura + boldura&web-cloud-apps.com +42825 + vArmour Networks + Sandro Janita + sjanita&varmour.com +42826 + ChengDu Network Security Technology Corporation + Cole.Chen + chenjunnian&wangankeji.cn +42827 + rm-netproject UG (haftungsbeschränkt) + Reiner Gutowski + rg&rm-netproject.de +42828 + US Army Electronic Provings Ground (USAEPG) Instrumentation Management System (IMS) + James Fisher + james.martin.fisher&us.army.mil +42829 + QuartzDesk.com + Jan Moravec + admin&quartzdesk.com +42830 + PowerSense + Lars E. Haven + leh&powersense.com +42831 + syssrv.net + Ian Weller + hostmaster&syssrv.net +42832 + Tata Institute Fundamental Research + Sagar Mungse + msagar&tifr.res.in +42833 + Nimbus Technologieberatung GmbH + Arno Fiedler + arno.fiedler&nimbus-berlin.com +42834 + TechniData IT-Service GmbH + Ralf Wigand + ralf.wigand&its-technidata.de +42835 + ZELITRON SA + Abatzis Kostas + abatzis&zelitron.com +42836 + eXtreme IT Development + Mohamed Ayyad + m.ayyad&xitd.net +42837 + Westpac New Zealand Ltd + David Biggs + David_Biggs&westpac.co.nz +42838 + FAST DISTRIBUTED CLOUD COMPUTING INC., + Hierro Park + acumen&wisetodd.com +42839 + Tactical Communications Corporation + Doug Fuller + dfuller&tacticalcommunications.com +42840 + Reporo + Reporo Tech + tech&reporo.com +42841 + Kraftanlagen Muenchen GmbH + Kai Hoeltgen + hoeltgenk&ka-muenchen.de +42842 + iQSpot + Damien Martin-Guillerez + damien.martin-guillerez&iqspot.fr +42843 + TWIN Engineering S.r.l. + Michele Fazzalari (CEO) + info&twinengineering.com +42844 + SPI GmbH + Eckhard Schilling + iana&spi.de +42845 + TOKYO SYSTEM HOUSE Co., Ltd. + Kazuya SAKAMOTO + k-sakamoto&tsh-world.co.jp +42846 + Corhoma SRL + Jorge Blasi + corhoma&gmail.com +42847 + 2H Offshore Engineering Ltd + Robert Brock + robert.brock&2hoffshore.com +42848 + NETIXIA + Laurent FRANCOISE + iana&netixia.fr +42849 + Fabrecode + Robert Banfill + robert&fabrecode.com +42850 + LocalTV LLC of Alabama + David McFerrin + david.mcferrin&whnt.com +42851 + Fidelity Voice Services + Rob McKrill + robm&fidelityvoice.com +42852 + Bank Gospodarstwa Krajowego + Przemyslaw Wasaznik + przemyslaw.wasaznik&BGK.com.pl +42853 + DunnCox + Ryan Dunbar + ryan.dunbar&dunncox.com +42854 + EMPRESA DE TECNOLOGIA DA INFORMAÇÃO E COMUNICAÇÃO DO MUNICÃPIO DE SÃO PAULO + Wagner Kanagusuko + wagnerk&prodam.sp.gov.br +42855 + techsoup.net + Don Betts + don&techsoup.net +42856 + Kreis Warendorf + Olaf Doering + olaf.doering&kreis-warendorf.de +42857 + Family Madera of Switzerland + Jan Madera + jan&madera.ch +42858 + Linux Szerver Kft. + Ferenc Koczka + info&linux-szerver.hu +42859 + Shanghai SHR Automation Co.,Ltd + HU Daoxu + hdx.3047&shrcn.com +42860 + Asul IT Consulting LLP + Alexandr Khrabrov + info&asul.kz +42861 + Ophylink Communication Technology Co., Ltd. + Linlin Qiu + linlin.qiu&ophylink.com +42862 + AITA-Soft + Oleg Ostroverkh + oleg.o&aitasoft.ru +42863 + IOS Health Systems + Dario Va + dva&ioshs.com +42864 + Mobius Embedded Systems Ltd + Andrew Chilcott + iana&mobius-embedded-systems.co.uk +42865 + Hoza Logistic Solutions + John Melet + jmelet&hoza.nl +42866 + Frontend.biz GmbH + Antonio Pedrazzini + info&frontend.biz +42867 + BestSolution.at + Udo Rader + udo.rader&bestsolution.at +42868 + Association of American Railroads + Mr. Robert A. Kollmar + rkollmar&aar.org +42869 + UNE EPM Telecomunicaciones S.A. + Hector Fernando Vargas Montoya + hector.vargas&une.com.co +42870 + Unither Manufacturing LLC + Melissa Mehlenbacher + melissa.mehlenbacher&unither-pharma.com +42871 + IMRIS + Chris Mussack + cmussack&imris.com +42872 + Unomaly AB + Goran Sandahl + goran&unomaly.com +42873 + Comune di Ascoli Piceno + Mauro Angiolillo + admin&comuneap.gov.it +42874 + Hospedia Ltd + Keith Jacobs + keith&keithjacobs.net +42875 + ACISA + Silvio Fernández + silvio.fernandez&acisa.es +42876 + SGSITES Technologies + Stefan Genchev + stefan.genchev&sgsites.net +42877 + Sundvor + Aage Johan Strøm Sundvor + aage&sundvor.com +42878 + Credit-Moscow Bank + Nikolay Belyakov + cso&cmbank.ru +42879 + Sielaff GmbH & Co. KG + Oliver Muck + oliver.muck&isa.de.com +42880 + Uwe Disch + Uwe Disch + mail&uwe-disch.de +42881 + No Limit Network + Nicolas Belan + contact&no-limit-network.com +42882 + Jiangsu Fablesoft Co.,Ltd + Xiaoqiang Ye + yexq&fablesoft.cn +42883 + CARC (C-DOT Alcatel-Lucent Research Centre Pvt Ltd) + Ramkumar Jayachandran + ramkumar.jayachandran&carc.co.in +42884 + Anderson Morgan Kelowna Inc. + Fred Brown + fredb&andersonmorgan.ca +42885 + S P I R I T - informaÄné systémy, a.s. + Lubomir Bak + bak&spirit.sk +42886 + InMotion Hosting + Vanessa Vasile + steam&imhadmin.net +42887 + One Call Now + Edward Curren + ed.curren&onecallnow.com +42888 + Canadian Museum for Human Rights + Christopher Rivers + christopher.rivers&museumforhumanrights.ca +42889 + IO Data Centers, LLC + Kjell Holmgren + koh&io.com +42890 + Renkus Heinz Incorporated + Tim Shuttleworth + tim&renkus-heinz.com +42891 + Santechkomplekt Ltd. + Babin Vladimir + postmaster&santech.ru +42892 + TOYGA + Gil Shinar + gils&hexagontech.co.il +42893 + Funkfeuer Wien - Verein zur Förderung freier Netze + Josef Semler + josef.semler&gmail.com +42894 + CAROL JEANNE MACK CORPORATION + Carol Jeanne Mack + mac.carol5&gmail.com +42895 + Securiton GmbH + Peter Treutler + peter.treutler&securiton.de +42896 + The O'Gara Group + Mike Estridge + postmaster&ogaragroup.com +42897 + Evan Edstrom + Evan Edstrom + contact&evanedstrom.com +42898 + IM Service Lab Srl + Claudio Spallaccini + info&imservicelab.com +42899 + kiloWattsol + Sebastien Collin + scollin&kilowattsol.com +42900 + Elcom Innovations Private Limited + Rajeev Vats + rvats&elcominnovations.com +42901 + Chaos Computer Club Cologne + Tobias Wolter + towo&koeln.ccc.de +42902 + J.R. Torralba + Jesus R. Torralba + jhunetorralba&hotmail.com +42903 + IT Innovations Ukraine LLC + Vyacheslav Labzin + vyacheslav.labzin&ua.ibm.com +42904 + Nemik Consulting Inc + Nemanja Stefanovic + snmp&nemik.net +42905 + Trihedral Engineering Ltd. + John Cole + john.cole&trihedral.com +42906 + Shift Workforce Management + Diego Jorquera Tapia + djorquera&shiftlabor.com +42907 + PLUTEX GmbH + Fabian Müller + fmu&plutex.de +42908 + Megadevices + Oleksandr Kovalenko + kovalenko.md&gmail.com +42909 + Tver State University + Andrew Zhukov + zhukov&tversu.ru +42910 + latticeware.com + stanton fisque + sfisque&latticeware.com +42911 + Metiri Systems, LLC + Steven C. Ollmann + s.ollmann&metirisystems.com +42912 + locate solution GmbH + Daniel Petat + daniel.petat&locatesolution.de +42913 + Exatech bv + Henk Pragt + hpragt&exatech.nl +42914 + Wimsey + Stuart Lynne + stuart.lynne&gmail.com +42915 + MCATSYSTEMS LLC + Hendry Kunthara + info&mcatsystems.com +42916 + Arcerm + Alexey Grenev + graa&arcerm.spb.ru +42917 + Adcubum AG + Christian Pfister + intit&adcubum.com +42918 + Trafigura + Mark Parris + mark.parris&trafigura.com +42919 + Max-Planck-Institut fuer Astrophysik + Heinz-Ado Arnolds + arnolds&mpa-garching.mpg.de +42920 + Slaughter and May + John Lynch + John.Lynch&slaughterandmay.com +42921 + Dropbox, Inc. + Gary M. Josack + pen-contact&dropbox.com +42922 + Ministarstvo odbrane Republike Srbije + Milos Pejanovic + milos.pejanovic&vs.rs +42923 + Stefan Ebert + Stefan Ebert + stefan&huhn.li +42924 + The Molecule + alex maceda + alex&themolecule.com +42925 + SYLEB SARL + KLA KOUE SYLVANUS + sylvanuskla&syleb.com +42926 + NSC Communications Siberia Ltd + Alexei Tsigulin + alex&nsc-com.com +42927 + Fidelio Cruise Software + Gregor Stute + gstute&fcruise.com +42928 + Galleon Systems Ltd + Craig Richards + support&galleonmail.com +42929 + securedeviceaccess.com + Lars Reemts + postmaster&securedeviceaccess.com +42930 + GEKO.NET di Mena Giuseppe + Giuseppe Mena + info&gekoinformatica.net +42931 + Vladimir Mihajlović pr, raÄunarsko programiranje, METACODE, Beograd + Vladimir Mihajlovic + vlada79&gmail.com +42932 + Infolink Global + Alec Hans + alec&infolinkglobal.net +42933 + iArtemis + Jie Xia + admin&iartemis.ca +42934 + APRS World, LLC + James J Jarvis + jj&aprsworld.com +42935 + Axcelera + Diogo Sato + diogo&axcelera.com.br +42936 + Anhui Telehome Digital Technology Co. Ltd + Simon Wu + simon100.wu&gmail.com +42937 + VP (Video Privacy) Forum + JinKyo Shin + jkshin&4dream.co.kr +42938 + Moviri S.p.a. + Davide Malagoli + davide.malagoli&moviri.com +42939 + Applied Informatics for Health Society + Doug Gorley + dgorley&aihs.ca +42940 + City of Smyrna + Chris Addicks + is&smyrnaga.gov +42941 + 2XWIRELESS, INC + Brock Eastman + brock&2xwireless.com +42942 + kayzan + Kay Zander + kayzan&kayzan.de +42943 + CopperPoint Mutual Insurance Company + Evan F. Erickson + eerickson&copperpoint.com +42944 + Seenov Inc. + Claude Arpin + claude.arpin&me.com +42945 + Seeser Datentechnik + Peter Seeser + guardian&seeser.net +42946 + Utel Systems + Frode Gorseth + frode.gorseth&utelsystems.com +42947 + Network Technologies International, Inc. + Daniel F. Domnick + registrar&nticloud.net +42948 + Methodist Home for Children + Daniel F. Domnick + registrar&nticloud.net +42949 + Bol.com b.v. + Mark Frasa + tim&bol.com +42950 + Hangzhou Joson Technology Co.,Ltd + songjing + songjing&hzjoson.com +42951 + Highlands Technologies Solutions + Patrick Zucchetta + it&h-t-solutions.com +42952 + SOREDI touch systems GmbH + Gertrud Brandl + brandl&soredi-touch-systems.com +42953 + "Runet Business Systems" + Sergey Levin + levin&paymentgate.ru +42954 + Bizerba GmbH & Co. KG + Michael Briegel + Michael.Briegel&bizerba.com +42955 + Louisville-Jefferson County Metro Government + Brian Clenney + Brian.Clenney&Louisvilleky.gov +42956 + HumanIT Inc. + Manuel Deschambault + mdeschambault&humanit.ca +42957 + Wave Advanced Technology Applications s.r.l. + Sergio Arena + info&wave-srl.com +42958 + Central Office for Administrative and Electronic Public Services + Krisztian Horvath + Krisztian.Horvath&kekkh.gov.hu +42959 + Snap Limited + James Burnett + noc&snap.net.nz +42960 + Garn Contracting & Consulting Pty Ltd + Jeremy Ford + jez&garn.cc +42961 + EH-electronics GmbH + Guenther Heumann + info&eh-electronics.com +42962 + Blitznote e.K. + Mark Kubacki + kubacki&blitznote.com +42963 + UltraMED Systems, Inc. + Robert Gill + support&ultramedonline.com +42964 + Abelsoft Inc + Kazutoshi Osakabe + k-osakabe&abelsoft.co.jp +42965 + ec3 Networks GmbH + Manfred Hackl + manfred.hackl&ec3networks.at +42966 + ECHO LLC + Sergey Shakirov + registry&lwd.ru +42967 + liedloff.org + David Liedloff + david&liedloff.org +42968 + ME Engineering M2M GmbH + Matthias Wimmer + mwi&me-industries.de +42969 + Iorga Group + Frédéric PREVOST + fprevost&iorga.com +42970 + RP SIA "Rigas satiksme" + Nils Kolecis + nils.kolecis&rigassatiksme.lv +42971 + ONELAN LIMITED + Amit Kachroo + amit.kachroo&onelan.com +42972 + IT Business Solutions and Services (ITBSS) + Juergen Graf + juergen.graf&itbss.de +42973 + COMDOK GmbH + Sven Ehret + support&comdok.de +42974 + Willis-Knighton Health System + Theresa Cochran + tcochran&wkhs.com +42975 + Iridium Thought + Peter Wood + development&iridiumthought.com +42976 + Key Source International + Paul Schwartz + paul&ksikeyboards.com +42977 + Matta Consulting Limited + Florent Daigniere + florent.daigniere-pen&trustmatta.com +42978 + CSN Groep BV + F.A.N. van den Berg + f.berg&csngroep.nl +42979 + Wellington Security Systems + Seth Stiebinger + admin&wellingtonsecurity.com +42980 + EZ e-TRAK + Christos Chochlidakis + christos&eze-trak.com.au +42981 + Heuristic Systems Pty Ltd + Dewayne Geraghty + admin.operations&heuristicsystems.com.au +42982 + Leafsprout + Cezary Klimczak + cezary.klimczak&leafsprout.com +42983 + SAS Nexylan + Gaetan Allart + gaetan&nexylan.com +42984 + Toyohashi University of Technology + TSUCHIYA Masatoshi + oid-liaison-officer&imc.tut.ac.jp +42985 + Cnofe + Ding Fei + paul712&163.com +42986 + Beijing MicroColor Corp., LTD. + WANG LONG + wanglongµcolor.net +42987 + Gida Technology Services + Pravin Carvalho + pravincar&gmail.com +42988 + Nanjing Huamai Technology Co., Ltd + Xia Haibin + davidxia136&139.com +42989 + Telegärtner Karl Gärtner GmbH + Felix Klein + felix.klein&telegaertner.com +42990 + VTSL Ltd + Daniel Wilson + dwilson&vtsl.net +42991 + Marylhurst University + Keelan Cleary + ies-admins&marylhurst.edu +42992 + Vektron Energy (Pty) Ltd + Glen Medlin + glen&vektron.co.za +42993 + Cornerstone Health Care, P.A. + Ian Atchison + ian.atchison&cornerstonehealthcare.com +42994 + Institut de Physique de Rennes + Jérémy Gardais + jeremy.gardais&univ-rennes1.fr +42995 + AvertIT + Alan Stewart + Alan.Stewart&AvertIT.com +42996 + NOMASYSTEMS, S.L. + Enrique Marcote Peña + admin&nomasystems.com +42997 + Red Giant Inc + Adam Murphy + adam.murphy&redgiantmobile.com +42998 + Progdence Co.,Ltd. + Yusuke Fujimura + fujimura&progdence.co.jp +42999 + Parse Software Development B.V. + Sjon Hortensius + sjon&parse.nl +43000 + Service Ontario + Mike Lefever + mike.lefever&ontario.ca +43001 + Nextbeacon + Steve Waldbusser + snmp&nextbeacon.com +43002 + RootService (Markus Kohlmeyer) + Markus Kohlmeyer + admin&rootservice.org +43003 + TribalGroup + Martyn Smith + martyn.smith&tribalgroup.com +43004 + Xinguard, Inc. + Kae Hsu + MIBs&xinguard.com +43005 + University of Technology and Life Sciences in Bydgoszcz + Åukasz Dobosiewicz + lukasz.dobosiewicz&utp.edu.pl +43006 + root-a.net + Kukharev Vitaly + postmaster&root-a.net +43007 + Gipen Systems + Gyula Nemetz + info&gipen.hu +43008 + FRTek + Doyeon Kim + dykim&frtek.co.kr +43009 + Vilnius Gallery + Constantin Piskounov + kpiskounov&outlook.com +43010 + Two Sigma Investments, LLC + Viktor Dukhovni + iana-master&twosigma.com +43011 + Sängerschaft Erato + Julian Metza + senior&erato.de +43012 + Aldo Group Inc. + Eric Beaumier + ebeaumier&aldogroup.com +43013 + ISC8, Inc. + Scott Millis + smillis&isc8.com +43014 + En Garde Systems, Inc. + Mike Neuman + mcn&EnGarde.com +43015 + Quinyx AB + Mikael Knutsson + mikael.knutsson&quinyx.com +43016 + Réseau en scène Languedoc-Roussillon + Yvan GODARD + y.godard&reseauenscene.fr +43017 + Albaad + Vladimir Kopolovich + admin&albaad.com +43018 + Pädagogisches Landesinstitut + Waldemar Brodkorb + waldemar.brodkorb&pl.rlp.de +43019 + Digital Human Identity S.L + Ramón Martínez + rampa&encomix.org +43020 + Angel Lane + Paul Bennett + registry&angellane.com +43021 + i-storm + SeongJin Park + sjpark&i-storms.com +43022 + OneSearch Direct Ltd. + Jamie Craig + ithelpdesk&onesearchdirect.co.uk +43023 + Tuxpower.dk + Mikael Bertelsen + mickey&tuxpower.dk +43024 + InfoGoose.Inc + Seeyun Kim + seeyunk&infogoose.com +43025 + Nomadconnection, Inc. + Kyoungjune Lee + ym1020&nomadconnection.com +43026 + Mostlucky Ltd. + David Fan + david&mostlucky.com.tw +43027 + Fujian Great Power PLC Equipment Co.,Ltd + Wu Xueya + wuxueya&md-front.com.cn +43028 + Office of Immigration and Nationality + Ede SOÓS + iana-pen&bah.b-m.hu +43029 + Netco Ltda. Network Solutions Co. + Alejandro Naranjo + anaranjo&netco.la +43030 + ROCK YOUR LIFE! gGmbH + Daniel Menzel + daniel.menzel&rockyourlife.de +43031 + RaumZeitLabor e.V. + Simon Elsbrock + info&raumzeitlabor.de +43032 + Live It - Nerd + Peter Young + peter&liveitnerd.com +43033 + TVV lippu- ja maksujärjestelmä Oy + Ilkka Kankkunen + ilkka.kankkunen&lmj.fi +43034 + K and P Business Solutions + Mulenga Katebe + katebe&kpbs.co.zm +43035 + Feinschliff + Christian Schweizer + administrator&feinschliff.ch +43036 + Bay Of Plenty District Health Board + Alexey Lobanov + alexey.lobanov&bopdhb.govt.nz +43037 + Newcastle-under-Lyme College + Mr Chris Stevenson + administrator&nulc.ac.uk +43038 + Creative Electronic Systems SA + Cédric Gaudin + cedric.gaudin&ces.ch +43039 + OASYS Healthcare Corporation + Martin vanPutten + mvanputten&oasyshealthcare.com +43040 + Davra Networks + Colin Ryan + colin.ryan&davranetworks.com +43041 + ATREM S.A. + Michal Kowalski + kontaktit&atrem.pl +43042 + Definition Networks Inc. + Kalidas Porika + kporika&definitionnetworks.com +43043 + Information System Assiociaties + Mario Remy Almeida + malmeida&isa.ae +43044 + Gran Investimentos + Thiago Mello + ti&granbio.com.br +43045 + Banco Exterior C.A. Banco Universal + Gabriel Salcedo + arquitecturay.soporte&bancoexterior.com +43046 + Andrey Fedorov + Andrey Fedorov + andrey.fedorov&gmail.com +43047 + H&W Computer Systems + Nick Yates + nyates&hwcs.com +43048 + CB7 Systems LLC + Lance Palatini + admin&cb7systems.com +43049 + Stewart Bryant + Stewart Bryant + stewart.bryant&gmail.com +43050 + Vobileinc + Honghui Ding + ding_honghui&vobile.cn +43051 + SHENZHEN SENSEGRID CO.,LTD. + liu.minpeng + liu.minpeng&sensegrid.cn +43052 + Shenzhen Tendzone Intelligent Technology Co; Ltd + Buck Yu + yuyupeng&tendzone.com +43053 + I.T. SYNERGY LIMITED + Tony Smith + oid&itsynergy.co.uk +43054 + Crown Prince Court + Meera Al Mansoori + meera.almansoori&cpc.gov.ae +43055 + American Kybernetik (Juan Daugherty) + Juan Daugherty + juan&acm.org +43056 + ENVISTACOM + Mark Hammel + mhammel&envistacom.com +43057 + PrAT CENTRAVIS PRODUCTION UKRAINE + Vladyslav Mochalov + administrator¢ravis.com +43058 + Synergy Sky AS + Egil Hasting + eh&synergysky.com +43059 + iteracon GmbH + Michael van Laak + michael.vanlaak&iteracon.de +43060 + Leepfrog Technologies, Inc. + Wes Bachman + certmaster&leepfrog.com +43061 + Global System & Network Services BVBA + Mr. Ferrara Cataldo + tech&gsns.be +43062 + Ingenieure ohne Grenzen e.V. + Tom Dinkelaker + tom.dinkelaker&gmail.com +43063 + Digital Multimedia Technology Co.,Ltd. + Jae Kyun, Lee + jklee&dmt.kr +43064 + Embedded Wireless Labs + Phang Wee Meng + wmphang&embeddedwireless.com +43065 + Shanghai Onezero Electronic Commerce Co., Ltd. + yibing wang + appdev&mc2.cn +43066 + Stiebel Eltron GmbH & Co. KG + Oliver Bast + oliver.bast&stiebel-eltron.de +43067 + VFI SYSTEM + Fabrice VOMSCHEID + fabrice.vomscheid&vfi-system.com +43068 + AVG Technologies + Pavel Odehnal + pavel.odehnal&avg.com +43069 + Markus Ruecker (mr-consult.net) + Markus Ruecker + markus.ruecker&mr-consult.net +43070 + Hrvatska narodna banka + Ana Puntarić + ana.puntaric&hnb.hr +43071 + NABB Gaming Community + Mathieu Dugas + mathieu.dugas&gmail.com +43072 + Privlo, Inc. + Aaron Picht + IT-IANA&privlo.com +43073 + roskakori.fi + Jarmo Jaakkola + operator&roskakori.fi +43074 + WRH Inc + Jack Cheney + jack.cheney&wrhinc.net +43075 + SKY Interactive + James Yong + james.yong&skyinteractive.com.au +43076 + Greiner Holding AG + Servicedesk + servicedesk&greiner.at +43077 + TUI Marine + Shawn LoPresto + shawn.lopresto&tuimarine.com +43078 + Lindvik + Kristian Lindvik + kristian&lindvik.com +43079 + Zimmer GmbH + Matt Addy + matt.addy&zimmer.com +43080 + Atlantic Corporation of Wilmington, Inc. + Robbie Walker + robbiew&atlanticpkg.com +43081 + intellec + Christian Jucker + christian.jucker&intellec.ch +43082 + Informatik Service Gesellschaft mbH + EL Ghouat Nor-eddine + ne.elghouat&isg-cgn.de +43083 + IMEN RAYANE SHRGH Co. + Hassan Hamzeloue monfared + info&imenrayaneh.com +43084 + Webtown Informatika Kft. + Peter Felber + wtsysop&webtown.hu +43085 + Detroit R & D, Inc. + David Putt + info&detroitrandd.com +43086 + NHS Sistemas Eletronicos + Thiago Wiezbicki + thiago.wiezbicki&nhs.com.br +43087 + xCelor LLC + Vahan Sardaryan + vahan&x-celor.com +43088 + Measurlogic Inc. + John Stratford + john&measurlogic.com +43089 + Dualog AS + Vidar Berg + vidar&dualog.com +43090 + KVADOS, a.s. + Milan Dadok + dadok&kvados.cz +43091 + SAP integrator Ltd. + Anthony Pankov + info&sapintegrator.com +43092 + Habermehl + Martin Habermehl + Martin&Habermehls.de +43093 + Xiamen Faratronic Co., Ltd. + Xiang Bai + bx&faratronic.com.cn +43094 + HyperWallet Systems Inc + Mark E.S. Bernard + mbernard&hyperwallet.com +43095 + Service2Media B.V. + Gerben van der Stouwe + gvanderstouwe&service2media.com +43096 + James Guse (JAG Enterprises) + James Guse + guse3&beryk.com +43097 + ROTH + WEBER GmbH + Stephan Frisch + software-entwicklung&rowe.de +43098 + Martem AS + Roland Uuesoo + roland&martem.ee +43099 + Embrionix Design inc. + Sithideth Viengkhou + sviengkhou&embrionix.com +43100 + Strata Decision Technology, L.L.C. + Joshua Bautista + it&stratadecision.com +43101 + Alphavida + Stuart Cianos + scianos&alphavida.com +43102 + Regional Municipality of Peel + Arthur Michalec + arthur.michalec&peelregion.ca +43103 + Caradigm + Sampath Damodarasamy + Sampath.Damodarasamy&Caradigm.com +43104 + CyberSecure IPS + Steve Sohn + steve.sohn&cybersecureips.com +43105 + CyberFlow Analytics, Inc. + Steve Hinkle + stevehinkle&cyberflowanalytics.com +43106 + PERK Innovation GmbH + Michael Pauen + michael.pauen&perk-innovation.com +43107 + Waclaw Schiller (Torinthiel) + Waclaw Schiller + iana-pen&torinthiel.pl +43108 + Attend Systems, LLC + Noah Groth + ngroth&attendsystems.com +43109 + dataFASCIA Corporation + Bill Lattin + blattin&datafascia.com +43110 + LTD «Bradbury Lab» + Evgeny Novikov + evn&bradburylab.com +43111 + VNT Software + Mirit Manor + mirit&vnt-software.com +43112 + Picsearch AB (publ) + Navid Abdi + sysadmin&picsearch.com +43113 + Screen9 AB + Navid Abdi + sysadmin&screen9.com +43114 + Kantonsapotheke Zuerich + Clau Deplazes + clau.deplazes&kaz.zh.ch +43115 + Forêts & Bois de l'Est + Alain JACQUET + contact&foretsetboisdelest.com +43116 + Berghof Automation GmbH + Dr. Arno Rabold + Arno.Rabold&berghof.com +43117 + National Stock Exchange Of India Limited + Prasad Addagatla + prasada&nse.co.in +43118 + NORDSYS GmbH + Stefan Sander + penadmin&nordsys.de +43119 + Altibox AS + Jan-Frode Myklebust + jf&altibox.no +43120 + Peshawar Business School + Muhammad Amjad + amjid49&yahoo.com +43121 + Ypsomed AG + Patrick Hostettler + dnsadmin&itsroot.net +43122 + Summit Networks + Daniel Korndorfer + daniel.korndorfer&summitnetworks.com.br +43123 + Instituto Nacional para la Evaluación de la Educación + Saul Castro Olvera + scastro&inee.edu.mx +43124 + PasswordBox Inc. + Francois Proulx + francois&passwordbox.com +43125 + System Studies Incorporated + Eric Malmberg + eric&airtalk.com +43126 + US Fire Insurance Company + Amos Desrosiers + amos.desrosiers&cfins.com +43127 + Oliver Manz (ips manz consulting) + Oliver Manz + ips&omanz.de +43128 + TangentOrg + Brian Aker + brian&tangent.org +43129 + Meijo University + Toshihiko KATO + ccoffice&meijo-u.ac.jp +43130 + Amplesky Communication Technologies Ltd. + Huang SongTao + snmpoid&lesky.com +43131 + Ternopil State Medical University + Kovalok Volodymyr + admin&tdmu.edu.ua +43132 + CJSC Svyaz engineering + Evgeniy Chudaykin + e.chudaykin&sipower.ru +43133 + mailgarant (Meint Post) + Meint Post + meint&meint.net +43134 + Advanced Fiber Products LLC + Wojciech Przeczkowski + wprzeczkowski&afpgco.com +43135 + adis.ca + Adi Linden + adi&adis.ca +43136 + Digital Footprints International, LLC; DBA Internet Identity + Rod Rasmussen + iana-pen&internetidentity.com +43137 + Raven Rocks Computer Services Group, Inc. + Charles Hopkins + charlesghopkins&gmail.com +43138 + Multapplied Networks, Inc. + Matthew Fox + support&multapplied.net +43139 + Glutonus SRL + Vladimir Tanase + vtanase&glutonus.md +43140 + Xora, Inc. + James Graham + jgraham&xora.com +43141 + RVTN.org + Vladimir Voskoboynikov + vladv&rvtn.org +43142 + St. Mary's International School + DJ Feldmeyer + administrator&smis.ac.jp +43143 + Nanjing Sinovatio Technology Co. ltd + Ning Zhang + zhang.ning&sinovatio.com +43144 + HMS Industrial Networks + Magnus Hansson + Ianacontact&hms.se +43145 + Vasily Nushtakin (Home Router) + Vasily Nushtakin + nushtakin.vasily&gmail.com +43146 + VanWesten.net + Erik Jan van Westen + erik&vanwesten.net +43147 + Best Theratronics Ltd. + Lloyd Smith + lloyd.smith&theratronics.ca +43148 + Det Norske Oljeselskap + Hans Arvid Olsen + hans.arvid.olsen&detnor.no +43149 + RUBYCAT-Labs + Anthony DAVID + iana&rubycat-labs.com +43150 + Stenbock Systems Inc. + Tore Stenbock + tore.stenbock&gmail.com +43151 + AltaSteel Ltd + Neil Tomlinson + ntomlinson&altasteel.com +43152 + Kristoffer Berdal (cognitive.io) + Kristoffer Berdal + iana&flexd.net +43153 + Gerriko S-E-T Technology Solutions Ltd. + Colin Gerrish + info&gerriko.ie +43154 + NexLabs Pte Ltd + Foo Ji-Haw + jhfoo&nexlabs.com +43155 + ION Trading Srl + Marco Bizzarri + m.bizzarri&iontrading.com +43156 + WEY Elektronik AG + Thomas Rast + thomas.rast&weytec.com +43157 + Tatung Technology Inc. + Ming-Yih Tom Lu + tomlu&tti.tv +43158 + Skytech.lt + Viktoras Dobrovolskis + viktoras.d&skytech.lt +43159 + Hartley Consultants Limited + Alan Chandler + alan.chandler&hartley-consultants.com +43160 + EnStream LP + Yiping Ye + yiping.ye&enstream.com +43161 + Riverside County Regional Medical Center + Elsa Wu + elwu&co.riverside.ca.us +43162 + Flash Services + F.Ruitenburg + frank.ruitenburg&flash-services.com +43163 + Cloud Technologies Inc. + Isao Tanimoto + support_sapphire&cloud-tech.co.jp +43164 + Eruditor Group Ltd. + Alexander Tyumentsev + it-admin&eruditor-group.com +43165 + Strike Technologies, LLC + Ben Yu + byu-operations&strikens.com +43166 + Thai Citrus, Inc. + Krissada Jindanupajit + info&thaicitrus.com +43167 + NaSys Inc. + Youngjae,Ahn + youngjaeahn&nasys.kr +43168 + ALFRED E. TIEFENBACHER (Gmbh & Co. KG) + Marek Falten + m.falten&aet.eu +43169 + Tiroler Versicherung + Ernst Schweighofer + it.admin&tiroler.at +43170 + Banco Bilbao Vizcaya Argentaria S.A + MERCEDES GARCIA FLORES + mercedes.garciaf&bbva.com +43171 + Datwyler Holding AG + Martin Sager + global.ict&datwyler.com +43172 + Atrium - Region PACA + Kevin Musarella + kevin.musarella&atos.net +43173 + Elesta Ltd. + Bykov Dmitry + elesta&elesta.ru +43174 + Ubiquity Srl + Giacomo Olgeni + giacomo.olgeni&ubiquity.it +43175 + Dorsey Racing + Walt Dorsey + admin&dorseyracing.com +43176 + Swiss Mobility Solutions + Miguel A. Roman + sysadmin&swissms.ch +43177 + Positron srl + Pier Bruni Venturoli + info&positronaudio.com +43178 + Main Line HealthCare + Kim Martino + martinok&mlhs.org +43179 + Lendy LLC + Brian Brophy + brianmbrophy&gmail.com +43180 + Ole Virginia Hams Amateur Radio Club + Derek LaHousse + dlahouss&mtu.edu +43181 + VFA INC + Antoine Jackson + itgroup&vfa.com +43182 + Minor Inf.Tech. + Ahmet Bahar + ahmetb&minor.com.tr +43183 + Renfe Viajeros, S.A. + Salvador Pozo Ortega + sportega&renfe.es +43184 + The Floow + James Ridgway + james.ridgway&thefloow.com +43185 + FINN Sp. z o.o. + Przemyslaw Sztoch + psztoch&finn.pl +43186 + Zweite Heimat GmbH + enno dobberke + ed&zweite-heimat.com +43187 + LIM college. + Syed Zaidi + Syed.Zaidi&limcollege.edu +43188 + INDIWAN GmbH + Marco Revesz + info&indiwan.de +43189 + J.B. Hunt Transport Services, Inc. + Michael Mullins + Michael_Mullins&jbhunt.com +43190 + Arket Srl + Paolo Grotto + p.grotto&arket.it +43191 + Metamako + Scott Newham + info&metamako.com +43192 + Automation & Integration Global Security Group, LLC. + Elisa Hernandez + elisa&aigsg.com +43193 + GRG International LTD + Rico Wang + rico.wang&grgatm.com +43194 + ABB Oy + Mika J Kärnä + mika.j.karna&fi.abb.com +43195 + Management of finance of the Administration of Tchaikovsky municipal district Perm region + Svetlana Koroteeva + purdiksergey&yandex.ru +43196 + Evintia SL + Jorge Albareda Florensa + timestamp&evintia.com +43197 + BCS Technologies + George Abitbol + mco-bcs&bcstechno.net +43198 + stepins.com + Markus Stepins + support&stepins.com +43199 + Aitch-Pea Limited + Jernej Zajc + oidmaster&aitch-pea.com +43200 + CLAAS KGaA mbH + Ralph Hoeltmann + iana&claas.com +43201 + bytemine GmbH + Holger Rasch + info&bytemine.net +43202 + Digital Networks UK Ltd + Ed Taylor + edward.taylor&dnuk.com +43203 + TSS COMPANY + Frantisek Takacs + takacs&tsscompany.eu +43204 + Hard 'n Software Consulting GmbH + Scott Hardin + scott&hnsc.de +43205 + Aloxa.eu + Javier Fernández + javier&aloxa.eu +43206 + American Cancer Society, Inc. + Scott Barr + scott.barr&cancer.org +43207 + Real-Time by Design, LLC + Creed Huddleston + creedh&realtimebydesign.com +43208 + Cybersavants,LLC + Guy Fuller + sales&cybersavants.com +43209 + Bliik + Jonathan Vermeulen + info&bliik.nl +43210 + Prominic.NET, Inc. + Andrew Hettinger + ahettinger&prominic.net +43211 + Atostek Oy + Timo Mähönen + root&atostek.com +43212 + space150, Inc. + Shawn Roske + shawn.roske&space150.com +43213 + Aveillant Ltd + Jason Morgan + jason.morgan&aveillant.com +43214 + Programa Interlegis + Fabio Kaiser Rauber + fabior&interlegis.leg.br +43215 + PC Users Group (ACT) Incorporated + Stephen Rothwell + hostmaster&tip.net.au +43216 + Fukushima Prefectural Government. Japan + Katsumi Ujiie + ujiie_katsumi_01&pref.fukushima.lg.jp +43217 + Ultimate Europe Transportation Equipment GmbH + Christian Hintersteiner + christian.hintersteiner&ultimate-eur.com +43218 + tecalor + Michael Kruckenberg + michael.kruckenberg&tecalor.de +43219 + Sallie Mae + Mike Bandy + mike.bandy&salliemae.com +43220 + DB Netz AG + Jan Kaebisch + jan.kaebisch&deutschebahn.com +43221 + Bemobi Midia e Entretenimento LTDA. + Tamoyo Vitali + tamoyo.vitali&bemobi.com.br +43222 + Oxfam + Gabriele Sani + gabriele.sani&oxfaminternational.org +43223 + Wireless Telecom Group, Inc + Brian Forbes + bforbes&wtcom.com +43224 + Netyard Pawel Jenner + Pawel Jenner + netyard&jenner.pl +43225 + Unitymedia KabelBW + Sven Ossendorf + postmaster&unitymedia.de +43226 + Ashe Cosgrove Corporation + Chris Cosgrove + chris&sunmoonstar.net +43227 + ossmail.de + Till Smejkal + postmaster&ossmail.de +43228 + Shanghai MRDcom Co., Ltd. + Qingzhong Tan + qingzhong.tan&mrdcom.net +43229 + SOFTEH PLUS SRL + Adrian Trif + adrian&softeh.ro +43230 + Betrust N.V. + Stefan Geelen + stefan.geelen&betrust.be +43231 + GSI Helmholtzzentrum für Schwerionenforschung GmbH + Christopher Huhn + monitoring-service&gsi.de +43232 + Bank of Nova Scotia + Jason Gray + jason.gray&scotiabank.com +43233 + Scheinkönig & Co. + Dieter Scheinkönig + service&scheinkoenig.com +43234 + LLC Enistek + Andrey Tolstoy + andrey&enistek.com +43235 + Stadt Chur + Josua Ackermann + lizenzen_it&chur.ch +43236 + Pilz GmbH & Co. KG + Frank Eberle + f.eberle&pilz.de +43237 + AOC Oost + Pascal te Pas + ictservicedesk&aoc-oost.nl +43238 + Compass Plus Ltd. + Alexandra Kochergina + a.kochergina&compassplus.com +43239 + MindMade sp. z o.o. + Tomasz Borkowski + office&mindmade.pl +43240 + Day & Zimmermann + Jason Schrader + NetworkInfrastructure&dayzim.com +43241 + Guidance Ltd. + Peter Varga + peter.varga&guidance.hu +43242 + Universal Switching Corporation + Hans Johansson + hj&uswi.com +43243 + ShinyByte Web Agency, LLC. + Jacob Vancil + Jacob&shinybyte.com +43244 + Open Information Security Foundation + Victor Julien + oisf-team&openinfosecfoundation.org +43245 + G421 Networks + Keith Dube + keith.dube&g421networks.com +43246 + Bennington-Rutland Supervisory Union + Daniel French + daniel.french&brsu.org +43247 + Rui Pereira (netcloud.pt) + Rui Pereira + admin&netcloud.pt +43248 + 3 Turn Productions LLC + Judy Tyrer + judy3t&3turnproductions.com +43249 + THM Consulting Ltd + Thorsten Mayr + thorstenpm&gmail.com +43250 + "Group of companies "POWER ENGINEERING" Ltd + Evgeniy Petrov + e.petrov&e-pwr.ru +43251 + Planet Erde + Roland Gsell + roland.gsell&gmx.net +43252 + CosDay e. V. + Alexander Pankow + it&cosday.de +43253 + ASGraphics + Andreas Strobl + astrobl&asgraphics.at +43254 + Geonov + Mathieu Ambrosy + mathieu.ambrosy&geonov.info +43255 + FISBA Optik AG + Joder Philipp + Philipp.Joder&fisba.ch +43256 + FlouLab (Ioannis Angelakopoulos) + Ioannis Angelakopoulos + ioangel&floulab.net +43257 + webs.bz + Rafal Kruk + hello&webs.bz +43258 + D'Youville College + Mary Spence + helpdesk&dyc.edu +43259 + Cambridge Health Alliance + Jeffrey Johnson + itd39&challiance.org +43260 + WireGeo.com + Konstantin Artemev + manager&wiregeo.com +43261 + Pontis Research Inc. + Aditya Bhushan + aditya.bhushan&pontisresearch.com +43262 + ABVI-Goodwill + Randy Overmyer + rovermyer&abvi-goodwill.com +43263 + SolarCity + Todd Tidwell + ttidwell&solarcity.com +43264 + Opanga Networks, Inc. + John Burnette + johnb&opanga.com +43265 + HongKong Yunlink Technology Co., Ltd + WU SHUNQUAN (Jessy) + yuncore.jessy&gmail.com +43266 + S.Toraighyrov Pavlodar State University + Sergey Berendakov + admin&psu.kz +43267 + JAMESON MEMORIAL HOSPITAL + RHONDA GRICKS + RGRICKS&JAMESONHEALTH.ORG +43268 + TELECO Spa + Massimiliano Negretti + laboratorio&telecospa.it +43269 + DI Kurt Renauer + DI Kurt Renauer + office&renauer.at +43270 + Yoshitaka Yamane + Yoshitaka Yamane + yoshitaka.yamane&oasis.ocn.ne.jp +43271 + Justus-Liebig-Universität Gießen + Dr. Oliver Bäumer + ldap-admin&hrz.uni-giessen.de +43272 + Austria Card Plastikkarten und Ausweissysteme Ges.m.b.H + Thomas Aichinger + thomas.aichinger&austriacard.at +43273 + Control Center Apps GmbH + Christoph Knittel + christoph.knittel&controlcenterapps.com +43274 + "Group of Companies "RosIntegracija" LLC. + Dmitriy Gvozdyuk + dmitriy.gvozdyuk&rosintegracija.ru +43275 + Alex Eggenberger + Alex Eggenberger + domaxinreg9&gmail.com +43276 + Coreline Soft Co.,Ltd + Hyungi Seo + hyungi.seo&corelinesoft.com +43277 + AE Telelink System Limited + Rajeev Kumar + rajeev&aetelelink.com +43278 + zalio + Hans Riethmann + hans.riethmann&zal.io +43279 + R. L. Drake Holdings, LLC + Joshua Blanton + jblanton&rldrake.com +43280 + Vereniging Ons Middelbaar Onderwijs + Thijs van Ham + ham.t&2college.nl +43281 + PAUL HARTMANN AG + Falk Nicolaus + certificate-admins&hartmann.info +43282 + PROVIDENTIA SYSTEMS + ROBERT BASSANO + robert.bassano&providentiasystems.com +43283 + Vado Security + Yossi Ben Hagai + yossi&vadosecurity.com +43284 + Dream Solutions Ltd + Martin Searancke + martin&dreamsolutions.biz +43285 + Quanzhou Karassn Security Protection Electronics Co., Ltd. + HongYaDe + www&dik.com.cn +43286 + Keysight Technologies, Inc. + Elizabeth Geary + elizabeth_geary&agilent.com +43287 + Mocomsoft Inc. + Jian Shen + jshen&mocomsoft.com +43288 + Lugansk State Academy Culture and Arts + Filippov Valeriy Leonidovich + lugansk.academy.culture.arts&gmail.com +43289 + W3Security + Adrian Tanasie + adrian.tanasie&w3s.ro +43290 + DLP Networks + David Jia Wei Li + david&david-li.com +43291 + Frank Loepthien (Loeppi) + Frank Loepthien + loeppi&gmx.de +43292 + Applifier Oy + Juho Mäkinen + juho&applifier.com +43293 + Diakonie Deutschland + Jörn Hoffmann + internet&diakonie.de +43294 + M2M Telemetria Ltda + Celso de Oliveira + celso&m2mtelemetria.com.br +43295 + Kreel LLC + Scott Kreel + scott&kreel.com +43296 + Exablaze + Matthew Chapman + matthew.chapman&exablaze.com +43297 + BASSANO & ASSOCIATES + ROBERT BASSANO + robert.bassano&bassanoassociates.co +43298 + fnordspace.net + Markus Barenhoff + mbarenh&alios.org +43299 + Das Kartell (German Star Citizen Organization) + Jörg Griepentroch + BFC.OGDA&gmx.net +43300 + PDC Corporation + Hershel Wolf + hershel.wolf¶meds.com +43301 + xiamen diksoft Co.,Ltd. + YaDe Hong + www&dik.com.cn +43302 + Bank Of Stockton + Tyler Applebaum + tapplebaum&bankofstockton.com +43303 + 1st Choice Tax Service, Inc. + Don Larsen + donlarsen&1stChoiceTax.biz +43304 + Davenport University + Steven Tharp + stharp&davenport.edu +43305 + Hey Communications + Chris Bajumpaa + chrisb&hey.net +43306 + Bitclear, LLC + Chris Lamont + chris.lamont&bitclear.us +43307 + Keyprocessor + Wilfred Janssen + wilfred.janssen&keyprocessor.com +43308 + Appcara Inc + Goh Eng Teong + engteong.goh&appcara.com +43309 + Sweratel AB + LIM KEE CHIAN + keechian&sweratel.se +43310 + Konak Solutions Pty Ltd + Nesh Nenad Mijailovic + info&konak.com.au +43311 + Belcity Software + Nigel Prosser + nigel.prosser&belcity.co.uk +43312 + ZRO Kvant + Nazarenko Victor + snakedj&inbox.ru +43313 + zerolatency ltd + Mauro Rappa + info&zerolatency.co +43314 + Tecteo Group SA + Adrien le Maire + adrien.le.maire&tecteo.be +43315 + PowerDNS.COM BV + bert hubert + bert.hubert&powerdns.com +43316 + Information Factory + Anton Borowka + admins&information-factory.com +43317 + Stadtwerke Bonn GmbH + Eduard Dueck + it-service&stadtwerke-bonn.de +43318 + PERSON to PERSON Analysis CA + Enrique Fermin + efermin&contactop2p.com +43319 + Secure Meters Limited + Hemant Jangid + hemant.jangid&securetogether.com +43320 + NetSTAR inc + seinosuke terashi + s.terashi&netstar-inc.com +43321 + Polaris Networks + Pradip Biswas + pradip_biswas&polarisnetworks.net +43322 + Kenya Education Network + Peter Muia + pmuia&kenet.or.ke +43323 + Trans4mation IT GmbH + Sebastian Hähnel + Sebastian.Haehnel&trans4mation.de +43324 + FARSENS S.L. + Daniel Pardo + info&farsens.com +43325 + Shoreland Inc. + Scott Kreel + sakreel&shoreland.com +43326 + Triple Canopy Inc. + Todd Wallace + it-services&triplecanopy.com +43327 + Toronto Public Library + Ian Stegman + istegman&torontopubliclibrary.ca +43328 + Exscribe, Inc + Tony Kennedy + tony&exscribe.com +43329 + OneConfig Pty Ltd + Martyn Lomax + mlomax&oneconfig.net +43330 + Sonavation, Inc. + Tom Alexander + tom.alexander&sonavation.com +43331 + Madhat Technical Solutions LLC + Jamie Duemo + jamieduemo&madhatts.com +43332 + DialogSoft inc. + Ivan Petrov + peti&dialogsoft.biz +43333 + Gangwon EMbedded Software Cooperative Research Center + Chang Yeong CHOI + ccy333&gwnu.ac.kr +43334 + iDocTrust + Gerhardus Muller + gerhardus1&gmail.com +43335 + Union des Bois de Champagne + Alain JACQUET + contact&foretsetboisdelest.com +43336 + GOERLITZ AG + Norbert Bartsch + norbert.bartsch&goerlitz.com +43337 + ZENON MEDIA GmbH + Horst Roser + roser&zenon-media.net +43338 + Yottabyte + Greg Campbell + Engineering&Yottabyte.com +43339 + efComs UG + Joachim von Stieglitz + jvs&efcoms.com +43340 + Traffic Technologies, Inc. + Michael Kolb + michael.kolb&t-t-i.com +43341 + Dashlink + Rick Gibson + rick&dashlink.com +43342 + SnailProof Computer Services + Shawn Amyotte + shawn&snailproof.com +43343 + Contactless Devices LLC + Evgeny Boger + info&contactless.ru +43344 + Maven Inventing Solutions + Marison Gomes + marison&maven.com.br +43345 + Aktietrykkeriet AS + Eyvind Riise + eyvind.riise&aktietrykkeriet.no +43346 + Douglas County School District, Colorado + Jeremy Norman + jnorman&dcsdk12.org +43347 + ValueDatum Systems, Inc. Ltd + Kevin Huang + kevin&valuedatum.com +43348 + EmbeddedSoft Ltd + Aleksander Kałążny + aleksander.kalazny&embeddedsoft.eu +43349 + Nigerian Research and Education Network (NgREN) + Prof. Mike Faborode + ngren&eko-konnect.net.ng +43350 + Arikel.net Enterprises, LLC + Michael King + mking&arikel.net +43351 + Advania + Aki Barkarson + aki&advania.is End of Document diff -Nru wireshark-1.10.5/epan/epan.c wireshark-1.10.6/epan/epan.c --- wireshark-1.10.5/epan/epan.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/epan.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ /* epan.c * - * $Id: epan.c 48526 2013-03-24 14:39:19Z etxrab $ + * $Id$ * * Wireshark Protocol Analyzer Library * diff -Nru wireshark-1.10.5/epan/epan_dissect.h wireshark-1.10.6/epan/epan_dissect.h --- wireshark-1.10.5/epan/epan_dissect.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/epan_dissect.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ /* epan_dissect.h * - * $Id: epan_dissect.h 45451 2012-10-10 19:05:30Z darkjames $ + * $Id$ * * Wireshark Protocol Analyzer Library * diff -Nru wireshark-1.10.5/epan/epan.h wireshark-1.10.6/epan/epan.h --- wireshark-1.10.5/epan/epan.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/epan.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ /* epan.h * - * $Id: epan.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark Protocol Analyzer Library * diff -Nru wireshark-1.10.5/epan/etypes.h wireshark-1.10.6/epan/etypes.h --- wireshark-1.10.5/epan/etypes.h 2013-08-14 07:50:10.000000000 +0000 +++ wireshark-1.10.6/epan/etypes.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* etypes.h * Defines ethernet packet types, similar to tcpdump's ethertype.h * - * $Id: etypes.h 51354 2013-08-14 07:44:30Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/except.c wireshark-1.10.6/epan/except.c --- wireshark-1.10.5/epan/except.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/except.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Portable Exception Handling for ANSI C. * Copyright (C) 1999 Kaz Kylheku * - * $Id: except.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Free Software License: * diff -Nru wireshark-1.10.5/epan/except.h wireshark-1.10.6/epan/except.h --- wireshark-1.10.5/epan/except.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/except.h 2014-03-07 18:07:15.000000000 +0000 @@ -14,7 +14,7 @@ * into proprietary software; there is no requirement for such software to * contain a copyright notice related to this source. * - * $Id: except.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * $Name: $ */ diff -Nru wireshark-1.10.5/epan/exceptions.h wireshark-1.10.6/epan/exceptions.h --- wireshark-1.10.5/epan/exceptions.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/exceptions.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* exceptions.h * Wireshark's exceptions. * - * $Id: exceptions.h 48917 2013-04-18 19:22:24Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/exntest.c wireshark-1.10.6/epan/exntest.c --- wireshark-1.10.5/epan/exntest.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/exntest.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ /* Standalone program to test functionality of exceptions. * - * $Id: exntest.c 48917 2013-04-18 19:22:24Z guy $ + * $Id$ * * Copyright (c) 2004 MX Telecom Ltd. * diff -Nru wireshark-1.10.5/epan/ex-opt.c wireshark-1.10.6/epan/ex-opt.c --- wireshark-1.10.5/epan/ex-opt.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/ex-opt.c 2014-03-07 18:07:15.000000000 +0000 @@ -5,7 +5,7 @@ * * (c) 2006, Luis E. Garcia Ontanon * - * $Id: ex-opt.c 48412 2013-03-19 04:54:30Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ex-opt.h wireshark-1.10.6/epan/ex-opt.h --- wireshark-1.10.5/epan/ex-opt.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/ex-opt.h 2014-03-07 18:07:15.000000000 +0000 @@ -5,7 +5,7 @@ * * (c) 2006, Luis E. Garcia Ontanon * - * $Id: ex-opt.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/expert.c wireshark-1.10.6/epan/expert.c --- wireshark-1.10.5/epan/expert.c 2013-07-17 22:26:25.000000000 +0000 +++ wireshark-1.10.6/epan/expert.c 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ * * Implemented as a tap named "expert". * - * $Id: expert.c 50710 2013-07-17 22:20:12Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/expert.h wireshark-1.10.6/epan/expert.h --- wireshark-1.10.5/epan/expert.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/expert.h 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ * * For further info, see: http://wiki.wireshark.org/Development/ExpertInfo * - * $Id: expert.h 47995 2013-03-02 01:00:20Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/filesystem.c wireshark-1.10.6/epan/filesystem.c --- wireshark-1.10.5/epan/filesystem.c 2013-09-10 00:13:13.000000000 +0000 +++ wireshark-1.10.6/epan/filesystem.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* filesystem.c * Filesystem utility routines * - * $Id: filesystem.c 51910 2013-09-10 00:07:17Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/filesystem.h wireshark-1.10.6/epan/filesystem.h --- wireshark-1.10.5/epan/filesystem.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/filesystem.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* filesystem.h * Filesystem utility definitions * - * $Id: filesystem.h 48797 2013-04-09 02:48:03Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/filter_expressions.c wireshark-1.10.6/epan/filter_expressions.c --- wireshark-1.10.5/epan/filter_expressions.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/filter_expressions.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* filter_expressions.c * Submitted by Edwin Groothuis * - * $Id: filter_expressions.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/filter_expressions.h wireshark-1.10.6/epan/filter_expressions.h --- wireshark-1.10.5/epan/filter_expressions.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/filter_expressions.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* filter_expressions.h * Submitted by Edwin Groothuis * - * $Id: filter_expressions.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/follow.c wireshark-1.10.6/epan/follow.c --- wireshark-1.10.5/epan/follow.c 2013-12-13 21:58:09.000000000 +0000 +++ wireshark-1.10.6/epan/follow.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ /* follow.c * - * $Id: follow.c 54070 2013-12-13 21:47:00Z gerald $ + * $Id$ * * Copyright 1998 Mike Hall * diff -Nru wireshark-1.10.5/epan/follow.h wireshark-1.10.6/epan/follow.h --- wireshark-1.10.5/epan/follow.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/follow.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ /* follow.h * - * $Id: follow.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Copyright 1998 Mike Hall * diff -Nru wireshark-1.10.5/epan/frame_data.c wireshark-1.10.6/epan/frame_data.c --- wireshark-1.10.5/epan/frame_data.c 2013-06-03 18:19:06.000000000 +0000 +++ wireshark-1.10.6/epan/frame_data.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* frame_data.c * Routines for packet disassembly * - * $Id: frame_data.c 49724 2013-06-03 18:08:59Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/frame_data.h wireshark-1.10.6/epan/frame_data.h --- wireshark-1.10.5/epan/frame_data.h 2013-06-04 02:46:12.000000000 +0000 +++ wireshark-1.10.6/epan/frame_data.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* frame_data.h * Definitions for frame_data structures and routines * - * $Id: frame_data.h 49746 2013-06-04 02:28:03Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/frequency-utils.c wireshark-1.10.6/epan/frequency-utils.c --- wireshark-1.10.5/epan/frequency-utils.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/frequency-utils.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* frequency-utils.c * Frequency conversion utility definitions * - * $Id: frequency-utils.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/frequency-utils.h wireshark-1.10.6/epan/frequency-utils.h --- wireshark-1.10.5/epan/frequency-utils.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/frequency-utils.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* frequency-utils.h * Frequency conversion utility definitions * - * $Id: frequency-utils.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ftypes/ftype-bytes.c wireshark-1.10.6/epan/ftypes/ftype-bytes.c --- wireshark-1.10.5/epan/ftypes/ftype-bytes.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/ftypes/ftype-bytes.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: ftype-bytes.c 48424 2013-03-19 19:02:25Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ftypes/ftype-double.c wireshark-1.10.6/epan/ftypes/ftype-double.c --- wireshark-1.10.5/epan/ftypes/ftype-double.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/ftypes/ftype-double.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: ftype-double.c 45948 2012-11-06 13:28:59Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ftypes/ftype-guid.c wireshark-1.10.6/epan/ftypes/ftype-guid.c --- wireshark-1.10.5/epan/ftypes/ftype-guid.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/ftypes/ftype-guid.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: ftype-guid.c 45948 2012-11-06 13:28:59Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ftypes/ftype-integer.c wireshark-1.10.6/epan/ftypes/ftype-integer.c --- wireshark-1.10.5/epan/ftypes/ftype-integer.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/ftypes/ftype-integer.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: ftype-integer.c 45948 2012-11-06 13:28:59Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ftypes/ftype-ipv4.c wireshark-1.10.6/epan/ftypes/ftype-ipv4.c --- wireshark-1.10.5/epan/ftypes/ftype-ipv4.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/ftypes/ftype-ipv4.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: ftype-ipv4.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ftypes/ftype-ipv6.c wireshark-1.10.6/epan/ftypes/ftype-ipv6.c --- wireshark-1.10.5/epan/ftypes/ftype-ipv6.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/ftypes/ftype-ipv6.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: ftype-ipv6.c 45948 2012-11-06 13:28:59Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ftypes/ftype-none.c wireshark-1.10.6/epan/ftypes/ftype-none.c --- wireshark-1.10.5/epan/ftypes/ftype-none.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/ftypes/ftype-none.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: ftype-none.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ftypes/ftype-pcre.c wireshark-1.10.6/epan/ftypes/ftype-pcre.c --- wireshark-1.10.5/epan/ftypes/ftype-pcre.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/ftypes/ftype-pcre.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: ftype-pcre.c 48424 2013-03-19 19:02:25Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ftypes/ftypes.c wireshark-1.10.6/epan/ftypes/ftypes.c --- wireshark-1.10.5/epan/ftypes/ftypes.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/ftypes/ftypes.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: ftypes.c 48227 2013-03-10 14:52:14Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ftypes/ftypes.h wireshark-1.10.6/epan/ftypes/ftypes.h --- wireshark-1.10.5/epan/ftypes/ftypes.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/ftypes/ftypes.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* ftypes.h * Definitions for field types * - * $Id: ftypes.h 48218 2013-03-09 20:02:19Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ftypes/ftypes-int.h wireshark-1.10.6/epan/ftypes/ftypes-int.h --- wireshark-1.10.5/epan/ftypes/ftypes-int.h 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/ftypes/ftypes-int.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: ftypes-int.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ftypes/ftype-string.c wireshark-1.10.6/epan/ftypes/ftype-string.c --- wireshark-1.10.5/epan/ftypes/ftype-string.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/ftypes/ftype-string.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: ftype-string.c 48424 2013-03-19 19:02:25Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ftypes/ftype-time.c wireshark-1.10.6/epan/ftypes/ftype-time.c --- wireshark-1.10.5/epan/ftypes/ftype-time.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/ftypes/ftype-time.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: ftype-time.c 45948 2012-11-06 13:28:59Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ftypes/ftype-tvbuff.c wireshark-1.10.6/epan/ftypes/ftype-tvbuff.c --- wireshark-1.10.5/epan/ftypes/ftype-tvbuff.c 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/ftypes/ftype-tvbuff.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: ftype-tvbuff.c 48424 2013-03-19 19:02:25Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ftypes/Makefile.am wireshark-1.10.6/epan/ftypes/Makefile.am --- wireshark-1.10.5/epan/ftypes/Makefile.am 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/ftypes/Makefile.am 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ # Makefile.am # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/ftypes/Makefile.common wireshark-1.10.6/epan/ftypes/Makefile.common --- wireshark-1.10.5/epan/ftypes/Makefile.common 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/ftypes/Makefile.common 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/ftypes/Makefile.in wireshark-1.10.6/epan/ftypes/Makefile.in --- wireshark-1.10.5/epan/ftypes/Makefile.in 2013-12-19 19:13:48.000000000 +0000 +++ wireshark-1.10.6/epan/ftypes/Makefile.in 2014-03-07 18:07:36.000000000 +0000 @@ -17,7 +17,7 @@ # Makefile.am # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -42,7 +42,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/ftypes/Makefile.nmake wireshark-1.10.6/epan/ftypes/Makefile.nmake --- wireshark-1.10.5/epan/ftypes/Makefile.nmake 2013-04-22 18:05:18.000000000 +0000 +++ wireshark-1.10.6/epan/ftypes/Makefile.nmake 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ ## Makefile for building wireshark.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ include ..\..\config.nmake diff -Nru wireshark-1.10.5/epan/funnel.c wireshark-1.10.6/epan/funnel.c --- wireshark-1.10.5/epan/funnel.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/funnel.c 2014-03-07 18:07:15.000000000 +0000 @@ -5,7 +5,7 @@ * * (c) 2006, Luis E. Garcia Ontanon * - * $Id: funnel.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/funnel.h wireshark-1.10.6/epan/funnel.h --- wireshark-1.10.5/epan/funnel.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/funnel.h 2014-03-07 18:07:15.000000000 +0000 @@ -5,7 +5,7 @@ * * (c) 2006, Luis E. Garcia Ontanon * - * $Id: funnel.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/garrayfix.h wireshark-1.10.6/epan/garrayfix.h --- wireshark-1.10.5/epan/garrayfix.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/garrayfix.h 2014-03-07 18:07:15.000000000 +0000 @@ -4,7 +4,7 @@ * ensuring that the data is aligned strictly enough for any data type, * we still get warnings with -Wcast-align. * - * $Id: garrayfix.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/gcp.c wireshark-1.10.6/epan/gcp.c --- wireshark-1.10.5/epan/gcp.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/gcp.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * gcp.c * Gateway Control Protocol -- Context Tracking * - * $Id: gcp.c 48291 2013-03-14 06:47:05Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/gcp.h wireshark-1.10.6/epan/gcp.h --- wireshark-1.10.5/epan/gcp.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/gcp.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* gcp.h * Gateway Control Protocol -- Context Tracking * - * $Id: gcp.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/geoip_db.c wireshark-1.10.6/epan/geoip_db.c --- wireshark-1.10.5/epan/geoip_db.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/geoip_db.c 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2008, Gerald Combs * - * $Id: geoip_db.c 48450 2013-03-21 14:29:58Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/geoip_db.h wireshark-1.10.6/epan/geoip_db.h --- wireshark-1.10.5/epan/geoip_db.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/geoip_db.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* geoip_db.h * GeoIP database support * - * $Id: geoip_db.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Copyright 2008, Gerald Combs * diff -Nru wireshark-1.10.5/epan/golay.c wireshark-1.10.6/epan/golay.c --- wireshark-1.10.5/epan/golay.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/golay.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* $Id: golay.c 43536 2012-06-28 22:56:06Z darkjames $ +/* $Id$ * * Provides routines for encoding and decoding the extended Golay * (24,12,8) code. diff -Nru wireshark-1.10.5/epan/golay.h wireshark-1.10.6/epan/golay.h --- wireshark-1.10.5/epan/golay.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/golay.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* $Id: golay.h 47992 2013-03-01 23:53:11Z rbalint $ +/* $Id$ * * Provides routines for encoding and decoding the extended Golay * (24,12,8) code. diff -Nru wireshark-1.10.5/epan/greproto.h wireshark-1.10.6/epan/greproto.h --- wireshark-1.10.5/epan/greproto.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/greproto.h 2014-03-07 18:07:15.000000000 +0000 @@ -10,7 +10,7 @@ * definition for them; when this file is empty, get rid of all includes * of it, and get rid of it. * - * $Id: greproto.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/guid-utils.c wireshark-1.10.6/epan/guid-utils.c --- wireshark-1.10.5/epan/guid-utils.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/guid-utils.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* guid-utils.c * GUID handling * - * $Id: guid-utils.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/guid-utils.h wireshark-1.10.6/epan/guid-utils.h --- wireshark-1.10.5/epan/guid-utils.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/guid-utils.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* guid-utils.h * Definitions for GUID handling * - * $Id: guid-utils.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/h225-persistentdata.c wireshark-1.10.6/epan/h225-persistentdata.c --- wireshark-1.10.5/epan/h225-persistentdata.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/h225-persistentdata.c 2014-03-07 18:07:15.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright 2003 Lars Roland * - * $Id: h225-persistentdata.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/h225-persistentdata.h wireshark-1.10.6/epan/h225-persistentdata.h --- wireshark-1.10.5/epan/h225-persistentdata.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/h225-persistentdata.h 2014-03-07 18:07:15.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright 2003 Lars Roland * - * $Id: h225-persistentdata.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/iana_snap_pid.h wireshark-1.10.6/epan/iana_snap_pid.h --- wireshark-1.10.5/epan/iana_snap_pid.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/iana_snap_pid.h 2014-03-07 18:07:15.000000000 +0000 @@ -4,7 +4,7 @@ * * http://www.iana.org/assignments/ethernet-numbers * - * $Id: iana_snap_pid.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/iax2_codec_type.h wireshark-1.10.6/epan/iax2_codec_type.h --- wireshark-1.10.5/epan/iax2_codec_type.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/iax2_codec_type.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* iax2_codec_type.h * Defines IAX2 codec types * - * $Id: iax2_codec_type.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/in_cksum.c wireshark-1.10.6/epan/in_cksum.c --- wireshark-1.10.5/epan/in_cksum.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/in_cksum.c 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ * pointers/lengths giving the pieces to be checksummed. Also using * Tahoe/CGI version of ADDCARRY(x) macro instead of from portable version. * - * $Id: in_cksum.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ */ /* diff -Nru wireshark-1.10.5/epan/in_cksum.h wireshark-1.10.6/epan/in_cksum.h --- wireshark-1.10.5/epan/in_cksum.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/in_cksum.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* in_cksum.h * Declaration of Internet checksum routine. * - * $Id: in_cksum.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ */ #ifndef __IN_CKSUM_H__ diff -Nru wireshark-1.10.5/epan/ip_opts.h wireshark-1.10.6/epan/ip_opts.h --- wireshark-1.10.5/epan/ip_opts.h 2013-07-17 22:26:25.000000000 +0000 +++ wireshark-1.10.6/epan/ip_opts.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions of structures and routines for dissection of options that * work like IPv4 options * - * $Id: ip_opts.h 50710 2013-07-17 22:20:12Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ipproto.c wireshark-1.10.6/epan/ipproto.c --- wireshark-1.10.5/epan/ipproto.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/ipproto.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* ipproto.c * Routines for converting IPv4 protocol/IPv6 nxthdr field into string * - * $Id: ipproto.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ipproto.h wireshark-1.10.6/epan/ipproto.h --- wireshark-1.10.5/epan/ipproto.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/ipproto.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Declarations of IP protocol numbers, and of routines for converting * IP protocol numbers into strings. * - * $Id: ipproto.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ipv4.c wireshark-1.10.6/epan/ipv4.c --- wireshark-1.10.5/epan/ipv4.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/ipv4.c 2014-03-07 18:07:15.000000000 +0000 @@ -5,7 +5,7 @@ * * Gilbert Ramirez * - * $Id: ipv4.c 45948 2012-11-06 13:28:59Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ipv4.h wireshark-1.10.6/epan/ipv4.h --- wireshark-1.10.5/epan/ipv4.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/ipv4.h 2014-03-07 18:07:15.000000000 +0000 @@ -5,7 +5,7 @@ * * Gilbert Ramirez * - * $Id: ipv4.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ipv6-utils.h wireshark-1.10.6/epan/ipv6-utils.h --- wireshark-1.10.5/epan/ipv6-utils.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/ipv6-utils.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* ipv6-utils.h * Definitions for IPv6 packet disassembly * - * $Id: ipv6-utils.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/lapd_sapi.h wireshark-1.10.6/epan/lapd_sapi.h --- wireshark-1.10.5/epan/lapd_sapi.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/lapd_sapi.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* lapd_sapi.h * Declarations of LAPD SAPI values. * - * $Id: lapd_sapi.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/llcsaps.h wireshark-1.10.6/epan/llcsaps.h --- wireshark-1.10.5/epan/llcsaps.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/llcsaps.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* llcsaps.h * Defines LLC SAP values. * - * $Id: llcsaps.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/Makefile.am wireshark-1.10.6/epan/Makefile.am --- wireshark-1.10.5/epan/Makefile.am 2013-12-17 20:10:15.000000000 +0000 +++ wireshark-1.10.6/epan/Makefile.am 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ # (EPAN is a historical name; it stands for Ethereal Protocol ANalyzer # Library) # -# $Id: Makefile.am 54192 2013-12-17 20:03:59Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -56,7 +56,7 @@ noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la lib_LTLIBRARIES = libwireshark.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwireshark_la_LDFLAGS = -version-info 4:5:1 @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 4:6:1 @LDFLAGS_SHAREDLIB@ include Makefile.common diff -Nru wireshark-1.10.5/epan/Makefile.common wireshark-1.10.6/epan/Makefile.common --- wireshark-1.10.5/epan/Makefile.common 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/Makefile.common 2014-03-07 18:07:12.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 48231 2013-03-10 15:10:27Z eapache $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/Makefile.in wireshark-1.10.6/epan/Makefile.in --- wireshark-1.10.5/epan/Makefile.in 2013-12-19 19:13:43.000000000 +0000 +++ wireshark-1.10.6/epan/Makefile.in 2014-03-07 18:07:32.000000000 +0000 @@ -20,7 +20,7 @@ # (EPAN is a historical name; it stands for Ethereal Protocol ANalyzer # Library) # -# $Id: Makefile.am 54192 2013-12-17 20:03:59Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -43,7 +43,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -68,7 +68,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 48231 2013-03-10 15:10:27Z eapache $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -595,7 +595,7 @@ noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la lib_LTLIBRARIES = libwireshark.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwireshark_la_LDFLAGS = -version-info 4:5:1 @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 4:6:1 @LDFLAGS_SHAREDLIB@ LIBWIRESHARK_SRC = \ addr_and_mask.c \ addr_resolv.c \ diff -Nru wireshark-1.10.5/epan/Makefile.nmake wireshark-1.10.6/epan/Makefile.nmake --- wireshark-1.10.5/epan/Makefile.nmake 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/Makefile.nmake 2014-03-07 18:07:12.000000000 +0000 @@ -1,7 +1,7 @@ ## Makefile for building wireshark.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 48515 2013-03-23 22:05:24Z guy $ +# $Id$ include ..\config.nmake include diff -Nru wireshark-1.10.5/epan/next_tvb.c wireshark-1.10.6/epan/next_tvb.c --- wireshark-1.10.5/epan/next_tvb.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/next_tvb.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* next_tvb.c * Routines for "next tvb" list * - * $Id: next_tvb.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/next_tvb.h wireshark-1.10.6/epan/next_tvb.h --- wireshark-1.10.5/epan/next_tvb.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/next_tvb.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* next_tvb.h * Definitions for "next tvb" list * - * $Id: next_tvb.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/nlpid.h wireshark-1.10.6/epan/nlpid.h --- wireshark-1.10.5/epan/nlpid.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/nlpid.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions of OSI NLPIDs (Network Layer Protocol IDs) * Laurent Deniel * - * $Id: nlpid.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/nstime.c wireshark-1.10.6/epan/nstime.c --- wireshark-1.10.5/epan/nstime.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/nstime.c 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright (c) 2005 MX Telecom Ltd. * - * $Id: nstime.c 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/nstime.h wireshark-1.10.6/epan/nstime.h --- wireshark-1.10.5/epan/nstime.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/nstime.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* nstime.h * Definition of data structure to hold time values with nanosecond resolution * - * $Id: nstime.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/oids.c wireshark-1.10.6/epan/oids.c --- wireshark-1.10.5/epan/oids.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/oids.c 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ * * (c) 2007, Luis E. Garcia Ontanon * - * $Id: oids.c 48797 2013-04-09 02:48:03Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/oids.h wireshark-1.10.6/epan/oids.h --- wireshark-1.10.5/epan/oids.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/oids.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* oids.h * Object IDentifier Support * - * $Id: oids.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * (c) 2007, Luis E. Garcia Ontanon * diff -Nru wireshark-1.10.5/epan/osi-utils.c wireshark-1.10.6/epan/osi-utils.c --- wireshark-1.10.5/epan/osi-utils.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/osi-utils.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for ISO/OSI network and transport protocol packet disassembly * Main entrance point and common functions * - * $Id: osi-utils.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * Laurent Deniel * Ralf Schneider * diff -Nru wireshark-1.10.5/epan/osi-utils.h wireshark-1.10.6/epan/osi-utils.h --- wireshark-1.10.5/epan/osi-utils.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/osi-utils.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ /* osi-utils.h * - * $Id: osi-utils.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/oui.h wireshark-1.10.6/epan/oui.h --- wireshark-1.10.5/epan/oui.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/oui.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* oui.h * Definitions of OUIs * - * $Id: oui.h 48963 2013-04-22 12:31:04Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/packet.c wireshark-1.10.6/epan/packet.c --- wireshark-1.10.5/epan/packet.c 2013-11-01 17:12:16.000000000 +0000 +++ wireshark-1.10.6/epan/packet.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* packet.c * Routines for packet disassembly * - * $Id: packet.c 53020 2013-11-01 16:24:42Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/packet.h wireshark-1.10.6/epan/packet.h --- wireshark-1.10.5/epan/packet.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/packet.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* packet.h * Definitions for packet disassembly structures and routines * - * $Id: packet.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/packet_info.h wireshark-1.10.6/epan/packet_info.h --- wireshark-1.10.5/epan/packet_info.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/packet_info.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* packet_info.h * Definitions for packet info structures and routines * - * $Id: packet_info.h 48018 2013-03-02 21:28:29Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/params.h wireshark-1.10.6/epan/params.h --- wireshark-1.10.5/epan/params.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/params.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* params.h * Definitions for parameter handling routines * - * $Id: params.h 47397 2013-01-31 21:02:23Z martink $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/pint.h wireshark-1.10.6/epan/pint.h --- wireshark-1.10.5/epan/pint.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/pint.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for extracting and translating integers safely and portably * via pointers. * - * $Id: pint.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/plugins.c wireshark-1.10.6/epan/plugins.c --- wireshark-1.10.5/epan/plugins.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/plugins.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* plugins.c * plugin routines * - * $Id: plugins.c 48383 2013-03-17 22:16:39Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/plugins.h wireshark-1.10.6/epan/plugins.h --- wireshark-1.10.5/epan/plugins.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/plugins.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* plugins.h * definitions for plugins structures * - * $Id: plugins.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ppptypes.h wireshark-1.10.6/epan/ppptypes.h --- wireshark-1.10.5/epan/ppptypes.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/ppptypes.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* ppptypes.h * Defines PPP packet types. * - * $Id: ppptypes.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/prefs.c wireshark-1.10.6/epan/prefs.c --- wireshark-1.10.5/epan/prefs.c 2013-07-24 18:21:29.000000000 +0000 +++ wireshark-1.10.6/epan/prefs.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* prefs.c * Routines for handling preferences * - * $Id: prefs.c 50871 2013-07-24 18:15:28Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/prefs.h wireshark-1.10.6/epan/prefs.h --- wireshark-1.10.5/epan/prefs.h 2013-07-24 18:21:29.000000000 +0000 +++ wireshark-1.10.6/epan/prefs.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* prefs.h * Definitions for preference handling routines * - * $Id: prefs.h 50871 2013-07-24 18:15:28Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/prefs-int.h wireshark-1.10.6/epan/prefs-int.h --- wireshark-1.10.5/epan/prefs-int.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/prefs-int.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for implementation of preference handling routines; * used by "friends" of the preferences type. * - * $Id: prefs-int.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/proto.c wireshark-1.10.6/epan/proto.c --- wireshark-1.10.5/epan/proto.c 2013-09-09 19:11:59.000000000 +0000 +++ wireshark-1.10.6/epan/proto.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* proto.c * Routines for protocol tree * - * $Id: proto.c 51876 2013-09-09 19:05:44Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/proto.h wireshark-1.10.6/epan/proto.h --- wireshark-1.10.5/epan/proto.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/proto.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* proto.h * Definitions for protocol display * - * $Id: proto.h 48753 2013-04-05 21:58:43Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/ptvcursor.h wireshark-1.10.6/epan/ptvcursor.h --- wireshark-1.10.5/epan/ptvcursor.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/ptvcursor.h 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ * Proto Tree TVBuff cursor * Gilbert Ramirez * - * $Id: ptvcursor.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/radius_dict.c wireshark-1.10.6/epan/radius_dict.c --- wireshark-1.10.5/epan/radius_dict.c 2013-12-19 19:21:23.000000000 +0000 +++ wireshark-1.10.6/epan/radius_dict.c 2014-03-07 18:14:07.000000000 +0000 @@ -990,7 +990,7 @@ * * RADIUS dictionary parser * - * $Id: radius_dict.l 48450 2013-03-21 14:29:58Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/radius_dict.l wireshark-1.10.6/epan/radius_dict.l --- wireshark-1.10.5/epan/radius_dict.l 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/radius_dict.l 2014-03-07 18:07:15.000000000 +0000 @@ -31,7 +31,7 @@ * * RADIUS dictionary parser * - * $Id: radius_dict.l 48450 2013-03-21 14:29:58Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/range.c wireshark-1.10.6/epan/range.c --- wireshark-1.10.5/epan/range.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/range.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* range.c * Range routines * - * $Id: range.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Dick Gooris * Ulf Lamping diff -Nru wireshark-1.10.5/epan/range.h wireshark-1.10.6/epan/range.h --- wireshark-1.10.5/epan/range.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/range.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* range.h * Range routines * - * $Id: range.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Dick Gooris * Ulf Lamping diff -Nru wireshark-1.10.5/epan/reassemble.c wireshark-1.10.6/epan/reassemble.c --- wireshark-1.10.5/epan/reassemble.c 2013-09-23 23:23:12.000000000 +0000 +++ wireshark-1.10.6/epan/reassemble.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* reassemble.c * Routines for {fragment,segment} reassembly * - * $Id: reassemble.c 52195 2013-09-23 23:17:22Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/reassemble.h wireshark-1.10.6/epan/reassemble.h --- wireshark-1.10.5/epan/reassemble.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/reassemble.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* reassemble.h * Declarations of outines for {fragment,segment} reassembly * - * $Id: reassemble.h 48909 2013-04-18 02:31:45Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/reassemble_test.c wireshark-1.10.6/epan/reassemble_test.c --- wireshark-1.10.5/epan/reassemble_test.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/reassemble_test.c 2014-03-07 18:07:15.000000000 +0000 @@ -28,7 +28,7 @@ * reassembled table. * #define debug to enable the code. * - * $Id: reassemble_test.c 48513 2013-03-23 19:38:54Z guy $ + * $Id$ * * Copyright (c) 2007 MX Telecom Ltd. * diff -Nru wireshark-1.10.5/epan/reedsolomon.c wireshark-1.10.6/epan/reedsolomon.c --- wireshark-1.10.5/epan/reedsolomon.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/reedsolomon.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ /* * - * $Id: reedsolomon.c 25240 2008-05-05 20:38:27Z etxrab $ + * $Id$ * * Reed-Solomon coding and decoding * Phil Karn (karn@ka9q.ampr.org) September 1996 diff -Nru wireshark-1.10.5/epan/report_err.c wireshark-1.10.6/epan/report_err.c --- wireshark-1.10.5/epan/report_err.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/report_err.c 2014-03-07 18:07:15.000000000 +0000 @@ -9,7 +9,7 @@ * doesn't itself know whether to pop up a dialog or print something * to the standard error. * -* $Id: report_err.c 45016 2012-09-20 01:48:30Z morriss $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/report_err.h wireshark-1.10.6/epan/report_err.h --- wireshark-1.10.5/epan/report_err.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/report_err.h 2014-03-07 18:07:15.000000000 +0000 @@ -9,7 +9,7 @@ * doesn't itself know whether to pop up a dialog or print something * to the standard error. * - * $Id: report_err.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/req_resp_hdrs.c wireshark-1.10.6/epan/req_resp_hdrs.c --- wireshark-1.10.5/epan/req_resp_hdrs.c 2013-09-09 19:11:59.000000000 +0000 +++ wireshark-1.10.6/epan/req_resp_hdrs.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Routines handling protocols with a request/response line, headers, * a blank line, and an optional body. * - * $Id: req_resp_hdrs.c 51875 2013-09-09 18:52:33Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/req_resp_hdrs.h wireshark-1.10.6/epan/req_resp_hdrs.h --- wireshark-1.10.5/epan/req_resp_hdrs.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/req_resp_hdrs.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Declarations of routines handling protocols with a request/response line, * headers, a blank line, and an optional body. * - * $Id: req_resp_hdrs.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/rtp_pt.h wireshark-1.10.6/epan/rtp_pt.h --- wireshark-1.10.5/epan/rtp_pt.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/rtp_pt.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* rtp_pt.h * Defines RTP payload types * - * $Id: rtp_pt.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/sctpppids.h wireshark-1.10.6/epan/sctpppids.h --- wireshark-1.10.5/epan/sctpppids.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/sctpppids.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* sctpppids.h * Declarations of SCTP payload protocol IDs. * - * $Id: sctpppids.h 44500 2012-08-14 20:31:49Z tuexen $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/show_exception.c wireshark-1.10.6/epan/show_exception.c --- wireshark-1.10.5/epan/show_exception.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/show_exception.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * * Routines to put exception information into the protocol tree * - * $Id: show_exception.c 48946 2013-04-21 06:14:11Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/show_exception.h wireshark-1.10.6/epan/show_exception.h --- wireshark-1.10.5/epan/show_exception.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/show_exception.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * * Routines to put exception information into the protocol tree * - * $Id: show_exception.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/sigcomp_state_hdlr.c wireshark-1.10.6/epan/sigcomp_state_hdlr.c --- wireshark-1.10.5/epan/sigcomp_state_hdlr.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/sigcomp_state_hdlr.c 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ * used for Signaling Compression (SigComp) dissection. * Copyright 2004, Anders Broman * - * $Id: sigcomp_state_hdlr.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/sigcomp_state_hdlr.h wireshark-1.10.6/epan/sigcomp_state_hdlr.h --- wireshark-1.10.5/epan/sigcomp_state_hdlr.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/sigcomp_state_hdlr.h 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ * used for Signaling Compression (SigComp) dissection. * Copyright 2004, Anders Broman * - * $Id: sigcomp_state_hdlr.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/sigcomp-udvm.c wireshark-1.10.6/epan/sigcomp-udvm.c --- wireshark-1.10.5/epan/sigcomp-udvm.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/sigcomp-udvm.c 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ * Signaling Compression (SigComp) dissection. * Copyright 2004, Anders Broman * - * $Id: sigcomp-udvm.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/sigcomp-udvm.h wireshark-1.10.6/epan/sigcomp-udvm.h --- wireshark-1.10.5/epan/sigcomp-udvm.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/sigcomp-udvm.h 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ * Signaling Compression (SigComp) dissection. * Copyright 2004, Anders Broman * - * $Id: sigcomp-udvm.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/sminmpec.c wireshark-1.10.6/epan/sminmpec.c --- wireshark-1.10.5/epan/sminmpec.c 2013-12-19 19:21:28.000000000 +0000 +++ wireshark-1.10.6/epan/sminmpec.c 2014-03-07 18:14:10.000000000 +0000 @@ -88,7 +88,7 @@ { 66, "David Systems" }, { 67, "Reuter" }, { 68, "Cornell" }, - { 69, "LMS" }, + { 69, "Michael Sabo" }, { 70, "Locus Computing Corp." }, { 71, "NASA" }, { 72, "Retix" }, @@ -165,7 +165,7 @@ { 143, "Eyring, Inc." }, { 144, "Case Communications" }, { 145, "Penril DataComm, Inc." }, - { 146, "American Airlines" }, + { 146, "American Airlines, Inc." }, { 147, "Sequent Computer Systems" }, { 148, "Bellcore" }, { 149, "Concord Communications" }, @@ -379,7 +379,7 @@ { 357, "Kasten Chase Applied Research" }, { 358, "Skyline Technology, Inc." }, { 359, "Nu-Mega Technologies, Inc." }, - { 360, "Morgan Stanley & Co. Inc." }, + { 360, "Morgan Stanley & Co. International PLC" }, { 361, "Integrated Business Network" }, { 362, "L & N Technologies, Ltd." }, { 363, "Cincinnati Bell Information Systems, Inc." }, @@ -1702,7 +1702,7 @@ { 1680, "Amati Communications Corp." }, { 1681, "P.H.U. RysTECH" }, { 1682, "Data Labs Inc." }, - { 1683, "Occidental Petroleum Services, Inc." }, + { 1683, "Occidental Petroleum Corporation" }, { 1684, "Rijnhaave Internet Services" }, { 1685, "Lynx Real-Time Systems, Inc." }, { 1686, "QA IT Services Ltd" }, @@ -1728,7 +1728,7 @@ { 1706, "Midland Business Systems, Inc." }, { 1707, "Optimal Networks" }, { 1708, "Gresham Computing plc" }, - { 1709, "Science Applications International Corp. (SAIC)" }, + { 1709, "Leidos, Inc. (Formerly SAIC)" }, { 1710, "Acclaim Communications" }, { 1711, "BISS Limited" }, { 1712, "Caravelle Inc." }, @@ -1985,7 +1985,7 @@ { 1963, "Intermec Technologies Corp." }, { 1964, "OPTIMUM Data AG" }, { 1965, "DMCNW" }, - { 1966, "Perle Systems Limited Moti" }, + { 1966, "Perle Systems Limited" }, { 1967, "inktomi corporation" }, { 1968, "TELE-TV Systems, L.P." }, { 1969, "Fritz-Haber-Institut" }, @@ -2954,7 +2954,7 @@ { 2932, "TERMA Elektronik AS" }, { 2933, "Floware System Solutions Ltd." }, { 2934, "Citicorp" }, - { 2935, "Pathlight Technology Inc." }, + { 2935, "Quantum Corp. (previous was 'Pathlight Technology Inc.')" }, { 2936, "Prominence Dot Com, Inc." }, { 2937, "Deutsche Telekom AG" }, { 2938, "Proginet Corporation" }, @@ -3783,7 +3783,7 @@ { 3761, "HAGER-ELECTRONICS GmbH" }, { 3762, "Kwangwoon University" }, { 3763, "Veramark" }, - { 3764, "Quantum Corporation (previous was 'Advanced Digital Information Corporation')" }, + { 3764, "Quantum Corporation (previous was 'Advanced Digital Information Corporation')" }, { 3765, "StrategicLink Consulting" }, { 3766, "Hannibal Teknologies" }, { 3767, "Pan-International Industrial Corp." }, @@ -4155,7 +4155,7 @@ { 4133, "philipjeddycpas" }, { 4134, "Philip J. Eddy & Partners Pty Ltd" }, { 4135, "NiceTec GmbH" }, - { 4136, "UQAM" }, + { 4136, "UQAM | Universit\0303\0251 du Qu\0303\0251bec \0303\0240 Montr\0303\0251al" }, { 4137, "GAURI Info-Comm.Inc." }, { 4138, "Sychron Ltd" }, { 4139, "WapIT Ltd." }, @@ -4966,7 +4966,7 @@ { 4944, "Future Networks, Inc." }, { 4945, "Logicon, Inc." }, { 4946, "Psychedelic Illuminations Magazine" }, - { 4947, "Grass Valley Group, Inc." }, + { 4947, "Grass Valley USA, LLC" }, { 4948, "MIGROS" }, { 4949, "Fortress Technologies" }, { 4950, "Luxor Software Inc." }, @@ -5221,7 +5221,7 @@ { 5199, "Odetics ITS" }, { 5200, "EnFlex Corp." }, { 5201, sminmpec_unknown }, /* (Added by Wireshark) */ - { 5202, "Helsinki University of Technology" }, + { 5202, "Aalto University (previous was 'Helsinki University of Technology')" }, { 5203, "The Naqvi Group" }, { 5204, "ClickNet Software Corporation" }, { 5205, "Ruby Tech Corp." }, @@ -7004,7 +7004,7 @@ { 6982, "Erba Holding" }, { 6983, "Sofaware Technologies" }, { 6984, "Fovea, Inc." }, - { 6985, "Prism Software, Inc." }, + { 6985, "Jumpy Cat Systems, Inc. (previous was 'Prism Software, Inc.')" }, { 6986, "Kiodex, Inc." }, { 6987, "WRonline GbR" }, { 6988, "University of Northern British Columbia" }, @@ -10086,7 +10086,7 @@ { 10064, "ASH" }, { 10065, "Ironoak Software" }, { 10066, "Digital Multimedia Technologies" }, - { 10067, "DVTel" }, + { 10067, "DVTEL Inc." }, { 10068, "E-OfficeServices Ltd." }, { 10069, "Epsilon AB" }, { 10070, "Flashwave Ltd" }, @@ -11195,7 +11195,7 @@ { 11173, "Directory Solutions" }, { 11174, "DX Antenna Co., Ltd." }, { 11175, "Epic Group plc" }, - { 11176, "Extelligence" }, + { 11176, "Objective Pathology Services Limited (previous was 'Extelligence')" }, { 11177, "Grapevine Interactive (Pty) Ltd" }, { 11178, "Guardian Controls International" }, { 11179, "hereUare Communications, Inc." }, @@ -11400,7 +11400,7 @@ { 11378, "Quartz Electronics Ltd." }, { 11379, "Radiant Rt." }, { 11380, "Retek Inc" }, - { 11381, "Rogers Shared Services" }, + { 11381, "Rogers Communications Inc" }, { 11382, "RR Enterprises" }, { 11383, "SaudiNet" }, { 11384, "SevenLayer Services" }, @@ -11427,7 +11427,7 @@ { 11405, "shanghaionline Inc." }, { 11406, "SANDY Group" }, { 11407, "obsceneskills.com" }, - { 11408, "Wuhan FiberHome Networks Co, Ltd" }, + { 11408, "Wuhan FiberHome Networks Co., Ltd" }, { 11409, "adequate systems GmbH" }, { 11410, "Advanced Communication Devices Corp." }, { 11411, "AOL Australia" }, @@ -12381,7 +12381,7 @@ { 12359, "Indigo Tango Ltd." }, { 12360, "Instituto Espa\0303\0261ol de Inform\0303\0241tica y Derecho" }, { 12361, "KGEx.com Co., Ltd" }, - { 12362, "Lombard Odier Darier Hentsch & Cie" }, + { 12362, "Lombard Odier & Cie" }, { 12363, "net-labs Systemhaus GmbH" }, { 12364, "Newbreak LLC" }, { 12365, "NTT COMWARE CORPORATION" }, @@ -13324,7 +13324,7 @@ { 13302, "The Advantage Media Group" }, { 13303, "The Gillette Company" }, { 13304, "T-Systems Solutions for Research GmbH" }, - { 13305, "Berne University of Applied Sciences" }, + { 13305, "BFH Berne University of Applied Sciences (previous was 'Berne University of Applied Sciences')" }, { 13306, "University of Montana" }, { 13307, "V.R.A.M. Rt." }, { 13308, "V\0303\0241rosmajori Gimn\0303\0241zium" }, @@ -14020,7 +14020,7 @@ { 13998, "Conceptual MindWorks, Inc." }, { 13999, "ItsNotA.com" }, { 14000, "InterZone" }, - { 14001, "DRS Flight Safety and Communications" }, + { 14001, "DRS Technologies Canada Ltd. (previous was 'DRS Flight Safety and Communications')" }, { 14002, "University of Wisconsin - Whitewater" }, { 14003, "Saint Mary's College" }, { 14004, "Gap Inc." }, @@ -14042,7 +14042,7 @@ { 14020, "Zencod" }, { 14021, "Shapers" }, { 14022, "Arachne (Poland)" }, - { 14023, "Mistral Internet Group" }, + { 14023, "KCOM Service Provider Network (previous was 'Mistral Internet Group')" }, { 14024, "fiscus GmbH" }, { 14025, "Landesversicherungsanstalt" }, { 14026, "Slapd.Net" }, @@ -14451,7 +14451,7 @@ { 14429, "McLuckie and Associates" }, { 14430, "PoliVec Inc." }, { 14431, "Universitas Kristen Krida Wacana" }, - { 14432, "SkySoft Pty Ltd" }, + { 14432, "Reserved" }, { 14433, "China Financial Certification Authority" }, { 14434, "Network Systems and Technologies" }, { 14435, "Vrije Universiteit Amsterdam" }, @@ -15915,7 +15915,7 @@ { 15893, "Emerson Climate Technologies Retail Solutions, Inc. (previously was 'Computer Process Controls')" }, { 15894, "AstroStage Inc." }, { 15895, "4Linux" }, - { 15896, "Rostov State University, Computer Center" }, + { 15896, "Southern Federal University (previous was 'Rostov State University, Computer Center')" }, { 15897, "Guangzhou GaoU S & T Development Co. Ltd." }, { 15898, "Polizei Brandenburg" }, { 15899, "inubit" }, @@ -17337,7 +17337,7 @@ { 17315, "EtherAddress.com" }, { 17316, "Peoria Christian School" }, { 17317, "MassiveEgo" }, - { 17318, "M5T Centre d'Excellence en Telecom Inc." }, + { 17318, "Media5 Corporation (previous was 'M5T Centre d'Excellence en Telecom Inc.')" }, { 17319, "JC Computing" }, { 17320, "J&M Crowther Ltd." }, { 17321, "Calpine" }, @@ -18082,7 +18082,7 @@ { 18060, "The Apache Software Foundation" }, { 18061, "OCEAN DEVELOPMENT" }, { 18062, "Jo Tankers AS" }, - { 18063, "Tratec Telecom b.v." }, + { 18063, "Technetix BV (previous was 'Tratec Telecom b.v.')" }, { 18064, "Marek Walther" }, { 18065, "XOU Solutions Limited" }, { 18066, "Planet Lauritsen" }, @@ -18682,7 +18682,7 @@ { 18660, "WebKMS" }, { 18661, "Elitech Information Technology Co.,Ltd." }, { 18662, "Mathias Kettner" }, - { 18663, "SCA Graphic Laakirchen AG" }, + { 18663, "Laakirchen Papier AG" }, { 18664, "IPnP" }, { 18665, "Axelero Internet Szolg\0303\0241ltat\0303\0263 Rt." }, { 18666, "Payroll Sweden AB" }, @@ -19161,7 +19161,7 @@ { 19139, "Edgewater Networks, Inc." }, { 19140, "Matthew R. Wilson" }, { 19141, "Quest Serviced Apartments" }, - { 19142, "ScriptaWorks s.r.l." }, + { 19142, "Carlo Strozzi (previous was 'ScriptaWorks s.r.l.')" }, { 19143, "SecureAge Technology" }, { 19144, "Arjuna" }, { 19145, "Xonix" }, @@ -19218,7 +19218,7 @@ { 19196, "Agarik" }, { 19197, "Eastlink GmbH" }, { 19198, "activ-net GmbH & Co. KG" }, - { 19199, "SHC Netzwerktechnik" }, + { 19199, "SHC Netzwerktechnik GmbH" }, { 19200, "MMG" }, { 19201, "Oyster Partners Ltd" }, { 19202, "meto-logic" }, @@ -20505,7 +20505,7 @@ { 20483, "Ministerio de Hacienda" }, { 20484, "Sukra Helitek, Inc." }, { 20485, "Fuchsia Open Source Solutions" }, - { 20486, "Chyron Corporation" }, + { 20486, "ChyronHego Corporation (previous was 'Chyron Corporation')" }, { 20487, "AXT Systems Pty Limited" }, { 20488, "DTMC Systems" }, { 20489, "Geotek Design Services" }, @@ -21434,7 +21434,7 @@ { 21412, "Andreas Wachter" }, { 21413, "ScriptLogic Corporation" }, { 21414, "Batra Consulting, Inc." }, - { 21415, "Option Germany GmbH" }, + { 21415, "Option nv" }, { 21416, "Centre Hospitalier de la C\0303\0264te Basque" }, { 21417, "tdb Software Service GmbH" }, { 21418, "Unient Communications, a.s." }, @@ -22331,7 +22331,7 @@ { 22309, "California State Automobile Association" }, { 22310, "ComNetMedia AG" }, { 22311, "A.F. Blakemore and Son Ltd" }, - { 22312, "Facult\0303\0251s Universitaires Saint-Louis (FUSL)" }, + { 22312, "Universit\0303\0251 Saint-Louis - Bruxelles (USL-B) (previous was 'Universit\0303\0251 Saint-Louis (USL-B)')" }, { 22313, "SP Controls, Inc." }, { 22314, "TGN-Systeme Krueger + Partner" }, { 22315, "spot media AG" }, @@ -22492,7 +22492,7 @@ { 22470, "NetDeposit Inc." }, { 22471, "Visible School, Inc." }, { 22472, "Boingo Wireless Inc." }, - { 22473, "Teledyne Controls wichta, Inc." }, + { 22473, "Teledyne Controls" }, { 22474, "Asylum Telecom, Ltd." }, { 22475, "UK Broadband" }, { 22476, "Syncor Systems, Inc." }, @@ -24139,7 +24139,7 @@ { 24117, "Idera" }, { 24118, "artemis-design GbR" }, { 24119, "eSimone" }, - { 24120, "Jsdaav Internet Solutions" }, + { 24120, "JSDAAV INTERNET SOLUTIONS CC" }, { 24121, "Centro Nacional de Infromaci\0303\0263n y Comunicaci\0303\0263n Educativa" }, { 24122, "Brodersen Controls A/S" }, { 24123, "Sparkasse Haslach-Zell" }, @@ -24613,7 +24613,7 @@ { 24591, "Marchex, Inc." }, { 24592, "Brazos County, Texas" }, { 24593, "Think Zone S.C." }, - { 24594, "Ilisys Web Hosting Pty Ltd" }, + { 24594, "MYOB Australia E1 Pty Ltd (previous was 'Ilisys Web Hosting Pty Ltd')" }, { 24595, "safari video networks llc." }, { 24596, "Ascent Technology, Inc." }, { 24597, "NRW.BANK" }, @@ -25025,7 +25025,7 @@ { 25003, "SQUILD" }, { 25004, "AEGON Magyarorszag Rt." }, { 25005, "sevecek" }, - { 25006, "SITRONICS Telecom Solutions, Czech Republic a.s." }, + { 25006, "NVision Czech Republic a.s. (previous was 'SITRONICS Telecom Solutions, Czech Republic a.s.')" }, { 25007, "Precesamiento Digital y Sistemas S.L." }, { 25008, "I.T.E.N.O.S. GmbH - Mobile Solutions" }, { 25009, "Sysworksoft" }, @@ -25058,7 +25058,7 @@ { 25036, "Kantonsschule Romanshorn" }, { 25037, "Novovia" }, { 25038, "denver health" }, - { 25039, "infinity-3 GmbH" }, + { 25039, "vitroconnect systems GmbH (previous was 'infinity-3 GmbH')" }, { 25040, "Keytronix GmbH." }, { 25041, "Microsol Ltd." }, { 25042, "JDM Software BV" }, @@ -25154,7 +25154,7 @@ { 25132, "Redeal Ltd" }, { 25133, "HKU School of Professional and Continuing Education" }, { 25134, "ComDesign Inc." }, - { 25135, "Ministerul Comunicatiilor si Tehnologiei Informatiei" }, + { 25135, "Ministerul pentru Societatea Informa\0310\0233ional\0304\0203 (previous was 'Ministerul Comunicatiilor si Tehnologiei Informatiei')" }, { 25136, "Haute Ecole Arc" }, { 25137, "Voronezh State Pedagogical University" }, { 25138, "Alyseo" }, @@ -26668,7 +26668,7 @@ { 26646, "Institute for Parallel Processing, BAS" }, { 26647, "Banco Safra S/A" }, { 26648, "Avago Technologies Limited" }, - { 26649, "Tyco Healthcare" }, + { 26649, "Covidien (previous 'Tyco Healthcare')" }, { 26650, "Pandora Media Inc." }, { 26651, "Propus Informatica Ltda" }, { 26652, "MELCO HOLDINGS INC." }, @@ -26785,7 +26785,7 @@ { 26763, "Cestel S.A." }, { 26764, "Novnet HB" }, { 26765, "Universitaet Bielefeld, Fakultaet fuer Mathematik" }, - { 26766, ".vantronix GmbH" }, + { 26766, ".vantronix secure systems" }, { 26767, "Alcatel-Lucent TMC (previous was 'Alcatel SOC')" }, { 26768, "Comune di Rimini" }, { 26769, "United Technologies Corporation" }, @@ -27340,7 +27340,7 @@ { 27318, "ISE Inc." }, { 27319, "Nexen Inc." }, { 27320, "Kingsbury Inc." }, - { 27321, "Ready Technology Limited" }, + { 27321, "Ready Technology (UK) Limited" }, { 27322, "21Net Ltd." }, { 27323, "Kei Communication Technology Inc." }, { 27324, "Semejny Doktor" }, @@ -27944,7 +27944,7 @@ { 27922, "Tripoint Corporation Pty Ltd" }, { 27923, "Trillian GmbH" }, { 27924, "Titof3000.org" }, - { 27925, "medi.com J. Jaronski T. Licznerski sp. j." }, + { 27925, "OPTOPOL Technology S.A. (previous was 'medi.com J. Jaronski T. Licznerski sp. j.')" }, { 27926, "Future Voice Technology" }, { 27927, "Evangelische Kliniken Bonn gGmbH" }, { 27928, "Ayecka Communication Systems Ltd." }, @@ -27962,7 +27962,7 @@ { 27940, "Stadtwerke Muenchen GmbH" }, { 27941, "Elaborata Produtos e Treinamentos de Informatica Ltda." }, { 27942, "Stredni prumyslova skola, Usti nad Labem, Stara 99, p.o." }, - { 27943, "VimpelCom" }, + { 27943, "VimpelCom Ltd." }, { 27944, "3Leaf Networks" }, { 27945, "Upsys" }, { 27946, "thomaskoch.it" }, @@ -28353,7 +28353,7 @@ { 28331, "Smiley Media, Inc." }, { 28332, "Brink's Home Security" }, { 28333, "Simon Niechzial EDV Dienstleistungen" }, - { 28334, "pulz8 Communications ApS" }, + { 28334, "Siemens A/S (previous was 'pulz8 Communications ApS')" }, { 28335, "Xworks NZ Limited" }, { 28336, "Voxeo" }, { 28337, "albatron S.r.l." }, @@ -28477,7 +28477,7 @@ { 28455, "Trion World Network" }, { 28456, "QNIX Pty Ltd" }, { 28457, "NTT America Enterprise Hosting" }, - { 28458, "Nokia Siemens Networks" }, + { 28458, "Nokia Solutions and Networks (previous was 'Nokia Siemens Networks')" }, { 28459, "Rogue Engineering Inc." }, { 28460, "Benone Bitencourt" }, { 28461, "Mutoh Industries Ltd." }, @@ -28825,7 +28825,7 @@ { 28803, "ISCaD GmbH" }, { 28804, "L'Occitane SA" }, { 28805, "Visionary Networks, Inc." }, - { 28806, "Children's Hospital, Inc." }, + { 28806, "Nationwide Children's Hospital (previous was 'Children's Hospital, Inc.')" }, { 28807, "Mullins Household" }, { 28808, "accom GmbH & Co. KG" }, { 28809, "Netwurk Labs" }, @@ -30133,7 +30133,7 @@ { 30111, "Pacific NETwork Imaging, Inc." }, { 30112, "Network Solutions Private Limited" }, { 30113, "Fornova" }, - { 30114, "SOLVIS Ltd" }, + { 30114, "Reserved" }, { 30115, "Damien Degois" }, { 30116, "Jims Group" }, { 30117, "Telefield, Inc." }, @@ -30688,7 +30688,7 @@ { 30666, "Online Rewards" }, { 30667, "Port40" }, { 30668, "BrControls" }, - { 30669, "RFSAT Ltd" }, + { 30669, "Research for Science, Art and Technology (RFSAT) Ltd" }, { 30670, "Vololink Pty Ltd" }, { 30671, "Crocus-com Company" }, { 30672, "Ancerno Ltd." }, @@ -30753,7 +30753,7 @@ { 30731, "BODET S.A" }, { 30732, "NetSocket, Inc." }, { 30733, "Umpqua Bank" }, - { 30734, "Seven-F" }, + { 30734, "Florian Sailer (previously was 'Seven-F')" }, { 30735, "BLUECOARA Networks" }, { 30736, "Kyoeisangyo corp." }, { 30737, "Servicios Tecnicos Agrupados S.A." }, @@ -32042,7 +32042,7 @@ { 32020, "doudemoii" }, { 32021, "Positron Inc." }, { 32022, "Pegatron Computer Inc." }, - { 32023, "XeNSiiS" }, + { 32023, "American Clean Air, Inc. (previous was 'XeNSiiS')" }, { 32024, "Applied Polymorphism" }, { 32025, "Primal Research" }, { 32026, "Sigma ITS Co., Ltd." }, @@ -32236,7 +32236,7 @@ { 32214, "GRETA de Bordeaux" }, { 32215, "John Anson Co. LLC" }, { 32216, "SIOS Technology, Inc." }, - { 32217, "B\0303\0226WE Systec AG" }, + { 32217, "B\0303\0226WE Systec GmbH" }, { 32218, "tedman.com" }, { 32219, "NBS srl" }, { 32220, "Esperion Therapeutics, Inc." }, @@ -32823,7 +32823,7 @@ { 32801, "ObjectFX" }, { 32802, "Inuk Networks" }, { 32803, "Research Institute for Linguistics, Hungarian Academy of Sciences" }, - { 32804, "Siemens Enterprise Communications GmbH & Co. KG" }, + { 32804, "Unify GmbH & Co. KG (formerly 'Siemens Enterprise Communications GmbH & Co. KG')" }, { 32805, "CR Host" }, { 32806, "scientia.net" }, { 32807, "TVACE" }, @@ -32892,7 +32892,7 @@ { 32870, "Fujian Sunnada Communication Co., Ltd" }, { 32871, "BUPT Incowin Information Communication Technology Institute Ltd." }, { 32872, "Royal Alberts Broadcasting Network" }, - { 32873, "KONE Deursystemen" }, + { 32873, "KONE Corporation" }, { 32874, "Novatium Solutions Private Limited" }, { 32875, "vedicis" }, { 32876, "Marian Fotul" }, @@ -33095,7 +33095,7 @@ { 33073, "System Analysis and Information Technologies Conference" }, { 33074, "Oryx Mail Systems GmbH" }, { 33075, "linux systeme thomas" }, - { 33076, "Virtual Internet Service Provider" }, + { 33076, "SCORE42 SAS (previous was 'Virtual Internet Service Provider')" }, { 33077, "InformSvyazStroi, Ltd." }, { 33078, "Ganymeade Systems" }, { 33079, "EmblaCom Oy" }, @@ -33884,7 +33884,7 @@ { 33862, "Large Binocular Telescope Observatory" }, { 33863, "Mantaro Networks, Inc." }, { 33864, "Praktiker Services GmbH" }, - { 33865, "Squad 17 Limited" }, + { 33865, "Atukorala Holdings Ltd. (previous was 'Squad 17 Limited')" }, { 33866, sminmpec_unknown }, /* (Added by Wireshark) */ { 33867, "Infrascape Technologies Limited" }, { 33868, "DOSIsoft" }, @@ -34162,7 +34162,7 @@ { 34140, "MAISONNEUVE Informatique" }, { 34141, "EXPRESS" }, { 34142, "Bank of Thailand" }, - { 34143, "Absilion AB" }, + { 34143, "Netrounds Solutions AB (previous was 'Absilion AB')" }, { 34144, "B\0303\0266hler Edelstahl GmbH & CoKG" }, { 34145, "K\0303\0241roly R\0303\0263bert College, Gy\0303\0266ngy\0303\0266s, Hungary" }, { 34146, "Telogic Ltd." }, @@ -34464,7 +34464,7 @@ { 34442, "e-utile S.p.A." }, { 34443, "Narinet Inc." }, { 34444, "STS Studi Tecnologie Sistemi S.r.l." }, - { 34445, "Capgemini BAS b.v. ( Netherlands )" }, + { 34445, "Capgemini Nederland B.V. ( Netherlands )" }, { 34446, "Hasenohr Consulting" }, { 34447, "Beijing Huoohuoo Technology Co., Ltd" }, { 34448, "G-Bits Network Technology Co., Ltd." }, @@ -34874,7 +34874,7 @@ { 34852, "Roeften" }, { 34853, "RainStor" }, { 34854, "indeni" }, - { 34855, "MobileTick Ltd," }, + { 34855, "Votiro Ltd. (previous was 'MobileTick Ltd')" }, { 34856, "ALTAVIA SA" }, { 34857, "BaiY Studio" }, { 34858, "Wireless Networks Association (WNA.gr)" }, @@ -35699,7 +35699,7 @@ { 35677, "Envisionier Medical Technologies, Inc." }, { 35678, "Clayster AB" }, { 35679, "GRITA" }, - { 35680, "Bloom Digital Platforms" }, + { 35680, "AdGear Technologies Inc. (previous was 'Bloom Digital Platforms')" }, { 35681, "Zenith System Solutions" }, { 35682, "Technical University of Liberec" }, { 35683, "Hofmann-IT-Systeme Ingenieurbuero" }, @@ -36120,7 +36120,7 @@ { 36098, "GoodForBusiness" }, { 36099, "Hangmat" }, { 36100, "WWF-UK" }, - { 36101, "SMK Software" }, + { 36101, "South Patron (previous was 'SMK Software')" }, { 36102, "Paramatrix Technologies Pvt. Ltd." }, { 36103, "Lan ETS" }, { 36104, "TraceSpan Communications" }, @@ -36312,7 +36312,7 @@ { 36290, "VeEX Inc" }, { 36291, "Signalion GmbH" }, { 36292, "kulthauskante e.V." }, - { 36293, "Smartlink Network Systems LImited" }, + { 36293, "Smartlink Network Systems Limited" }, { 36294, "MSO Link" }, { 36295, "Marubeni-Itochu Tubulars America, Inc." }, { 36296, "Mentor Solutions" }, @@ -36324,7 +36324,7 @@ { 36302, "ARTiiS GROUP a.s." }, { 36303, "AuthenTec Inc." }, { 36304, "Kandcnet Inc." }, - { 36305, "WoSign eCommerce Services Ltd." }, + { 36305, "WoSign CA Limited (previous was 'WoSign eCommerce Services Ltd.')" }, { 36306, "University of Teesside" }, { 36307, "SONUMA" }, { 36308, "txtNation Ltd." }, @@ -36835,7 +36835,7 @@ { 36813, "SafeTek USA, LLC" }, { 36814, "DEFFAYET" }, { 36815, "Savings Society Inc" }, - { 36816, "Beijing Yunshengfa Technologies Co., Ltd" }, + { 36816, "Beijing Abloomy Technologies Co., Ltd (previous was 'Beijing Yunshengfa Technologies Co., Ltd')" }, { 36817, "Bohemia Interactive Simulations" }, { 36818, "Accelya France SAS" }, { 36819, "Yare Objects AB" }, @@ -36878,7 +36878,7 @@ { 36856, "GEDIA Gebr\0303\0274der Dingerkus GmbH" }, { 36857, "Holztechnikum Kuchl" }, { 36858, "THQ Inc." }, - { 36859, "BreakingPoint Systems" }, + { 36859, "Ixia (previous was 'BreakingPoint Systems')" }, { 36860, "True Value Company" }, { 36861, "Pacmed International Inc" }, { 36862, "Mitrol SRL" }, @@ -38118,7 +38118,7 @@ { 38096, "CyclopusCAD s.r.l." }, { 38097, "Universidade Estadual de Goi\0303\0241s" }, { 38098, "Rostov region office of Federal service of state registration cadaster and cartography" }, - { 38099, "Transglobal Secure Collaboration Program (TSCP)" }, + { 38099, "Transglobal Secure Collaboration Participation Inc. (TSCP)" }, { 38100, "CAMI Research Inc." }, { 38101, "Roalter International" }, { 38102, "Szechenyi Istvan University" }, @@ -38239,7 +38239,7 @@ { 38217, "gigatec GmbH" }, { 38218, "Designer Systems Ltd" }, { 38219, "Therap Services, LLC" }, - { 38220, "IZAO Greenwall Systems" }, + { 38220, "Private Unitary Enterprise on Rendering Services \"Greenwall Systems\" (previous was 'IZAO Greenwall Systems')" }, { 38221, "IP Gorshkov Yuri Valerevich" }, { 38222, "Philips Electronics North America Corporation" }, { 38223, "definition six, inc." }, @@ -38496,7 +38496,7 @@ { 38474, "Blackridge Technology" }, { 38475, "Global SATCOM Technology, Inc." }, { 38476, "prosozial GmbH" }, - { 38477, "Aaxeon Technologies, LLC." }, + { 38477, "Antaira Technologies, LLC. (previous was 'Aaxeon Technologies, LLC.')" }, { 38478, "VerticalCue Design LLC" }, { 38479, "Seluxit" }, { 38480, "ABPM" }, @@ -39892,7 +39892,7 @@ { 39870, "Telesis A.S." }, { 39871, "Trans Industrias Electronicas" }, { 39872, "CIPFP Ausias March" }, - { 39873, "Ember Corporation" }, + { 39873, "Silicon Labs (previous was 'Ember Corporation')" }, { 39874, "Asmlab Limited" }, { 39875, "Beijing GuangXinYingKe Technology Co.,Ltd" }, { 39876, "7-Technologies A/S" }, @@ -40693,7 +40693,7 @@ { 40671, "Radinet Communications Inc." }, { 40672, "Fiber SenSys, Inc." }, { 40673, "Unigine Inc." }, - { 40674, "SAIT Zenitel" }, + { 40674, "SAIT (previous was SAIT Zenitel)" }, { 40675, "geiger BDT GmbH" }, { 40676, "Microsemi Corporation" }, { 40677, "RKF Engineering Solutions, LLC" }, @@ -40911,7 +40911,7 @@ { 40889, "Global Invacom Ltd" }, { 40890, "Hardomo" }, { 40891, "RDC, Inc. dba LynTec" }, - { 40892, "Abimus" }, + { 40892, "abimus" }, { 40893, "University of the Arts Helsinki" }, { 40894, "Cory-Net" }, { 40895, "VRVis Zentrum f\0303\0274r Virtual Reality und Visualisierung Forschungs-GmbH" }, @@ -41460,7 +41460,7 @@ { 41438, "HITOTEK Co.,Ltd" }, { 41439, "Moscow Psychological and Social University" }, { 41440, "Stabilus GmbH" }, - { 41441, "School of Medicine, Tohoku University" }, + { 41441, "Tohoku University" }, { 41442, "Berger Gunkel IT Systeme GmbH" }, { 41443, "Evotope AS" }, { 41444, "Syslore Oy" }, @@ -41565,7 +41565,7 @@ { 41543, "Advanced Power Laboratories" }, { 41544, "Fish Eagle Limited" }, { 41545, "Gravity Networks" }, - { 41546, "Innologija JSC" }, + { 41546, "Innologica JSC" }, { 41547, "MOVASIM" }, { 41548, "Laimbock Consulting" }, { 41549, "runtastic GmbH" }, @@ -41625,6 +41625,1752 @@ { 41603, "SOMANSA Co., Ltd" }, { 41604, "Monitor Electric Joint Stock Company" }, { 41605, "Georgia's Own Credit Union" }, + { 41606, "centrotherm photovoltaics AG" }, + { 41607, "One IP" }, + { 41608, "EFP Rotenberg LLP" }, + { 41609, "Kjempekjekt AS" }, + { 41610, "Aspectra AG" }, + { 41611, "Bank Vontobel AG" }, + { 41612, "Swisscom Energy Solution AG" }, + { 41613, "Controles S.A." }, + { 41614, "Eagleville Hospital" }, + { 41615, "Manhattan College" }, + { 41616, "Weeo Group" }, + { 41617, "Sparta Consulting" }, + { 41618, "OJSC Bank SGB" }, + { 41619, "Hospitality Alliance AG" }, + { 41620, "Eric Lakin" }, + { 41621, "Ministerio de Gobierno y Reforma del Estado" }, + { 41622, "XOR Media, Inc." }, + { 41623, "One Tech Inc." }, + { 41624, "Bell Aliant" }, + { 41625, "Mended Duck Computer Services" }, + { 41626, "Geller & Company LLC" }, + { 41627, "Cenwell LTD" }, + { 41628, "Learning Media Ltd" }, + { 41629, "Chakra Network Solutions Private Limited" }, + { 41630, "SENSEMATIX" }, + { 41631, "Tasneem electronics LLC" }, + { 41632, "PT.Bina Buana Raya" }, + { 41633, "Certivox Ltd." }, + { 41634, "EDV Beratung Haag" }, + { 41635, "NBC Elettronica Group Srl" }, + { 41636, "Tolaris.com" }, + { 41637, "Talia Ltd" }, + { 41638, "Socus networks" }, + { 41639, "SVSI" }, + { 41640, "Laconisoft LLC" }, + { 41641, "Colglazier Clinic" }, + { 41642, "ThinKom Solutions, Inc." }, + { 41643, "RCG Creations Limited" }, + { 41644, "Cinegy GmbH" }, + { 41645, "Sinogram Technology (Beijing) Co., Ltd." }, + { 41646, "QUADROtech Solutions AG" }, + { 41647, "SpectrAp" }, + { 41648, "Shenzhen SDGI Optical Network Technologies Co,. Ltd." }, + { 41649, "Schnoor Industrieelektronik GmbH & Co. KG" }, + { 41650, "Engisoft" }, + { 41651, "Dapesco S.A." }, + { 41652, "IdentSign" }, + { 41653, "GETCO Europe Ltd" }, + { 41654, "EAL (Apeldoorn) BV" }, + { 41655, "CardSmart Technologies" }, + { 41656, "2024Sight INC." }, + { 41657, "Bressner Technology" }, + { 41658, "United Business Media" }, + { 41659, "Datasat Technologies Ltd" }, + { 41660, "SciVisum Ltd" }, + { 41661, "SEKAS GmbH" }, + { 41662, "Capio S:t G\0303\0266rans Sjukhus AB" }, + { 41663, "Philippe Bonatti" }, + { 41664, "Costaneira - Arno Johann S/A Com\0303\0251rcio de Material de Constru\0303\0247\0303\0243o" }, + { 41665, "George Flemming LLC" }, + { 41666, "Government of Yukon" }, + { 41667, "Park Bench Software" }, + { 41668, "The Evergreen State College" }, + { 41669, "Spiros Iliadis" }, + { 41670, "AddOn Holding Gmbh" }, + { 41671, "Atelier WW Architekten SIA AG" }, + { 41672, "TECMASUR CIA. LTDA." }, + { 41673, "Lapsum" }, + { 41674, "WAS.ch GmbH" }, + { 41675, "ArmOwl LAB (Roman V. Kosinskiy)" }, + { 41676, "Gordon Broom" }, + { 41677, "Nicholas Brown" }, + { 41678, "SIBOAVANCE" }, + { 41679, "OVNETAP" }, + { 41680, "Media Netwerk AS" }, + { 41681, "Chudyk Cloud Services" }, + { 41682, "ASSEMBLY Organizing Oy" }, + { 41683, "Nebula Media Solutions Ltd." }, + { 41684, sminmpec_unknown }, /* (Added by Wireshark) */ + { 41685, "nfotex Informationstechnologie Dienstleistungs GmbH" }, + { 41686, "Uzin Utz AG" }, + { 41687, "Cold Crossing" }, + { 41688, "EOS Sistemi s.r.l." }, + { 41689, "Th\0303\0274ga Aktiengesellschaft" }, + { 41690, "Dension Audio Systems" }, + { 41691, "Horizon Forest Products, LLP " }, + { 41692, "Renee Marie Jones" }, + { 41693, "Nyingma Association of Mangalam Organizations - Communications And Network Infrastructure" }, + { 41694, "Christians Against Poverty" }, + { 41695, "Translational Centre for Regenerative Medicine (TRM)" }, + { 41696, "Actia Systems Espa\0303\0261a SAU" }, + { 41697, "European Central Bank" }, + { 41698, "Lucas-Consulting" }, + { 41699, "LGS Innovations" }, + { 41700, "eyeReturn Marketing Inc." }, + { 41701, "Jarvis Ford" }, + { 41702, "Levart Distribution Systems Pty. Ltd." }, + { 41703, "ATM-12" }, + { 41704, "Neoflow. Co., Ltd." }, + { 41705, "Institutul de Dezvoltare a Societatii Informationale" }, + { 41706, "Trollhattan Stad IT" }, + { 41707, "Solbox Inc." }, + { 41708, "Superior Access Solutions, Inc." }, + { 41709, "EAP Technologies, Inc." }, + { 41710, "ATES Networks" }, + { 41711, "Dossia" }, + { 41712, "ISTHARI" }, + { 41713, "Melet.com" }, + { 41714, "Azuki Systems, Inc." }, + { 41715, "Universal Cinema Services Co., Ltd." }, + { 41716, "Rational Retention, LLC" }, + { 41717, "Blekinge Institute of Technology" }, + { 41718, "Ouroboros" }, + { 41719, "Qosmotec GmbH" }, + { 41720, "Saisei Networks Inc" }, + { 41721, "International Communications Corporation INC" }, + { 41722, "Information Networks Ltd." }, + { 41723, "XGEN - Web Business" }, + { 41724, "Chengdu SKSpruce Technology Inc." }, + { 41725, "Tere.com Networks O\0303\0234" }, + { 41726, "Dr. Sulaiman Al Habib Medical Group" }, + { 41727, "Sabatier Geolocalisation" }, + { 41728, "athenahealth, Inc." }, + { 41729, "United Equitable Group, Ltd." }, + { 41730, "Arab States Research and Education Network, GmbH" }, + { 41731, "Prodware Deutschland AG" }, + { 41732, "Mathias Haimerl 3S" }, + { 41733, "Parallel Wireless" }, + { 41734, "V10 Networks" }, + { 41735, "Teletech Pty. Ltd." }, + { 41736, "Beatrice Wireko IT" }, + { 41737, "Bryan Health" }, + { 41738, "Algo Communication Products Ltd." }, + { 41739, "Five9, Inc." }, + { 41740, "TheGunns.net" }, + { 41741, "Ittim Technology Co.Ltd" }, + { 41742, "IMEC" }, + { 41743, "eKing Technology Co., Ltd." }, + { 41744, "Z3 Technology" }, + { 41745, "FrozenWarrior.com" }, + { 41746, "Chengdu Kingtype Digital TV Equipment Co., Ltd." }, + { 41747, "Oliver Solutions" }, + { 41748, "CensorNet Ltd" }, + { 41749, "Owens State Community College" }, + { 41750, "Head Department for Statistics and Information Technologies of State Customs Committee" }, + { 41751, "ROBIN'S" }, + { 41752, "ZAO \"NPK Rotek\"" }, + { 41753, "Greg Waterhouse" }, + { 41754, "Daniel Sage" }, + { 41755, "Lastline, Inc." }, + { 41756, "REVCORD - Revolutionizing Voice Recording" }, + { 41757, "Prism Systems, Inc." }, + { 41758, "Axham Corporation" }, + { 41759, "Open Computing Facility" }, + { 41760, "TibetSystem Co.,Ltd." }, + { 41761, "Atea Sverige AB" }, + { 41762, "Mayak LTD" }, + { 41763, "JSC \0302\0253BystroBank\0302\0273" }, + { 41764, "ETAT DE FRIBOURG" }, + { 41765, "Troyer AG" }, + { 41766, "Flow-Data, Inc" }, + { 41767, "IDSS AB" }, + { 41768, "Beijing Telesound Electronics Co., Ltd." }, + { 41769, "IS4IT GmbH" }, + { 41770, "Ascendi" }, + { 41771, "Fundamental Games" }, + { 41772, "Auth-servers" }, + { 41773, "TelVue Corporation" }, + { 41774, "Health Research, Inc." }, + { 41775, "Global Solutions Tecnologia da Informa\0303\0247\0303\0243o LTDA" }, + { 41776, "IACIT Solu\0303\0247\0303\0265es Tecnol\0303\0263gicas LTDA" }, + { 41777, "GSE Environmental, LLC" }, + { 41778, "Lake Avenue Congregational Church of Pasadena" }, + { 41779, "QualityLogic Inc." }, + { 41780, "Telesphere Networks Ltd" }, + { 41781, "Digby Wells Environmental" }, + { 41782, "Pacific Design Enginering" }, + { 41783, "Geolink Satellite Services" }, + { 41784, "ifbyphone, Inc." }, + { 41785, "Mary Washington Healthcare" }, + { 41786, "Ryu project" }, + { 41787, "HyperMatrix Solutions Ltd." }, + { 41788, "kuederli.net" }, + { 41789, "AlTaysir for Information Systems Security Consulting LLC" }, + { 41790, "I-CONCEPT" }, + { 41791, "eSPe" }, + { 41792, "Alrayyan for media and marketing co" }, + { 41793, "North East Independent School District" }, + { 41794, "High Point PC Solutions" }, + { 41795, "Net Consulting UK Ltd" }, + { 41796, "EleSy" }, + { 41797, "STC Systema" }, + { 41798, "astozi" }, + { 41799, "William Hill" }, + { 41800, "GaHIN (Georgia Health Information Network)" }, + { 41801, "Prattville Water Works Board" }, + { 41802, "Talkpath LLC" }, + { 41803, "On Center Software, Inc." }, + { 41804, "Austrian Federal Ministry of Science and Research" }, + { 41805, "Guidance Solutions, Inc." }, + { 41806, "Viastorage" }, + { 41807, "GuiZhou BC&TV Information Network Co.,LTD" }, + { 41808, "Administration of Municipal Formation of the City-Hero of Novorossiysk" }, + { 41809, "Dismuntel S.A.L." }, + { 41810, "Credit Agricole Bank, PJSC" }, + { 41811, "Spital M\0303\0244nnedorf AG" }, + { 41812, "Rouis Labs" }, + { 41813, "Anhui comhigher tech co.,ltd" }, + { 41814, "Hubei University Of Automotive Technology" }, + { 41815, "Fraunhofer-Institut fuer Software- und Systemtechnik ISST" }, + { 41816, "Blissful Living Foundation" }, + { 41817, "Cooper Gitiesse" }, + { 41818, "Quotient, Inc." }, + { 41819, "IPNetwork" }, + { 41820, "Kanton Basel-Landschaft" }, + { 41821, "Frantovo.cz" }, + { 41822, "Project FiFo" }, + { 41823, "Miaozhen Systems" }, + { 41824, "Universit\0303\0251 Gaston Berger" }, + { 41825, "Agilord Ltd." }, + { 41826, "Prognus Solu\0303\0247\0303\0265es Livres em TI" }, + { 41827, "Novantum BV" }, + { 41828, "NySoft Argentina SRL" }, + { 41829, "MEDDATA" }, + { 41830, "PicoCELA Inc." }, + { 41831, "Bitbase AS" }, + { 41832, "Private Entrepreneur Kutsevol Maxym" }, + { 41833, "Paree BV - Elektro Telecom" }, + { 41834, "BRAM Technologies" }, + { 41835, "JDL Digital Systems Inc." }, + { 41836, "bct electronic GesmbH" }, + { 41837, "Evan-Moor Corp" }, + { 41838, "Dynamic Network Services Inc." }, + { 41839, "Prism-IPX Systems, LLC" }, + { 41840, "University of the Philippines Manila" }, + { 41841, "Zhuhai Bluemax Broadband Electronic Co.,Ltd" }, + { 41842, "Novosibirsk State University" }, + { 41843, "Uni-Film-Club Dortmund" }, + { 41844, "PERF-IT B.V." }, + { 41845, "Bitcarrier S.L." }, + { 41846, "Chinasoft International Co., Ltd." }, + { 41847, "EDALab s.r.l." }, + { 41848, "TOVEK" }, + { 41849, "CIDON" }, + { 41850, "DaySequerra Corporation" }, + { 41851, "zeb/rolfes.schierenbeck.associates gmbh" }, + { 41852, "Peregrine Capital Management" }, + { 41853, "RAMI" }, + { 41854, "W.J. Bradley" }, + { 41855, "Logol" }, + { 41856, "Grand Valley State University" }, + { 41857, "AGENCE NATIONALE DES INFRASTRUCTURES NUMERIQUES ET DES FREQUENCES" }, + { 41858, "The Trade Desk, Inc." }, + { 41859, "Hidden Design Kft." }, + { 41860, "Oryon TI" }, + { 41861, "Tucker Ellis LLP" }, + { 41862, "Metawell" }, + { 41863, "Mongoose GFX" }, + { 41864, "EyeKor LLC." }, + { 41865, "Monitor Business Machines Ltd" }, + { 41866, "Hitachi-LG Data Storage, Inc." }, + { 41867, "yinyuetai" }, + { 41868, "elecom co., ltd." }, + { 41869, "Selex Gematronik GmbH" }, + { 41870, "Notartel S.p.A" }, + { 41871, "Sonifex Ltd" }, + { 41872, "Masdar PV GmbH" }, + { 41873, "Institut Superieur d'Electronique de Paris (ISEP)" }, + { 41874, "LLC \"ANTE-MEDIAM\"" }, + { 41875, "Esselte IPR AB" }, + { 41876, "FOXCOMM NETWORKS" }, + { 41877, "Orban" }, + { 41878, "Tobias & Tobias" }, + { 41879, "Mind Labs" }, + { 41880, "MIcrotel Innovation S.r.l." }, + { 41881, "Korbitec (Pty) Ltd." }, + { 41882, "KLU Consulting / K\0305\0215kua Lolo Uila" }, + { 41883, "Trojan Technologies" }, + { 41884, "Katherine Shaw Bethea Hospital" }, + { 41885, "NDsoftware" }, + { 41886, "Beijing Sapling Technology Co.,Ltd" }, + { 41887, "ENSCO, Inc." }, + { 41888, "URZ Friedrich-Schiller-Universit\0303\0244t Jena" }, + { 41889, "Nine Internet Solutions AG" }, + { 41890, "Cuyahoga Community College District" }, + { 41891, "Holland LP" }, + { 41892, "BIFIT Service" }, + { 41893, "DBM S.r.l." }, + { 41894, "Logistica Integral" }, + { 41895, "Alliance Data" }, + { 41896, "Alberta Electric System Operator" }, + { 41897, "Inovar" }, + { 41898, "Australian Nuclear Science Technology Organization" }, + { 41899, "YU JYA TECHNOLOGY CO., LTD." }, + { 41900, "Ministry of Interior, Bulgaria" }, + { 41901, "CSG SCIENCE&TECHNOLOGY CO., LTD.HEFEI" }, + { 41902, "Gemeindeverwaltung Landquart" }, + { 41903, "ETL Solutions Ltd." }, + { 41904, "Impala Editores, SA" }, + { 41905, "Great-West Life " }, + { 41906, "VeriSign, Inc." }, + { 41907, "LoudCell Technologies Pvt Ltd." }, + { 41908, "HanKeInfo" }, + { 41909, "AventuraHQ, Inc" }, + { 41910, "Zentyal" }, + { 41911, "Great Plains Manufacturing, Inc." }, + { 41912, "International Electrotechnical Commission" }, + { 41913, "Tecsys do Brasil Industrial Ltda" }, + { 41914, "Bradford Robotic Telescope" }, + { 41915, "Southwestern Energy Co." }, + { 41916, "vIPtela Inc." }, + { 41917, "Leica Geosystems AG" }, + { 41918, "CIT Telecom-Service JSC" }, + { 41919, "Ugobame Uchibeke" }, + { 41920, "Shenzhen Integrated Electronic Systerms Lab Co.,Ltd." }, + { 41921, "Beijing Infomedia Electronic Technology Co., Ltd" }, + { 41922, "GuangDong Super Telecom Co,Ltd." }, + { 41923, "Patrick Sczepanski" }, + { 41924, "Digital Value SL" }, + { 41925, "Nufarm Limited" }, + { 41926, "Finecom Telecommunications AG" }, + { 41927, "FORO-tele" }, + { 41928, "Muir Matheson Ltd" }, + { 41929, "Jung, DMS & Cie. AG" }, + { 41930, "Nautronix Limited" }, + { 41931, "CMC Electronics" }, + { 41932, "HSC Brasil" }, + { 41933, "Aligera" }, + { 41934, "NKI AS" }, + { 41935, "Indian River County Sheriff" }, + { 41936, "Marway Power Solutions" }, + { 41937, "Escola Agricola de Jundiai - EAJ/UFRN" }, + { 41938, "INCEPTRUM Technologies Inc." }, + { 41939, "Tralix M\0303\0251xico S. de R.L. de C.V." }, + { 41940, "Bradbury School" }, + { 41941, "StuStaNet e. V." }, + { 41942, "Lettergen" }, + { 41943, "Bartec GmbH" }, + { 41944, "Virginia Department of Behavioral Health and Developmental Services" }, + { 41945, "Institution Solutions" }, + { 41946, "The Information Architecture Institute" }, + { 41947, "Unidem Sales Inc" }, + { 41948, "Job Snijders" }, + { 41949, "Danmagi" }, + { 41950, "DTI Solutions" }, + { 41951, "Quarles & Brady, LLP" }, + { 41952, "Asad Ahmed" }, + { 41953, "JSC \"ESC of EVRAAS\"" }, + { 41954, "Polewall Norge AS" }, + { 41955, "Jansen AG" }, + { 41956, "Fellig" }, + { 41957, "Olfeo" }, + { 41958, "Prime Rate Ltd." }, + { 41959, "Earlham College" }, + { 41960, "easygo" }, + { 41961, "IntraCom Systems, LLC" }, + { 41962, "3ZTelecom Inc." }, + { 41963, "WebAmphibian.Com" }, + { 41964, "Ozona Consulting, S.L." }, + { 41965, "Mano Namai UK" }, + { 41966, "Applied Card Technologies Ltd." }, + { 41967, "Pivot Point Security" }, + { 41968, "EPCOTS" }, + { 41969, "Enero Solutions, inc." }, + { 41970, "Orion Networks International, Inc." }, + { 41971, "Touch Tecnologia e Inform\0303\0241tica LTDA" }, + { 41972, "Poznan University of Life Sciences" }, + { 41973, "Generation Tech" }, + { 41974, "Auf nach Mallorca GmbH" }, + { 41975, "ALNET ELEKTROMEKANIK LTD" }, + { 41976, "Turvasana Tmi" }, + { 41977, "Oakland County, Michigan" }, + { 41978, "BEIJING DING QING TECHNOLOGY LTD." }, + { 41979, "Mitsubishi Electric TOKKI Systems Corporation" }, + { 41980, "Neo-Renaissance Studios" }, + { 41981, "AerVox" }, + { 41982, "zetVisions AG" }, + { 41983, "Vorboss Limited" }, + { 41984, "meterriblecrew.net" }, + { 41985, "Desvaux Labs" }, + { 41986, "deepearth.co.uk" }, + { 41987, "BMO Capital Markets" }, + { 41988, "Van Wert County Hospital" }, + { 41989, "Alphatron Security Systems" }, + { 41990, "Pelagicore AG" }, + { 41991, "Super-Visions" }, + { 41992, "HOPPE Holding AG" }, + { 41993, "Redactia" }, + { 41994, "Jonas Kopp Systems Trust Network" }, + { 41995, "SIA-CE" }, + { 41996, "COM-TECH Italia S.p.A." }, + { 41997, "Silversky Inc." }, + { 41998, "Bumicom Telecommunicatie B.V. " }, + { 41999, "e2x Ltd." }, + { 42000, "National Mineral Resource University" }, + { 42001, "TechDivision GmbH" }, + { 42002, "Hurrikane Systems" }, + { 42003, "Akron Public Schools" }, + { 42004, "Gertec" }, + { 42005, "NHST MEDIA GROUP AS" }, + { 42006, "netis korea" }, + { 42007, "nikolakoco" }, + { 42008, "BumeBox, Inc." }, + { 42009, "Riava Networks Inc." }, + { 42010, "Luxul Corporation" }, + { 42011, "ISAAC Software Solutions B.V." }, + { 42012, "Mangold Technologies" }, + { 42013, "Registro General de la Propiedad de Guatemala" }, + { 42014, "Francois Trahan" }, + { 42015, "Weilhammer Networks" }, + { 42016, "Kingman Regional Medical Center" }, + { 42017, "MailMak ApS" }, + { 42018, "numo labs Pty. Ltd." }, + { 42019, "Fort-Telecom" }, + { 42020, "Piter Gaz JSC." }, + { 42021, "VoiceCom SA" }, + { 42022, "ITUS JAPAN" }, + { 42023, "Thetus Corporation" }, + { 42024, "Cibertec Internacional" }, + { 42025, "Koji Komatsuzaki" }, + { 42026, "TSTREAM CO.,LTD." }, + { 42027, "Sanctum Networks (P) Ltd." }, + { 42028, "Arnel limited" }, + { 42029, "Amigo Software" }, + { 42030, "Ghost Software" }, + { 42031, "42" }, + { 42032, "swisspartners Investment Network AG" }, + { 42033, "IslaLink" }, + { 42034, "Intemo Technologies" }, + { 42035, "Zedge" }, + { 42036, "LOYTEC electronics GmbH" }, + { 42037, "Stadt Augsburg" }, + { 42038, "Sanquin Bloedvoorziening" }, + { 42039, "Laboratoire Jacques Louis Lions" }, + { 42040, "Nasuni Corporation" }, + { 42041, "V\0303\0244nerhamn AB" }, + { 42042, "Inca Telecom S.A.C." }, + { 42043, "DingLi Communications Corp., Ltd." }, + { 42044, "GMQ Consulting AB" }, + { 42045, "Logical Tools s.r.l." }, + { 42046, "DigitalSign - Certifica\0303\0247\0303\0243o Digital Ltda" }, + { 42047, "twis.la (Clement Martin)" }, + { 42048, "Circle of Life Hospice" }, + { 42049, "Achkey Ltd" }, + { 42050, "China Security & Surveillance Technology,Inc." }, + { 42051, "Skyward Information System Co.,LTD." }, + { 42052, "vitapublic GmbH" }, + { 42053, "MEDvision360" }, + { 42054, "Stadler Bussnang AG" }, + { 42055, "West Lothian Council" }, + { 42056, "MultiToll Solutions SAS" }, + { 42057, "cegedim" }, + { 42058, "Lomnido, s.r.o." }, + { 42059, "MED2020 Health Care Software Inc." }, + { 42060, "Egon Braun" }, + { 42061, "SquareTwo Financial" }, + { 42062, "CyberTransJapan Co., Ltd." }, + { 42063, "Guidoon SAS" }, + { 42064, "Royse City ISD" }, + { 42065, "Iberia" }, + { 42066, "dbSpectra" }, + { 42067, "Bayerische Staatsforsten AoeR" }, + { 42068, "UBM Drecker GmbH" }, + { 42069, "The Comptroller General\0342\0200\0231s Department " }, + { 42070, "German Aerospace Center; Institute of Communications and Navigation" }, + { 42071, "Sprecher Automation GmbH" }, + { 42072, "Homes and Communities Agency" }, + { 42073, "DatASE" }, + { 42074, "Deltenna Limited" }, + { 42075, "BAFO Technologies Corp" }, + { 42076, "saltation GmbH & Co. KG" }, + { 42077, "sRatio" }, + { 42078, "Recursoft.org" }, + { 42079, "Army Emergency Relief " }, + { 42080, "Dajar" }, + { 42081, "TravailPrive" }, + { 42082, sminmpec_unknown }, /* (Added by Wireshark) */ + { 42083, "JS Networking Lab" }, + { 42084, "Mike Mackintosh" }, + { 42085, "Prolateral Consulting Ltd" }, + { 42086, "Vossloh Cogifer" }, + { 42087, "Business Insurance Direct" }, + { 42088, "Legal & General Nederland" }, + { 42089, "Rambler Internet Holding LLC" }, + { 42090, "Aleat shpk" }, + { 42091, "Tritech International Limited" }, + { 42092, "Serttel LTDA" }, + { 42093, "Expand" }, + { 42094, "Bfabric.org" }, + { 42095, "NII SOKB Ltd" }, + { 42096, "IQnet Ltd" }, + { 42097, "IT2u Czech s.r.o." }, + { 42098, "Fahrzeugsystemdaten GmbH" }, + { 42099, "Smart Green Labs S.L." }, + { 42100, "DV Industrial Computer Ltd." }, + { 42101, "iTEL" }, + { 42102, "Communications Audit UK Ltd" }, + { 42103, "hmcw gmbh" }, + { 42104, "wi2be Tecnologia S/A" }, + { 42105, "WebControl" }, + { 42106, "'MIGHTY APPARATUS FOR RADIOBRODCASTING AND TV\" Joint-Stock Company" }, + { 42107, "South Carolina Department of Revenue" }, + { 42108, "HRSoftworks" }, + { 42109, "Linux Based Systems Design, Ltd" }, + { 42110, "API Digital Communications Group, LLC" }, + { 42111, "Inovonics, Inc." }, + { 42112, "Kakapo Technologies Ltd." }, + { 42113, "STAsoft.net" }, + { 42114, "Finnish Institute of Occupational Health" }, + { 42115, "CommerceWest Bank" }, + { 42116, "AIG" }, + { 42117, "Oman Telecommunications Company (S.A.O.G)" }, + { 42118, "IDentAcc" }, + { 42119, "TRACT cjsc" }, + { 42120, "Multimatic Inc." }, + { 42121, "Michigan Public Health Institute" }, + { 42122, "Yurur" }, + { 42123, "Shanghai Xinyou Information Technology Co., Ltd." }, + { 42124, "YN-IT" }, + { 42125, "CK Engineering Ltd" }, + { 42126, "NOVARCHIVE" }, + { 42127, "SYMCOM INC" }, + { 42128, "KUL Elektronik Teknolojileri Ltd." }, + { 42129, "Continental Graphics Corp" }, + { 42130, "Skylink Technology Inc." }, + { 42131, "Westmont College" }, + { 42132, "Applied Security GmbH" }, + { 42133, "GoS Networks Ltd." }, + { 42134, "ScaleArc" }, + { 42135, "TRUSTe" }, + { 42136, "Ultra Electronics Airport Systems" }, + { 42137, "Unipagos S. de R.L. de C.V." }, + { 42138, "Virtualmaster, s.r.o." }, + { 42139, "Internet Corporation for Assigned Names and Numbers" }, + { 42140, "Bitfabrik GmbH & Co. KG" }, + { 42141, "Laboratoire d'Informatique Paris Nord" }, + { 42142, "The Faculty of Advocates" }, + { 42143, "Moose Beast Software" }, + { 42144, "cycos AG" }, + { 42145, "PRIME Apparatus" }, + { 42146, "EntobilSoft, Inc." }, + { 42147, "Pepperl+Fuchs GmbH" }, + { 42148, "The Geneva Foundation" }, + { 42149, "Cloud Life Software, LLC" }, + { 42150, "AffiniInternational B.V." }, + { 42151, "Net Business Pty Ltd" }, + { 42152, "Itransition" }, + { 42153, "Chuden CTI Co.,Ltd." }, + { 42154, "oak3 GmbH" }, + { 42155, "Evolution Racingteam Saar" }, + { 42156, "NeoLab-Systems S.A.R.L." }, + { 42157, "CERTIFIRMA, SOCIEDAD ANONIMA" }, + { 42158, "NetAgent Co., Ltd." }, + { 42159, "AT-Biotech Traceability Information Systems, S.L.U." }, + { 42160, "Iverdahl Systems" }, + { 42161, "GIE AGIRC-ARRCO" }, + { 42162, "NAKAYO ELECTRONICS CO.,LTD" }, + { 42163, "EBS Service Company Limited" }, + { 42164, "Minist\0303\0251rio P\0303\0272blico do RS" }, + { 42165, "Pi-Coral Inc." }, + { 42166, "Saint Josephs Hospital, Yonkers" }, + { 42167, "Data Tote" }, + { 42168, "blackchair Ltd" }, + { 42169, "The Coca-Cola Company" }, + { 42170, "Tiger Computing Ltd." }, + { 42171, "Gravitate" }, + { 42172, "Strencom" }, + { 42173, "Adiczion SARL" }, + { 42174, "ThiemoNet" }, + { 42175, "REFER Telecom, S.A." }, + { 42176, "eBernd" }, + { 42177, "Anuta Networks, Inc." }, + { 42178, "Nym Networks" }, + { 42179, "Sonora Quest Laboratories" }, + { 42180, "Kantonsspital Winterthur" }, + { 42181, "Wavecom - Solu\0303\0247\0303\0265es R\0303\0241dio S.A." }, + { 42182, "Speed and Function" }, + { 42183, "Digitus Biometrics" }, + { 42184, "ECG Management Consultants, Inc." }, + { 42185, "DEMTECH" }, + { 42186, "National Cement Company, Inc." }, + { 42187, "Podomatic, Inc" }, + { 42188, "MATRIXGROUP (CMS) PTY LTD" }, + { 42189, "JRTwine Software, LLC" }, + { 42190, "Genowise" }, + { 42191, "TotalServe Pty Ltd" }, + { 42192, "IDF Connect, Inc." }, + { 42193, "Alpha Networks S.A." }, + { 42194, "Matthews Midrange Consulting, Inc." }, + { 42195, "Tektorque, Lda" }, + { 42196, "Cauldron Development LLC" }, + { 42197, "Coffee Bean Software Pty Ltd" }, + { 42198, "IO-Power Technology Co., Ltd." }, + { 42199, "Foothills Rural Telephone Cooperative Corporation Inc." }, + { 42200, "Ecil Inform\0303\0241tica Ind\0303\0272stria e Comercio LTDA" }, + { 42201, "Schenker, Inc." }, + { 42202, "FreeTel, s.r.o." }, + { 42203, "TRA\0303\0207OTOP\0303\0201ZIO - INFORM\0303\0201TICA UNIPESSOAL LDA" }, + { 42204, "Kumoya Network" }, + { 42205, "Dooks Computer Services Ltd." }, + { 42206, "Proelse" }, + { 42207, "Commission Scolaire de la Pointe-de-l'Ile" }, + { 42208, "itecPlus GmbH" }, + { 42209, "CharlesRead Dot Com" }, + { 42210, "Beenius d.o.o. " }, + { 42211, "SHENZHEN HUAXUNARK TECHNOLOGY Co. Ltd." }, + { 42212, "CareCenter Software GmbH" }, + { 42213, "troydenton.ca" }, + { 42214, "Kaplan Bilisim Teknolojileri Yazilim ve Ticaret Ltd." }, + { 42215, "Alerant Inc." }, + { 42216, "BlueCorner" }, + { 42217, "Khoo Software Solutions" }, + { 42218, "ValleyCare Health System" }, + { 42219, "UniCredit Luxembourg S.A." }, + { 42220, "TELEDATA IT-L\0303\0266sungen GmbH" }, + { 42221, "Syl Research Limited" }, + { 42222, "Integrated Systems Technology, Inc." }, + { 42223, "Archive Analytics Ltd" }, + { 42224, "Fraunhofer Portugal Research Center for Assistive Information and Communication Solutions (Fraunhofer AICOS)" }, + { 42225, "Amco Marketing" }, + { 42226, "Evolve Media LLC" }, + { 42227, "Max-Planck-Institut fuer Mikrostrukturphysik" }, + { 42228, "Center Group" }, + { 42229, "Coriant R&D GmbH" }, + { 42230, "HiProCall GmbH" }, + { 42231, "AlfaTrein Ltd" }, + { 42232, "Fanzz" }, + { 42233, "Sigma Designs Inc." }, + { 42234, "Knotice, Ltd." }, + { 42235, "Tresorit Kft." }, + { 42236, "RDT Ltd" }, + { 42237, "Texas A&M University-Central Texas" }, + { 42238, "Grenville Mutual Insurance Company" }, + { 42239, "Aspira Networks, Inc" }, + { 42240, "Keyano College" }, + { 42241, "Geoquip Worldwide" }, + { 42242, "znets" }, + { 42243, "DLA Piper LLP (US)" }, + { 42244, "ITS Express, Inc." }, + { 42245, "Tagged, Inc." }, + { 42246, "OnePIN, Inc." }, + { 42247, "Aleph01" }, + { 42248, "SAIV" }, + { 42249, "Claritech SRL" }, + { 42250, "HFC Technics Ltd." }, + { 42251, "FutureTek, Inc." }, + { 42252, "Pflegeheim Alexander Beer GmbH & Co KG" }, + { 42253, "Zalando GmbH" }, + { 42254, "Inline Telecom Solutions" }, + { 42255, "The All England Lawn Tennis Club (Championships) Limited" }, + { 42256, "McGuireWoods LLP" }, + { 42257, "Cambridge Major Laboratories, Inc." }, + { 42258, "ooblick.com" }, + { 42259, "Green Energy Options Ltd" }, + { 42260, "Bent Vector" }, + { 42261, "Sayegh & John e-Trolley GbR" }, + { 42262, "TechRede, LLC" }, + { 42263, "Servas" }, + { 42264, "Fabien Debuire" }, + { 42265, "Thunder Software Technology Co., Ltd." }, + { 42266, "Otto (GmbH & Co KG)" }, + { 42267, "SARL Mixcom" }, + { 42268, "MEWA Textil-Service AG & Co. Management OHG" }, + { 42269, "Rigspolitiet (Danish National Police)" }, + { 42270, "Azienda Unita' Sanitaria Locale di Parma" }, + { 42271, "Fixious Global Indonesia" }, + { 42272, "Howard University Hospital" }, + { 42273, "AMPER" }, + { 42274, "Nexusguard Limited" }, + { 42275, "Advanced MR Analytics AB" }, + { 42276, "Infragear Inc" }, + { 42277, "CSW.IO" }, + { 42278, "Precitel SA" }, + { 42279, "SensMaster S/B" }, + { 42280, "SatExpander" }, + { 42281, "InfoBridge Solutions " }, + { 42282, "Pragmatix Services Private Limited" }, + { 42283, "Berwick Area School District" }, + { 42284, "Kai van Es" }, + { 42285, "FCS Computer Systems Sdn Bhd" }, + { 42286, "Connectem Inc." }, + { 42287, "UAP inc." }, + { 42288, "Sportech Inc." }, + { 42289, "NetTech Associates LLC" }, + { 42290, "LLC Sysvisor" }, + { 42291, "DWANGO MOBILE Co., Ltd." }, + { 42292, "SL Audio A/S" }, + { 42293, "North-West Customs-Logistical Service Co. Ltd." }, + { 42294, "S. & A.S. Ltd." }, + { 42295, "imzadi.de Network" }, + { 42296, "Impero Solutions Ltd" }, + { 42297, "Fraunhofer-Institut fuer Kommunikation, Informationsverarbeitung und Ergonomie FKIE" }, + { 42298, "Smoothwall Ltd" }, + { 42299, "Johnson Financial Group" }, + { 42300, "Minist\0303\0250re de la sant\0303\0251 et des serveurs sociaux" }, + { 42301, "turleyclan.com" }, + { 42302, "Beijing ForEase Times Technology Co., Ltd." }, + { 42303, "TE-SYSTEMS GmbH" }, + { 42304, "it & synergy GmbH" }, + { 42305, "Lupus alpha Asset Management" }, + { 42306, "CANARIE Inc." }, + { 42307, "Wildcard UK Ltd" }, + { 42308, "IndexUniverse, LLC" }, + { 42309, "Skale, Inc." }, + { 42310, "Matrix Switch Corporation" }, + { 42311, "X-Centric Solutions" }, + { 42312, "Hangzhou Zailing Electronic Technology Co., LTD" }, + { 42313, "Synergy Tecnologia" }, + { 42314, "D2D Technologies, LLC" }, + { 42315, "Mobisante, INC" }, + { 42316, "Pragmatech" }, + { 42317, "inVentia" }, + { 42318, "Recognition Technologies, Ltd" }, + { 42319, "777 Technology Solutions Limited" }, + { 42320, "Unassigned" }, + { 42321, "Mother Lode Holding Company" }, + { 42322, "TrakSystems" }, + { 42323, "Demma" }, + { 42324, "Powercode LLC" }, + { 42325, "Dialight, Inc." }, + { 42326, "ICON Americas" }, + { 42327, sminmpec_unknown }, /* (Added by Wireshark) */ + { 42328, "Nementis" }, + { 42329, "ipowertec" }, + { 42330, "Deltapath Commerce And Technology Limited" }, + { 42331, "Polarlink" }, + { 42332, "Vaillant Group" }, + { 42333, "Aliter Technologies, a.s." }, + { 42334, "Relmek co., Ltd" }, + { 42335, "iQ Consult Pty Ltd" }, + { 42336, "ADITO Software GmbH" }, + { 42337, "New York State Workers' Compensation Board" }, + { 42338, "Anywhere.24 Technologies GmbH" }, + { 42339, "Sabtech" }, + { 42340, "Open Standard Digital-IF Interface" }, + { 42341, "Tucson Airport Authority" }, + { 42342, "Guangdong Cable Corporation Limited" }, + { 42343, "James Hurley" }, + { 42344, "Puli Space Technologies Ltd." }, + { 42345, "Fluidic, Inc., d/b/a Fluidic Energy" }, + { 42346, "E-SIGN S.A." }, + { 42347, "Toyou Feiji Electronics Co., Ltd." }, + { 42348, "RUSNANO" }, + { 42349, "Noack Group" }, + { 42350, "Trebing & Himstedt Prozessautomation GmbH & Co. KG" }, + { 42351, "Champs Libres SCRLFS" }, + { 42352, "Hanweck Associates LLC" }, + { 42353, "LottSpot" }, + { 42354, "Trackprotect B.V." }, + { 42355, "ABCTec" }, + { 42356, "Electronic Media Services Ltd" }, + { 42357, "CHILLI MINT LABS LIMITED" }, + { 42358, "IP2I" }, + { 42359, "Versa Networks, Inc" }, + { 42360, "Skybox Imaging, Inc." }, + { 42361, "rahont" }, + { 42362, "spacefrogg.net" }, + { 42363, "Dematis" }, + { 42364, "Optoscape Optical Electronic Tech.Co.,Ltd " }, + { 42365, "H & M Hennes & Mauritz AB" }, + { 42366, "WxBR Wireless Broadband Soluctions" }, + { 42367, "Gedomo GmbH" }, + { 42368, "Azuru Networks" }, + { 42369, "Softel ltd" }, + { 42370, "ADRIATIC SLOVENICA d.d." }, + { 42371, "PA CSS (Pennsylvania eHealth Partnership Authority\0342\0200\0231s Community Shared Services)" }, + { 42372, "Banterra" }, + { 42373, "Kliniken des MTK GmbH" }, + { 42374, "Inmar Enterprises" }, + { 42375, "Unassigned" }, + { 42376, "Xyne GmbH" }, + { 42377, "MBD Consulting, LLC" }, + { 42378, "FOSS-Group GmbH" }, + { 42379, "Danske Fragtm\0303\0246nd A/S" }, + { 42380, "IDFocus" }, + { 42381, "Human Brain Project" }, + { 42382, "iSystems e.U." }, + { 42383, "Horizon Fuel Cell Technologies" }, + { 42384, "Tecnolog\0303\0255as Inteligentes y Modelaci\0303\0263n de Sistemas, S.A de C.V." }, + { 42385, "AIC Inc." }, + { 42386, "dylanharris.org" }, + { 42387, "CompuTEK Industries" }, + { 42388, "TEL-STER sp. z o.o." }, + { 42389, "Ital-Mec s.r.l." }, + { 42390, "Oslo KFUMs Sj\0303\0270korps" }, + { 42391, "Eastern Informatics, Inc." }, + { 42392, "FOXTER Cia Imobili\0303\0241ria" }, + { 42393, "Teledata Comunicaciones S.A." }, + { 42394, "Synapse" }, + { 42395, "EPM" }, + { 42396, "xsinfosol pvt ltd" }, + { 42397, "Grandstream Networks, Inc." }, + { 42398, "KnCMiner AB" }, + { 42399, "Garuda Permata Saputra, CV." }, + { 42400, "TD Tech Ltd." }, + { 42401, "CanTech s.r.o." }, + { 42402, "Spec S.A." }, + { 42403, "Ivane Javakhishvili Tbilisi State University" }, + { 42404, "Vadacom Limited" }, + { 42405, "Roambotics, Inc." }, + { 42406, "SATO Corporation " }, + { 42407, "iGrid S.L." }, + { 42408, "HealthSafe24" }, + { 42409, "TopMenu.com" }, + { 42410, "Blue Denim Consulting Group Inc." }, + { 42411, "Niklaus Ltd." }, + { 42412, "Osorno Enterprises Inc." }, + { 42413, "PACSHealth, LLC" }, + { 42414, "Cloudacc Interactive, Inc." }, + { 42415, "Prince Rupert Grain Ltd." }, + { 42416, "Software Engineering Center (SEC)" }, + { 42417, "A2Zlogix" }, + { 42418, "GovSource Pty Ltd" }, + { 42419, "NICEUC Communication Tech CO., LTD" }, + { 42420, "Hebei SICON-EMI Power System Co., Ltd." }, + { 42421, "OpenVox Ltd." }, + { 42422, "ALLWIN Network Corp." }, + { 42423, "Republic of Azerbaijan Ministry of Foreign Affairs" }, + { 42424, "International Card Services BV (ICS)" }, + { 42425, "Thiesen Hardware- & Software-Design GmbH" }, + { 42426, "Institut Paul Bocuse" }, + { 42427, "New York Community Bancorp" }, + { 42428, "Bharti Airtel Limited" }, + { 42429, "Hidden Authentication and Trust service" }, + { 42430, "University of Massachusetts" }, + { 42431, "Chelyabinsk palace of pioneers and pupils named after Krupskaya N.K." }, + { 42432, "lepassepresent.com" }, + { 42433, "Parliamentary Commissioner for Administrative Investigations" }, + { 42434, "BOMATEC AG" }, + { 42435, "LEONHARD KURZ Stiftung & Co. KG" }, + { 42436, "Ojsc NIAEP" }, + { 42437, "Deltek, Inc." }, + { 42438, "Saratoga Speed Inc." }, + { 42439, "Stephan Seitz" }, + { 42440, "IQ Devices" }, + { 42441, "Uniscon universal identity control GmbH" }, + { 42442, "Hochschule der Medien Stuttgart" }, + { 42443, "Genesis Integration" }, + { 42444, "Oriental Cambridge Education Group" }, + { 42445, "InterASIA Solutions Inc." }, + { 42446, "Beijing Hesun Technologies Co.Ltd." }, + { 42447, "FreeSoft Nyrt." }, + { 42448, "Taisis Integration And Consulting Services sl" }, + { 42449, "InvestLab Technology, LLC" }, + { 42450, "Mutual Aid Labs, LLC" }, + { 42451, "Rizotec" }, + { 42452, "IRIS-RFID" }, + { 42453, "Drawersteak Research" }, + { 42454, "Funkring.net" }, + { 42455, "FOBAS Consulting, Inc." }, + { 42456, "VM Farms" }, + { 42457, "Palluc" }, + { 42458, "TigerLead Solutions" }, + { 42459, "Esdenera Networks GmbH" }, + { 42460, "SYS'TRONICS Co., Ltd." }, + { 42461, "Innosonix GmbH" }, + { 42462, "David Ouagne" }, + { 42463, "TLS Corp." }, + { 42464, "binarycube" }, + { 42465, "Xerx Software Ltd" }, + { 42466, "Kratos Defense and Security Solutions, Inc." }, + { 42467, "Lucipher" }, + { 42468, "Jorge Cavallin" }, + { 42469, "Infobahn SA" }, + { 42470, "Voippartners s.r.l." }, + { 42471, "HOTCITY S.A." }, + { 42472, "SC-IT GmbH" }, + { 42473, "Action Technology Ltd." }, + { 42474, "Toro Development Ltd." }, + { 42475, "Dewar Electronics Pty Ltd" }, + { 42476, "Border 6" }, + { 42477, "OneNeck IT Services Corporation" }, + { 42478, "Proteus Sensor" }, + { 42479, "Metropolitan Wireless International Pte Ltd" }, + { 42480, "Grenland Data as" }, + { 42481, "Teletronix" }, + { 42482, "DocuSign, Inc." }, + { 42483, "Pioneer Bank" }, + { 42484, "Ultrix Sistemas de Informa\0303\0247\0303\0243o" }, + { 42485, "Christian Scholz" }, + { 42486, "Nuolezio" }, + { 42487, "Shenzhen Philorise co.ltd." }, + { 42488, "Element d.o.o" }, + { 42489, "Preferred Credit, Inc." }, + { 42490, "Intesi Group SpA" }, + { 42491, "Racktop Systems" }, + { 42492, "Far Bank Enterprises" }, + { 42493, "City of Waukesha" }, + { 42494, "Beckwith Electric Co. Inc" }, + { 42495, "O2 Systems Limited" }, + { 42496, "GlobalNaz IT" }, + { 42497, "Brookhaven Retreat, LLC" }, + { 42498, "Guenter Zimmermann" }, + { 42499, "Orlov-Miller" }, + { 42500, "Deoca Ltd." }, + { 42501, "Oto IT Limited" }, + { 42502, "CellOS Software Limited" }, + { 42503, "XJ Group Corporation" }, + { 42504, "SOKRAT Ltd." }, + { 42505, "Denkovi Assembly Electronics LTD" }, + { 42506, "Gostcomp Oliwer Godlewski" }, + { 42507, "HeuleSoft" }, + { 42508, "Shepherd Group Built Environment Information Systems (SGBE IS)" }, + { 42509, "net4home GmbH" }, + { 42510, "Cape Fear Valley Health System" }, + { 42511, "maxrosin.com" }, + { 42512, "Suchocki IT" }, + { 42513, "Ymax Communications" }, + { 42514, "SHENZHEN HXWK TECHNOLOGIES,CO LTD" }, + { 42515, "Liberty Global Services B.V." }, + { 42516, "Orderman GmbH" }, + { 42517, "Fundaci\0303\0263n Centro de Estudios de F\0303\0255sica del Cosmos de Arag\0303\0263n" }, + { 42518, "ZPE Systems, Inc" }, + { 42519, "BrainLogical Software Development" }, + { 42520, "LifeSafety Power, Inc." }, + { 42521, "Assystem France" }, + { 42522, "Velin V. Pavlov" }, + { 42523, "Leibniz-Institut fuer Analytische Wissenschaften -ISAS- e.V." }, + { 42524, "Townet srl" }, + { 42525, "Werkbank Multimedia GmbH" }, + { 42526, "elgris UG" }, + { 42527, "WTG Technologies Ltd" }, + { 42528, "Slovak Hydrometeorological Institute (SHMU)" }, + { 42529, "New Jersey Office of Information Technology" }, + { 42530, "SSQ Financial Group" }, + { 42531, "Security Industry Association" }, + { 42532, "Holysee Vatican Library" }, + { 42533, "BIOVELA, UAB" }, + { 42534, "CAFAT" }, + { 42535, "ictjob" }, + { 42536, "Hanover Displays Ltd." }, + { 42537, "SnmpStack" }, + { 42538, "artnet world wide" }, + { 42539, "Trumpet, Inc" }, + { 42540, "Zimpel Events And Communications PTY Ltd." }, + { 42541, "My Telecom Holdings Pty Ltd" }, + { 42542, "Voillo Solutions Ltd." }, + { 42543, "Simpson University" }, + { 42544, "ALLENGERS GLOBAL HEALTHCARE PRIVATE LIMITED" }, + { 42545, "CSC Telecom" }, + { 42546, "tyntec GmbH" }, + { 42547, "OrecX LLC" }, + { 42548, "gloops, Inc." }, + { 42549, "F.S.P. Filofarm" }, + { 42550, "SFS services AG" }, + { 42551, "CRFS Limited" }, + { 42552, "Hrvatski zavod za telemedicinu" }, + { 42553, "TeknoUnit" }, + { 42554, "Dynamic Quest, INC" }, + { 42555, "Faculty of Information Technology and Applied Mathematics, BelSU" }, + { 42556, "Visao Tecnologia em Transmissao de Dados Ltda" }, + { 42557, "Unico Data AG" }, + { 42558, "Canis Lupus LLC" }, + { 42559, "AppEnsure" }, + { 42560, "Kirovohrad Volodymyr Vynnychenko State Pedagogical University" }, + { 42561, "ZAO \"MD Project 2000\"" }, + { 42562, "Universidad P\0303\0272blica de Navarra (UPNA)" }, + { 42563, "Kaleidescape, Inc." }, + { 42564, "KO4BB Electronics" }, + { 42565, "Weirton Medical Center" }, + { 42566, "ClearBearing, Inc." }, + { 42567, "David Spinella" }, + { 42568, "Andreas Vavra" }, + { 42569, "Miesepies" }, + { 42570, "Independent Bank Corporation" }, + { 42571, "Cybera, Inc" }, + { 42572, "SAFELYLOCKED, LLC" }, + { 42573, "Sun Nuclear Corporation" }, + { 42574, "Sydestep Ltd" }, + { 42575, "e-business-systems SARL" }, + { 42576, "Linpow SRL" }, + { 42577, "Crosspoint SRL Romania" }, + { 42578, "Xcel Energy" }, + { 42579, "sysmocom - systems for mobile communications GmbH" }, + { 42580, "Statseeker" }, + { 42581, "Regional Digital Telecommunication Company" }, + { 42582, "Interlink Ltd." }, + { 42583, "DPII TELECOM & SERVICES" }, + { 42584, "ROWA Group Holding GmbH" }, + { 42585, "TRIKOM Ltd." }, + { 42586, "DAG System" }, + { 42587, "Investigaciones Medicas S.A." }, + { 42588, "AGST Controles e Automa\0303\0247\0303\0243o Ltda" }, + { 42589, "Swifttrip LLC" }, + { 42590, "AVB GmbH Wind Engineering" }, + { 42591, "Forlani Impianti s.r.l." }, + { 42592, "TV 2/Danmark A/S" }, + { 42593, "Gas Natural Inform\0303\0241tica, S.A." }, + { 42594, "Fox Technologies" }, + { 42595, "Right Systems Inc" }, + { 42596, "ATNet Services" }, + { 42597, "Norberto Bensa - ENEABE" }, + { 42598, "Tibero" }, + { 42599, "NIPPON TELEGRAPH AND TELEPHONE WEST CORPORATION" }, + { 42600, "Rejlers Oy" }, + { 42601, "Sycada" }, + { 42602, "Performr B.V." }, + { 42603, "Vorston" }, + { 42604, "Springfield Technical Community College" }, + { 42605, "PLC International Inc" }, + { 42606, "Urban-Software.de" }, + { 42607, "Brekford International" }, + { 42608, "Alan Seedhouse" }, + { 42609, "Boundary, Inc." }, + { 42610, "Superior Power solutions (HK) Co.,Ltd" }, + { 42611, "Valdrea, LLC" }, + { 42612, "Koninklijke BAM Groep nv" }, + { 42613, "POLYONE CORPORATION" }, + { 42614, "Tribal Chicken Australia" }, + { 42615, "eTRUST co., ltd." }, + { 42616, "Pannonia Technologies" }, + { 42617, "Alphion India Private Limited" }, + { 42618, "Kaaos Unlimited Oy" }, + { 42619, "PRYSM SARL" }, + { 42620, "Katalix Systems Ltd" }, + { 42621, "Elecdan" }, + { 42622, "Hernic Ferro Chrome Pty Ltd" }, + { 42623, "Open Compute Project" }, + { 42624, "Whatever s.a." }, + { 42625, "Technology Toolbox LLC" }, + { 42626, "Blue Fire Capital" }, + { 42627, "Vermont Department of Labor" }, + { 42628, "Shenzhen HD Digital Tech Co., Ltd." }, + { 42629, "WaveNT Co.,Ltd. " }, + { 42630, "Dona Ana County, New Mexico" }, + { 42631, "Xellia Pharmaceuticals ApS" }, + { 42632, "Kompanija Dunav Osiguranje a.d.o. Beograd" }, + { 42633, "VOXXL" }, + { 42634, "PSW GROUP GmbH & Co. KG" }, + { 42635, "RudiNet Ltd." }, + { 42636, "SecuriPax" }, + { 42637, "Cloudhouse Technologies" }, + { 42638, "ARD-Sternpunkt" }, + { 42639, "Cellcrypt Ltd" }, + { 42640, "Derek Lambert (CrEOF)" }, + { 42641, "Tri-State Generation and Transmission" }, + { 42642, "Stage Entertainment" }, + { 42643, "NetSavia SA" }, + { 42644, "New Leaf Publishing Group, Inc." }, + { 42645, "Ros Vicente (ITComp)" }, + { 42646, "Etherlive Ltd" }, + { 42647, "Alliance Spacesystems, LLC" }, + { 42648, "Blue Global Media" }, + { 42649, "The LaSalle Technology Group" }, + { 42650, "Parque Tecnol\0303\0263gico Itaipu - Paraguay" }, + { 42651, "willisss.com" }, + { 42652, "Sichuan Bihong Broadcast&Television New Technologies Co.,Ltd" }, + { 42653, "Netcloud AG" }, + { 42654, "RCS & RDS SA" }, + { 42655, "On the Cusp Ltd." }, + { 42656, "Clear-Com" }, + { 42657, "Mixpo" }, + { 42658, "Lakra Sintez Ltd." }, + { 42659, "Robert Maxwell Professional Consulting" }, + { 42660, "Wildman & Morris" }, + { 42661, "Asian Pacific Telecommunications" }, + { 42662, "Wuerzburger Versorgungs- und Verkehrs-GmbH" }, + { 42663, "Zhengwei-tech Co.,Ltd." }, + { 42664, "Iromedica AG" }, + { 42665, "WIRD AG" }, + { 42666, "Affiliated Managers Group, Inc." }, + { 42667, "Northwest Multiple Listing Service" }, + { 42668, "ZIMT University of Siegen" }, + { 42669, "HangZhou Chenxiao Technologies Co.,ltd" }, + { 42670, "Sociedad Ib\0303\0251rica de Construcciones El\0303\0251ctricas, S.A." }, + { 42671, "Pinetron Co.,Ltd" }, + { 42672, "G. X. Clarke & Co." }, + { 42673, "SAIC, Inc." }, + { 42674, "TVH Group NV" }, + { 42675, "Comit\0303\0251 Permanent des M\0303\0251decins Europ\0303\0251ens" }, + { 42676, "Servergy, Inc" }, + { 42677, "Altertech s.r.o." }, + { 42678, "Lakra Sibir Ltd." }, + { 42679, "cne.at" }, + { 42680, "Randstad Espa\0303\0261a, S.L." }, + { 42681, "Freeport of Riga Authority" }, + { 42682, "Cyviz AS" }, + { 42683, "Trans Data Management (TDM)" }, + { 42684, "Bump Networks, Inc." }, + { 42685, "Benjamin Huepeden IT" }, + { 42686, "Siempelkamp Maschinen- und Anlagenbau GmbH & Co. KG" }, + { 42687, "Meridian Health System" }, + { 42688, "STABILO International GmbH" }, + { 42689, "Southern Methodist University" }, + { 42690, "nGeniux LLC" }, + { 42691, "Australia and New Zealand Banking Group Limited" }, + { 42692, "Philotech" }, + { 42693, "AcroRed Technologies, Inc." }, + { 42694, "LoopPay, Inc." }, + { 42695, "Beijing QTS Networks Technologies Co., Ltd" }, + { 42696, "Indian Hotels Company Limited" }, + { 42697, "Activsolar" }, + { 42698, "Qualitis Kft." }, + { 42699, "Dorwin Enterprises" }, + { 42700, "ESP Credit Management" }, + { 42701, "thepickle.com, Inc." }, + { 42702, "Altairis, s. r. o." }, + { 42703, "Locatrix Communications" }, + { 42704, "Marco Displays" }, + { 42705, "HVR Software" }, + { 42706, "Ministry of Internal Affairs - Kosova" }, + { 42707, "Corvinus University of Budapest" }, + { 42708, "Teachers Assurance" }, + { 42709, "CarWoo! Inc." }, + { 42710, "Designs for Health, Inc." }, + { 42711, "MEIRYO DENSHI CORPORATION" }, + { 42712, "Hanvit SI, Inc." }, + { 42713, "HPS ICT&Mobile Solutions" }, + { 42714, "Beijing Joy and Success Technology Co., Ltd." }, + { 42715, "tanum consult GmbH" }, + { 42716, "LzLabs GmbH" }, + { 42717, "Prefeitura Municipal de Cachoeirinha - RS - Brasil" }, + { 42718, "Vema, a.s." }, + { 42719, "CyberFX, Inc." }, + { 42720, "Bilgibim Bilgisayar Teknolojileri" }, + { 42721, "Teck Resources Limited" }, + { 42722, "Miraj Technology and Consulting Corporation" }, + { 42723, "Shouting Ground Technologies, Inc." }, + { 42724, "Kernel Electronics Co Ltd" }, + { 42725, "Institut Teknologi Sepuluh Nopember" }, + { 42726, "ArcSoft Hangzhou CO.,LTD." }, + { 42727, "X-Company Pty Ltd" }, + { 42728, "Tomaxx GmbH" }, + { 42729, "Private Iron and Steel Joint Stock Company \"Donetsksteel\"" }, + { 42730, "Croda International Plc" }, + { 42731, "Statkraft SF" }, + { 42732, "Southern Power Systems, Inc." }, + { 42733, "FSMLabs" }, + { 42734, "Nextmove Technologies" }, + { 42735, "dParadig" }, + { 42736, "Haus der Barmherzigkeit" }, + { 42737, "Zends" }, + { 42738, "Vivint Wireless" }, + { 42739, "Veolia Water Solutions & Technologies" }, + { 42740, "MaerdnGaming GbR" }, + { 42741, sminmpec_unknown }, /* (Added by Wireshark) */ + { 42742, "Winix Solutions LLC" }, + { 42743, "Nieder\0303\0266sterreichische Gebietskrankenkasse" }, + { 42744, "Falabella" }, + { 42745, "Jamdeo" }, + { 42746, "InterNetX GmbH" }, + { 42747, "Kik Interactive" }, + { 42748, "MyOrg.at (Johannes Hackl)" }, + { 42749, "Utilidata, Inc" }, + { 42750, "Umbrella ID" }, + { 42751, "Neowatt Energy Solutions Co. Pvt. Ltd." }, + { 42752, "AMEDTEC Medizintechnik Aue GmbH" }, + { 42753, "University of The Philippines Los Ba\0303\0261os" }, + { 42754, "Enel Energy Electronic" }, + { 42755, "ATON GmbH" }, + { 42756, "Purdue Research Foundation" }, + { 42757, "Encana Corporation" }, + { 42758, "C4B Com For Business AG" }, + { 42759, "Practicom B.V." }, + { 42760, "PHOENIX PHARMA " }, + { 42761, "Imavis srl" }, + { 42762, "ipex telecom LLC" }, + { 42763, "ShangHai Jeelan Information Technology Inc." }, + { 42764, "Smith College" }, + { 42765, "Muzeum Historii Zydow Polskich" }, + { 42766, "Typomedia Foundation" }, + { 42767, "Queensland Motorways Limited" }, + { 42768, "Marcelo Leal" }, + { 42769, "Supermathie Networks" }, + { 42770, "Totalpost Services PLC" }, + { 42771, "DGQoS" }, + { 42772, "Galkam PTY LTD" }, + { 42773, "Transport for London" }, + { 42774, "Semtech Corporation" }, + { 42775, "Linx ICT Solutions" }, + { 42776, "one2many BV" }, + { 42777, "Gosuncn Technology Group Co., Ltd" }, + { 42778, "Michael Offel (mflour.com)" }, + { 42779, "CJSC \"NORSI-TRANS\"" }, + { 42780, "SEB DEVELOPPEMENT SAS" }, + { 42781, "Bragg Communications Inc." }, + { 42782, "Ekrompt, JSC" }, + { 42783, "workvslife.com" }, + { 42784, "Pinnacle Foods Group, LLC" }, + { 42785, "Syntaxjockey" }, + { 42786, "CNS Engineering" }, + { 42787, "Concentric Sky" }, + { 42788, "artec technologies AG" }, + { 42789, "SynQor, Inc." }, + { 42790, "Rebasoft" }, + { 42791, "Geo-Comm, Inc." }, + { 42792, "Near East University" }, + { 42793, "IntCache Technology Co.,Ltd" }, + { 42794, "LEX Media Concepts SRL" }, + { 42795, "mrByte Tech Solutions" }, + { 42796, "IQ Solutions S.A." }, + { 42797, "Freie ArbeiterInnen Union" }, + { 42798, "HUENGSBERG AG" }, + { 42799, "Alfstore" }, + { 42800, "Co-Nexus Communications Systems, Inc." }, + { 42801, "Essai Inc" }, + { 42802, "Rigel Engineering" }, + { 42803, "Valialsoft LLC" }, + { 42804, "New Singularity International Technical Development Co.,Ltd." }, + { 42805, "Cloudy IT" }, + { 42806, "WINFO Corp." }, + { 42807, "City West Country Ltd" }, + { 42808, "Arachnid Labs Ltd" }, + { 42809, "netbreaker IT-Service" }, + { 42810, "Telesis, S.A. de C.V." }, + { 42811, "Enyx" }, + { 42812, "ISD Dunaferr Co. Ltd." }, + { 42813, "Polskie Sieci Elektroenergetyczne S.A." }, + { 42814, "Inveo " }, + { 42815, "Tussa IKT AS" }, + { 42816, "HACENTER" }, + { 42817, "IBM Platform Firmware Division " }, + { 42818, "Relative Variable Software" }, + { 42819, "Carante Groep" }, + { 42820, "Techsun" }, + { 42821, "ACXIO" }, + { 42822, "Tesc" }, + { 42823, "Spilsby Internet Solutions" }, + { 42824, "Web.Cloud.Apps. GmbH" }, + { 42825, "vArmour Networks" }, + { 42826, "ChengDu Network Security Technology Corporation" }, + { 42827, "rm-netproject UG (haftungsbeschr\0303\0244nkt)" }, + { 42828, "US Army Electronic Provings Ground (USAEPG) Instrumentation Management System (IMS)" }, + { 42829, "QuartzDesk.com" }, + { 42830, "PowerSense" }, + { 42831, "syssrv.net" }, + { 42832, "Tata Institute Fundamental Research " }, + { 42833, "Nimbus Technologieberatung GmbH" }, + { 42834, "TechniData IT-Service GmbH" }, + { 42835, "ZELITRON SA" }, + { 42836, "eXtreme IT Development" }, + { 42837, "Westpac New Zealand Ltd" }, + { 42838, "FAST DISTRIBUTED CLOUD COMPUTING INC.," }, + { 42839, "Tactical Communications Corporation" }, + { 42840, "Reporo" }, + { 42841, "Kraftanlagen Muenchen GmbH" }, + { 42842, "iQSpot" }, + { 42843, "TWIN Engineering S.r.l." }, + { 42844, "SPI GmbH" }, + { 42845, "TOKYO SYSTEM HOUSE Co., Ltd." }, + { 42846, "Corhoma SRL" }, + { 42847, "2H Offshore Engineering Ltd" }, + { 42848, "NETIXIA" }, + { 42849, "Fabrecode" }, + { 42850, "LocalTV LLC of Alabama" }, + { 42851, "Fidelity Voice Services" }, + { 42852, "Bank Gospodarstwa Krajowego" }, + { 42853, "DunnCox" }, + { 42854, "EMPRESA DE TECNOLOGIA DA INFORMA\0303\0207\0303\0203O E COMUNICA\0303\0207\0303\0203O DO MUNIC\0303\0215PIO DE S\0303\0203O PAULO" }, + { 42855, "techsoup.net" }, + { 42856, "Kreis Warendorf" }, + { 42857, "Family Madera of Switzerland" }, + { 42858, "Linux Szerver Kft." }, + { 42859, "Shanghai SHR Automation Co.,Ltd" }, + { 42860, "Asul IT Consulting LLP" }, + { 42861, "Ophylink Communication Technology Co., Ltd. " }, + { 42862, "AITA-Soft" }, + { 42863, "IOS Health Systems" }, + { 42864, "Mobius Embedded Systems Ltd" }, + { 42865, "Hoza Logistic Solutions" }, + { 42866, "Frontend.biz GmbH" }, + { 42867, "BestSolution.at" }, + { 42868, "Association of American Railroads" }, + { 42869, "UNE EPM Telecomunicaciones S.A." }, + { 42870, "Unither Manufacturing LLC" }, + { 42871, "IMRIS" }, + { 42872, "Unomaly AB" }, + { 42873, "Comune di Ascoli Piceno" }, + { 42874, "Hospedia Ltd" }, + { 42875, "ACISA" }, + { 42876, "SGSITES Technologies" }, + { 42877, "Sundvor" }, + { 42878, "Credit-Moscow Bank" }, + { 42879, "Sielaff GmbH & Co. KG" }, + { 42880, "Uwe Disch" }, + { 42881, "No Limit Network" }, + { 42882, "Jiangsu Fablesoft Co.,Ltd" }, + { 42883, "CARC (C-DOT Alcatel-Lucent Research Centre Pvt Ltd)" }, + { 42884, "Anderson Morgan Kelowna Inc." }, + { 42885, "S P I R I T - informa\0304\0215n\0303\0251 syst\0303\0251my, a.s. " }, + { 42886, "InMotion Hosting" }, + { 42887, "One Call Now" }, + { 42888, "Canadian Museum for Human Rights" }, + { 42889, "IO Data Centers, LLC" }, + { 42890, "Renkus Heinz Incorporated" }, + { 42891, "Santechkomplekt Ltd." }, + { 42892, "TOYGA" }, + { 42893, "Funkfeuer Wien - Verein zur F\0303\0266rderung freier Netze" }, + { 42894, "CAROL JEANNE MACK CORPORATION" }, + { 42895, "Securiton GmbH" }, + { 42896, "The O'Gara Group" }, + { 42897, "Evan Edstrom" }, + { 42898, "IM Service Lab Srl" }, + { 42899, "kiloWattsol" }, + { 42900, "Elcom Innovations Private Limited" }, + { 42901, "Chaos Computer Club Cologne" }, + { 42902, "J.R. Torralba" }, + { 42903, "IT Innovations Ukraine LLC" }, + { 42904, "Nemik Consulting Inc" }, + { 42905, "Trihedral Engineering Ltd." }, + { 42906, "Shift Workforce Management" }, + { 42907, "PLUTEX GmbH" }, + { 42908, "Megadevices" }, + { 42909, "Tver State University" }, + { 42910, "latticeware.com" }, + { 42911, "Metiri Systems, LLC" }, + { 42912, "locate solution GmbH" }, + { 42913, "Exatech bv" }, + { 42914, "Wimsey" }, + { 42915, "MCATSYSTEMS LLC" }, + { 42916, "Arcerm" }, + { 42917, "Adcubum AG" }, + { 42918, "Trafigura" }, + { 42919, "Max-Planck-Institut fuer Astrophysik" }, + { 42920, "Slaughter and May" }, + { 42921, "Dropbox, Inc." }, + { 42922, "Ministarstvo odbrane Republike Srbije" }, + { 42923, "Stefan Ebert" }, + { 42924, "The Molecule" }, + { 42925, "SYLEB SARL" }, + { 42926, "NSC Communications Siberia Ltd" }, + { 42927, "Fidelio Cruise Software" }, + { 42928, "Galleon Systems Ltd" }, + { 42929, "securedeviceaccess.com" }, + { 42930, "GEKO.NET di Mena Giuseppe" }, + { 42931, "Vladimir Mihajlovi\0304\0207 pr, ra\0304\0215unarsko programiranje, METACODE, Beograd" }, + { 42932, "Infolink Global" }, + { 42933, "iArtemis" }, + { 42934, "APRS World, LLC" }, + { 42935, "Axcelera" }, + { 42936, "Anhui Telehome Digital Technology Co. Ltd" }, + { 42937, "VP (Video Privacy) Forum" }, + { 42938, "Moviri S.p.a." }, + { 42939, "Applied Informatics for Health Society" }, + { 42940, "City of Smyrna" }, + { 42941, "2XWIRELESS, INC" }, + { 42942, "kayzan" }, + { 42943, "CopperPoint Mutual Insurance Company" }, + { 42944, "Seenov Inc." }, + { 42945, "Seeser Datentechnik" }, + { 42946, "Utel Systems" }, + { 42947, "Network Technologies International, Inc." }, + { 42948, "Methodist Home for Children" }, + { 42949, "Bol.com b.v." }, + { 42950, "Hangzhou Joson Technology Co.,Ltd" }, + { 42951, "Highlands Technologies Solutions" }, + { 42952, "SOREDI touch systems GmbH" }, + { 42953, "\"Runet Business Systems\"" }, + { 42954, "Bizerba GmbH & Co. KG" }, + { 42955, "Louisville-Jefferson County Metro Government" }, + { 42956, "HumanIT Inc." }, + { 42957, "Wave Advanced Technology Applications s.r.l." }, + { 42958, "Central Office for Administrative and Electronic Public Services" }, + { 42959, "Snap Limited" }, + { 42960, "Garn Contracting & Consulting Pty Ltd" }, + { 42961, "EH-electronics GmbH" }, + { 42962, "Blitznote e.K." }, + { 42963, "UltraMED Systems, Inc." }, + { 42964, "Abelsoft Inc" }, + { 42965, "ec3 Networks GmbH" }, + { 42966, "ECHO LLC" }, + { 42967, "liedloff.org" }, + { 42968, "ME Engineering M2M GmbH" }, + { 42969, "Iorga Group" }, + { 42970, "RP SIA \"Rigas satiksme\"" }, + { 42971, "ONELAN LIMITED" }, + { 42972, "IT Business Solutions and Services (ITBSS)" }, + { 42973, "COMDOK GmbH" }, + { 42974, "Willis-Knighton Health System" }, + { 42975, "Iridium Thought" }, + { 42976, "Key Source International" }, + { 42977, "Matta Consulting Limited" }, + { 42978, "CSN Groep BV" }, + { 42979, "Wellington Security Systems" }, + { 42980, "EZ e-TRAK" }, + { 42981, "Heuristic Systems Pty Ltd" }, + { 42982, "Leafsprout" }, + { 42983, "SAS Nexylan" }, + { 42984, "Toyohashi University of Technology" }, + { 42985, "Cnofe" }, + { 42986, "Beijing MicroColor Corp., LTD." }, + { 42987, "Gida Technology Services" }, + { 42988, "Nanjing Huamai Technology Co., Ltd" }, + { 42989, "Teleg\0303\0244rtner Karl G\0303\0244rtner GmbH" }, + { 42990, "VTSL Ltd" }, + { 42991, "Marylhurst University" }, + { 42992, "Vektron Energy (Pty) Ltd" }, + { 42993, "Cornerstone Health Care, P.A." }, + { 42994, "Institut de Physique de Rennes" }, + { 42995, "AvertIT" }, + { 42996, "NOMASYSTEMS, S.L." }, + { 42997, "Red Giant Inc" }, + { 42998, "Progdence Co.,Ltd." }, + { 42999, "Parse Software Development B.V." }, + { 43000, "Service Ontario" }, + { 43001, "Nextbeacon" }, + { 43002, "RootService (Markus Kohlmeyer)" }, + { 43003, "TribalGroup" }, + { 43004, "Xinguard, Inc." }, + { 43005, "University of Technology and Life Sciences in Bydgoszcz" }, + { 43006, "root-a.net" }, + { 43007, "Gipen Systems" }, + { 43008, "FRTek" }, + { 43009, "Vilnius Gallery" }, + { 43010, "Two Sigma Investments, LLC" }, + { 43011, "S\0303\0244ngerschaft Erato" }, + { 43012, "Aldo Group Inc." }, + { 43013, "ISC8, Inc." }, + { 43014, "En Garde Systems, Inc." }, + { 43015, "Quinyx AB" }, + { 43016, "R\0303\0251seau en sc\0303\0250ne Languedoc-Roussillon" }, + { 43017, "Albaad" }, + { 43018, "P\0303\0244dagogisches Landesinstitut" }, + { 43019, "Digital Human Identity S.L" }, + { 43020, "Angel Lane" }, + { 43021, "i-storm" }, + { 43022, "OneSearch Direct Ltd." }, + { 43023, "Tuxpower.dk" }, + { 43024, "InfoGoose.Inc" }, + { 43025, "Nomadconnection, Inc." }, + { 43026, "Mostlucky Ltd." }, + { 43027, "Fujian Great Power PLC Equipment Co.,Ltd" }, + { 43028, "Office of Immigration and Nationality" }, + { 43029, "Netco Ltda. Network Solutions Co." }, + { 43030, "ROCK YOUR LIFE! gGmbH" }, + { 43031, "RaumZeitLabor e.V." }, + { 43032, "Live It - Nerd" }, + { 43033, "TVV lippu- ja maksuj\0303\0244rjestelm\0303\0244 Oy" }, + { 43034, "K and P Business Solutions" }, + { 43035, "Feinschliff" }, + { 43036, "Bay Of Plenty District Health Board" }, + { 43037, "Newcastle-under-Lyme College" }, + { 43038, "Creative Electronic Systems SA" }, + { 43039, "OASYS Healthcare Corporation" }, + { 43040, "Davra Networks" }, + { 43041, "ATREM S.A." }, + { 43042, "Definition Networks Inc." }, + { 43043, "Information System Assiociaties" }, + { 43044, "Gran Investimentos" }, + { 43045, "Banco Exterior C.A. Banco Universal" }, + { 43046, "Andrey Fedorov" }, + { 43047, "H&W Computer Systems" }, + { 43048, "CB7 Systems LLC" }, + { 43049, "Stewart Bryant" }, + { 43050, "Vobileinc" }, + { 43051, "SHENZHEN SENSEGRID CO.,LTD." }, + { 43052, "Shenzhen Tendzone Intelligent Technology Co; Ltd" }, + { 43053, "I.T. SYNERGY LIMITED" }, + { 43054, "Crown Prince Court" }, + { 43055, "American Kybernetik (Juan Daugherty)" }, + { 43056, "ENVISTACOM" }, + { 43057, "PrAT CENTRAVIS PRODUCTION UKRAINE" }, + { 43058, "Synergy Sky AS" }, + { 43059, "iteracon GmbH" }, + { 43060, "Leepfrog Technologies, Inc." }, + { 43061, "Global System & Network Services BVBA" }, + { 43062, "Ingenieure ohne Grenzen e.V." }, + { 43063, "Digital Multimedia Technology Co.,Ltd." }, + { 43064, "Embedded Wireless Labs" }, + { 43065, "Shanghai Onezero Electronic Commerce Co., Ltd." }, + { 43066, "Stiebel Eltron GmbH & Co. KG" }, + { 43067, "VFI SYSTEM" }, + { 43068, "AVG Technologies" }, + { 43069, "Markus Ruecker (mr-consult.net)" }, + { 43070, "Hrvatska narodna banka" }, + { 43071, "NABB Gaming Community" }, + { 43072, "Privlo, Inc." }, + { 43073, "roskakori.fi" }, + { 43074, "WRH Inc" }, + { 43075, "SKY Interactive" }, + { 43076, "Greiner Holding AG" }, + { 43077, "TUI Marine" }, + { 43078, "Lindvik" }, + { 43079, "Zimmer GmbH" }, + { 43080, "Atlantic Corporation of Wilmington, Inc." }, + { 43081, "intellec" }, + { 43082, "Informatik Service Gesellschaft mbH" }, + { 43083, "IMEN RAYANE SHRGH Co." }, + { 43084, "Webtown Informatika Kft." }, + { 43085, "Detroit R & D, Inc." }, + { 43086, "NHS Sistemas Eletronicos" }, + { 43087, "xCelor LLC" }, + { 43088, "Measurlogic Inc." }, + { 43089, "Dualog AS" }, + { 43090, "KVADOS, a.s." }, + { 43091, "SAP integrator Ltd." }, + { 43092, "Habermehl" }, + { 43093, "Xiamen Faratronic Co., Ltd." }, + { 43094, "HyperWallet Systems Inc" }, + { 43095, "Service2Media B.V." }, + { 43096, "James Guse (JAG Enterprises)" }, + { 43097, "ROTH + WEBER GmbH" }, + { 43098, "Martem AS" }, + { 43099, "Embrionix Design inc." }, + { 43100, "Strata Decision Technology, L.L.C." }, + { 43101, "Alphavida" }, + { 43102, "Regional Municipality of Peel" }, + { 43103, "Caradigm" }, + { 43104, "CyberSecure IPS" }, + { 43105, "CyberFlow Analytics, Inc." }, + { 43106, "PERK Innovation GmbH" }, + { 43107, "Waclaw Schiller (Torinthiel)" }, + { 43108, "Attend Systems, LLC" }, + { 43109, "dataFASCIA Corporation" }, + { 43110, "LTD \0302\0253Bradbury Lab\0302\0273" }, + { 43111, "VNT Software" }, + { 43112, "Picsearch AB (publ)" }, + { 43113, "Screen9 AB" }, + { 43114, "Kantonsapotheke Zuerich" }, + { 43115, "For\0303\0252ts & Bois de l'Est" }, + { 43116, "Berghof Automation GmbH" }, + { 43117, "National Stock Exchange Of India Limited" }, + { 43118, "NORDSYS GmbH" }, + { 43119, "Altibox AS" }, + { 43120, "Peshawar Business School" }, + { 43121, "Ypsomed AG" }, + { 43122, "Summit Networks" }, + { 43123, "Instituto Nacional para la Evaluaci\0303\0263n de la Educaci\0303\0263n" }, + { 43124, "PasswordBox Inc." }, + { 43125, "System Studies Incorporated" }, + { 43126, "US Fire Insurance Company" }, + { 43127, "Oliver Manz (ips manz consulting)" }, + { 43128, "TangentOrg" }, + { 43129, "Meijo University" }, + { 43130, "Amplesky Communication Technologies Ltd." }, + { 43131, "Ternopil State Medical University" }, + { 43132, "CJSC Svyaz engineering" }, + { 43133, "mailgarant (Meint Post)" }, + { 43134, "Advanced Fiber Products LLC" }, + { 43135, "adis.ca" }, + { 43136, "Digital Footprints International, LLC; DBA Internet Identity" }, + { 43137, "Raven Rocks Computer Services Group, Inc." }, + { 43138, "Multapplied Networks, Inc." }, + { 43139, "Glutonus SRL" }, + { 43140, "Xora, Inc." }, + { 43141, "RVTN.org" }, + { 43142, "St. Mary's International School" }, + { 43143, "Nanjing Sinovatio Technology Co. ltd" }, + { 43144, "HMS Industrial Networks" }, + { 43145, "Vasily Nushtakin (Home Router)" }, + { 43146, "VanWesten.net" }, + { 43147, "Best Theratronics Ltd." }, + { 43148, "Det Norske Oljeselskap" }, + { 43149, "RUBYCAT-Labs" }, + { 43150, "Stenbock Systems Inc." }, + { 43151, "AltaSteel Ltd" }, + { 43152, "Kristoffer Berdal (cognitive.io)" }, + { 43153, "Gerriko S-E-T Technology Solutions Ltd." }, + { 43154, "NexLabs Pte Ltd" }, + { 43155, "ION Trading Srl" }, + { 43156, "WEY Elektronik AG" }, + { 43157, "Tatung Technology Inc." }, + { 43158, "Skytech.lt" }, + { 43159, "Hartley Consultants Limited" }, + { 43160, "EnStream LP" }, + { 43161, "Riverside County Regional Medical Center" }, + { 43162, "Flash Services" }, + { 43163, "Cloud Technologies Inc." }, + { 43164, "Eruditor Group Ltd." }, + { 43165, "Strike Technologies, LLC" }, + { 43166, "Thai Citrus, Inc." }, + { 43167, "NaSys Inc." }, + { 43168, "ALFRED E. TIEFENBACHER (Gmbh & Co. KG)" }, + { 43169, "Tiroler Versicherung" }, + { 43170, "Banco Bilbao Vizcaya Argentaria S.A" }, + { 43171, "Datwyler Holding AG" }, + { 43172, "Atrium - Region PACA" }, + { 43173, "Elesta Ltd." }, + { 43174, "Ubiquity Srl" }, + { 43175, "Dorsey Racing" }, + { 43176, "Swiss Mobility Solutions" }, + { 43177, "Positron srl" }, + { 43178, "Main Line HealthCare" }, + { 43179, "Lendy LLC" }, + { 43180, "Ole Virginia Hams Amateur Radio Club" }, + { 43181, "VFA INC" }, + { 43182, "Minor Inf.Tech." }, + { 43183, "Renfe Viajeros, S.A." }, + { 43184, "The Floow" }, + { 43185, "FINN Sp. z o.o." }, + { 43186, "Zweite Heimat GmbH" }, + { 43187, "LIM college." }, + { 43188, "INDIWAN GmbH" }, + { 43189, "J.B. Hunt Transport Services, Inc." }, + { 43190, "Arket Srl" }, + { 43191, "Metamako" }, + { 43192, "Automation & Integration Global Security Group, LLC." }, + { 43193, "GRG International LTD" }, + { 43194, "ABB Oy " }, + { 43195, "Management of finance of the Administration of Tchaikovsky municipal district Perm region" }, + { 43196, "Evintia SL" }, + { 43197, "BCS Technologies" }, + { 43198, "stepins.com" }, + { 43199, "Aitch-Pea Limited" }, + { 43200, "CLAAS KGaA mbH " }, + { 43201, "bytemine GmbH" }, + { 43202, "Digital Networks UK Ltd" }, + { 43203, "TSS COMPANY" }, + { 43204, "Hard 'n Software Consulting GmbH" }, + { 43205, "Aloxa.eu" }, + { 43206, "American Cancer Society, Inc." }, + { 43207, "Real-Time by Design, LLC" }, + { 43208, "Cybersavants,LLC" }, + { 43209, "Bliik" }, + { 43210, "Prominic.NET, Inc." }, + { 43211, "Atostek Oy" }, + { 43212, "space150, Inc." }, + { 43213, "Aveillant Ltd" }, + { 43214, "Programa Interlegis" }, + { 43215, "PC Users Group (ACT) Incorporated" }, + { 43216, "Fukushima Prefectural Government. Japan" }, + { 43217, "Ultimate Europe Transportation Equipment GmbH" }, + { 43218, "tecalor" }, + { 43219, "Sallie Mae" }, + { 43220, "DB Netz AG" }, + { 43221, "Bemobi Midia e Entretenimento LTDA." }, + { 43222, "Oxfam" }, + { 43223, "Wireless Telecom Group, Inc" }, + { 43224, "Netyard Pawel Jenner" }, + { 43225, "Unitymedia KabelBW" }, + { 43226, "Ashe Cosgrove Corporation" }, + { 43227, "ossmail.de" }, + { 43228, "Shanghai MRDcom Co., Ltd." }, + { 43229, "SOFTEH PLUS SRL" }, + { 43230, "Betrust N.V." }, + { 43231, "GSI Helmholtzzentrum f\0303\0274r Schwerionenforschung GmbH" }, + { 43232, "Bank of Nova Scotia" }, + { 43233, "Scheink\0303\0266nig & Co." }, + { 43234, "LLC Enistek" }, + { 43235, "Stadt Chur" }, + { 43236, "Pilz GmbH & Co. KG" }, + { 43237, "AOC Oost" }, + { 43238, "Compass Plus Ltd." }, + { 43239, "MindMade sp. z o.o." }, + { 43240, "Day & Zimmermann" }, + { 43241, "Guidance Ltd." }, + { 43242, "Universal Switching Corporation" }, + { 43243, "ShinyByte Web Agency, LLC." }, + { 43244, "Open Information Security Foundation" }, + { 43245, "G421 Networks" }, + { 43246, "Bennington-Rutland Supervisory Union" }, + { 43247, "Rui Pereira (netcloud.pt)" }, + { 43248, "3 Turn Productions LLC" }, + { 43249, "THM Consulting Ltd" }, + { 43250, sminmpec_unknown }, /* (Added by Wireshark) */ + { 43251, "Planet Erde" }, + { 43252, "CosDay e. V." }, + { 43253, "ASGraphics" }, + { 43254, "Geonov" }, + { 43255, "FISBA Optik AG" }, + { 43256, "FlouLab (Ioannis Angelakopoulos)" }, + { 43257, "webs.bz" }, + { 43258, "D'Youville College" }, + { 43259, "Cambridge Health Alliance" }, + { 43260, "WireGeo.com" }, + { 43261, "Pontis Research Inc." }, + { 43262, "ABVI-Goodwill" }, + { 43263, "SolarCity" }, + { 43264, "Opanga Networks, Inc." }, + { 43265, "HongKong Yunlink Technology Co., Ltd" }, + { 43266, "S.Toraighyrov Pavlodar State University" }, + { 43267, "JAMESON MEMORIAL HOSPITAL" }, + { 43268, "TELECO Spa" }, + { 43269, "DI Kurt Renauer" }, + { 43270, "Yoshitaka Yamane" }, + { 43271, "Justus-Liebig-Universit\0303\0244t Gie\0303\0237en" }, + { 43272, "Austria Card Plastikkarten und Ausweissysteme Ges.m.b.H" }, + { 43273, "Control Center Apps GmbH" }, + { 43274, "\"Group of Companies \"RosIntegracija\" LLC." }, + { 43275, "Alex Eggenberger" }, + { 43276, "Coreline Soft Co.,Ltd" }, + { 43277, "AE Telelink System Limited" }, + { 43278, "zalio" }, + { 43279, "R. L. Drake Holdings, LLC" }, + { 43280, "Vereniging Ons Middelbaar Onderwijs" }, + { 43281, "PAUL HARTMANN AG" }, + { 43282, "PROVIDENTIA SYSTEMS" }, + { 43283, "Vado Security" }, + { 43284, "Dream Solutions Ltd" }, + { 43285, "Quanzhou Karassn Security Protection Electronics Co., Ltd." }, + { 43286, "Keysight Technologies, Inc." }, + { 43287, "Mocomsoft Inc." }, + { 43288, "Lugansk State Academy Culture and Arts" }, + { 43289, "W3Security" }, + { 43290, "DLP Networks" }, + { 43291, "Frank Loepthien (Loeppi)" }, + { 43292, "Applifier Oy" }, + { 43293, "Diakonie Deutschland" }, + { 43294, "M2M Telemetria Ltda" }, + { 43295, "Kreel LLC" }, + { 43296, "Exablaze" }, + { 43297, "BASSANO & ASSOCIATES" }, + { 43298, "fnordspace.net" }, + { 43299, "Das Kartell (German Star Citizen Organization)" }, + { 43300, "PDC Corporation" }, + { 43301, "xiamen diksoft Co.,Ltd." }, + { 43302, "Bank Of Stockton" }, + { 43303, "1st Choice Tax Service, Inc." }, + { 43304, "Davenport University" }, + { 43305, "Hey Communications" }, + { 43306, "Bitclear, LLC" }, + { 43307, "Keyprocessor" }, + { 43308, "Appcara Inc" }, + { 43309, "Sweratel AB" }, + { 43310, "Konak Solutions Pty Ltd" }, + { 43311, "Belcity Software" }, + { 43312, "ZRO Kvant" }, + { 43313, "zerolatency ltd" }, + { 43314, "Tecteo Group SA" }, + { 43315, "PowerDNS.COM BV" }, + { 43316, "Information Factory" }, + { 43317, "Stadtwerke Bonn GmbH" }, + { 43318, "PERSON to PERSON Analysis CA" }, + { 43319, "Secure Meters Limited" }, + { 43320, "NetSTAR inc" }, + { 43321, "Polaris Networks" }, + { 43322, "Kenya Education Network" }, + { 43323, "Trans4mation IT GmbH" }, + { 43324, "FARSENS S.L." }, + { 43325, "Shoreland Inc." }, + { 43326, "Triple Canopy Inc." }, + { 43327, "Toronto Public Library " }, + { 43328, "Exscribe, Inc" }, + { 43329, "OneConfig Pty Ltd" }, + { 43330, "Sonavation, Inc." }, + { 43331, "Madhat Technical Solutions LLC" }, + { 43332, "DialogSoft inc." }, + { 43333, "Gangwon EMbedded Software Cooperative Research Center" }, + { 43334, "iDocTrust" }, + { 43335, "Union des Bois de Champagne" }, + { 43336, "GOERLITZ AG" }, + { 43337, "ZENON MEDIA GmbH" }, + { 43338, "Yottabyte" }, + { 43339, "efComs UG" }, + { 43340, "Traffic Technologies, Inc." }, + { 43341, "Dashlink" }, + { 43342, "SnailProof Computer Services" }, + { 43343, "Contactless Devices LLC" }, + { 43344, "Maven Inventing Solutions" }, + { 43345, "Aktietrykkeriet AS" }, + { 43346, "Douglas County School District, Colorado" }, + { 43347, "ValueDatum Systems, Inc. Ltd" }, + { 43348, "EmbeddedSoft Ltd" }, + { 43349, "Nigerian Research and Education Network (NgREN)" }, + { 43350, "Arikel.net Enterprises, LLC" }, + { 43351, "Advania" }, { 0, NULL} }; diff -Nru wireshark-1.10.5/epan/sminmpec.h wireshark-1.10.6/epan/sminmpec.h --- wireshark-1.10.5/epan/sminmpec.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/sminmpec.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* sminmpec.h * SMI Network Management Private Enterprise Codes for organizations * - * $Id: sminmpec.h 48884 2013-04-16 18:12:56Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/sna-utils.c wireshark-1.10.6/epan/sna-utils.c --- wireshark-1.10.5/epan/sna-utils.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/sna-utils.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for SNA * Gilbert Ramirez * - * $Id: sna-utils.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/sna-utils.h wireshark-1.10.6/epan/sna-utils.h --- wireshark-1.10.5/epan/sna-utils.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/sna-utils.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* sna-utils.h * Definitions for SNA dissection. * - * $Id: sna-utils.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/epan/stat_cmd_args.c wireshark-1.10.6/epan/stat_cmd_args.c --- wireshark-1.10.5/epan/stat_cmd_args.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/stat_cmd_args.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* stat_cmd_args.c * Routines to register "-z" command-line argument handlers for stats * - * $Id: stat_cmd_args.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/stat_cmd_args.h wireshark-1.10.6/epan/stat_cmd_args.h --- wireshark-1.10.5/epan/stat_cmd_args.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/stat_cmd_args.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Declarations of routines to register "-z" command-line argument handlers * for stats * - * $Id: stat_cmd_args.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/stats_tree.c wireshark-1.10.6/epan/stats_tree.c --- wireshark-1.10.5/epan/stats_tree.c 2013-10-29 23:01:22.000000000 +0000 +++ wireshark-1.10.6/epan/stats_tree.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * API for a counter tree for Wireshark * 2004, Luis E. G. Ontanon * - * $Id: stats_tree.c 52974 2013-10-29 22:55:21Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/stats_tree.h wireshark-1.10.6/epan/stats_tree.h --- wireshark-1.10.5/epan/stats_tree.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/stats_tree.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * A counter tree API for Wireshark dissectors * 2005, Luis E. G. Ontanon * - * $Id: stats_tree.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/stats_tree_priv.h wireshark-1.10.6/epan/stats_tree_priv.h --- wireshark-1.10.5/epan/stats_tree_priv.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/stats_tree_priv.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * implementor's API for stats_tree * 2005, Luis E. G. Ontanon * - * $Id: stats_tree_priv.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/stream.c wireshark-1.10.6/epan/stream.c --- wireshark-1.10.5/epan/stream.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/stream.c 2014-03-07 18:07:15.000000000 +0000 @@ -4,7 +4,7 @@ * which are handled as streams, and don't have lengths * and IDs such as are required for reassemble.h * - * $Id: stream.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/stream.h wireshark-1.10.6/epan/stream.h --- wireshark-1.10.5/epan/stream.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/stream.h 2014-03-07 18:07:15.000000000 +0000 @@ -4,7 +4,7 @@ * which are handled as streams, and don't have lengths * and IDs such as are required for reassemble.h * - * $Id: stream.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/strutil.c wireshark-1.10.6/epan/strutil.c --- wireshark-1.10.5/epan/strutil.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/strutil.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* strutil.c * String utility routines * - * $Id: strutil.c 48400 2013-03-18 21:16:23Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/strutil.h wireshark-1.10.6/epan/strutil.h --- wireshark-1.10.5/epan/strutil.h 2013-05-03 23:46:25.000000000 +0000 +++ wireshark-1.10.6/epan/strutil.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* strutil.h * String utility definitions * - * $Id: strutil.h 49151 2013-05-03 23:40:45Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/t35.c wireshark-1.10.6/epan/t35.c --- wireshark-1.10.5/epan/t35.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/t35.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * T.35 and H.221 tables * 2003 Tomas Kukosa * - * $Id: t35.c 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/t35.h wireshark-1.10.6/epan/t35.h --- wireshark-1.10.5/epan/t35.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/t35.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * T.35 and H.221 tables * 2003 Tomas Kukosa * - * $Id: t35.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/tap.c wireshark-1.10.6/epan/tap.c --- wireshark-1.10.5/epan/tap.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/tap.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* tap.c * packet tap interface 2002 Ronnie Sahlberg * - * $Id: tap.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/tap.h wireshark-1.10.6/epan/tap.h --- wireshark-1.10.5/epan/tap.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/tap.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* tap.h * packet tap interface 2002 Ronnie Sahlberg * - * $Id: tap.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/tap-voip.h wireshark-1.10.6/epan/tap-voip.h --- wireshark-1.10.5/epan/tap-voip.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/tap-voip.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-voip.h * VoIP packet tap interface 2007 Tomas Kukosa * - * $Id: tap-voip.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/tcap-persistentdata.c wireshark-1.10.6/epan/tcap-persistentdata.c --- wireshark-1.10.5/epan/tcap-persistentdata.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/tcap-persistentdata.c 2014-03-07 18:07:15.000000000 +0000 @@ -8,7 +8,7 @@ * By Gerald Combs * Copyright 1998 Gerald Combs * - * $Id: tcap-persistentdata.c 48383 2013-03-17 22:16:39Z etxrab $ + * $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/epan/tcap-persistentdata.h wireshark-1.10.6/epan/tcap-persistentdata.h --- wireshark-1.10.5/epan/tcap-persistentdata.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/tcap-persistentdata.h 2014-03-07 18:07:15.000000000 +0000 @@ -8,7 +8,7 @@ * By Gerald Combs * Copyright 1998 Gerald Combs * - * $Id: tcap-persistentdata.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/epan/tfs.c wireshark-1.10.6/epan/tfs.c --- wireshark-1.10.5/epan/tfs.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/tfs.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * true_false strings * Copyright 2007, Jaap Keuter * - * $Id: tfs.c 47856 2013-02-24 19:09:04Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/tfs.h wireshark-1.10.6/epan/tfs.h --- wireshark-1.10.5/epan/tfs.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/tfs.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * true_false strings * Copyright 2007, Jaap Keuter * - * $Id: tfs.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/time_fmt.h wireshark-1.10.6/epan/time_fmt.h --- wireshark-1.10.5/epan/time_fmt.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/time_fmt.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* time_fmt.h * Definitions for various time display formats. * - * $Id: time_fmt.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/timestamp.c wireshark-1.10.6/epan/timestamp.c --- wireshark-1.10.5/epan/timestamp.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/timestamp.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* timestamp.c * Routines for timestamp type setting. * - * $Id: timestamp.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/timestamp.h wireshark-1.10.6/epan/timestamp.h --- wireshark-1.10.5/epan/timestamp.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/timestamp.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* timestamp.h * Defines for packet timestamps * - * $Id: timestamp.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/to_str.c wireshark-1.10.6/epan/to_str.c --- wireshark-1.10.5/epan/to_str.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/to_str.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* to_str.c * Routines for utilities to convert various other types to strings. * - * $Id: to_str.c 48400 2013-03-18 21:16:23Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/to_str.h wireshark-1.10.6/epan/to_str.h --- wireshark-1.10.5/epan/to_str.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/to_str.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* to_str.h * Definitions for utilities to convert various other types to strings. * - * $Id: to_str.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/tvbparse.c wireshark-1.10.6/epan/tvbparse.c --- wireshark-1.10.5/epan/tvbparse.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/tvbparse.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * * Copyright 2005, Luis E. Garcia Ontanon * - * $Id: tvbparse.c 48025 2013-03-02 23:05:27Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/tvbparse.h wireshark-1.10.6/epan/tvbparse.h --- wireshark-1.10.5/epan/tvbparse.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/tvbparse.h 2014-03-07 18:07:15.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 2005, Luis E. Garcia Ontanon * -* $Id: tvbparse.h 47992 2013-03-01 23:53:11Z rbalint $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/tvbtest.c wireshark-1.10.6/epan/tvbtest.c --- wireshark-1.10.5/epan/tvbtest.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/tvbtest.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * * tvbtest : tvbtest.o tvbuff.o except.o * - * $Id: tvbtest.c 48917 2013-04-18 19:22:24Z guy $ + * $Id$ * * Copyright (c) 2000 by Gilbert Ramirez * diff -Nru wireshark-1.10.5/epan/tvbuff.c wireshark-1.10.6/epan/tvbuff.c --- wireshark-1.10.5/epan/tvbuff.c 2013-07-17 22:26:25.000000000 +0000 +++ wireshark-1.10.6/epan/tvbuff.c 2014-03-07 18:07:15.000000000 +0000 @@ -9,7 +9,7 @@ * the data of a backing tvbuff, or can be a composite of * other tvbuffs. * - * $Id: tvbuff.c 50710 2013-07-17 22:20:12Z gerald $ + * $Id$ * * Copyright (c) 2000 by Gilbert Ramirez * diff -Nru wireshark-1.10.5/epan/tvbuff.h wireshark-1.10.6/epan/tvbuff.h --- wireshark-1.10.5/epan/tvbuff.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/tvbuff.h 2014-03-07 18:07:15.000000000 +0000 @@ -9,7 +9,7 @@ * the data of a backing tvbuff, or can be a composite of * other tvbuffs. * - * $Id: tvbuff.h 48940 2013-04-20 02:53:57Z guy $ + * $Id$ * * Copyright (c) 2000 by Gilbert Ramirez * diff -Nru wireshark-1.10.5/epan/tvbuff-int.h wireshark-1.10.6/epan/tvbuff-int.h --- wireshark-1.10.5/epan/tvbuff-int.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/tvbuff-int.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * * Structures that most TVB users should not be accessing directly. * - * $Id: tvbuff-int.h 48940 2013-04-20 02:53:57Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/uat.c wireshark-1.10.6/epan/uat.c --- wireshark-1.10.5/epan/uat.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/uat.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* * uat.c * - * $Id: uat.c 48960 2013-04-22 02:10:49Z mmann $ + * $Id$ * * User Accessible Tables * Mantain an array of user accessible data strucures diff -Nru wireshark-1.10.5/epan/uat.h wireshark-1.10.6/epan/uat.h --- wireshark-1.10.5/epan/uat.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/uat.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* * uat.h * - * $Id: uat.h 48259 2013-03-12 06:40:13Z etxrab $ + * $Id$ * * User Accessible Tables * Mantain an array of user accessible data strucures diff -Nru wireshark-1.10.5/epan/uat-int.h wireshark-1.10.6/epan/uat-int.h --- wireshark-1.10.5/epan/uat-int.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/uat-int.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* * uat-int.h * - * $Id: uat-int.h 48960 2013-04-22 02:10:49Z mmann $ + * $Id$ * * User Accessible Tables * Mantain an array of user accessible data strucures diff -Nru wireshark-1.10.5/epan/uat_load.c wireshark-1.10.6/epan/uat_load.c --- wireshark-1.10.5/epan/uat_load.c 2013-12-19 19:21:23.000000000 +0000 +++ wireshark-1.10.6/epan/uat_load.c 2014-03-07 18:14:07.000000000 +0000 @@ -535,7 +535,7 @@ /* * uat_load.l * - * $Id: uat_load.l 48960 2013-04-22 02:10:49Z mmann $ + * $Id$ * * User Accessible Tables * Mantain an array of user accessible data strucures diff -Nru wireshark-1.10.5/epan/uat_load.l wireshark-1.10.6/epan/uat_load.l --- wireshark-1.10.5/epan/uat_load.l 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/uat_load.l 2014-03-07 18:07:15.000000000 +0000 @@ -23,7 +23,7 @@ /* * uat_load.l * - * $Id: uat_load.l 48960 2013-04-22 02:10:49Z mmann $ + * $Id$ * * User Accessible Tables * Mantain an array of user accessible data strucures diff -Nru wireshark-1.10.5/epan/value_string.c wireshark-1.10.6/epan/value_string.c --- wireshark-1.10.5/epan/value_string.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/value_string.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* value_string.c * Routines for value_strings * - * $Id: value_string.c 48646 2013-03-30 00:11:00Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/value_string.h wireshark-1.10.6/epan/value_string.h --- wireshark-1.10.5/epan/value_string.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/value_string.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* value_string.h * Definitions for value_string structures and routines * - * $Id: value_string.h 48645 2013-03-29 23:23:28Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/Makefile.am wireshark-1.10.6/epan/wmem/Makefile.am --- wireshark-1.10.5/epan/wmem/Makefile.am 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/Makefile.am 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Wireshark Memory Manager # -# $Id: Makefile.am 48436 2013-03-20 00:28:36Z eapache $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/Makefile.common wireshark-1.10.6/epan/wmem/Makefile.common --- wireshark-1.10.5/epan/wmem/Makefile.common 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/Makefile.common 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 48219 2013-03-09 20:16:33Z eapache $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/Makefile.in wireshark-1.10.6/epan/wmem/Makefile.in --- wireshark-1.10.5/epan/wmem/Makefile.in 2013-12-19 19:13:48.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/Makefile.in 2014-03-07 18:07:36.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for Wireshark Memory Manager # -# $Id: Makefile.am 48436 2013-03-20 00:28:36Z eapache $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -43,7 +43,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 48219 2013-03-09 20:16:33Z eapache $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/Makefile.nmake wireshark-1.10.6/epan/wmem/Makefile.nmake --- wireshark-1.10.5/epan/wmem/Makefile.nmake 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/Makefile.nmake 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ ## Makefile for building wmem.lib with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 48517 2013-03-23 23:51:07Z eapache $ +# $Id$ include ..\..\config.nmake include Makefile.common diff -Nru wireshark-1.10.5/epan/wmem/wmem_allocator_block.c wireshark-1.10.6/epan/wmem/wmem_allocator_block.c --- wireshark-1.10.5/epan/wmem/wmem_allocator_block.c 2013-08-03 01:53:18.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_allocator_block.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Wireshark Memory Manager Large-Block Allocator * Copyright 2012, Evan Huus * - * $Id: wmem_allocator_block.c 51130 2013-08-03 01:47:05Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_allocator_block.h wireshark-1.10.6/epan/wmem/wmem_allocator_block.h --- wireshark-1.10.5/epan/wmem/wmem_allocator_block.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_allocator_block.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for the Wireshark Memory Manager Large-Block Allocator * Copyright 2012, Evan Huus * - * $Id: wmem_allocator_block.h 48519 2013-03-24 00:45:32Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_allocator.h wireshark-1.10.6/epan/wmem/wmem_allocator.h --- wireshark-1.10.5/epan/wmem/wmem_allocator.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_allocator.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for the Wireshark Memory Manager Allocator * Copyright 2012, Evan Huus * - * $Id: wmem_allocator.h 47548 2013-02-08 01:47:48Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_allocator_simple.c wireshark-1.10.6/epan/wmem/wmem_allocator_simple.c --- wireshark-1.10.5/epan/wmem/wmem_allocator_simple.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_allocator_simple.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Wireshark Memory Manager Simple Allocator * Copyright 2012, Evan Huus * - * $Id: wmem_allocator_simple.c 48435 2013-03-20 00:10:07Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_allocator_simple.h wireshark-1.10.6/epan/wmem/wmem_allocator_simple.h --- wireshark-1.10.5/epan/wmem/wmem_allocator_simple.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_allocator_simple.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for the Wireshark Memory Manager Simple Allocator * Copyright 2012, Evan Huus * - * $Id: wmem_allocator_simple.h 46603 2012-12-18 23:36:45Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_allocator_strict.c wireshark-1.10.6/epan/wmem/wmem_allocator_strict.c --- wireshark-1.10.5/epan/wmem/wmem_allocator_strict.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_allocator_strict.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Wireshark Memory Manager Strict Allocator * Copyright 2012, Evan Huus * - * $Id: wmem_allocator_strict.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_allocator_strict.h wireshark-1.10.6/epan/wmem/wmem_allocator_strict.h --- wireshark-1.10.5/epan/wmem/wmem_allocator_strict.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_allocator_strict.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for the Wireshark Memory Manager Strict Allocator * Copyright 2012, Evan Huus * - * $Id: wmem_allocator_strict.h 46828 2012-12-28 17:04:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_core.c wireshark-1.10.6/epan/wmem/wmem_core.c --- wireshark-1.10.5/epan/wmem/wmem_core.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_core.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Wireshark Memory Manager Core * Copyright 2012, Evan Huus * - * $Id: wmem_core.c 48435 2013-03-20 00:10:07Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_core.h wireshark-1.10.6/epan/wmem/wmem_core.h --- wireshark-1.10.5/epan/wmem/wmem_core.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_core.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for the Wireshark Memory Manager Core * Copyright 2012, Evan Huus * - * $Id: wmem_core.h 48019 2013-03-02 21:29:05Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem.h wireshark-1.10.6/epan/wmem/wmem.h --- wireshark-1.10.5/epan/wmem/wmem.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for the Wireshark Memory Manager * Copyright 2012, Evan Huus * - * $Id: wmem.h 48219 2013-03-09 20:16:33Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_scopes.c wireshark-1.10.6/epan/wmem/wmem_scopes.c --- wireshark-1.10.5/epan/wmem/wmem_scopes.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_scopes.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Wireshark Memory Manager Scopes * Copyright 2012, Evan Huus * - * $Id: wmem_scopes.c 48416 2013-03-19 15:32:42Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_scopes.h wireshark-1.10.6/epan/wmem/wmem_scopes.h --- wireshark-1.10.5/epan/wmem/wmem_scopes.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_scopes.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for the Wireshark Memory Manager Scopes * Copyright 2012, Evan Huus * - * $Id: wmem_scopes.h 48220 2013-03-09 20:25:44Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_slist.c wireshark-1.10.6/epan/wmem/wmem_slist.c --- wireshark-1.10.5/epan/wmem/wmem_slist.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_slist.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Wireshark Memory Manager Singly-Linked List * Copyright 2012, Evan Huus * - * $Id: wmem_slist.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_slist.h wireshark-1.10.6/epan/wmem/wmem_slist.h --- wireshark-1.10.5/epan/wmem/wmem_slist.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_slist.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for the Wireshark Memory Manager Singly-Linked List * Copyright 2012, Evan Huus * - * $Id: wmem_slist.h 48220 2013-03-09 20:25:44Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_stack.c wireshark-1.10.6/epan/wmem/wmem_stack.c --- wireshark-1.10.5/epan/wmem/wmem_stack.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_stack.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Wireshark Memory Manager Stack * Copyright 2012, Evan Huus * - * $Id: wmem_stack.c 48219 2013-03-09 20:16:33Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_stack.h wireshark-1.10.6/epan/wmem/wmem_stack.h --- wireshark-1.10.5/epan/wmem/wmem_stack.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_stack.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for the Wireshark Memory Manager Stack * Copyright 2012, Evan Huus * - * $Id: wmem_stack.h 48220 2013-03-09 20:25:44Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_strbuf.c wireshark-1.10.6/epan/wmem/wmem_strbuf.c --- wireshark-1.10.5/epan/wmem/wmem_strbuf.c 2013-04-26 22:06:08.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_strbuf.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Wireshark Memory Manager String Buffer * Copyright 2012, Evan Huus * - * $Id: wmem_strbuf.c 49064 2013-04-26 21:46:49Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_strbuf.h wireshark-1.10.6/epan/wmem/wmem_strbuf.h --- wireshark-1.10.5/epan/wmem/wmem_strbuf.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_strbuf.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for the Wireshark Memory Manager String Buffer * Copyright 2012, Evan Huus * - * $Id: wmem_strbuf.h 48220 2013-03-09 20:25:44Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_strutl.c wireshark-1.10.6/epan/wmem/wmem_strutl.c --- wireshark-1.10.5/epan/wmem/wmem_strutl.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_strutl.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Wireshark Memory Manager String Utilities * Copyright 2012, Evan Huus * - * $Id: wmem_strutl.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_strutl.h wireshark-1.10.6/epan/wmem/wmem_strutl.h --- wireshark-1.10.5/epan/wmem/wmem_strutl.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_strutl.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for the Wireshark Memory Manager String Utilities * Copyright 2012, Evan Huus * - * $Id: wmem_strutl.h 48220 2013-03-09 20:25:44Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wmem/wmem_test.c wireshark-1.10.6/epan/wmem/wmem_test.c --- wireshark-1.10.5/epan/wmem/wmem_test.c 2013-05-04 12:56:26.000000000 +0000 +++ wireshark-1.10.6/epan/wmem/wmem_test.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Wireshark Memory Manager Tests * Copyright 2012, Evan Huus * - * $Id: wmem_test.c 49162 2013-05-04 12:50:11Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wslua/CMakeLists.txt wireshark-1.10.6/epan/wslua/CMakeLists.txt --- wireshark-1.10.5/epan/wslua/CMakeLists.txt 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/CMakeLists.txt 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/wslua/console.lua wireshark-1.10.6/epan/wslua/console.lua --- wireshark-1.10.5/epan/wslua/console.lua 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/console.lua 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ -- -- (c) 2006 Luis E. Garcia Ontanon -- --- $Id: console.lua 43536 2012-06-28 22:56:06Z darkjames $ +-- $Id$ -- -- Wireshark - Network traffic analyzer -- By Gerald Combs diff -Nru wireshark-1.10.5/epan/wslua/dtd_gen.lua wireshark-1.10.6/epan/wslua/dtd_gen.lua --- wireshark-1.10.5/epan/wslua/dtd_gen.lua 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/dtd_gen.lua 2014-03-07 18:07:15.000000000 +0000 @@ -4,7 +4,7 @@ -- -- (c) 2006 Luis E. Garcia Ontanon -- --- $Id: dtd_gen.lua 43536 2012-06-28 22:56:06Z darkjames $ +-- $Id$ -- -- Wireshark - Network traffic analyzer -- By Gerald Combs diff -Nru wireshark-1.10.5/epan/wslua/init_wslua.c wireshark-1.10.6/epan/wslua/init_wslua.c --- wireshark-1.10.5/epan/wslua/init_wslua.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/init_wslua.c 2014-03-07 18:07:15.000000000 +0000 @@ -5,7 +5,7 @@ * * (c) 2006, Luis E. Garcia Ontanon * - * $Id: init_wslua.c 48797 2013-04-09 02:48:03Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wslua/lua_bitop.c wireshark-1.10.6/epan/wslua/lua_bitop.c --- wireshark-1.10.5/epan/wslua/lua_bitop.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/lua_bitop.c 2014-03-07 18:07:15.000000000 +0000 @@ -181,9 +181,11 @@ } #if LUA_VERSION_NUM < 502 luaL_register(L, "bit", bit_funcs); + return 1; #else luaL_newlib(L, bit_funcs); + lua_setglobal(L, "bit"); /* added for wireshark */ + return 0; /* changed from 1 to 0 for wireshark, since lua_setglobal now pops the table */ #endif - return 1; } diff -Nru wireshark-1.10.5/epan/wslua/Makefile.am wireshark-1.10.6/epan/wslua/Makefile.am --- wireshark-1.10.5/epan/wslua/Makefile.am 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/Makefile.am 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ # Makefile.am # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/wslua/Makefile.in wireshark-1.10.6/epan/wslua/Makefile.in --- wireshark-1.10.5/epan/wslua/Makefile.in 2013-12-19 19:13:48.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/Makefile.in 2014-03-07 18:07:36.000000000 +0000 @@ -17,7 +17,7 @@ # Makefile.am # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/wslua/Makefile.nmake wireshark-1.10.6/epan/wslua/Makefile.nmake --- wireshark-1.10.5/epan/wslua/Makefile.nmake 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/Makefile.nmake 2014-03-07 18:07:15.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # include ..\..\config.nmake diff -Nru wireshark-1.10.5/epan/wslua/make-init-lua.pl wireshark-1.10.6/epan/wslua/make-init-lua.pl --- wireshark-1.10.5/epan/wslua/make-init-lua.pl 2013-06-03 22:09:26.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/make-init-lua.pl 2014-03-07 18:07:15.000000000 +0000 @@ -6,7 +6,7 @@ # # (c) 2006, Luis E. Garcia Onatnon # -# $Id: make-init-lua.pl 49730 2013-06-03 22:03:32Z etxrab $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/wslua/make-reg.pl wireshark-1.10.6/epan/wslua/make-reg.pl --- wireshark-1.10.5/epan/wslua/make-reg.pl 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/make-reg.pl 2014-03-07 18:07:15.000000000 +0000 @@ -5,7 +5,7 @@ # # (c) 2006, Luis E. Garcia Onatnon # -# $Id: make-reg.pl 45016 2012-09-20 01:48:30Z morriss $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/wslua/make-taps.pl wireshark-1.10.6/epan/wslua/make-taps.pl --- wireshark-1.10.5/epan/wslua/make-taps.pl 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/make-taps.pl 2014-03-07 18:07:15.000000000 +0000 @@ -7,7 +7,7 @@ # # (c) 2006 Luis E. Garcia Ontanon # -# $Id: make-taps.pl 48337 2013-03-16 08:12:29Z etxrab $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/wslua/taps wireshark-1.10.6/epan/wslua/taps --- wireshark-1.10.5/epan/wslua/taps 2013-04-22 18:13:49.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/taps 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ # # (c) 2006 Luis E. Garcia Ontanon # -# $Id: taps 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/wslua/template-init.lua wireshark-1.10.6/epan/wslua/template-init.lua --- wireshark-1.10.5/epan/wslua/template-init.lua 2013-06-03 22:09:26.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/template-init.lua 2014-03-07 18:07:15.000000000 +0000 @@ -5,7 +5,7 @@ -- This file is going to be executed before any other lua script. -- It can be used to load libraries, disable functions and more. -- --- $Id: template-init.lua 49730 2013-06-03 22:03:32Z etxrab $ +-- $Id$ -- -- Wireshark - Network traffic analyzer -- By Gerald Combs diff -Nru wireshark-1.10.5/epan/wslua/wslua_dumper.c wireshark-1.10.6/epan/wslua/wslua_dumper.c --- wireshark-1.10.5/epan/wslua/wslua_dumper.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/wslua_dumper.c 2014-03-07 18:07:15.000000000 +0000 @@ -5,7 +5,7 @@ * * (c) 2006, Luis E. Garcia Ontanon * - * $Id: wslua_dumper.c 48691 2013-04-01 21:39:28Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wslua/wslua_field.c wireshark-1.10.6/epan/wslua/wslua_field.c --- wireshark-1.10.5/epan/wslua/wslua_field.c 2013-09-10 01:11:44.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/wslua_field.c 2014-03-07 18:07:15.000000000 +0000 @@ -5,7 +5,7 @@ * * (c) 2006, Luis E. Garcia Ontanon * - * $Id: wslua_field.c 51912 2013-09-10 00:14:09Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -224,17 +224,11 @@ static int FieldInfo_get_range(lua_State* L) { /* The TvbRange covering this field */ FieldInfo fi = checkFieldInfo(L,1); - TvbRange r = ep_new(struct _wslua_tvbrange); - r->tvb = ep_new(struct _wslua_tvb); - - r->tvb->ws_tvb = fi->ds_tvb; - r->tvb->expired = FALSE; - r->tvb->need_free = FALSE; - r->offset = fi->start; - r->len = fi->length; + if (push_TvbRange (L, fi->ds_tvb, fi->start, fi->length)) { + return 1; + } - pushTvbRange(L,r); - return 1; + return 0; } static int FieldInfo_get_generated(lua_State* L) { diff -Nru wireshark-1.10.5/epan/wslua/wslua_gui.c wireshark-1.10.6/epan/wslua/wslua_gui.c --- wireshark-1.10.5/epan/wslua/wslua_gui.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/wslua_gui.c 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ * * (c) 2006, Luis E. Garcia Ontanon * - * $Id: wslua_gui.c 48337 2013-03-16 08:12:29Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wslua/wslua.h wireshark-1.10.6/epan/wslua/wslua.h --- wireshark-1.10.5/epan/wslua/wslua.h 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/wslua.h 2014-03-07 18:07:15.000000000 +0000 @@ -7,7 +7,7 @@ * (c) 2007, Tamas Regos * (c) 2008, Balint Reczey * - * $Id: wslua.h 48542 2013-03-24 23:49:22Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -439,6 +439,7 @@ extern int Proto_commit(lua_State* L); extern Tvb* push_Tvb(lua_State* L, tvbuff_t* tvb); +extern gboolean push_TvbRange(lua_State* L, tvbuff_t* tvb, int offset, int len); extern void clear_outstanding_Tvb(void); extern void clear_outstanding_TvbRange(void); diff -Nru wireshark-1.10.5/epan/wslua/wslua_listener.c wireshark-1.10.6/epan/wslua/wslua_listener.c --- wireshark-1.10.5/epan/wslua/wslua_listener.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/wslua_listener.c 2014-03-07 18:07:15.000000000 +0000 @@ -7,7 +7,7 @@ * * (c) 2006, Luis E. Garcia Ontanon * - * $Id: wslua_listener.c 48337 2013-03-16 08:12:29Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wslua/wslua_pinfo.c wireshark-1.10.6/epan/wslua/wslua_pinfo.c --- wireshark-1.10.5/epan/wslua/wslua_pinfo.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/wslua_pinfo.c 2014-03-07 18:07:15.000000000 +0000 @@ -7,7 +7,7 @@ * (c) 2008, Balint Reczey * (c) 2011, Stig Bjorlykke * - * $Id: wslua_pinfo.c 48337 2013-03-16 08:12:29Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wslua/wslua_proto.c wireshark-1.10.6/epan/wslua/wslua_proto.c --- wireshark-1.10.5/epan/wslua/wslua_proto.c 2013-09-09 19:11:59.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/wslua_proto.c 2014-03-07 18:07:15.000000000 +0000 @@ -6,7 +6,7 @@ * (c) 2006, Luis E. Garcia Ontanon * (c) 2007, Tamas Regos * - * $Id: wslua_proto.c 51875 2013-09-09 18:52:33Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -617,7 +617,7 @@ WSLUA_CONSTRUCTOR ProtoField_new(lua_State* L) { /* Creates a new field to be used in a protocol. */ #define WSLUA_ARG_ProtoField_new_NAME 1 /* Actual name of the field (the string that appears in the tree). */ #define WSLUA_ARG_ProtoField_new_ABBR 2 /* Filter name of the field (the string that is used in filters). */ -#define WSLUA_ARG_ProtoField_new_TYPE 3 /* Field Type: one of ftypes.NONE, ftypes.PROTOCOL, ftypes.BOOLEAN, +#define WSLUA_ARG_ProtoField_new_TYPE 3 /* Field Type: one of ftypes.BOOLEAN, ftypes.UINT8, ftypes.UINT16, ftypes.UINT24, ftypes.UINT32, ftypes.UINT64, ftypes.INT8, ftypes.INT16 ftypes.INT24, ftypes.INT32, ftypes.INT64, ftypes.FLOAT, ftypes.DOUBLE, ftypes.ABSOLUTE_TIME ftypes.RELATIVE_TIME, ftypes.STRING, ftypes.STRINGZ, ftypes.UINT_STRING, ftypes.ETHER, ftypes.BYTES @@ -628,64 +628,138 @@ #define WSLUA_OPTARG_ProtoField_new_MASK 6 /* The bitmask to be used. */ #define WSLUA_OPTARG_ProtoField_new_DESCR 7 /* The description of the field. */ - ProtoField f = (wslua_field_t *)g_malloc(sizeof(wslua_field_t)); + ProtoField f; + int nargs = lua_gettop(L); + const gchar* name = luaL_checkstring(L,WSLUA_ARG_ProtoField_new_NAME); + const gchar* abbr = luaL_checkstring(L,WSLUA_ARG_ProtoField_new_ABBR); + enum ftenum type; value_string* vs = NULL; true_false_string* tfs = NULL; - const gchar *blob; + unsigned base; + guint32 mask = (guint32)luaL_optnumber(L, WSLUA_OPTARG_ProtoField_new_MASK, 0x0); + const gchar *blob = luaL_optstring(L,WSLUA_OPTARG_ProtoField_new_DESCR,NULL); - /* will be using -2 as far as the field has not been added to an array then it will turn -1 */ - f->hfid = -2; - f->ett = -1; - f->name = g_strdup(luaL_checkstring(L,WSLUA_ARG_ProtoField_new_NAME)); - f->abbr = g_strdup(luaL_checkstring(L,WSLUA_ARG_ProtoField_new_ABBR)); - f->type = get_ftenum(luaL_checkstring(L,WSLUA_ARG_ProtoField_new_TYPE)); - - /*XXX do it better*/ - if (f->type == FT_NONE) { - g_free(f->name); - g_free(f->abbr); - g_free(f); - WSLUA_ARG_ERROR(ProtoField_new,TYPE,"invalid ftypes"); + if (lua_isnumber(L,WSLUA_ARG_ProtoField_new_TYPE)) { + type = luaL_checkint(L,WSLUA_ARG_ProtoField_new_TYPE); + } else { + type = get_ftenum(luaL_checkstring(L,WSLUA_ARG_ProtoField_new_TYPE)); } - if (!f->abbr || !f->abbr[0]) { + if (lua_isnumber(L, WSLUA_OPTARG_ProtoField_new_BASE)) { + base = luaL_optint(L, WSLUA_OPTARG_ProtoField_new_BASE, BASE_NONE); + } else { + base = string_to_base(luaL_optstring(L, WSLUA_OPTARG_ProtoField_new_BASE, "BASE_NONE")); + } + + if (!abbr || !abbr[0]) { WSLUA_ARG_ERROR(ProtoField_new,ABBR,"Missing abbrev"); } - if (proto_check_field_name(f->abbr)) { - g_free(f->name); - g_free(f->abbr); - g_free(f); + if (proto_check_field_name(abbr)) { WSLUA_ARG_ERROR(ProtoField_new,ABBR,"Invalid char in abbrev"); } - if (! lua_isnil(L,WSLUA_OPTARG_ProtoField_new_VOIDSTRING) ) { - if (f->type == FT_BOOLEAN) { + switch (type) { + case FT_FRAMENUM: + if (base != BASE_NONE) { + WSLUA_OPTARG_ERROR(ProtoField_new,BASE,"FRAMENUM must use base.NONE"); + } + if (mask) { + WSLUA_OPTARG_ERROR(ProtoField_new,MASK,"FRAMENUM can not have a bitmask"); + } + break; + case FT_UINT8: + case FT_UINT16: + case FT_UINT24: + case FT_UINT32: + case FT_UINT64: + case FT_INT8: + case FT_INT16: + case FT_INT24: + case FT_INT32: + case FT_INT64: + if (base == BASE_NONE) { + base = BASE_DEC; /* Default base for integer */ + } else if (base < BASE_DEC || base > BASE_HEX_DEC) { + WSLUA_OPTARG_ERROR(ProtoField_new,BASE,"Base must be either base.DEC, base.HEX, base.OCT," + " base.DEC_HEX, base.DEC_HEX or base.HEX_DEC"); + } + if ((base == BASE_HEX || base == BASE_OCT) && + (type == FT_INT8 || type == FT_INT16 || type == FT_INT24 || type == FT_INT32 || type == FT_INT64)) + { + WSLUA_OPTARG_ERROR(ProtoField_new,BASE,"This type does not display as hexadecimal"); + } + if (nargs >= WSLUA_OPTARG_ProtoField_new_VOIDSTRING && !lua_isnil(L,WSLUA_OPTARG_ProtoField_new_VOIDSTRING)) { + if (type == FT_UINT64 || type == FT_INT64) { + WSLUA_OPTARG_ERROR(ProtoField_new,VOIDSTRING,"This type does not support value string"); + return 0; + } else { + vs = value_string_from_table(L,WSLUA_OPTARG_ProtoField_new_VOIDSTRING); + } + } + break; + case FT_BOOLEAN: + if (mask == 0x0 && base != BASE_NONE) { + WSLUA_OPTARG_ERROR(ProtoField_new,BASE,"Base must be base.NONE if bitmask is zero."); + } + if (mask != 0x0 && (base < 1 || base > 64)) { + WSLUA_OPTARG_ERROR(ProtoField_new,BASE,"Base must be between 1 and 64 if bitmask is non-zero."); + } + if (nargs >= WSLUA_OPTARG_ProtoField_new_VOIDSTRING && !lua_isnil(L,WSLUA_OPTARG_ProtoField_new_VOIDSTRING)) { tfs = true_false_string_from_table(L,WSLUA_OPTARG_ProtoField_new_VOIDSTRING); } - else { - vs = value_string_from_table(L,WSLUA_OPTARG_ProtoField_new_VOIDSTRING); + break; + case FT_ABSOLUTE_TIME: + if (base == BASE_NONE) { + base = ABSOLUTE_TIME_LOCAL; /* Default base for FT_ABSOLUTE_TIME */ + } else if (base < ABSOLUTE_TIME_LOCAL || base > ABSOLUTE_TIME_DOY_UTC) { + WSLUA_OPTARG_ERROR(ProtoField_new,BASE,"Base must be either LOCAL, UTC, or DOY_UTC"); + } + if (mask) { + WSLUA_OPTARG_ERROR(ProtoField_new,MASK,"ABSOLUTE_TIME can not have a bitmask"); + } + break; + case FT_IPv4: + case FT_IPv6: + case FT_IPXNET: + case FT_ETHER: + case FT_FLOAT: + case FT_DOUBLE: + case FT_RELATIVE_TIME: + case FT_STRING: + case FT_STRINGZ: + case FT_BYTES: + case FT_UINT_BYTES: + case FT_GUID: + case FT_OID: + if (base != BASE_NONE) { + WSLUA_OPTARG_ERROR(ProtoField_new,BASE,"Base must be base.NONE"); } - - if (vs) { - f->vs = VALS(vs); - } else if (tfs) { - f->vs = TFS(tfs); - } else { - g_free(f->name); - g_free(f->abbr); - g_free(f); - return 0; + if (mask) { + WSLUA_OPTARG_ERROR(ProtoField_new,MASK,"This type can not have a bitmask"); } + break; + case FT_NONE: + default: + WSLUA_ARG_ERROR(ProtoField_new,TYPE,"Invalid field type"); + } + f = g_new(wslua_field_t,1); + + f->hfid = -2; + f->ett = -1; + f->name = g_strdup(name); + f->abbr = g_strdup(abbr); + f->type = type; + f->base = base; + if (tfs) { + f->vs = TFS(tfs); + } else if (vs) { + f->vs = VALS(vs); } else { f->vs = NULL; } - - /* XXX: need BASE_ERROR */ - f->base = string_to_base(luaL_optstring(L, WSLUA_OPTARG_ProtoField_new_BASE, "BASE_NONE")); - f->mask = (guint32)luaL_optnumber(L, WSLUA_OPTARG_ProtoField_new_MASK, 0x0); - blob = luaL_optstring(L,WSLUA_OPTARG_ProtoField_new_DESCR,NULL); + f->mask = mask; if (blob && strcmp(blob, f->name) != 0) { f->blob = g_strdup(blob); } else { @@ -872,7 +946,7 @@ const gchar* abbr = luaL_checkstring(L,1); const gchar* name = luaL_optstring(L,2,abbr); unsigned base = luaL_optint(L, 3, BASE_NONE); - true_false_string* tfs = (lua_gettop(L) > 3) ? true_false_string_from_table(L,4) : NULL; + true_false_string* tfs = NULL; guint32 mask = (guint32)luaL_optnumber(L,5,0); const gchar* blob = luaL_optstring(L,6,NULL); @@ -898,6 +972,10 @@ return 0; } + if (lua_gettop(L) > 3 && !lua_isnil(L,4)) { + tfs = true_false_string_from_table(L,4); + } + f = g_new(wslua_field_t,1); f->hfid = -2; diff -Nru wireshark-1.10.5/epan/wslua/wslua_tree.c wireshark-1.10.6/epan/wslua/wslua_tree.c --- wireshark-1.10.5/epan/wslua/wslua_tree.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/wslua_tree.c 2014-03-07 18:07:15.000000000 +0000 @@ -6,7 +6,7 @@ * (c) 2006, Luis E. Garcia Ontanon * (c) 2008, Balint Reczey * - * $Id: wslua_tree.c 48337 2013-03-16 08:12:29Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -246,6 +246,8 @@ const gchar* s = lua_tostring(L,1); item = proto_tree_add_text(tree_item->tree, tvbr->tvb->ws_tvb, tvbr->offset, tvbr->len,"%s",s); lua_remove(L,1); + } else { + luaL_error(L,"Tree item ProtoField/Protocol handle is invalid (ProtoField/Proto not registered?)"); } } @@ -268,20 +270,32 @@ WSLUA_METHOD TreeItem_add(lua_State *L) { /* - Adds an child item to a given item, returning the child. - tree_item:add([proto_field | proto], [tvbrange], [label], ...) - if the proto_field represents a numeric value (int, uint or float) is to be treated as a Big Endian (network order) Value. + Adds a child item to this tree item, returning the new child TreeItem. + if the protofield represents a numeric value (int, uint or float), then it's treated as a Big Endian (network order) value. + This function has a complicated form: 'treeitem:add(protofield, [tvbrange,] [[value], label]])', such that if the second + argument is a tvbrange, and a third argument is given, it's a value; but if the second argument is a non-tvbrange type, then + it is the value (as opposed to filling that argument with 'nil', which is invalid for this function). */ - WSLUA_RETURN(TreeItem_add_item_any(L,FALSE)); /* The child item */ +#define WSLUA_ARG_TreeItem_add_PROTOFIELD 2 /* The ProtoField field or Proto protocol object to add to the tree. */ +#define WSLUA_OPTARG_TreeItem_add_TVBRANGE 3 /* The TvbRange of bytes in the packet this tree item covers/represents. */ +#define WSLUA_OPTARG_TreeItem_add_VALUE 4 /* The field's value, instead of the ProtoField/Proto one. */ +#define WSLUA_OPTARG_TreeItem_add_LABEL 5 /* One or more strings to use for the tree item label, instead of the ProtoField/Proto one. */ + WSLUA_RETURN(TreeItem_add_item_any(L,FALSE)); /* The new child TreeItem */ } WSLUA_METHOD TreeItem_add_le(lua_State *L) { /* - Adds (and returns) an child item to a given item, returning the child. - tree_item:add([proto_field | proto], [tvbrange], [label], ...) - if the proto_field represents a numeric value (int, uint or float) is to be treated as a Little Endian Value. + Adds a child item to this tree item, returning the new child TreeItem. + if the protofield represents a numeric value (int, uint or float), then it's treated as a Little Endian value. + This function has a complicated form: 'treeitem:add_le(protofield, [tvbrange,] [[value], label]])', such that if the second + argument is a tvbrange, and a third argument is given, it's a value; but if the second argument is a non-tvbrange type, then + it is the value (as opposed to filling that argument with 'nil', which is invalid for this function). */ - WSLUA_RETURN(TreeItem_add_item_any(L,TRUE)); /* The child item */ +#define WSLUA_ARG_TreeItem_add_le_PROTOFIELD 2 /* The ProtoField field or Proto protocol object to add to the tree. */ +#define WSLUA_OPTARG_TreeItem_add_le_TVBRANGE 3 /* The TvbRange of bytes in the packet this tree item covers/represents. */ +#define WSLUA_OPTARG_TreeItem_add_le_VALUE 4 /* The field's value, instead of the ProtoField/Proto one. */ +#define WSLUA_OPTARG_TreeItem_add_le_LABEL 5 /* One or more strings to use for the tree item label, instead of the ProtoField/Proto one. */ + WSLUA_RETURN(TreeItem_add_item_any(L,TRUE)); /* The new child TreeItem */ } WSLUA_METHOD TreeItem_set_text(lua_State *L) { diff -Nru wireshark-1.10.5/epan/wslua/wslua_tvb.c wireshark-1.10.6/epan/wslua/wslua_tvb.c --- wireshark-1.10.5/epan/wslua/wslua_tvb.c 2013-09-09 19:11:59.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/wslua_tvb.c 2014-03-07 18:07:15.000000000 +0000 @@ -7,7 +7,7 @@ * (c) 2008, Balint Reczey * (c) 2009, Stig Bjorlykke * - * $Id: wslua_tvb.c 51876 2013-09-09 19:05:44Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -247,8 +247,8 @@ WSLUA_RETURN(1); /* A ByteArray contaning the requested segment. */ } -static int ByteArray_tostring(lua_State* L) { - /* Obtain a string containing the bytes in a ByteArray so that it can be used in display filters (e.g. "01:23:45:67:89:AB") */ +WSLUA_METAMETHOD ByteArray__tostring(lua_State* L) { + /* Obtain a string containing the bytes in a ByteArray so that it can be used in display filters (e.g. "01FE456789AB") */ static const gchar* byte_to_str[] = { "00","01","02","03","04","05","06","07","08","09","0A","0B","0C","0D","0E","0F", "10","11","12","13","14","15","16","17","18","19","1A","1B","1C","1D","1E","1F", @@ -282,7 +282,7 @@ lua_pushstring(L,s->str); g_string_free(s,TRUE); - WSLUA_RETURN(1); /* A string contaning a representaion of the ByteArray. */ + WSLUA_RETURN(1); /* A hex-ascii string containing a representation of the ByteArray. */ } static int ByteArray_tvb (lua_State *L); @@ -301,7 +301,7 @@ }; static const luaL_Reg ByteArray_meta[] = { - {"__tostring", ByteArray_tostring}, + {"__tostring", ByteArray__tostring}, {"__concat", ByteArray__concat}, {"__call",ByteArray_subset}, { NULL, NULL } @@ -568,24 +568,23 @@ Tvb's range the creation will cause a runtime error. */ -static TvbRange new_TvbRange(lua_State* L, tvbuff_t* ws_tvb, int offset, int len) { +gboolean push_TvbRange(lua_State* L, tvbuff_t* ws_tvb, int offset, int len) { TvbRange tvbr; - if (!ws_tvb) { luaL_error(L,"expired tvb"); - return 0; + return FALSE; } if (len == -1) { len = tvb_length_remaining(ws_tvb,offset); if (len < 0) { luaL_error(L,"out of bounds"); - return 0; + return FALSE; } } else if ( (guint)(len + offset) > tvb_length(ws_tvb)) { luaL_error(L,"Range is out of bounds"); - return NULL; + return FALSE; } tvbr = (TvbRange)g_malloc(sizeof(struct _wslua_tvbrange)); @@ -596,7 +595,9 @@ tvbr->offset = offset; tvbr->len = len; - return tvbr; + PUSH_TVBRANGE(L,tvbr); + + return TRUE; } @@ -608,7 +609,6 @@ Tvb tvb = checkTvb(L,1); int offset = luaL_optint(L,WSLUA_OPTARG_Tvb_range_OFFSET,0); int len = luaL_optint(L,WSLUA_OPTARG_Tvb_range_LENGTH,-1); - TvbRange tvbr; if (!tvb) return 0; if (tvb->expired) { @@ -616,8 +616,7 @@ return 0; } - if ((tvbr = new_TvbRange(L,tvb->ws_tvb,offset,len))) { - PUSH_TVBRANGE(L,tvbr); + if (push_TvbRange(L,tvb->ws_tvb,offset,len)) { WSLUA_RETURN(1); /* The TvbRange */ } @@ -1256,8 +1255,7 @@ return 0; } - if ((tvbr = new_TvbRange(L,tvbr->tvb->ws_tvb,tvbr->offset+offset,len))) { - PUSH_TVBRANGE(L,tvbr); + if (push_TvbRange(L,tvbr->tvb->ws_tvb,tvbr->offset+offset,len)) { WSLUA_RETURN(1); /* The TvbRange */ } @@ -1266,9 +1264,9 @@ static int TvbRange_uncompress(lua_State* L) { /* Obtain a uncompressed TvbRange from a TvbRange */ -#define WSLUA_ARG_TvbRange_tvb_NAME 2 /* The name to be given to the new data-source. */ +#define WSLUA_ARG_TvbRange_uncompress_NAME 2 /* The name to be given to the new data-source. */ TvbRange tvbr = checkTvbRange(L,1); - const gchar* name = luaL_optstring(L,WSLUA_ARG_ByteArray_tvb_NAME,"Uncompressed"); + const gchar* name = luaL_optstring(L,WSLUA_ARG_TvbRange_uncompress_NAME,"Uncompressed"); tvbuff_t *uncompr_tvb; if (!(tvbr && tvbr->tvb)) return 0; @@ -1282,8 +1280,7 @@ uncompr_tvb = tvb_child_uncompress(tvbr->tvb->ws_tvb, tvbr->tvb->ws_tvb, tvbr->offset, tvbr->len); if (uncompr_tvb) { add_new_data_source (lua_pinfo, uncompr_tvb, name); - if ((tvbr = new_TvbRange(L,uncompr_tvb,0,tvb_length(uncompr_tvb)))) { - PUSH_TVBRANGE(L,tvbr); + if (push_TvbRange(L,uncompr_tvb,0,tvb_length(uncompr_tvb))) { WSLUA_RETURN(1); /* The TvbRange */ } } diff -Nru wireshark-1.10.5/epan/wslua/wslua_util.c wireshark-1.10.6/epan/wslua/wslua_util.c --- wireshark-1.10.5/epan/wslua/wslua_util.c 2013-04-22 18:04:37.000000000 +0000 +++ wireshark-1.10.6/epan/wslua/wslua_util.c 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ * * (c) 2006, Luis E. Garcia Ontanon * - * $Id: wslua_util.c 48797 2013-04-09 02:48:03Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/wspython/CMakeLists.txt wireshark-1.10.6/epan/wspython/CMakeLists.txt --- wireshark-1.10.5/epan/wspython/CMakeLists.txt 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wspython/CMakeLists.txt 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 44629 2012-08-23 10:34:45Z jmayer $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/wspython/Makefile.am wireshark-1.10.6/epan/wspython/Makefile.am --- wireshark-1.10.5/epan/wspython/Makefile.am 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wspython/Makefile.am 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ # Makefile.am # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/wspython/Makefile.common wireshark-1.10.6/epan/wspython/Makefile.common --- wireshark-1.10.5/epan/wspython/Makefile.common 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wspython/Makefile.common 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 30057 2009-09-21 21:25:23Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/wspython/Makefile.in wireshark-1.10.6/epan/wspython/Makefile.in --- wireshark-1.10.5/epan/wspython/Makefile.in 2013-12-19 19:13:48.000000000 +0000 +++ wireshark-1.10.6/epan/wspython/Makefile.in 2014-03-07 18:07:36.000000000 +0000 @@ -17,7 +17,7 @@ # Makefile.am # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -42,7 +42,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 30057 2009-09-21 21:25:23Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/epan/wspython/Makefile.nmake wireshark-1.10.6/epan/wspython/Makefile.nmake --- wireshark-1.10.5/epan/wspython/Makefile.nmake 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wspython/Makefile.nmake 2014-03-07 18:07:15.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # include ..\..\config.nmake diff -Nru wireshark-1.10.5/epan/wspython/register-dissector.py wireshark-1.10.6/epan/wspython/register-dissector.py --- wireshark-1.10.5/epan/wspython/register-dissector.py 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wspython/register-dissector.py 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ # register-dissector.py # -# $Id: register-dissector.py 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark Protocol Python Binding # diff -Nru wireshark-1.10.5/epan/wspython/wspy_dissector.py wireshark-1.10.6/epan/wspython/wspy_dissector.py --- wireshark-1.10.5/epan/wspython/wspy_dissector.py 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wspython/wspy_dissector.py 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ # wspy_dissector.py # -# $Id: wspy_dissector.py 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark Protocol Python Binding # diff -Nru wireshark-1.10.5/epan/wspython/wspy_libws.py wireshark-1.10.6/epan/wspython/wspy_libws.py --- wireshark-1.10.5/epan/wspython/wspy_libws.py 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wspython/wspy_libws.py 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ # wspy_libws.py # -# $Id: wspy_libws.py 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark Protocol Python Binding # diff -Nru wireshark-1.10.5/epan/wspython/wspy_proto.c wireshark-1.10.6/epan/wspython/wspy_proto.c --- wireshark-1.10.5/epan/wspython/wspy_proto.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wspython/wspy_proto.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ /* wspy_proto.c * - * $Id: wspy_proto.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark Protocol Python Binding * diff -Nru wireshark-1.10.5/epan/wspython/wspy_proto.h wireshark-1.10.6/epan/wspython/wspy_proto.h --- wireshark-1.10.5/epan/wspython/wspy_proto.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wspython/wspy_proto.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ /* wspy_proto.h * - * $Id: wspy_proto.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark Protocol Python Binding * diff -Nru wireshark-1.10.5/epan/wspython/wspy_register.c wireshark-1.10.6/epan/wspython/wspy_register.c --- wireshark-1.10.5/epan/wspython/wspy_register.c 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wspython/wspy_register.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ /* wspy_register.c * - * $Id: wspy_register.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark Protocol Python Binding * diff -Nru wireshark-1.10.5/epan/wspython/wspy_register.h wireshark-1.10.6/epan/wspython/wspy_register.h --- wireshark-1.10.5/epan/wspython/wspy_register.h 2013-04-22 18:04:38.000000000 +0000 +++ wireshark-1.10.6/epan/wspython/wspy_register.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,6 +1,6 @@ /* wspy_register.h * - * $Id: wspy_register.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark Protocol Python Binding * diff -Nru wireshark-1.10.5/epan/x264_prt_id.h wireshark-1.10.6/epan/x264_prt_id.h --- wireshark-1.10.5/epan/x264_prt_id.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/x264_prt_id.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* x264_prt_id.h * Definitions of X.264/ISO 11570 transport protocol IDs * - * $Id: x264_prt_id.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/xdlc.c wireshark-1.10.6/epan/xdlc.c --- wireshark-1.10.5/epan/xdlc.c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/xdlc.c 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for use by various SDLC-derived protocols, such as HDLC * and its derivatives LAPB, IEEE 802.2 LLC, etc.. * - * $Id: xdlc.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/epan/xdlc.h wireshark-1.10.6/epan/xdlc.h --- wireshark-1.10.5/epan/xdlc.h 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/epan/xdlc.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Define *DLC frame types, and routine to dissect the control field of * a *DLC frame. * - * $Id: xdlc.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/file.c wireshark-1.10.6/file.c --- wireshark-1.10.5/file.c 2013-09-10 15:45:18.000000000 +0000 +++ wireshark-1.10.6/file.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* file.c * File I/O routines * - * $Id: file.c 51931 2013-09-10 15:39:51Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/file.h wireshark-1.10.6/file.h --- wireshark-1.10.5/file.h 2013-06-04 18:51:25.000000000 +0000 +++ wireshark-1.10.6/file.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* file.h * Definitions for file structures and routines * - * $Id: file.h 49768 2013-06-04 18:44:42Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/fileset.c wireshark-1.10.6/fileset.c --- wireshark-1.10.5/fileset.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/fileset.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* fileset.c * Routines for handling file sets * - * $Id: fileset.c 45707 2012-10-22 12:20:36Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/fileset.h wireshark-1.10.6/fileset.h --- wireshark-1.10.5/fileset.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/fileset.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* fileset.h * Definitions for routines for file sets. * - * $Id: fileset.h 45333 2012-10-05 18:52:42Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/filters.c wireshark-1.10.6/filters.c --- wireshark-1.10.5/filters.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/filters.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* filters.c * Code for reading and writing the filters file. * - * $Id: filters.c 48797 2013-04-09 02:48:03Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/filters.h wireshark-1.10.6/filters.h --- wireshark-1.10.5/filters.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/filters.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* filters.h * Declarations of routines for reading and writing the filters file. * - * $Id: filters.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/fix/Values.xsl wireshark-1.10.6/fix/Values.xsl --- wireshark-1.10.5/fix/Values.xsl 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/fix/Values.xsl 2014-03-07 18:07:15.000000000 +0000 @@ -10,7 +10,7 @@ * This file is autogenerated * Look fix/README for more information how to generate this file * - * $Id: Values.xsl 47178 2013-01-20 18:32:23Z alagoutte $ + * $Id$ * */ diff -Nru wireshark-1.10.5/frame_data_sequence.c wireshark-1.10.6/frame_data_sequence.c --- wireshark-1.10.5/frame_data_sequence.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/frame_data_sequence.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* frame_data_sequence.c * Implements a sequence of frame_data structures * - * $Id: frame_data_sequence.c 48589 2013-03-27 17:14:42Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/frame_data_sequence.h wireshark-1.10.6/frame_data_sequence.h --- wireshark-1.10.5/frame_data_sequence.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/frame_data_sequence.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* frame_data_sequence.h * Implements a sequence of frame_data structures * - * $Id: frame_data_sequence.h 48589 2013-03-27 17:14:42Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/g711.c wireshark-1.10.6/g711.c --- wireshark-1.10.5/g711.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/g711.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: g711.c 15355 2005-08-14 23:25:20Z jmayer $ + * $Id$ * * This source code is a product of Sun Microsystems, Inc. and is provided * for unrestricted use. Users may copy or modify this source code without diff -Nru wireshark-1.10.5/g711.h wireshark-1.10.6/g711.h --- wireshark-1.10.5/g711.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/g711.h 2014-03-07 18:07:15.000000000 +0000 @@ -3,7 +3,7 @@ * * Definitions for routines for u-law, A-law and linear PCM conversions * - * $Id: g711.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/globals.h wireshark-1.10.6/globals.h --- wireshark-1.10.5/globals.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/globals.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* globals.h * Global defines, etc. * - * $Id: globals.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/help/faq.py wireshark-1.10.6/help/faq.py --- wireshark-1.10.5/help/faq.py 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/help/faq.py 2014-03-07 18:07:15.000000000 +0000 @@ -6,7 +6,7 @@ # Questions and answer content can be found below. Section and # question numbers will be automatically generated. # -# $Id: faq.py 48912 2013-04-18 17:10:47Z gerald $ +# $Id$ import sys import string diff -Nru wireshark-1.10.5/help/Makefile.am wireshark-1.10.6/help/Makefile.am --- wireshark-1.10.5/help/Makefile.am 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/help/Makefile.am 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Wireshark help files # -# $Id: Makefile.am 47469 2013-02-04 17:22:32Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/help/Makefile.in wireshark-1.10.6/help/Makefile.in --- wireshark-1.10.5/help/Makefile.in 2013-12-19 19:13:48.000000000 +0000 +++ wireshark-1.10.6/help/Makefile.in 2014-03-07 18:07:36.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for Wireshark help files # -# $Id: Makefile.am 47469 2013-02-04 17:22:32Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/help/Makefile.nmake wireshark-1.10.6/help/Makefile.nmake --- wireshark-1.10.5/help/Makefile.nmake 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/help/Makefile.nmake 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ ## Makefile for building wireshark.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 27041 2008-12-17 21:11:20Z gerald $ +# $Id$ TOOLS_DIR=..\tools include ..\config.nmake diff -Nru wireshark-1.10.5/iface_monitor.c wireshark-1.10.6/iface_monitor.c --- wireshark-1.10.5/iface_monitor.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/iface_monitor.c 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* iface_monitor.c * interface monitor by Pontus Fuchs * - * $Id: iface_monitor.c 48701 2013-04-02 17:05:50Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/iface_monitor.h wireshark-1.10.6/iface_monitor.h --- wireshark-1.10.5/iface_monitor.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/iface_monitor.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* iface_monitor.h * interface monitor by Pontus Fuchs * - * $Id: iface_monitor.h 43545 2012-06-29 18:04:11Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/image/expert_indicators.svg wireshark-1.10.6/image/expert_indicators.svg --- wireshark-1.10.5/image/expert_indicators.svg 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/image/expert_indicators.svg 2014-03-07 18:07:15.000000000 +0000 @@ -1,427 +1,427 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - Chat - Error - Note - None - Warn - - Originally from the public domain image at http://openclipart.org/Xiph/files/Anonymous/13273 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Chat + Error + Note + None + Warn + + Originally from the public domain image at http://openclipart.org/Xiph/files/Anonymous/13273 + + diff -Nru wireshark-1.10.5/image/Makefile.nmake wireshark-1.10.6/image/Makefile.nmake --- wireshark-1.10.5/image/Makefile.nmake 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/image/Makefile.nmake 2014-03-07 18:07:15.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake 45094 2012-09-24 11:25:40Z martinm $ +# $Id$ # include ..\config.nmake diff -Nru wireshark-1.10.5/INSTALL wireshark-1.10.6/INSTALL --- wireshark-1.10.5/INSTALL 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/INSTALL 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: INSTALL 45090 2012-09-24 10:23:20Z martinm $ +$Id$ NOTE: this document applies to the Wireshark source releases and buildbot source tarballs. It does not apply to source code checked diff -Nru wireshark-1.10.5/isprint.h wireshark-1.10.6/isprint.h --- wireshark-1.10.5/isprint.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/isprint.h 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ * Temporary redefinition of "isprint()" to cope with GTK+ 1.3 and * later using UTF-8 strings * - * $Id: isprint.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/log.h wireshark-1.10.6/log.h --- wireshark-1.10.5/log.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/log.h 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ /* log.h * log output definitions * - * $Id: log.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/macosx-setup.sh wireshark-1.10.6/macosx-setup.sh --- wireshark-1.10.5/macosx-setup.sh 2013-07-31 06:34:59.000000000 +0000 +++ wireshark-1.10.6/macosx-setup.sh 2014-03-07 18:07:15.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # Setup development environment on Mac OS X (tested with 10.6.8 and Xcode 3.2.6) # -# $Id: macosx-setup.sh 51055 2013-07-31 06:28:06Z guy $ +# $Id$ # # Trying to follow "Building Wireshark on SnowLeopard" # given by Michael Tuexen at diff -Nru wireshark-1.10.5/Makefile.am wireshark-1.10.6/Makefile.am --- wireshark-1.10.5/Makefile.am 2013-08-07 16:49:23.000000000 +0000 +++ wireshark-1.10.6/Makefile.am 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Wireshark # -# $Id: Makefile.am 51190 2013-08-07 16:43:53Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -555,7 +555,7 @@ am__v_PERL_0 = @echo " PERL " $@; am__v_PERL_1 = -svnversion.h: FORCE +version.h: FORCE $(AM_V_PERL)$(PERL) $(srcdir)/make-version.pl $(srcdir) # @@ -580,7 +580,7 @@ vgcore.* # -# We have to remove svnversion.h with "make distclean", as, otherwise, +# We have to remove version.h with "make distclean", as, otherwise, # "make distcheck" fails. We still need to make the tarballs work # even if you do "make distclean" and try to rebuild; that's a work in # progress. @@ -591,7 +591,7 @@ # DISTCLEANFILES = \ ps.c \ - svnversion.h + version.h MAINTAINERCLEANFILES = \ $(GENERATED_FILES) \ diff -Nru wireshark-1.10.5/Makefile.am.inc wireshark-1.10.6/Makefile.am.inc --- wireshark-1.10.5/Makefile.am.inc 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/Makefile.am.inc 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/Makefile.common wireshark-1.10.6/Makefile.common --- wireshark-1.10.5/Makefile.common 2013-06-04 07:45:22.000000000 +0000 +++ wireshark-1.10.6/Makefile.common 2014-03-07 18:07:11.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 49758 2013-06-04 07:33:53Z etxrab $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -25,7 +25,7 @@ # "BUILT_SOURCES" are built before any "make all" or "make check" targets. BUILT_HEADER_FILES = \ - svnversion.h + version.h BUILT_C_FILES = \ ps.c @@ -63,7 +63,7 @@ # corresponding headers WIRESHARK_COMMON_INCLUDES = \ - svnversion.h \ + version.h \ capture-pcap-util.h \ capture-pcap-util-int.h \ cfile.h \ @@ -170,7 +170,7 @@ mergecap_SOURCES = \ mergecap.c \ merge.c \ - svnversion.h + version.h # editcap specifics editcap_SOURCES = \ @@ -182,7 +182,7 @@ # reordercap specifics reordercap_SOURCES = \ reordercap.c \ - svnversion.h + version.h # capinfos specifics capinfos_SOURCES = \ diff -Nru wireshark-1.10.5/Makefile.in wireshark-1.10.6/Makefile.in --- wireshark-1.10.5/Makefile.in 2013-12-19 19:13:55.000000000 +0000 +++ wireshark-1.10.6/Makefile.in 2014-03-07 18:07:40.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for Wireshark # -# $Id: Makefile.am 51190 2013-08-07 16:43:53Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -43,7 +43,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 49758 2013-06-04 07:33:53Z etxrab $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -964,7 +964,7 @@ # "BUILT_SOURCES" are built before any "make all" or "make check" targets. BUILT_HEADER_FILES = \ - svnversion.h + version.h BUILT_C_FILES = \ ps.c @@ -1005,7 +1005,7 @@ # corresponding headers WIRESHARK_COMMON_INCLUDES = \ - svnversion.h \ + version.h \ capture-pcap-util.h \ capture-pcap-util-int.h \ cfile.h \ @@ -1120,7 +1120,7 @@ mergecap_SOURCES = \ mergecap.c \ merge.c \ - svnversion.h + version.h # editcap specifics @@ -1134,7 +1134,7 @@ # reordercap specifics reordercap_SOURCES = \ reordercap.c \ - svnversion.h + version.h # capinfos specifics @@ -1420,7 +1420,7 @@ # -# We have to remove svnversion.h with "make distclean", as, otherwise, +# We have to remove version.h with "make distclean", as, otherwise, # "make distcheck" fails. We still need to make the tarballs work # even if you do "make distclean" and try to rebuild; that's a work in # progress. @@ -1431,7 +1431,7 @@ # DISTCLEANFILES = \ ps.c \ - svnversion.h + version.h MAINTAINERCLEANFILES = \ $(GENERATED_FILES) \ @@ -4162,7 +4162,7 @@ # FORCE is the portable version of .PHONY FORCE: -svnversion.h: FORCE +version.h: FORCE $(AM_V_PERL)$(PERL) $(srcdir)/make-version.pl $(srcdir) .sh: rm -f $@ $@.tmp diff -Nru wireshark-1.10.5/Makefile.nmake wireshark-1.10.6/Makefile.nmake --- wireshark-1.10.5/Makefile.nmake 2013-10-10 19:56:26.000000000 +0000 +++ wireshark-1.10.6/Makefile.nmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ ## Makefile for building wireshark.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 52507 2013-10-10 19:50:30Z cmaynard $ +# $Id$ # We "Deploy using XCopy," which is described at # http://msdn.microsoft.com/en-us/library/ms235291.aspx @@ -493,15 +493,18 @@ # # Build the version string # -!IF EXIST(".svn/wc.db") -SVNENTRIES = .svn/wc.db +# XXX - Makefile.am uses FORCE for this. +!IF EXIST(".git/index") +GITINDEX = .git/index +!ELSE IF EXIST(".svn/wc.db") +GITINDEX = .svn/wc.db !ELSE IF EXIST(".svn/entries") -SVNENTRIES = .svn/entries +GITINDEX = .svn/entries !ELSE -SVNENTRIES = +GITINDEX = !ENDIF -svnversion.h: $(SVNENTRIES) - rm -f svnversion.h +version.h: $(GITINDEX) + rm -f version.h $(PERL) make-version.pl @@ -513,10 +516,9 @@ # # The following targets will rebuild their respective objs -# if and when svnversion.h should change. +# if and when version.h should change. # -text2pcap.obj mergecap.obj capinfos.obj editcap.obj reordercap.obj version_info.obj: svnversion.h - +text2pcap.obj mergecap.obj capinfos.obj editcap.obj reordercap.obj version_info.obj: version.h clean-local: rm -f $(wireshark_OBJECTS) $(tshark_OBJECTS) $(dumpcap_OBJECTS) $(rawshark_OBJECTS) \ @@ -744,12 +746,12 @@ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. -ui:: help config.h svnversion.h doxygen +ui:: help config.h version.h doxygen cd ui $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libui.lib cd .. -gtk:: help config.h svnversion.h doxygen +gtk:: help config.h version.h doxygen cd ui/gtk $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui.lib cd ../.. @@ -759,7 +761,7 @@ $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui_win32.lib cd ../.. -cli:: help config.h svnversion.h doxygen +cli:: help config.h version.h doxygen cd ui/cli $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libcliui.lib cd ../.. @@ -853,7 +855,7 @@ # If $(CHECK_TAG) is non-null then checktag failed; Exit with an error message. (See beginning of this Makefile). # Otherwise do detailed library package files verification only if Makefile.nmake or config.make have been updated # (or dummy file doesn't exist because of 'make clean' or whatever). -# Note that the creation/modification time of a file after an svn update of that file +# Note that the creation/modification time of a file after a git pull of that file # is the time of the update (not the time of the file in the repository). # touch is only called if libverify succeeds. $(LIBS_CHECK): $(CHECK_TAG) config.nmake Makefile.nmake diff -Nru wireshark-1.10.5/Makefile.nmake.inc wireshark-1.10.6/Makefile.nmake.inc --- wireshark-1.10.5/Makefile.nmake.inc 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/Makefile.nmake.inc 2014-03-07 18:07:11.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.nmake.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.nmake.inc 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/make-version.pl wireshark-1.10.6/make-version.pl --- wireshark-1.10.5/make-version.pl 2013-12-17 20:10:16.000000000 +0000 +++ wireshark-1.10.6/make-version.pl 2014-03-07 18:07:15.000000000 +0000 @@ -2,7 +2,7 @@ # # Copyright 2004 Jörg Mayer (see AUTHORS file) # -# $Id: make-version.pl 54192 2013-12-17 20:03:59Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -38,7 +38,7 @@ # # If run with the "-r" or "--set-release" argument the AC_INIT macro in # configure.ac and the VERSION macro in config.nmake will have the -# pkg_format template appended to the version number. svnversion.h will +# pkg_format template appended to the version number. version.h will # _not_ be generated if either argument is present. # # Default configuration: @@ -47,7 +47,7 @@ # svn_client: 1 # format: SVN %Y%m%d%H%M%S # pkg_enable: 1 -# pkg_format: -SVN-%# +# pkg_format: -%# # XXX - We're pretty dumb about the "%#" substitution, and about having # spaces in the package format. @@ -55,19 +55,22 @@ use strict; use Time::Local; +use File::Basename; use POSIX qw(strftime); use Getopt::Long; use Pod::Usage; use IO::Handle; use English; -my $version_file = 'svnversion.h'; +my $version_file = 'version.h'; my $package_string = ""; my $vconf_file = 'version.conf'; my $tortoise_file = "tortoise_template"; my $last_change = 0; -my $revision = 0; -my $repo_path = "unknown"; +my $num_commits = 0; +my $commit_id = ''; +my $repo_branch = "unknown"; +my $git_description = undef; my $get_svn = 0; my $set_svn = 0; my $set_version = 0; @@ -75,18 +78,19 @@ my %version_pref = ( "version_major" => 1, "version_minor" => 10, - "version_micro" => 5, + "version_micro" => 6, "version_build" => 0, "enable" => 1, + "git_client" => 0, "svn_client" => 1, "tortoise_svn" => 0, - "format" => "SVN %Y%m%d%H%M%S", + "format" => "git %Y%m%d%H%M%S", "is_release" => 0, # Normal development builds "pkg_enable" => 1, - "pkg_format" => "-SVN-%#", + "pkg_format" => "-%#", # Development releases #"pkg_enable" => 0, @@ -98,10 +102,11 @@ # Ensure we run with correct locale $ENV{LANG} = "C"; $ENV{LC_ALL} = "C"; +$ENV{GIT_PAGER} = ""; # Run "svn info". Parse out the most recent modification time and the # revision number. -sub read_svn_info { +sub read_repo_info { my $line; my $version_format = $version_pref{"format"}; my $package_format = ""; @@ -113,11 +118,14 @@ my $do_hack = 1; my $info_source = "Unknown"; - if ($version_pref{"pkg_enable"}) { + if ($version_pref{"pkg_enable"} > 0) { $package_format = $version_pref{"pkg_format"}; } - if (-d "$srcdir/.svn" or -d "$srcdir/../.svn") { + if (-d "$srcdir/.git" && ! -d "$srcdir/.git/svn") { + $info_source = "Command line (git)"; + $version_pref{"git_client"} = 1; + } elsif (-d "$srcdir/.svn" or -d "$srcdir/../.svn") { $info_source = "Command line (svn info)"; $info_cmd = "svn info $srcdir"; } elsif (-d "$srcdir/.git/svn") { @@ -125,7 +133,72 @@ $info_cmd = "(cd $srcdir; git svn info)"; } - if ($version_pref{"svn_client"}) { + #Git can give us: + # + # A big ugly hash: git rev-parse HEAD + # 1ddc83849075addb0cac69a6fe3782f4325337b9 + # + # A small ugly hash: git rev-parse --short HEAD + # 1ddc838 + # + # The upstream branch path: git rev-parse --abbrev-ref --symbolic-full-name @{upstream} + # origin/master-1.8 + # + # A version description: git describe --tags --dirty + # wireshark-1.8.12-15-g1ddc838 + # + # Number of commits in this branch: git rev-list --count HEAD + # 48879 + # + # Number of commits since 1.8.0: git rev-list --count 5e212d72ce098a7fec4332cbe6c22fcda796a018..HEAD + # 320 + # + # Refs: git ls-remote code.wireshark.org:wireshark + # 2de75568bd635494cd75ee446d61eb1f111b806f first 1.10 commit? + # 863174359ce4d80881105bf0d7fe23945e3ef80d refs/tags/wireshark-1.10.0 + if ($version_pref{"git_client"}) { + eval { + use warnings "all"; + no warnings "all"; + + chomp($line = qx{git --git-dir=$srcdir/.git log -1 --pretty=format:%at}); + if ($? == 0 && length($line) > 1) { + $last_change = $line; + } + + # Commits in current (master-1.10) branch. We may want to use + # a different number. + chomp($line = qx{git --git-dir=$srcdir/.git describe --long --match v1.10.0-rc1}); + if ($? == 0 && length($line) > 1) { + my @parts = split(/-/, $line); + $num_commits = $parts[-2]; + $commit_id = $parts[-1]; + } + + chomp($line = qx{git ls-remote --get-url origin}); + if (defined($line)) { + $repo_url = $line; + } + + # This will break in some cases. Hopefully not during + # official package builds. + chomp($line = qx{git --git-dir=$srcdir/.git rev-parse --abbrev-ref --symbolic-full-name \@\{upstream\}}); + if ($? == 0 && length($line) > 1) { + $repo_branch = basename($line); + } + + chomp($line = qx{git --git-dir=$srcdir/.git describe --match "v*"}); + if (defined($line)) { + $git_description = $line; + } + + 1; + }; + + if ($last_change && $num_commits && $repo_url && $repo_branch) { + $do_hack = 0; + } + } elsif ($version_pref{"svn_client"}) { eval { use warnings "all"; no warnings "all"; @@ -135,7 +208,7 @@ $last_change = timegm($6, $5, $4, $3, $2 - 1, $1); } if ($line =~ /Last Changed Rev: (\d+)/) { - $revision = $1; + $num_commits = $1; } if ($line =~ /URL: (\S+)/) { $repo_url = $1; @@ -147,14 +220,14 @@ 1; }; - if ($last_change && $revision && $repo_url && $repo_root) { + if ($last_change && $num_commits && $repo_url && $repo_root) { $do_hack = 0; } } elsif ($version_pref{"tortoise_svn"}) { # Dynamically generic template file needed by TortoiseSVN open(TORTOISE, ">$tortoise_file"); - print TORTOISE "#define SVNVERSION \"\$WCREV\$\"\r\n"; - print TORTOISE "#define SVNPATH \"\$WCURL\$\"\r\n"; + print TORTOISE "#define GITVERSION \"\$WCREV\$\"\r\n"; + print TORTOISE "#define GITBRANCH \"\$WCURL\$\"\r\n"; close(TORTOISE); $info_source = "Command line (SubWCRev)"; @@ -168,21 +241,21 @@ unlink($tortoise_file); } - if ($revision == 0) { + if ($num_commits == 0) { # Fall back to config.nmake $info_source = "Prodding config.nmake"; my $filepath = "$srcdir/config.nmake"; open(CFGNMAKE, "< $filepath") || die "Can't read $filepath!"; while ($line = ) { - if ($line =~ /^SVN_REVISION=(\d+)/) { - $revision = $1; + if ($line =~ /^GIT_REVISION=(\d+)/) { + $num_commits = $1; $do_hack = 0; last; } } close (CFGNMAKE); } - if ($revision == 0 and -d "$srcdir/.git") { + if ($num_commits == 0 and -d "$srcdir/.git") { # Try git... eval { @@ -195,7 +268,7 @@ $line = qx{$info_cmd}; if (defined($line)) { if ($line =~ /svn path=.*; revision=(\d+)/) { - $revision = $1; + $num_commits = $1; } } $info_cmd = "(cd $srcdir; git log --format='%ad' -n 1 --date=iso)"; @@ -209,13 +282,13 @@ $line = qx{$info_cmd}; if (defined($line)) { if ($line =~ /\* (\S+)/) { - $repo_path = $1; + $repo_branch = $1; } } 1; }; } - if ($revision == 0 and -d "$srcdir/.bzr") { + if ($num_commits == 0 and -d "$srcdir/.bzr") { # Try bzr... eval { @@ -228,8 +301,8 @@ $last_change = timegm($6, $5, $4, $3, $2 - 1, $1); } if ($line =~ /svn revno: (\d+) \(on (\S+)\)/) { - $revision = $1; - $repo_path = $2; + $num_commits = $1; + $repo_branch = $2; } } 1; @@ -267,11 +340,11 @@ if ($line =~ /committed-date="(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)/) { $last_change = timegm($6, $5, $4, $3, $2 - 1, $1); } - if ($line =~ /revision="(\d+)"/) { $revision = $1; } + if ($line =~ /revision="(\d+)"/) { $num_commits = $1; } } if ($line =~ /\/>/) { if (($svn_name eq "" || $svn_name eq "svn:this_dir") && - $last_change && $revision) { + $last_change && $num_commits) { $in_entries = 0; last; } @@ -285,19 +358,20 @@ # If we picked up the revision and modification time, # generate our strings. - if ($revision && $last_change) { - $version_format =~ s/%#/$revision/; - $package_format =~ s/%#/$revision/; + if ($num_commits && $last_change) { + $version_format =~ s/%#/$num_commits/; + $package_format =~ s/%#/$num_commits-$commit_id/; $package_string = strftime($package_format, gmtime($last_change)); } if ($repo_url && $repo_root && index($repo_url, $repo_root) == 0) { - $repo_path = substr($repo_url, length($repo_root)); + $repo_branch = substr($repo_url, length($repo_root)); } if ($get_svn) { print <<"Fin"; -SVN revision : $revision +Commit distance : $num_commits +Commit ID : $commit_id Revision source : $info_source Release stamp : $package_string Fin @@ -347,8 +421,8 @@ open(CFGNMAKE, "< $filepath") || die "Can't read $filepath!"; while ($line = ) { - if ($line =~ /^SVN_REVISION=.*([\r\n]+)$/) { - $line = sprintf("SVN_REVISION=%d$1", $revision); + if ($line =~ /^GIT_REVISION=.*([\r\n]+)$/) { + $line = sprintf("GIT_REVISION=%d$1", $num_commits); } elsif ($set_version && $line =~ /^VERSION_MAJOR=.*([\r\n]+)$/) { $line = sprintf("VERSION_MAJOR=%d$1", $version_pref{"version_major"}); } elsif ($set_version && $line =~ /^VERSION_MINOR=.*([\r\n]+)$/) { @@ -505,22 +579,26 @@ # Print the SVN version to $version_file. # Don't change the file if it is not needed. -sub print_svn_revision +sub print_GIT_REVISION { - my $svn_revision; + my $GIT_REVISION; my $needs_update = 1; - if ($last_change && $revision) { - $svn_revision = "#define SVNVERSION \"SVN Rev " . - $revision . "\"\n" . - "#define SVNPATH \"" . $repo_path . "\"\n"; + if ($git_description) { + $GIT_REVISION = "#define GITVERSION \"" . + $git_description . "\"\n" . + "#define GITBRANCH \"" . $repo_branch . "\"\n"; + } elsif ($last_change && $num_commits) { + $GIT_REVISION = "#define GITVERSION \"Git Rev " . + $num_commits . "\"\n" . + "#define GITBRANCH \"" . $repo_branch . "\"\n"; } else { - $svn_revision = "#define SVNVERSION \"SVN Rev Unknown\"\n" . - "#define SVNPATH \"unknown\"\n"; + $GIT_REVISION = "#define GITVERSION \"Git Rev Unknown\"\n" . + "#define GITBRANCH \"unknown\"\n"; } if (open(OLDREV, "<$version_file")) { - my $old_svn_revision = . ; - if ($old_svn_revision eq $svn_revision) { + my $old_GIT_REVISION = . ; + if ($old_GIT_REVISION eq $GIT_REVISION) { $needs_update = 0; } close OLDREV; @@ -529,9 +607,9 @@ if (! $set_svn) { return; } if ($needs_update) { - # print "Updating $version_file so it contains:\n$svn_revision"; + # print "Updating $version_file so it contains:\n$GIT_REVISION"; open(VER, ">$version_file") || die ("Cannot write to $version_file ($!)\n"); - print VER "$svn_revision"; + print VER "$GIT_REVISION"; close VER; print "$version_file has been updated.\n"; } else { @@ -571,7 +649,7 @@ } while () { - chomp; + s/^\s+|\s+$//g; # chomp() may not handle CR next if (/^#/); next unless (/^(\w+)(:|=)\s*(\S.*)/); $version_pref{$1} = $3; @@ -586,9 +664,9 @@ &get_config(); -&read_svn_info(); +&read_repo_info(); -&print_svn_revision; +&print_GIT_REVISION; if ($set_version || $set_release) { if ($set_version) { @@ -604,7 +682,7 @@ print "Generating release information\n"; } else { print "Resetting release information\n"; - $revision = 0; + $num_commits = 0; $package_string = ""; } @@ -625,7 +703,7 @@ --help, -h This help message --get-svn, -g Print the SVN revision and source. - --set-svn, -s Set the information in svnversion.h + --set-svn, -s Set the information in version.h --set-version, -v Set the major, minor, and micro versions in configure.ac, config.nmake, debian/changelog, and docbook/asciidoc.conf. diff -Nru wireshark-1.10.5/manuf wireshark-1.10.6/manuf --- wireshark-1.10.5/manuf 2013-12-15 15:25:13.000000000 +0000 +++ wireshark-1.10.6/manuf 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ # # /etc/manuf - Ethernet vendor codes, and well-known MAC addresses # -# $Id: manuf 54118 2013-12-15 15:19:21Z gerald $ +# $Id$ # # Laurent Deniel # @@ -75,7 +75,7 @@ 00:00:14 Netronix 00:00:15 Datapoin # DATAPOINT CORPORATION 00:00:16 DuPontPi # DU PONT PIXEL SYSTEMS . -00:00:17 Tekelec +00:00:17 Oracle 00:00:18 WebsterC # WEBSTER COMPUTER CORPORATION 00:00:19 AppliedD # APPLIED DYNAMICS INTERNATIONAL 00:00:1A AMD @@ -1520,7 +1520,7 @@ 00:05:B9 Airvana # Airvana, Inc. 00:05:BA AreaNetw # Area Netwoeks, Inc. 00:05:BB Myspace # Myspace AB -00:05:BC Resorsys # Resorsys Ltd. +00:05:BC Resource # Resource Data Management Ltd 00:05:BD RoaxBv # ROAX BV 00:05:BE Kongsber # Kongsberg Seatex AS 00:05:BF JustezyT # JustEzy Technology, Inc. @@ -1836,7 +1836,7 @@ 00:06:F5 Alps # ALPS Co,. Ltd. 00:06:F6 Cisco # CISCO SYSTEMS, INC. 00:06:F7 Alps # ALPS Co,. Ltd. -00:06:F8 CpuTechn # CPU Technology, Inc. +00:06:F8 Boeing # The Boeing Company 00:06:F9 MitsuiZo # Mitsui Zosen Systems Research Inc. 00:06:FA IpSquare # IP SQUARE Co, Ltd. 00:06:FB HitachiP # Hitachi Printing Solutions, Ltd. @@ -1956,7 +1956,7 @@ 00:07:6D Flexligh # Flexlight Networks 00:07:6E Sinetica # Sinetica Corporation Limited 00:07:6F Synoptic # Synoptics Limited -00:07:70 Locusnet # Locusnetworks Corporation +00:07:70 Ubiquoss # Ubiquoss Inc 00:07:71 Embedded # Embedded System Corporation 00:07:72 AlcatelS # Alcatel Shanghai Bell Co., Ltd. 00:07:73 AscomPow # Ascom Powerline Communications Ltd. @@ -2122,7 +2122,7 @@ 00:08:13 Diskbank # Diskbank, Inc. 00:08:14 TilTechn # TIL Technologies 00:08:15 Cats # CATS Co., Ltd. -00:08:16 Bluetags # Bluetags A/S +00:08:16 BluelonA # Bluelon ApS 00:08:17 Emergeco # EmergeCore Networks LLC 00:08:18 Pixelwor # Pixelworks, Inc. 00:08:19 Banksys @@ -2705,7 +2705,7 @@ 00:0A:76 BeidaJad # Beida Jade Bird Huaguang Technology Co.,Ltd 00:0A:77 Bluewire # Bluewire Technologies LLC 00:0A:78 Olitec -00:0A:79 AlliedTe # Allied Telesis K.K. corega division +00:0A:79 CoregaKK # corega K.K 00:0A:7A Kyoritsu # Kyoritsu Electric Co., Ltd. 00:0A:7B Corneliu # Cornelius Consult 00:0A:7C Tecton # Tecton Ltd @@ -3059,7 +3059,7 @@ 00:0B:D8 Industri # Industrial Scientific Corp. 00:0B:D9 GeneralH # General Hydrogen 00:0B:DA Eyecross # EyeCross Co.,Inc. -00:0B:DB DellEsgP # Dell ESG PCBA Test +00:0B:DB Dell # Dell Inc 00:0B:DC Akcp 00:0B:DD TohokuRi # TOHOKU RICOH Co., LTD. 00:0B:DE Teldix # TELDIX GmbH @@ -3438,7 +3438,7 @@ 00:0D:53 Beijing5 # Beijing 5w Communication Corp. 00:0D:54 3com # 3Com Ltd 00:0D:55 SanycomT # SANYCOM Technology Co.,Ltd -00:0D:56 DellEsgP # Dell ESG PCBA Test +00:0D:56 Dell # Dell Inc 00:0D:57 FujitsuI # Fujitsu I-Network Systems Limited. 00:0D:58 Private 00:0D:59 Amity # Amity Systems, Inc. @@ -3895,7 +3895,7 @@ 00:0F:1C Digitall # DigitAll World Co., Ltd 00:0F:1D CosmoTec # Cosmo Techs Co., Ltd. 00:0F:1E ChengduK # Chengdu KT Electric Co.of High & New Technology -00:0F:1F DellEsgP # Dell ESG PCBA Test +00:0F:1F Dell # Dell Inc 00:0F:20 Hewlett- # Hewlett-Packard Company 00:0F:21 Scientif # Scientific Atlanta, Inc 00:0F:22 Helius # Helius, Inc. @@ -4334,7 +4334,7 @@ 00:10:D3 GripsEle # GRIPS ELECTRONIC GMBH 00:10:D4 StorageC # STORAGE COMPUTER CORPORATION 00:10:D5 ImasdeCa # IMASDE CANARIAS, S.A. -00:10:D6 Itt-A/Cd # ITT - A/CD +00:10:D6 Exelis 00:10:D7 ArgosyRe # ARGOSY RESEARCH INC. 00:10:D8 Calista 00:10:D9 IbmJapan # IBM JAPAN, FUJISAWA MT+D @@ -4443,7 +4443,7 @@ 00:11:40 Nanometr # Nanometrics Inc. 00:11:41 Goodman # GoodMan Corporation 00:11:42 E-Smartc # e-SMARTCOM INC. -00:11:43 DellEsgP # Dell ESG PCBA Test +00:11:43 Dell # Dell Inc 00:11:44 Assuranc # Assurance Technology Corp 00:11:45 Valuepoi # ValuePoint Networks 00:11:46 Telecard # Telecard-Pribor Ltd @@ -4695,7 +4695,7 @@ 00:12:3C SecondRu # Second Rule LLC 00:12:3D Ges 00:12:3E EruneTec # ERUNE technology Co., Ltd. -00:12:3F DellEsgP # Dell ESG PCBA Test +00:12:3F Dell # Dell Inc 00:12:40 AmoiElec # AMOI ELECTRONICS CO.,LTD 00:12:41 A2iMarke # a2i marketing center 00:12:42 Millenni # Millennial Net @@ -5002,7 +5002,7 @@ 00:13:6F Packetmo # PacketMotion, Inc. 00:13:70 NokiaDan # Nokia Danmark A/S 00:13:71 ArrisGro # ARRIS Group, Inc. -00:13:72 DellEsgP # Dell ESG PCBA Test +00:13:72 Dell # Dell Inc 00:13:73 BlwaveEl # BLwave Electronics Co., Ltd 00:13:74 AtherosC # Atheros Communications, Inc. 00:13:75 American # American Security Products Co. @@ -5178,7 +5178,7 @@ 00:14:1F Sunkwang # SunKwang Electronics Co., Ltd 00:14:20 G-LinksN # G-Links networking company 00:14:21 TotalWir # Total Wireless Technologies Pte. Ltd. -00:14:22 DellEsgP # Dell ESG PCBA Test +00:14:22 Dell # Dell Inc 00:14:23 J-SNeuro # J-S Co. NEUROCOM 00:14:24 MerryEle # Merry Electrics CO., LTD. 00:14:25 Galactic # Galactic Computing Corp. @@ -5597,7 +5597,7 @@ 00:15:C2 3mGerman # 3M Germany 00:15:C3 RufTelem # Ruf Telematik AG 00:15:C4 Flovel # FLOVEL CO., LTD. -00:15:C5 DellEsgP # Dell ESG PCBA Test +00:15:C5 Dell # Dell Inc 00:15:C6 Cisco # CISCO SYSTEMS, INC. 00:15:C7 Cisco # CISCO SYSTEMS, INC. 00:15:C8 Flexipan # FlexiPanel Ltd @@ -5827,7 +5827,7 @@ 00:16:A8 Cwt # CWT CO., LTD. 00:16:A9 2ei 00:16:AA KeiCommu # Kei Communication Technology Inc. -00:16:AB Pbi-Dans # PBI-Dansensor A/S +00:16:AB Dansenso # Dansensor A/S 00:16:AC TohoTech # Toho Technology Corp. 00:16:AD Bt-Links # BT-Links Company Limited 00:16:AE Inventel @@ -6307,7 +6307,7 @@ 00:18:88 GotiveAS # GOTIVE a.s. 00:18:89 WinnetSo # WinNet Solutions Limited 00:18:8A Infinova # Infinova LLC -00:18:8B DellEsgP # Dell ESG PCBA Test +00:18:8B Dell # Dell Inc 00:18:8C MobileAc # Mobile Action Technology Inc. 00:18:8D NokiaDan # Nokia Danmark A/S 00:18:8E Ekahau # Ekahau, Inc. @@ -7462,7 +7462,7 @@ 00:1C:4A Avm # AVM GmbH 00:1C:4B Gener8 # Gener8, Inc. 00:1C:4C Petrotes # Petrotest Instruments -00:1C:4D ZeemoteT # Zeemote Technology Inc. (part of Aplix). +00:1C:4D AplixIpH # Aplix IP Holdings Corporation 00:1C:4E TasaInte # TASA International Limited 00:1C:4F Macab # MACAB AB 00:1C:50 TclTechn # TCL Technoly Electronics(Huizhou)Co.,Ltd @@ -7502,7 +7502,7 @@ 00:1C:72 MayerCie # Mayer & Cie GmbH & Co KG 00:1C:73 AristaNe # Arista Networks, Inc. 00:1C:74 SyswanTe # Syswan Technologies Inc. -00:1C:75 Rf # RF Systems GmbH +00:1C:75 Segnet # Segnet Ltd. 00:1C:76 Wandswor # The Wandsworth Group Ltd 00:1C:77 Prodys 00:1C:78 WyplaySa # WYPLAY SAS @@ -7663,7 +7663,7 @@ 00:1D:13 Nextgtv 00:1D:14 Speradto # SPERADTONE INFORMATION TECHNOLOGY LIMITED 00:1D:15 Shenzhen # Shenzhen Dolphin Electronic Co., Ltd -00:1D:16 Efixo +00:1D:16 Sfr 00:1D:17 DigitalS # Digital Sky Corporation 00:1D:18 PowerInn # Power Innovation GmbH 00:1D:19 Arcadyan # Arcadyan Technology Corporation @@ -7705,7 +7705,7 @@ 00:1D:3D Avidyne # Avidyne Corporation 00:1D:3E SakaTech # SAKA TECHNO SCIENCE CO.,LTD 00:1D:3F MitronPt # Mitron Pty Ltd -00:1D:40 LivingIn # Living Independently Group, Inc. +00:1D:40 Intel–Ge # Intel – GE Care Innovations LLC 00:1D:41 HardyIns # Hardy Instruments 00:1D:42 Nortel 00:1D:43 Shenzhen # Shenzhen G-link Digital Technology Co., Ltd. @@ -9160,7 +9160,7 @@ 00:22:EC IdealbtT # IDEALBT TECHNOLOGY CORPORATION 00:22:ED TsiPower # TSI Power Corporation 00:22:EE AlgoComm # Algo Communication Products Ltd -00:22:EF IbisTekL # Ibis Tek, LLC +00:22:EF IwdlTech # iWDL Technologies 00:22:F0 3GreensA # 3 Greens Aviation Limited 00:22:F1 Private 00:22:F2 Sunpower # SunPower Corp @@ -9176,7 +9176,7 @@ 00:22:FC NokiaDan # Nokia Danmark A/S 00:22:FD NokiaDan # Nokia Danmark A/S 00:22:FE Micropro # Microprocessor Designs Inc -00:22:FF NivisLlc # NIVIS LLC +00:22:FF IwdlTech # iWDL Technologies 00:23:00 CayeeCom # Cayee Computer Ltd. 00:23:01 WitronTe # Witron Technology Limited 00:23:02 CobaltDi # Cobalt Digital, Inc. @@ -10072,7 +10072,7 @@ 00:26:84 KisanSys # KISAN SYSTEM 00:26:85 DigitalI # Digital Innovation 00:26:86 Quantenn # Quantenna Communcations, Inc. -00:26:87 AlliedTe # ALLIED TELESIS, K.K corega division. +00:26:87 CoregaKK # Corega K.K 00:26:88 JuniperN # Juniper Networks 00:26:89 GeneralD # General Dynamics Robotic Systems 00:26:8A TerrierS # Terrier SC Ltd @@ -10606,7 +10606,7 @@ 00:40:63 ViaTechn # VIA TECHNOLOGIES, INC. 00:40:64 KlaInstr # KLA INSTRUMENTS CORPORATION 00:40:65 GteSpace # GTE SPACENET -00:40:66 HitachiM # Hitachi Metals, Ltd +00:40:66 HitachiM # Hitachi Metals, Ltd. 00:40:67 Omnibyte # OMNIBYTE CORPORATION 00:40:68 Extended # EXTENDED SYSTEMS 00:40:69 Lemcom # LEMCOM SYSTEMS, INC. @@ -15173,7 +15173,7 @@ 00:60:5D Scanival # SCANIVALVE CORP. 00:60:5E LibertyT # LIBERTY TECHNOLOGY NETWORKING 00:60:5F NipponUn # NIPPON UNISOFT CORPORATION -00:60:60 DawningT # DAWNING TECHNOLOGIES, INC. +00:60:60 DataInno # Data Innovations North America 00:60:61 WhistleC # WHISTLE COMMUNICATIONS CORP. 00:60:62 Telesync # TELESYNC, INC. 00:60:63 PsionDac # PSION DACOM PLC. @@ -15343,6 +15343,7 @@ 00:70:B3 DataReca # DATA RECALL LTD. 00:73:8D TinnoMob # Tinno Mobile Technology Corp 00:73:E0 SamsungE # Samsung Electronics Co.,Ltd +00:75:32 InidBv # INID BV 00:75:E1 AmptLlc # Ampt, LLC 00:78:9E Sagemcom 00:7D:FA Volkswag # Volkswagen Group of America @@ -15870,6 +15871,7 @@ 00:90:FF TellusTe # TELLUS TECHNOLOGY INC. 00:91:D6 CrystalG # Crystal Group, Inc. 00:91:FA SynapseP # Synapse Product Development +00:92:FA Shenzhen # SHENZHEN WISKY TECHNOLOGY CO.,LTD 00:93:63 Uni-Link # Uni-Link Technology Co., Ltd. 00:95:69 LsdScien # LSD Science and Technology Co.,Ltd. 00:97:FF HeimannS # Heimann Sensor GmbH @@ -16010,7 +16012,7 @@ 00:A0:84 Dataplex # Dataplex Pty Ltd 00:A0:85 Private 00:A0:86 AmberWav # AMBER WAVE SYSTEMS, INC. -00:A0:87 ZarlinkS # Zarlink Semiconductor Ltd. +00:A0:87 Microsem # Microsemi Corporation 00:A0:88 Essentia # ESSENTIAL COMMUNICATIONS 00:A0:89 XpointTe # XPOINT TECHNOLOGIES, INC. 00:A0:8A Brooktro # BROOKTROUT TECHNOLOGY, INC. @@ -16139,6 +16141,7 @@ 00:AA:02 Intel # INTEL CORPORATION 00:AA:3C Olivetti # OLIVETTI TELECOM SPA (OLTECO) 00:AA:70 LgElectr # LG Electronics +00:AC:E0 ArrisGro # ARRIS Group, Inc. 00:B0:09 GrassVal # Grass Valley Group 00:B0:17 Infogear # InfoGear Technology Corp. 00:B0:19 UtcCcs # UTC CCS @@ -17046,6 +17049,7 @@ 04:3D:98 Chongqin # ChongQing QingJia Electronics CO.,LTD 04:44:A1 TeleconG # TELECON GALICIA,S.A. 04:46:65 MurataMa # Murata Manufacturing Co., Ltd. +04:48:9A Apple 04:4A:50 RamaxelT # Ramaxel Technology (Shenzhen) limited company 04:4B:FF Guangzho # GuangZhou Hedy Digital Technology Co., Ltd 04:4C:EF FujianSa # Fujian Sanao Technology Co.,Ltd @@ -17054,6 +17058,7 @@ 04:4F:AA RuckusWi # Ruckus Wireless 04:54:53 Apple 04:55:CA BriviewX # BriView (Xiamen) Corp. +04:57:2F SertelEl # Sertel Electronics UK Ltd 04:58:6F SichuanW # Sichuan Whayer information industry Co.,LTD 04:5A:95 Nokia # Nokia Corporation 04:5C:06 ZmodoTec # Zmodo Technology Corporation @@ -17110,6 +17115,7 @@ 04:E5:36 Apple 04:E5:48 CohdaWir # Cohda Wireless Pty Ltd 04:E6:62 Acroname # Acroname Inc. +04:E6:76 AmpakTec # AMPAK Technology Inc. 04:E9:E5 PjrcComL # PJRC.COM, LLC 04:EE:91 X-Fabric # x-fabric GmbH 04:F0:21 CompexPt # Compex Systems Pte Ltd @@ -17265,6 +17271,7 @@ 08:00:8F Chipcom # CHIPCOM CORPORATION 08:00:90 Retix 08:03:71 KrgCorpo # KRG CORPORATE +08:05:CD Dongguan # DongGuang EnMai Electronic Product Co.Ltd. 08:08:C2 SamsungE # Samsung Electronics 08:08:EA Amsc 08:0C:0B SysmikDr # SysMik GmbH Dresden @@ -17306,12 +17313,14 @@ 08:57:00 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 08:5A:E0 Recovisi # Recovision Technology Co., Ltd. 08:5B:0E Fortinet # Fortinet, Inc. +08:5D:DD Mercury # Mercury Corporation 08:60:6E AsustekC # ASUSTek COMPUTER INC. 08:63:61 HuaweiTe # Huawei Technologies Co., Ltd 08:68:D0 JapanSys # Japan System Design 08:68:EA EitoElec # EITO ELECTRONICS CO., LTD. 08:6D:F2 Shenzhen # Shenzhen MIMOWAVE Technology Co.,Ltd 08:70:45 Apple +08:74:F6 Winterha # Winterhalter Gastronom GmbH 08:75:72 ObeluxOy # Obelux Oy 08:76:18 VieTechn # ViE Technologies Sdn. Bhd. 08:76:95 AutoIndu # Auto Industrial Co., Ltd. @@ -17335,6 +17344,7 @@ 08:A9:5A Azurewav # Azurewave 08:AC:A5 BenuVide # Benu Video, Inc. 08:AF:78 TotusSol # Totus Solutions, Inc. +08:B2:A3 CynnyIta # Cynny Italia S.r.L. 08:B4:CF AbicomIn # Abicom International 08:B7:38 Lite-OnT # Lite-On Technogy Corp. 08:B7:EC Wireless # Wireless Seismic @@ -17348,6 +17358,8 @@ 08:D4:0C IntelCor # Intel Corporate 08:D4:2B SamsungE # Samsung Electronics 08:D5:C0 SeersTec # Seers Technology Co., Ltd +08:D8:33 Shenzhen # Shenzhen RF Technology Co,.Ltd +08:DF:1F Bose # Bose Corporation 08:E5:DA NanjingF # NANJING FUJITSU COMPUTER PRODUCTS CO.,LTD. 08:E6:72 JebseeEl # JEBSEE ELECTRONICS CO.,LTD. 08:EA:44 Aerohive # Aerohive Networks, Inc. @@ -17373,6 +17385,7 @@ 0C:17:F1 Telecsys 0C:19:1F InformEl # Inform Electronik 0C:1D:C2 SeahNetw # SeAH Networks +0C:20:26 NoaxTech # noax Technologies AG 0C:27:24 Cisco 0C:27:55 Valuable # Valuable Techologies Limited 0C:2A:69 Electric # electric imp, incorporated @@ -17396,6 +17409,7 @@ 0C:5A:19 AxtionSd # Axtion Sdn Bhd 0C:5C:D8 DoliElek # DOLI Elektronik GmbH 0C:60:76 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. +0C:63:FC NanjingS # Nanjing Signway Technology Co., Ltd 0C:68:03 Cisco 0C:6E:4F Primevol # PrimeVOLT Co., Ltd. 0C:71:5D SamsungE # Samsung Electronics Co.,Ltd @@ -17485,6 +17499,7 @@ 10:0D:7F Netgear # NETGEAR INC., 10:0E:2B NecCasio # NEC CASIO Mobile Communications 10:0E:7E JuniperN # Juniper networks +10:0F:18 FuGangEl # Fu Gang Electronic(KunShan)CO.,LTD 10:10:B6 Mccain # McCain Inc 10:12:12 VivoInte # Vivo International Corporation Pty Ltd 10:12:48 Itg # ITG, Inc. @@ -17496,6 +17511,7 @@ 10:1D:C0 SamsungE # Samsung Electronics Co.,Ltd 10:1F:74 Hewlett- # Hewlett-Packard Company 10:22:79 Zerodesk # ZeroDesktop, Inc. +10:27:BE Tvip 10:28:31 Morion # Morion Inc. 10:2D:96 Looxcie # Looxcie Inc. 10:2E:AF TexasIns # Texas Instruments @@ -17534,6 +17550,7 @@ 10:7B:EF ZyxelCom # ZyXEL Communications Corp 10:83:D2 Microsev # Microseven Systems, LLC 10:88:0F DarumaTe # Daruma Telecomunicações e Informática S.A. +10:88:CE Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. 10:8C:CF Cisco # CISCO SYSTEMS, INC. 10:93:E9 Apple 10:9A:B9 TosiboxO # Tosibox Oy @@ -17591,6 +17608,8 @@ 14:1B:F0 Intellim # Intellimedia Systems Ltd 14:23:D7 Eutronix # EUTRONIX CO., LTD. 14:2B:D2 Armtel # Armtel Ltd. +14:2B:D6 Guangdon # Guangdong Appscomm Co.,Ltd +14:2D:27 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 14:2D:8B IncipioT # Incipio Technologies, Inc 14:2D:F5 Amphitec # Amphitech 14:30:7A Avermetr # Avermetrics @@ -17599,6 +17618,7 @@ 14:36:05 Nokia # Nokia Corporation 14:37:3B Procom # PROCOM Systems 14:3A:EA Dynapowe # Dynapower Company LLC +14:3D:F2 BeijingS # Beijing Shidai Hongyuan Network Communication Co.,Ltd 14:3E:60 Alcatel- # Alcatel-Lucent 14:41:E2 MonacoEn # Monaco Enterprises, Inc. 14:43:19 Creative # Creative&Link Technology Limited @@ -17607,6 +17627,7 @@ 14:49:E0 SamsungE # Samsung Electro Mechanics co.,LTD. 14:4C:1A MaxCommu # Max Communication GmbH 14:54:12 Entis # Entis Co., Ltd. +14:56:45 Savitech # Savitech Corp. 14:5A:05 Apple 14:5B:D1 ArrisGro # ARRIS Group, Inc. 14:60:80 Zte # zte corporation @@ -17632,6 +17653,7 @@ 14:AB:F0 ArrisGro # ARRIS Group, Inc. 14:B1:26 Industri # Industrial Software Co 14:B1:C8 Infiniwi # InfiniWing, Inc. +14:B4:84 SamsungE # Samsung Electronics Co.,Ltd 14:B7:3D ArcheanT # ARCHEAN Technologies 14:B9:68 HuaweiTe # Huawei Technologies Co., Ltd 14:C0:89 DuneHd # DUNE HD LTD @@ -17648,7 +17670,7 @@ 14:E4:EC MlogicLl # mLogic LLC 14:E6:E4 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. 14:EB:33 Bsmedias # BSMediasoft Co., Ltd. -14:ED:A5 WächterS # Wächter GmbH Sicherheitssysteme +14:ED:A5 Wächter # Wächter GmbH Sicherheitssysteme 14:EE:9D AirnavLl # AirNav Systems LLC 14:F0:C5 Xtremio # Xtremio Ltd. 14:F2:8E Shenyang # ShenYang ZhongKe-Allwin Technology Co.LTD @@ -17676,6 +17698,7 @@ 18:20:12 AztechAs # Aztech Associates Inc. 18:20:32 Apple 18:20:A6 Sage # Sage Co., Ltd. +18:22:7E SamsungE # Samsung Electronics Co.,Ltd 18:26:66 SamsungE # Samsung Electronics Co.,Ltd 18:28:61 AirtiesW # AirTies Wireless Networks 18:2A:7B Nintendo # Nintendo Co., Ltd. @@ -17714,11 +17737,13 @@ 18:7E:D5 Shenzhen # shenzhen kaism technology Co. Ltd 18:80:CE Barberry # Barberry Solutions Ltd 18:80:F5 Alcatel- # Alcatel-Lucent Shanghai Bell Co., Ltd +18:83:31 SamsungE # Samsung Electronics Co.,Ltd 18:84:10 Coretrus # CoreTrust Inc. 18:86:3A DigitalA # DIGITAL ART SYSTEM 18:86:AC NokiaDan # Nokia Danmark A/S 18:87:96 Htc # HTC Corporation 18:88:57 BeijingJ # Beijing Jinhong Xi-Dian Information Technology Corp. +18:89:DF Cerebrex # CerebrEX Inc. 18:8E:D5 TpVision # TP Vision Belgium N.V. - innovation site Brugge 18:92:2C VirtualI # Virtual Instruments 18:97:FF Techfait # TechFaith Wireless Technology Limited @@ -17726,7 +17751,7 @@ 18:9C:5D Cisco 18:9E:FC Apple 18:A9:05 Hewlett- # Hewlett-Packard Company -18:A9:9B DellPcba # Dell Inc PCBA Test +18:A9:9B Dell # Dell Inc 18:AA:45 FonTechn # Fon Technology 18:AB:F5 UltraEle # Ultra Electronics - Electrics 18:AD:4D Polostar # Polostar Technology Corporation @@ -17742,6 +17767,7 @@ 18:C0:86 Broadcom # Broadcom Corporation 18:C4:51 TucsonEm # Tucson Embedded Systems 18:C8:E7 Shenzhen # Shenzhen Hualistone Technology Co.,Ltd +18:CC:23 PhilioTe # Philio Technology Corporation 18:D0:71 DasanSmc # DASAN SMC, Inc. 18:D6:6A Inmarsat 18:D6:CF KurthEle # Kurth Electronic GmbH @@ -17749,6 +17775,7 @@ 18:DC:56 YulongCo # Yulong Computer Telecommunication Scientific(shenzhen)Co.,Lt 18:E2:88 SttCondi # STT Condigi 18:E2:C2 SamsungE # Samsung Electronics +18:E7:28 Cisco 18:E7:F4 Apple 18:E8:0F VikingEl # Viking Electronics Inc. 18:E8:DD Modulete # MODULETEK @@ -17757,8 +17784,10 @@ 18:F6:50 Multimed # Multimedia Pacific Limited 18:F8:7A I3Intern # i3 International Inc. 18:FA:6F IscAppli # ISC applied systems corp +18:FB:7B Dell # Dell Inc 18:FC:9F ChangheE # Changhe Electronics Co., Ltd. 18:FE:34 Espressi # Espressif Inc. +18:FF:2E Shenzhen # Shenzhen Rui Ying Da Technology Co., Ltd 1C:06:56 Idy # IDY Corporation 1C:08:C1 LgInnote # Lg Innotek 1C:0B:52 EpicomSA # EPICOM S.A @@ -17769,7 +17798,9 @@ 1C:17:D3 Cisco # CISCO SYSTEMS, INC. 1C:18:4A Shenzhen # ShenZhen RicherLink Technologies Co.,LTD 1C:19:DE Eyevis # eyevis GmbH +1C:1A:C0 Apple 1C:1B:68 ArrisGro # ARRIS Group, Inc. +1C:1C:FD DalianHi # Dalian Hi-Think Computer Technology, Corp 1C:1D:67 Shenzhen # Shenzhen Huawei Communication Technologies Co., Ltd 1C:1D:86 Cisco 1C:33:4D ItsTelec # ITS Telecom @@ -17822,6 +17853,7 @@ 1C:99:4C MurataMa # Murata Manufactuaring Co.,Ltd. 1C:A7:70 Shenzhen # SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LT 1C:AA:07 Cisco # CISCO SYSTEMS, INC. +1C:AB:01 Innovolt 1C:AB:A7 Apple 1C:AF:05 SamsungE # Samsung Electronics Co.,Ltd 1C:AF:F7 D-LinkIn # D-LINK INTERNATIONAL PTE LIMITED @@ -17867,6 +17899,7 @@ 20:1A:06 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD. 20:1D:03 Elatec # Elatec GmbH 20:21:A5 LgElectr # LG Electronics Inc +20:25:64 Pegatron # PEGATRON CORPORATION 20:25:98 Teleview 20:2B:C1 Shenzhen # Shenzhen Huawei Communication Technologies Co., Ltd 20:2C:B7 KongYueE # Kong Yue Electronics & Information Industry (Xinhui) Ltd. @@ -17882,9 +17915,11 @@ 20:4C:6D HugoBren # Hugo Brennenstuhl Gmbh & Co. KG. 20:4E:6B AxxanaIs # Axxana(israel) ltd 20:4E:7F Netgear +20:53:CA RiskTech # Risk Technology Ltd 20:54:76 SonyMobi # Sony Mobile Communications AB 20:57:21 SalixTec # Salix Technology CO., Ltd. 20:59:A0 ParagonT # Paragon Technologies Inc. +20:5A:00 Coval 20:5B:2A Private 20:5B:5E Shenzhen # Shenzhen Wonhe Technology Co., Ltd 20:64:32 SamsungE # SAMSUNG ELECTRO MECHANICS CO.,LTD. @@ -17899,12 +17934,15 @@ 20:7C:8F QuantaMi # Quanta Microsystems,Inc. 20:7D:74 Apple 20:85:8C Assa +20:87:AC AesMotom # AES motomation 20:89:84 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD 20:89:86 Zte # zte corporation 20:91:8A Profalux 20:91:D9 IM # I'M SPA +20:9A:E9 Volacomm # Volacomm Co., Ltd 20:9B:A5 JiaxingG # JIAXING GLEAD Electronics Co.,Ltd 20:A2:E7 Lee-Dick # Lee-Dickens Ltd +20:A7:87 BointecT # Bointec Taiwan Corporation Limited 20:AA:25 Ip-NetLl # IP-NET LLC 20:AA:4B Cisco-Li # Cisco-Linksys, LLC 20:B0:F7 Enclustr # Enclustra GmbH @@ -17946,6 +17984,7 @@ 24:01:C7 Cisco 24:05:0F MtnElect # MTN Electronic Co. Ltd 24:09:17 DevlinEl # Devlin Electronics Limited +24:0A:11 TctMobil # TCT Mobile Limited 24:0A:64 Azurewav # AzureWaveTechnologies,Inc 24:0B:2A ViettelG # Viettel Group 24:0B:B1 KostalIn # KOSTAL Industrie Elektrik GmbH @@ -17959,6 +17998,7 @@ 24:21:AB SonyEric # Sony Ericsson Mobile Communications 24:26:42 Sharp # SHARP Corporation. 24:2F:FA ToshibaG # Toshiba Global Commerce Solutions +24:33:6C Private 24:37:4C CiscoSpv # Cisco SPVTG 24:37:EF EmcElect # EMC Electronic Media Communication SA 24:3C:20 Dynamode # Dynamode Group @@ -18046,10 +18086,13 @@ 28:29:D9 Globalbe # GlobalBeiMing technology (Beijing)Co. Ltd 28:2C:B2 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 28:31:52 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD +28:32:C5 Humax # Humax.co.,ltd 28:34:10 EnigmaDi # Enigma Diagnostics Limited +28:34:A2 Cisco 28:37:37 Apple 28:38:CF Gen2wave 28:39:E7 PrecenoT # Preceno Technology Pte.Ltd. +28:3B:96 CoolCont # Cool Control LTD 28:3C:E4 HuaweiTe # Huawei Technologies Co., Ltd 28:40:1A C8Medise # C8 MediSensors, Inc. 28:41:21 Optisens # OptiSense Network, LLC @@ -18074,6 +18117,7 @@ 28:72:C5 Smartmat # Smartmatic Corp 28:72:F0 Athena 28:79:94 Realplay # Realplay Digital Technology(Shenzhen) Co.,Ltd +28:80:23 HewlettP # Hewlett Packard 28:85:2D TouchNet # Touch Networks 28:89:15 Cashguar # CashGuard Sverige AB 28:8A:1C JuniperN # Juniper networks @@ -18123,6 +18167,7 @@ 28:E0:2C Apple 28:E1:4C Apple # Apple, Inc. 28:E2:97 Shanghai # Shanghai InfoTM Microelectronics Co.,Ltd. +28:E3:47 LiteonTe # Liteon Technology Corporation 28:E6:08 Tokheim 28:E7:94 Microtim # Microtime Computer Inc. 28:E7:CF Apple @@ -18156,8 +18201,10 @@ 2C:36:F8 Cisco # CISCO SYSTEMS, INC. 2C:37:31 Shenzhen # ShenZhen Yifang Digital Technology Co.,LTD 2C:39:96 Sagemcom +2C:39:C1 Ciena # Ciena Corporation 2C:3A:28 FagorEle # Fagor Electrónica 2C:3B:FD NetstorT # Netstor Technology Co., Ltd. +2C:3E:CF Cisco 2C:3F:38 Cisco # CISCO SYSTEMS, INC. 2C:3F:3E Alge-Tim # Alge-Timing GmbH 2C:41:38 Hewlett- # Hewlett-Packard Company @@ -18170,6 +18217,7 @@ 2C:59:E5 HewlettP # Hewlett Packard 2C:5A:05 Nokia # Nokia Corporation 2C:5A:A3 PromateE # PROMATE ELECTRONIC CO.LTD +2C:5B:E1 Centripe # Centripetal Networks, Inc 2C:5D:93 RuckusWi # Ruckus Wireless 2C:5F:F3 Pertroni # Pertronic Industries 2C:62:5A FinestSe # Finest Security Systems Co., Ltd @@ -18186,12 +18234,14 @@ 2C:7E:CF Onzo # Onzo Ltd 2C:80:65 HartingO # HARTING Inc. of North America 2C:81:58 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd +2C:8A:72 Htc # HTC Corporation 2C:8B:F2 HitachiM # Hitachi Metals America Ltd 2C:91:27 Eintechn # Eintechno Corporation 2C:92:2C KishuGik # Kishu Giken Kogyou Company Ltd,. 2C:94:64 Cincoze # Cincoze Co., Ltd. 2C:95:7F Zte # zte corporation 2C:97:17 ICYBV # I.C.Y. B.V. +2C:9A:A4 Ngi # NGI SpA 2C:9E:5F ArrisGro # ARRIS Group, Inc. 2C:9E:FC Canon # CANON INC. 2C:A1:57 Acromate # acromate, Inc. @@ -18257,6 +18307,7 @@ 30:52:5A Nst # NST Co., LTD 30:55:ED TrexNetw # Trex Network LLC 30:57:AC Irlab # IRLAB LTD. +30:59:B7 Microsof # Microsoft 30:5D:38 Beissbar # Beissbarth 30:60:23 ArrisGro # ARRIS Group, Inc. 30:61:12 Pav # PAV GmbH @@ -18277,6 +18328,7 @@ 30:89:99 Guangdon # Guangdong East Power Co., 30:8C:FB Dropcam 30:90:AB Apple +30:91:8F Technico # Technicolor 30:92:F6 Shanghai # SHANGHAI SUNMON COMMUNICATION TECHNOGY CO.,LTD 30:9B:AD BbkElect # BBK Electronics Corp., Ltd., 30:A8:DB SonyMobi # Sony Mobile Communications AB @@ -18286,8 +18338,11 @@ 30:B2:16 HytecGer # Hytec Geraetebau GmbH 30:B3:A2 Shenzhen # Shenzhen Heguang Measurement & Control Technology Co.,Ltd 30:B5:C2 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. +30:C7:50 MicTechn # MIC Technology Group +30:C7:AE SamsungE # Samsung Electronics Co.,Ltd 30:C8:2A Wi-NextS # Wi-Next s.r.l. 30:CD:A7 SamsungE # Samsung Electronics ITS, Printer division +30:D1:7E HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 30:D3:57 Logosol # Logosol, Inc. 30:D4:6A Autosale # Autosales Incorporated 30:D6:C9 SamsungE # Samsung Electronics Co.,Ltd @@ -18308,7 +18363,7 @@ 34:13:A8 Mediplan # Mediplan Limited 34:13:E8 IntelCor # Intel Corporate 34:15:9E Apple -34:17:EB DellPcba # Dell Inc PCBA Test +34:17:EB Dell # Dell Inc 34:1A:4C Shenzhen # SHENZHEN WEIBU ELECTRONICS CO.,LTD. 34:1B:22 Grandbei # Grandbeing Technology Co., Ltd 34:21:09 JensenSc # Jensen Scandinavia AS @@ -18325,9 +18380,11 @@ 34:4F:3F Io-Power # IO-Power Technology Co., Ltd. 34:4F:5C R&Amp;M # R&M AG 34:4F:69 EkinopsS # EKINOPS SAS +34:51:AA JidGloba # JID GLOBAL 34:51:C9 Apple 34:5B:11 EviHeat # EVI HEAT AB 34:5C:40 CargtHol # Cargt Holdings LLC +34:5D:10 Wytek 34:61:78 Boeing # The Boeing Company 34:68:4A Terawork # Teraworks Co., Ltd. 34:6B:D3 HuaweiTe # Huawei Technologies Co., Ltd @@ -18338,6 +18395,7 @@ 34:78:77 O-NetCom # O-NET Communications(Shenzhen) Limited 34:7E:39 NokiaDan # Nokia Danmark A/S 34:81:37 UnicardS # UNICARD SA +34:81:C4 Avm # AVM GmbH 34:82:DE KayoTech # Kayo Technology, Inc. 34:83:02 Iforcom # iFORCOM Co., Ltd 34:84:46 Ericsson # Ericsson AB @@ -18393,6 +18451,8 @@ 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:E2:FD Apple +34:E4:2A Automati # Automatic Bar Controls Inc. 34:EF:44 2wire 34:EF:8B NttCommu # NTT Communications Corporation 34:F3:9B Wizlan # WizLAN Ltd. @@ -18457,6 +18517,7 @@ 38:B5:BD EGOElekt # E.G.O. Elektro-Ger 38:B7:4D Fijowave # Fijowave Limited 38:BB:23 Ozvision # OzVision America LLC +38:BB:3C Avaya # Avaya, Inc 38:BC:1A MeizuTec # Meizu technology co.,ltd 38:BF:2F Espec # Espec Corp. 38:BF:33 NecCasio # NEC CASIO Mobile Communications @@ -18496,6 +18557,7 @@ 3C:0F:C1 KbcNetwo # KBC Networks 3C:10:40 DaesungN # daesung network 3C:10:6F Albahith # ALBAHITH TECHNOLOGIES +3C:15:C2 Apple 3C:15:EA Tescom # TESCOM CO., LTD. 3C:18:A0 Luxshare # Luxshare Precision Industry Co.,Ltd. 3C:19:15 GfiChron # GFI Chrono Time @@ -18503,6 +18565,7 @@ 3C:1A:57 Cardiopu # Cardiopulmonary Corp 3C:1A:79 HuayuanT # Huayuan Technology CO.,LTD 3C:1C:BE JadakLlc # JADAK LLC +3C:25:D7 Nokia # Nokia Corporation 3C:26:D5 SoteraWi # Sotera Wireless 3C:27:63 SleQuali # SLE quality engineering GmbH & Co. KG 3C:2D:B7 TexasIns # Texas Instruments @@ -18553,6 +18616,7 @@ 3C:A3:15 BlessInf # Bless Information & Communications Co., Ltd 3C:A7:2B MrvCommu # MRV Communications (Networks) LTD 3C:A9:F4 IntelCor # Intel Corporate +3C:AB:8E Apple 3C:B1:5B Avaya # Avaya, Inc 3C:B1:7F Wattwatc # Wattwatchers Pty Ld 3C:B8:7A Private @@ -18564,6 +18628,7 @@ 3C:C2:43 Nokia # Nokia Corporation 3C:C9:9E HuiyangT # Huiyang Technology Co., Ltd 3C:CA:87 Iders # Iders Incorporated +3C:CD:93 LgElectr # LG ELECTRONICS INC 3C:CE:73 Cisco # CISCO SYSTEMS, INC. 3C:D0:F8 Apple 3C:D1:6E Telepowe # Telepower Communication Co., Ltd @@ -18582,8 +18647,10 @@ 3C:F5:2C Dspecial # DSPECIALISTS GmbH 3C:F7:2A Nokia # Nokia Corporation 3C:F7:48 Shenzhen # Shenzhen Linsn Technology Development Co.,Ltd +3C:F8:08 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 3C:FB:96 EmcraftL # Emcraft Systems LLC 40:00:03 NetWare? # Net Ware (?) +40:01:07 Arista # Arista Corp 40:01:C6 3comEuro # 3COM EUROPE LTD 40:04:0C A&T 40:07:C0 Railtec # Railtec Systems GmbH @@ -18592,6 +18659,7 @@ 40:12:E4 Compass- # Compass-EOS 40:13:D9 GlobalEs # Global ES 40:15:97 ProtectA # Protect America, Inc. +40:16:7E AsustekC # ASUSTek COMPUTER INC. 40:16:9F Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. 40:16:FA EkmMeter # EKM Metering 40:18:B1 Aerohive # Aerohive Networks Inc. @@ -18609,6 +18677,7 @@ 40:3C:FC Apple 40:40:22 Ziv 40:40:6B Icomera +40:45:DA Spreadtr # Spreadtrum Communications (Shanghai) Co., Ltd. 40:4A:03 ZyxelCom # ZyXEL Communications Corporation 40:4A:18 AddrekSm # Addrek Smart Solutions 40:4D:8E Shenzhen # Shenzhen Huawei Communication Technologies Co., Ltd @@ -18624,7 +18693,7 @@ 40:61:86 Micro-St # MICRO-STAR INT'L CO.,LTD 40:61:8E Stella-G # Stella-Green Co 40:66:7A Mediola- # mediola - connected living AG -40:68:26 ThalesOp # Thales Optronics Limited +40:68:26 ThalesUk # Thales UK Limited 40:6A:AB Rim 40:6C:8F Apple 40:6F:2A Research # Research In Motion @@ -18654,6 +18723,7 @@ 40:B0:FA LgElectr # LG Electronics 40:B2:C8 NortelNe # Nortel Networks 40:B3:95 Apple +40:B3:CD ChiyodaE # Chiyoda Electronics Co.,Ltd. 40:B3:FC Logital # Logital Co. Limited 40:B4:F0 JuniperN # Juniper Networks 40:B6:B1 Sungsam # SUNGSAM CO,.Ltd @@ -19127,6 +19197,7 @@ 40:D8:55:1C:90:00/36 Andy-L # Andy-L Ltd. 40:D8:55:1C:A0:00/36 RigelEng # Rigel Engineering 40:D8:55:1C:B0:00/36 MgSRL # MG S.r.l. +40:D8:55:1C:C0:00/36 NktPhoto # NKT Photonics A/S 40:D8:55:1C:D0:00/36 YxlonInt # YXLON International A/S 40:D8:55:1C:E0:00/36 PeterHub # Peter Huber 40:D8:55:1C:F0:00/36 OmnikNew # Omnik New Energy Co., Ltd @@ -19139,6 +19210,20 @@ 40:D8:55:1D:60:00/36 EmsCompu # EMS Computers Pty Ltd 40:D8:55:1D:70:00/36 Wheatsto # Wheatstone Corporation 40:D8:55:1D:80:00/36 OwlCompu # Owl Computing Technologies, Inc. +40:D8:55:1D:90:00/36 Commerci # Commercial Wireless Systems International LLC. +40:D8:55:1D:A0:00/36 EnergyTe # Energy Technology and Control Ltd. +40:D8:55:1D:B0:00/36 NipponTe # NIPPON TECHNO LAB.,INC, +40:D8:55:1D:C0:00/36 AplexTec # Aplex Technology Inc. +40:D8:55:1D:D0:00/36 BaoptBen # BaOpt Benelux bv +40:D8:55:1D:E0:00/36 Vidisys # Vidisys GmbH +40:D8:55:1D:F0:00/36 ChengduM # Chengdu Meihuan Technology Co.,Ltd +40:D8:55:1E:00:00/36 Embedded # Embedded Technology Corporation +40:D8:55:1E:10:00/36 AdQualit # AD QUALITE +40:D8:55:1E:20:00/36 ElnecSRO # ELNEC s.r.o. +40:D8:55:1E:30:00/36 MegaElec # Mega Electronics Ltd +40:D8:55:1E:40:00/36 Stek # STEK Ltd +40:D8:55:50:D0:00/36 Shenzhen # Shenzhen MaiWei Cable TV Equipment CO.,LTD. +40:D8:55:EE:60:00/36 Narinet # Narinet, Inc. 40:E7:30 DeyStora # DEY Storage Systems, Inc. 40:E7:93 Shenzhen # Shenzhen Siviton Technology Co.,Ltd 40:EC:F8 Siemens # Siemens AG @@ -19153,12 +19238,15 @@ 40:FC:89 ArrisGro # ARRIS Group, Inc. 44:03:A7 Cisco 44:0C:FD Netman # NetMan Co., Ltd. +44:11:C2 Telegart # Telegartner Karl Gartner GmbH 44:13:19 WkkTechn # WKK TECHNOLOGY LTD. 44:18:4F Fitview 44:19:B6 Hangzhou # Hangzhou Hikvision Digital Technology Co.,Ltd. +44:1E:91 ArvidaIn # ARVIDA Intelligent Electronics Technology Co.,Ltd. 44:1E:A1 Hewlett- # Hewlett-Packard Company 44:23:AA Farmage # Farmage Co., Ltd. 44:25:BB BambooEn # Bamboo Entertainment Corporation +44:29:38 Nietzsch # NietZsche enterprise Co.Ltd. 44:2A:60 Apple 44:2A:FF E3Techno # E3 Technology, Inc. 44:2B:03 Cisco # CISCO SYSTEMS, INC. @@ -19197,6 +19285,7 @@ 44:6C:24 ReallinE # Reallin Electronic Co.,Ltd 44:6D:57 LiteonTe # Liteon Technology Corporation 44:70:0B Iffu +44:70:98 MingHong # MING HONG TECHNOLOGY (SHEN ZHEN) LIMITED 44:7B:C4 Dualshin # DualShine Technology(SZ)Co.,Ltd 44:7C:7F Innoligh # Innolight Technology Corporation 44:7D:A5 VtionInf # VTION INFORMATION TECHNOLOGY (FUJIAN) CO.,LTD @@ -19204,6 +19293,7 @@ 44:7E:95 AlphaAnd # Alpha and Omega, Inc 44:83:12 Star-Net 44:85:00 IntelCor # Intel Corporate +44:86:C1 SiemensL # Siemens Low Voltage & Products 44:87:FC Elitegro # ELITEGROUP COMPUTER SYSTEM CO., LTD. 44:8A:5B Micro-St # Micro-Star INT'L CO., LTD. 44:8C:52 Ktis # KTIS CO., Ltd @@ -19232,6 +19322,7 @@ 44:D1:5E Shanghai # Shanghai Kingto Information Technology Ltd 44:D2:CA AnviaTvO # Anvia TV Oy 44:D3:CA Cisco # CISCO SYSTEMS, INC. +44:D4:E0 SonyMobi # Sony Mobile Communications AB 44:D6:3D TalariNe # Talari Networks 44:D8:32 Azurewav # Azurewave Technologies, Inc. 44:D8:84 Apple @@ -19253,6 +19344,7 @@ 48:13:F3 BbkElect # BBK Electronics Corp., Ltd. 48:17:4C Micropow # MicroPower technologies 48:18:42 Shanghai # Shanghai Winaas Co. Equipment Co. Ltd. +48:1A:84 PointerT # Pointer Telocation Ltd 48:1B:D2 IntronSc # Intron Scientific co., ltd. 48:28:2F Zte # ZTE Corporation 48:2C:EA Motorola # Motorola Inc Business Light Radios @@ -19273,12 +19365,14 @@ 48:5D:60 Azurewav # Azurewave Technologies, Inc. 48:60:BC Apple 48:61:A3 Concern" # Concern "Axion" JSC +48:62:76 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 48:6B:91 Fleetwoo # Fleetwood Group Inc. 48:6E:73 Pica8 # Pica8, Inc. 48:6F:D2 Storsimp # StorSimple Inc 48:71:19 SgbGroup # SGB GROUP LTD. 48:74:6E Apple 48:76:04 Private +48:82:44 LifeFitn # Life Fitness / Div. of Brunswick 48:8E:42 Digalog # DIGALOG GmbH 48:91:53 Weinmann # Weinmann Geräte für Medizin GmbH + Co. KG 48:91:F6 Shenzhen # Shenzhen Reach software technology CO.,LTD @@ -19299,6 +19393,7 @@ 48:C8:B6 Systec # SysTec GmbH 48:CB:6E CelloEle # Cello Electronics (UK) Ltd 48:D0:CF Universa # Universal Electronics, Inc. +48:D1:8E MetisCom # Metis Communication Co.,Ltd 48:D2:24 LiteonTe # Liteon Technology Corporation 48:D5:4C JedaNetw # Jeda Networks 48:D7:FF BlankomA # BLANKOM Antennentechnik GmbH @@ -19309,6 +19404,7 @@ 48:EA:63 Zhejiang # Zhejiang Uniview Technologies Co., Ltd. 48:EB:30 EternaTe # ETERNA TECHNOLOGY, INC. 48:ED:80 DaesungE # daesung eltec +48:EE:07 SilverPa # Silver Palm Technologies LLC 48:EE:86 Utstarco # UTStarcom (China) Co.,Ltd 48:F2:30 Ubizcore # Ubizcore Co.,LTD 48:F3:17 Private @@ -19343,6 +19439,7 @@ 4C:30:89 ThalesTr # Thales Transportation Systems GmbH 4C:32:2D Teledata # TELEDATA NETWORKS 4C:32:D9 MRuttyHo # M Rutty Holdings Pty. Ltd. +4C:39:09 HplElect # HPL Electric & Power Private Limited 4C:39:10 NewtekEl # Newtek Electronics co., Ltd. 4C:3B:74 VogtecHK # VOGTEC(H.K.) Co., Ltd 4C:3C:16 SamsungE # Samsung Electronics Co.,Ltd @@ -19368,9 +19465,11 @@ 4C:77:4F Embedded # Embedded Wireless Labs 4C:78:97 Arrowhea # Arrowhead Alarm Products Ltd 4C:79:BA IntelCor # Intel Corporate +4C:7F:62 Nokia # Nokia Corporation 4C:80:4F Armstron # Armstrong Monitoring Corp 4C:80:93 IntelCor # Intel Corporate 4C:82:CF Echostar # Echostar Technologies +4C:8B:30 Actionte # Actiontec Electronics, Inc 4C:8B:55 GrupoDig # Grupo Digicon 4C:8B:EF HuaweiTe # Huawei Technologies Co., Ltd 4C:8D:79 Apple @@ -19379,6 +19478,7 @@ 4C:98:EF Zeo 4C:9E:80 KyokkoEl # KYOKKO ELECTRIC Co., Ltd. 4C:9E:E4 HanyangN # Hanyang Navicom Co.,Ltd. +4C:A5:6D SamsungE # Samsung Electronics Co.,Ltd 4C:A7:4B AlcatelL # Alcatel Lucent 4C:AA:16 Azurewav # AzureWave Technologies (Shanghai) Inc. 4C:AB:33 KstTechn # KST technology @@ -19405,6 +19505,7 @@ 4C:EB:42 IntelCor # Intel Corporate 4C:ED:DE AskeyCom # Askey Computer Corp 4C:F0:2E VifaDenm # Vifa Denmark A/S +4C:F4:5B BlueClov # Blue Clover Devices 4C:F7:37 SamjiEle # SamJi Electronics Co., Ltd 50:00:8C HongKong # Hong Kong Telecommunications (HKT) Limited 50:01:BB SamsungE # Samsung Electronics @@ -19436,10 +19537,13 @@ 50:46:5D AsustekC # ASUSTek COMPUTER INC. 50:48:EB BeijingH # BEIJING HAIHEJINSHENG NETWORK TECHNOLOGY CO. LTD. 50:4A:5E Masimo # Masimo Corporation +50:4A:6E Netgear # NETGEAR INC., 50:4F:94 LoxoneEl # Loxone Electronics GmbH 50:56:63 TexasIns # Texas Instruments 50:56:A8 Jolla # Jolla Ltd +50:56:BF SamsungE # Samsung Electronics Co.,LTD 50:57:A8 Cisco # CISCO SYSTEMS, INC. +50:58:00 WytecInt # WyTec International, Inc. 50:5A:C6 Guangdon # GUANGDONG SUPER TELECOM CO.,LTD. 50:60:28 Xirrus # Xirrus Inc. 50:61:84 Avaya # Avaya, Inc @@ -19480,6 +19584,7 @@ 50:C0:06 Carmanah # Carmanah Signs 50:C2:71 Securete # SECURETECH INC 50:C5:8D JuniperN # Juniper Networks +50:C7:BF Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 50:C9:71 GnNetcom # GN Netcom A/S 50:C9:A0 SkipperE # SKIPPER Electronics AS 50:CC:F8 SamsungE # Samsung Electro Mechanics @@ -19519,6 +19624,7 @@ 54:26:96 Apple 54:27:1E Azurewav # AzureWave Technonloies, Inc. 54:2A:9C LsyDefen # LSY Defense, LLC. +54:2A:A2 AlphaNet # Alpha Networks Inc. 54:2C:EA Protectr # PROTECTRON 54:2F:89 EuclidLa # Euclid Laboratories, Inc. 54:31:31 RasterVi # Raster Vision Ltd @@ -19530,7 +19636,9 @@ 54:42:49 Sony # Sony Corporation 54:44:08 Nokia # Nokia Corporation 54:46:6B Shenzhen # Shenzhen CZTIC Electronic Technology Co., Ltd +54:4A:00 Cisco 54:4A:05 WenglorS # wenglor sensoric gmbh +54:4A:16 TexasIns # Texas Instruments 54:53:ED Sony # Sony Corporation 54:54:14 DigitalR # Digital RF Corea, Inc 54:5E:BD NlTechno # NL Technologies @@ -19565,6 +19673,7 @@ 54:AE:27 Apple 54:B6:20 SuhdolE& # SUHDOL E&C Co.Ltd. 54:BE:F7 Pegatron # PEGATRON CORPORATION +54:C8:0F Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 54:CD:A7 FujianSh # Fujian Shenzhou Electronic Co.,Ltd 54:CD:EE Shenzhen # ShenZhen Apexis Electronic Co.,Ltd 54:D0:ED AximComm # AXIM Communications @@ -19573,11 +19682,14 @@ 54:D4:6F CiscoSpv # Cisco SPVTG 54:DF:63 Intrakey # Intrakey technologies GmbH 54:E0:32 JuniperN # Juniper Networks +54:E2:E0 Pace # Pace plc 54:E3:B0 JvlIndus # JVL Industri Elektronik 54:E4:3A Apple # Apple, Inc. 54:E6:3F Shenzhen # ShenZhen LingKeWeiEr Technology Co., Ltd. 54:E6:FC Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. 54:EA:A8 Apple # Apple, Inc. +54:EE:75 WistronI # Wistron InfoComm(Kunshan)Co.,Ltd. +54:EF:92 Shenzhen # Shenzhen Elink Technology Co., LTD 54:F5:B6 Oriental # ORIENTAL PACIFIC INTERNATIONAL LIMITED 54:F6:66 Berthold # Berthold Technologies GmbH and Co.KG 54:FB:58 Wiseware # WISEWARE, Lda @@ -19596,6 +19708,7 @@ 58:1D:91 Advanced # Advanced Mobile Telecom co.,ltd. 58:1F:AA Apple 58:1F:EF Tuttnaer # Tuttnaer LTD +58:23:8C Technico # Technicolor CH USA 58:2E:FE Lighting # Lighting Science Group 58:2F:42 Universa # Universal Electric Corporation 58:34:3B GlovastT # Glovast Technology Ltd. @@ -19660,6 +19773,7 @@ 58:D6:D3 DairyChe # Dairy Cheq Inc 58:DB:8D Fast # Fast Co., Ltd. 58:E0:2C MicroTec # Micro Technic A/S +58:E3:26 CompassT # Compass Technologies Inc. 58:E4:76 CentronC # CENTRON COMMUNICATIONS TECHNOLOGIES FUJIAN CO.,LTD 58:E6:36 EvrsafeT # EVRsafe Technologies 58:E7:47 Deltanet # Deltanet AG @@ -19690,6 +19804,7 @@ 5C:25:4C AvireGlo # Avire Global Pte Ltd 5C:26:0A Dell # Dell Inc. 5C:2A:EF OpenAcce # Open Access Pty Ltd +5C:31:3E TexasIns # Texas Instruments 5C:33:27 SpazioIt # Spazio Italia srl 5C:33:5C Swisspho # Swissphone Telecom AG 5C:33:8E AlphaNet # Alpha Networkc Inc. @@ -19756,6 +19871,7 @@ 5C:F2:07 SpecoTec # Speco Technologies 5C:F3:70 Cc&CTech # CC&C Technologies, Inc 5C:F3:FC Ibm # IBM Corp +5C:F4:AB ZyxelCom # ZyXEL Communications Corp 5C:F5:0D Institut # Institute of microelectronic applications 5C:F6:DC SamsungE # Samsung Electronics Co.,LTD 5C:F8:A1 MurataMa # Murata Manufactuaring Co.,Ltd. @@ -19790,6 +19906,7 @@ 60:45:5E LiptelSR # Liptel s.r.o. 60:45:BD Microsof # Microsoft 60:46:16 XiamenVa # XIAMEN VANN INTELLIGENT CO., LTD +60:47:D4 ForicsEl # FORICS Electronic Technology Co., Ltd. 60:4A:1C Suyin # SUYIN Corporation 60:52:D0 FactsEng # FACTS Engineering 60:54:64 EyedroGr # Eyedro Green Solutions Inc. @@ -19805,6 +19922,7 @@ 60:73:5C Cisco 60:74:8D AtmacaEl # Atmaca Elektronik 60:76:88 Velodyne +60:81:2B CustomCo # Custom Control Concepts 60:83:B2 GkwareEK # GkWare e.K. 60:84:3B Soladigm # Soladigm, Inc. 60:86:45 AveryWei # Avery Weigh-Tronix, LLC @@ -19813,7 +19931,9 @@ 60:89:B7 KaelMühe # KAEL MÃœHENDÄ°SLÄ°K ELEKTRONÄ°K TÄ°CARET SANAYÄ° LÄ°MÄ°TED ŞİRKETÄ° 60:8C:2B HansonTe # Hanson Technology 60:8D:17 SentrusG # Sentrus Government Systems Division, Inc +60:8F:5C SamsungE # Samsung Electronics Co.,Ltd 60:90:84 Dssd # DSSD Inc +60:92:17 Apple 60:96:20 Private 60:9A:A4 GviSecur # GVI SECURITY INC. 60:9E:64 Vivonic # Vivonic GmbH @@ -19824,6 +19944,7 @@ 60:B1:85 AthSyste # ATH system 60:B3:C4 ElberSrl # Elber Srl 60:B6:06 Phorus +60:B6:17 Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. 60:B9:33 DeutronE # Deutron Electronics Corp. 60:B9:82 RoVeRLab # RO.VE.R. Laboratories S.p.A. 60:BB:0C BeijingH # Beijing HuaqinWorld Technology Co,Ltd @@ -19841,10 +19962,12 @@ 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:D9:C7 Apple 60:DA:23 Estech # Estech Co.,Ltd 60:DB:2A Hns 60:DE:44 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 60:E0:0E ShinseiE # SHINSEI ELECTRONICS CO LTD +60:E3:27 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 60:E9:56 AylaNetw # Ayla Networks, Inc 60:EB:69 QuantaCo # Quanta computer Inc. 60:F1:3D Jablocom # JABLOCOM s.r.o. @@ -19869,6 +19992,7 @@ 64:0E:94 Pluribus # Pluribus Networks, Inc. 64:0F:28 2wire 64:10:84 HexiumTe # HEXIUM Technical Development Co., Ltd. +64:12:25 Cisco 64:16:8D Cisco # CISCO SYSTEMS, INC. 64:16:F0 Shehzhen # Shehzhen Huawei Communication Technologies Co., Ltd. 64:1A:22 Heliospe # Heliospectra/Woodhill Investments @@ -19914,6 +20038,7 @@ 64:72:D8 GoowiTec # GooWi Technology Co.,Limited 64:73:E2 Arbiter # Arbiter Systems, Inc. 64:76:57 Innovati # Innovative Security Designs +64:76:BA Apple 64:77:91 SamsungE # Samsung Electronics Co.,Ltd 64:7B:D4 TexasIns # Texas Instruments 64:7C:34 UbeeInte # Ubee Interactive Corp. @@ -19925,6 +20050,7 @@ 64:87:88 JuniperN # Juniper Networks 64:87:D7 PirelliT # Pirelli Tyre S.p.A. 64:88:FF SichuanC # Sichuan Changhong Electric Ltd. +64:8D:9E IvtElect # IVT Electronic Co.,Ltd 64:99:5D Lge 64:99:68 Elentec 64:99:A0 Elektron # AG Elektronik AB @@ -19938,6 +20064,7 @@ 64:A3:41 Wonderla # Wonderlan (Beijing) Technology Co., Ltd. 64:A3:CB Apple 64:A7:69 Htc # HTC Corporation +64:A7:DD Avaya # Avaya, Inc 64:A8:37 JuniKore # Juni Korea Co., Ltd 64:AE:0C Cisco # CISCO SYSTEMS, INC. 64:AE:88 Polytec # Polytec GmbH @@ -19993,6 +20120,7 @@ 68:1E:8B Infosigh # InfoSight Corporation 68:1F:D8 Advanced # Advanced Telemetry 68:23:4B NihonDen # Nihon Dengyo Kousaku +68:28:BA Dejai 68:2D:DC WuhanCha # Wuhan Changjiang Electro-Communication Equipment CO.,LTD 68:3B:1E Countwis # Countwise LTD 68:3E:EC Ereca @@ -20018,6 +20146,7 @@ 68:78:4C NortelNe # Nortel Networks 68:79:24 Els-Gmbh # ELS-GmbH & Co. KG 68:79:ED Sharp # SHARP Corporation +68:7C:C8 Measurem # Measurement Systems S. de R.L. 68:7C:D5 YSoftAS # Y Soft Corporation, a.s. 68:7F:74 Cisco-Li # Cisco-Linksys, LLC 68:83:1A PandoraM # Pandora Mobility Corporation @@ -20059,6 +20188,7 @@ 68:DB:67 NantongC # Nantong Coship Electronics Co., Ltd 68:DB:96 OpwillTe # OPWILL Technologies CO .,LTD 68:DC:E8 Packetst # PacketStorm Communications +68:DF:DD Xiaomi # Xiaomi inc. 68:E1:66 Private 68:E4:1F Unglaube # Unglaube Identech GmbH 68:EB:AE SamsungE # Samsung Electronics Co.,Ltd @@ -20075,12 +20205,14 @@ 6C:09:D6 Digiques # Digiquest Electronics LTD 6C:0E:0D SonyEric # Sony Ericsson Mobile Communications AB 6C:0F:6A JdcTech # JDC Tech Co., Ltd. +6C:14:F7 Erhardt+ # Erhardt+Leimer GmbH 6C:15:F9 Nautroni # Nautronix Limited 6C:18:11 DecaturE # Decatur Electronics 6C:20:56 Cisco 6C:22:AB Ainswort # Ainsworth Game Technology 6C:23:B9 SonyEric # Sony Ericsson Mobile Communications AB 6C:29:95 IntelCor # Intel Corporate +6C:2C:06 OooNppSy # OOO NPP Systemotechnika-NN 6C:2E:33 Accelink # Accelink Technologies Co.,Ltd. 6C:2E:85 Sagemcom 6C:32:DE IndieonT # Indieon Technologies Pvt. Ltd. @@ -20107,6 +20239,7 @@ 6C:64:1A PenguinC # Penguin Computing 6C:6F:18 Stereota # Stereotaxis, Inc. 6C:70:39 Novar # Novar GmbH +6C:70:9F Apple 6C:71:D9 Azurewav # AzureWave Technologies, Inc 6C:81:FE Mitsuba # Mitsuba Corporation 6C:83:36 SamsungE # Samsung Electronics Co.,Ltd @@ -20128,6 +20261,7 @@ 6C:A7:80 Nokia # Nokia Corporation 6C:A9:06 Telefiel # Telefield Ltd 6C:A9:6F Transpac # TransPacket AS +6C:AA:B3 RuckusWi # Ruckus Wireless 6C:AB:4D DigitalP # Digital Payment Technologies 6C:AC:60 Venetex # Venetex Corp 6C:AD:3F HubbellB # Hubbell Building Automation, Inc. @@ -20151,11 +20285,13 @@ 6C:E9:07 Nokia # Nokia Corporation 6C:E9:83 Gastron # Gastron Co., LTD. 6C:EC:A1 Shenzhen # SHENZHEN CLOU ELECTRONICS CO. LTD. +6C:EC:EB TexasIns # Texas Instruments 6C:F0:49 Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD. 6C:F3:73 SamsungE # Samsung Electronics Co.,Ltd 6C:F3:7F ArubaNet # Aruba Networks 6C:F9:7C Nanoptix # Nanoptix Inc. 6C:FA:58 Avaya # Avaya, Inc +6C:FA:A7 AmpakTec # AMPAK Technology Inc. 6C:FD:B9 ProwareT # Proware Technologies Co Ltd. 6C:FF:BE MpbCommu # MPB Communications Inc. 70:02:58 01db-Met # 01DB-METRAVIB @@ -20177,6 +20313,7 @@ 70:2F:4B Polyvisi # PolyVision Inc. 70:2F:97 AavaMobi # Aava Mobile Oy 70:30:18 Avaya # Avaya, Inc +70:30:5D Ubiquoss # Ubiquoss Inc 70:30:5E NanjingZ # Nanjing Zhongke Menglian Information Technology Co.,LTD 70:31:87 Acx # ACX GmbH 70:32:D5 AthenaWi # Athena Wireless Communications Inc @@ -20204,6 +20341,7 @@ 70:5E:AA ActionTa # Action Target, Inc. 70:60:DE Lavision # LaVision GmbH 70:61:73 Calantec # Calantec GmbH +70:62:B8 D-LinkIn # D-Link International 70:64:17 OrbisTec # ORBIS TECNOLOGIA ELECTRICA S.A. 70:65:82 SuzhouHa # Suzhou Hanming Technologies Co., Ltd. 70:6F:81 Private @@ -20226,6 +20364,7 @@ 70:85:C6 Pace # Pace plc. 70:8B:78 Citygrow # citygrow technology co., ltd 70:8D:09 Nokia # Nokia Corporation +70:93:83 Intellig # Intelligent Optical Network High Tech CO.,LTD. 70:93:F8 SpaceMon # Space Monkey, Inc. 70:97:56 Happyele # Happyelectronics Co.,Ltd 70:9A:0B ItalianI # Italian Institute of Technology @@ -20242,6 +20381,88 @@ 70:B0:8C ShenouCo # Shenou Communication Equipment Co.,Ltd 70:B1:4E Pace # Pace plc 70:B2:65 HiltronS # Hiltron s.r.l. +70:B3:D5 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see OUI36 public listing for more information. +70:B3:D5:04:40:00/36 DonElect # Don Electronics Ltd +70:B3:D5:05:20:00/36 SudoPrem # Sudo Premium Engineering +70:B3:D5:07:70:00/36 Inaccess # InAccess Networks SA +70:B3:D5:09:00:00/36 Powercra # POWERCRAFT ELECTRONICS PVT. LTD. +70:B3:D5:0A:90:00/36 Proconne # ProConnections, Inc. +70:B3:D5:0A:A0:00/36 Wanco # Wanco Inc +70:B3:D5:0E:00:00/36 Plcis +70:B3:D5:0F:00:00/36 Avionica +70:B3:D5:0F:B0:00/36 CygnusLl # Cygnus LLC +70:B3:D5:10:90:00/36 DitestFa # DiTEST Fahrzeugdiagnose GmbH +70:B3:D5:13:90:00/36 Tunstall # Tunstall A/S +70:B3:D5:18:30:00/36 EvcoSPA # Evco S.p.a. +70:B3:D5:18:40:00/36 Xv360Opt # XV360 Optical Information Systems Ltd. +70:B3:D5:19:00:00/36 FantomWi # Fantom Wireless, Inc. +70:B3:D5:1A:C0:00/36 SvpBroad # SVP Broadcast Microwave S.L. +70:B3:D5:28:F0:00/36 Overline # Overline Systems +70:B3:D5:29:D0:00/36 Xtech2Si # XTech2 SIA +70:B3:D5:30:80:00/36 DsdMicro # DSD MICROTECHNOLOGY,INC. +70:B3:D5:35:C0:00/36 AcsElect # ACS electronics srl +70:B3:D5:35:F0:00/36 AplexTec # Aplex Technology Inc. +70:B3:D5:3A:80:00/36 Jamhub # JamHub Corp. +70:B3:D5:3C:20:00/36 Cellular # Cellular Specialties, Inc. +70:B3:D5:3D:E0:00/36 ElomacEl # ELOMAC Elektronik GmbH +70:B3:D5:3E:D0:00/36 UltraEle # Ultra Electronics Sonar System Division +70:B3:D5:3F:10:00/36 OlympusN # Olympus NDT Canada +70:B3:D5:40:A0:00/36 MonroeEl # Monroe Electronics, Inc. +70:B3:D5:42:F0:00/36 Sintokog # SINTOKOGIO, LTD +70:B3:D5:43:30:00/36 Flexsolu # Flexsolution APS +70:B3:D5:4C:10:00/36 QuercusT # QUERCUS TECHNOLOGIES, S. L. +70:B3:D5:4C:80:00/36 Hosokawa # Hosokawa Micron Powder Systems +70:B3:D5:51:D0:00/36 TecnintH # Tecnint HTE Srl +70:B3:D5:51:E0:00/36 Fundació # Fundación Cardiovascular de Colombia +70:B3:D5:5A:80:00/36 Farmobil # Farmobile +70:B3:D5:5E:80:00/36 Vitec +70:B3:D5:61:F0:00/36 Labotect # Labotect Labor-Technik-Göttingen GmbH +70:B3:D5:62:50:00/36 VxInstru # VX Instruments GmbH +70:B3:D5:6B:60:00/36 Inradios # INRADIOS GmbH +70:B3:D5:6D:30:00/36 Deuta-We # DEUTA-WERKE GmbH +70:B3:D5:70:20:00/36 SensorHi # Sensor Highway Ltd +70:B3:D5:79:A0:00/36 Innerspe # Innerspec Technologies Inc. +70:B3:D5:80:F0:00/36 Quickwar # Quickware Eng & Des LLC +70:B3:D5:81:40:00/36 Ingenieu # Ingenieurbuero SOMTRONIK +70:B3:D5:87:10:00/36 OsoTechn # Oso Technologies +70:B3:D5:8B:10:00/36 M-TechIn # M-Tech Innovations Ltd +70:B3:D5:90:80:00/36 Accusoni # Accusonic +70:B3:D5:91:80:00/36 GlovaRai # Glova Rail A/S +70:B3:D5:99:40:00/36 KeffNetw # KeFF Networks +70:B3:D5:9A:70:00/36 Honeywel # Honeywell +70:B3:D5:9F:40:00/36 TbandSrl # Tband srl +70:B3:D5:A0:B0:00/36 Ambihome # ambiHome GmbH +70:B3:D5:A0:E0:00/36 Vetaphon # Vetaphone A/S +70:B3:D5:A2:F0:00/36 Botek # Botek Systems AB +70:B3:D5:AE:90:00/36 CariElec # Cari Electronic +70:B3:D5:B1:50:00/36 EtaBetaS # Eta Beta Srl +70:B3:D5:B2:A0:00/36 MyroCont # Myro Control, LLC +70:B3:D5:B3:D0:00/36 Inras # Inras GmbH +70:B3:D5:B8:A0:00/36 NexusTec # Nexus Tech. VN +70:B3:D5:BB:20:00/36 Mettler- # Mettler-Toledo Hi-Speed +70:B3:D5:C2:70:00/36 GeneralD # GENERAL DYNAMICS C4 SYSTEMS +70:B3:D5:C2:C0:00/36 DromontS # Dromont S.p.A. +70:B3:D5:C8:D0:00/36 KstTechn # KST Technology +70:B3:D5:CE:90:00/36 Kinemetr # KINEMETRICS +70:B3:D5:D4:70:00/36 Yotascop # YotaScope Technologies Co., Ltd. +70:B3:D5:D4:E0:00/36 Flsmidth +70:B3:D5:D8:60:00/36 WpgsysPt # WPGSYS Pte Ltd +70:B3:D5:D8:B0:00/36 LenoxiAu # Lenoxi Automation s.r.o. +70:B3:D5:D9:E0:00/36 GrupoEpe # GRUPO EPELSA S.L. +70:B3:D5:DD:D0:00/36 BioRadLa # BIO RAD LABORATORIES +70:B3:D5:E0:80:00/36 Olssen +70:B3:D5:EB:00:00/36 NautelLi # Nautel Limted +70:B3:D5:EC:D0:00/36 Sbs-Fein # SBS-Feintechnik GmbH & Co. KG +70:B3:D5:ED:C0:00/36 JDKoftin # J.D. Koftinoff Software, Ltd. +70:B3:D5:ED:D0:00/36 SolarNet # Solar Network & Partners +70:B3:D5:EF:90:00/36 Critical # Critical Link +70:B3:D5:F3:40:00/36 MacgrayS # MacGray Services +70:B3:D5:F3:80:00/36 Scanvaeg # Scanvaegt Nordic A/S +70:B3:D5:F6:10:00/36 PowerDia # Power Diagnostic Service +70:B3:D5:F6:20:00/36 Frs # FRS GmbH & Co. KG +70:B3:D5:F6:30:00/36 ArsProdu # Ars Products +70:B3:D5:FB:00:00/36 Rohde&Sc # Rohde&Schwarz Topex SA +70:B3:D5:FD:10:00/36 Redrat # RedRat Ltd 70:B5:99 Embedded # Embedded Technologies s.r.o. 70:B9:21 Fiberhom # FiberHome Telecommunication Technologies CO.,LTD 70:C6:AC BoschAut # Bosch Automotive Aftermarket @@ -20265,13 +20486,16 @@ 70:F1:E5 Xetawave # Xetawave LLC 70:F3:95 Universa # Universal Global Scientific Industrial Co., Ltd. 70:F9:27 SamsungE # Samsung Electronics +70:F9:6D Hangzhou # Hangzhou H3C Technologies Co., Limited 70:FF:76 TexasIns # Texas Instruments 74:0A:BC JsjsDesi # JSJS Designs (Europe) Limited 74:0E:DB Optowiz # Optowiz Co., Ltd 74:14:89 SrtWirel # SRT Wireless 74:15:E2 Tri-Sen # Tri-Sen Systems Corporation +74:19:F8 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. 74:1E:93 Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. 74:25:8A Hangzhou # Hangzhou H3C Technologies Co., Limited +74:26:AC Cisco 74:27:3C Changyan # ChangYang Technology (Nanjing) Co., LTD 74:27:EA Elitegro # Elitegroup Computer Systems Co., Ltd. 74:2B:0F Infinida # Infinidat Ltd. @@ -20307,7 +20531,7 @@ 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:86:7A DellPcba # Dell Inc PCBA Test +74:86:7A Dell # Dell Inc 74:88:2A HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 74:88:8B AdbBroad # ADB Broadband Italia 74:8E:08 Bestek # Bestek Corp. @@ -20355,6 +20579,7 @@ 74:F1:02 BeijingH # Beijing HCHCOM Technology Co., Ltd 74:F6:12 ArrisGro # ARRIS Group, Inc. 74:F7:26 NeuronRo # Neuron Robotics +74:F8:5D Berkeley # Berkeley Nucleonics Corp 74:FD:A0 Compupal # Compupal (Group) Corporation 74:FE:48 Advantec # ADVANTECH CO., LTD. 74:FF:7D WrenSoun # Wren Sound Systems, LLC @@ -20387,6 +20612,7 @@ 78:45:C4 Dell # Dell Inc 78:46:C4 DaehapHy # DAEHAP HYPER-TECH 78:47:1D SamsungE # Samsung Electronics Co.,Ltd +78:48:59 HewlettP # Hewlett Packard 78:49:1D Will-Bur # The Will-Burt Company 78:4B:08 FRobotic # f.robotics acquisitions ltd 78:4B:87 MurataMa # Murata Manufacturing Co.,Ltd. @@ -20411,6 +20637,7 @@ 78:89:73 Cmc 78:8C:54 EltekTec # Eltek Technologies LTD 78:8D:F7 HitronTe # Hitron Technologies. Inc +78:92:3E Nokia # Nokia Corporation 78:92:9C IntelCor # Intel Corporate 78:98:FD Q9Networ # Q9 Networks Inc. 78:99:5C NationzT # Nationz Technologies Inc @@ -20455,6 +20682,7 @@ 78:D3:4F Pace-O-M # Pace-O-Matic, Inc. 78:D3:8D Hongkong # HONGKONG YUNLINK TECHNOLOGY LIMITED 78:D5:B5 Navielek # NAVIELEKTRO KY +78:D6:6F Aristocr # Aristocrat Technologies Australia Pty. Ltd. 78:D6:F0 SamsungE # Samsung Electro Mechanics 78:D7:52 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 78:D9:9F NucomHk # NuCom HK Ltd. @@ -20566,6 +20794,7 @@ 7C:CD:3C Guangzho # Guangzhou Juzing Technology Co., Ltd 7C:CF:CF Shanghai # Shanghai SEARI Intelligent System Co., Ltd 7C:D1:C3 Apple +7C:D3:0A Inventec # INVENTEC Corporation 7C:D7:62 Freestyl # Freestyle Technology Pty Ltd 7C:D8:44 Enmotus # Enmotus Inc 7C:D9:FE NewCosmo # New Cosmos Electric Co., Ltd. @@ -20588,12 +20817,15 @@ 7C:F4:29 Nuuo # NUUO Inc. 7C:FA:DF Apple 7C:FE:28 Salutron # Salutron Inc. +7C:FE:4E Shenzhen # Shenzhen Safe vision Technology Co.,LTD +7C:FF:62 HuizhouS # Huizhou Super Electron Technology Co.,Ltd. 80:00:0B IntelCor # Intel Corporate 80:00:10 AttBellL # ATT BELL LABORATORIES 80:00:6E Apple 80:05:DF MontageT # Montage Technology Group Limited 80:07:A2 EssonTec # Esson Technology Inc. 80:0A:06 Comtec # COMTEC co.,ltd +80:0E:24 Forgetbo # ForgetBox 80:14:40 SunlitSy # Sunlit System Technology Corp 80:16:B7 BrunelUn # Brunel University 80:17:7D NortelNe # Nortel Networks @@ -20612,6 +20844,7 @@ 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:41:4E BbkElect # BBK Electronics Corp., Ltd., 80:42:7C AdolfTed # Adolf Tedsen GmbH & Co. KG 80:47:31 PacketDe # Packet Design, Inc. 80:48:A5 SichuanT # SICHUAN TIANYI COMHEART TELECOM CO.,LTD @@ -20622,6 +20855,7 @@ 80:56:F2 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 80:57:19 SamsungE # Samsung Electronics Co.,Ltd 80:58:C5 NovatecK # NovaTec Kommunikationstechnik GmbH +80:59:FD Noviga 80:60:07 Rim 80:61:8F Shenzhen # Shenzhen sangfei consumer communications co.,ltd 80:64:59 Nimbus # Nimbus Inc. @@ -20669,6 +20903,7 @@ 80:CF:41 LenovoMo # Lenovo Mobile Communication Technology Ltd. 80:D0:19 Embed # Embed, Inc 80:D1:8B Hangzhou # Hangzhou I'converge Technology Co.,Ltd +80:D4:33 Lzlabs # LzLabs GmbH 80:D7:33 QsrAutom # QSR Automations, Inc. 80:DB:31 PowerQuo # Power Quotient International Co., Ltd. 80:EA:96 Apple @@ -20683,6 +20918,7 @@ 84:0B:2D SamsungE # SAMSUNG ELECTRO-MECHANICS CO., LTD 84:0F:45 Shanghai # Shanghai GMT Digital Technologies Co., Ltd 84:17:15 GpElectr # GP Electronics (HK) Ltd. +84:17:66 WeifangG # Weifang GoerTek Electronics Co., Ltd 84:18:88 JuniperN # Juniper Networks 84:1B:38 Shenzhen # Shenzhen Excelsecu Data Technology Co.,Ltd 84:1B:5E Netgear @@ -20692,6 +20928,7 @@ 84:25:3F SilexTec # Silex Technology, Inc 84:25:A4 Tariox # Tariox Limited 84:25:DB SamsungE # Samsung Electronics Co.,Ltd +84:26:15 AdbBroad # ADB Broadband Italia 84:26:2B Alcatel- # Alcatel-Lucent 84:27:CE OfPresid # Corporation of the Presiding Bishop of The Church of Jesus Christ of Latter-day Saints 84:29:14 EmporiaT # EMPORIA TELECOM Produktions- und VertriebsgesmbH & Co KG @@ -20704,6 +20941,7 @@ 84:34:97 HewlettP # Hewlett Packard 84:36:11 Hyungseu # hyungseul publishing networks 84:38:35 Apple +84:38:38 SamsungE # Samsung Electro Mechanics co., LTD. 84:3A:4B IntelCor # Intel Corporate 84:3F:4E Tri-Tech # Tri-Tech Manufacturing, Inc. 84:48:23 WoxterTe # WOXTER TECHNOLOGY Co. Ltd @@ -20719,6 +20957,7 @@ 84:62:A6 EurocbPh # EuroCB (Phils), Inc. 84:6A:ED Wireless # Wireless Tsukamoto.,co.LTD 84:6E:B1 ParkAssi # Park Assist LLC +84:72:07 I&CTechn # I&C Technology 84:74:2A Zte # zte corporation 84:76:16 AddatSRO # Addat S.r.o. 84:78:AC Cisco @@ -20730,10 +20969,12 @@ 84:84:33 ParadoxE # Paradox Engineering SA 84:85:06 Apple 84:8D:84 Rajant # Rajant Corporation +84:8D:C7 CiscoSpv # Cisco SPVTG 84:8E:0C Apple 84:8E:96 Embertec # Embertec Pty Ltd 84:8F:69 Dell # Dell Inc. 84:90:00 ArnoldRi # Arnold & Richter Cine Technik +84:94:8C HitronTe # Hitron Technologies. Inc 84:97:B8 Memjet # Memjet Inc. 84:9C:A6 Arcadyan # Arcadyan Technology Corporation 84:9D:C5 CenteraP # Centera Photonics Inc. @@ -20743,6 +20984,8 @@ 84:A9:91 CyberTra # Cyber Trans Japan Co.,Ltd. 84:AC:A4 BeijingN # Beijing Novel Super Digital TV Technology Co., Ltd 84:AF:1F BeatSyst # Beat System Service Co,. Ltd. +84:B1:53 Apple +84:B5:9C JuniperN # Juniper networks 84:C2:E4 JiangsuQ # Jiangsu Qinheng Co., Ltd. 84:C7:27 Gnodal # Gnodal Ltd 84:C7:A9 C3poSA # C3PO S.A. @@ -20765,6 +21008,8 @@ 84:FE:9E RtcIndus # RTC Industries, Inc. 88:03:55 Arcadyan # Arcadyan Technology Corp. 88:09:05 Mtmcommu # MTMCommunications +88:0F:10 HuamiInf # Huami Information Technology Co.,Ltd. +88:0F:B6 JabilCir # Jabil Circuits India Pvt Ltd,-EHTP unit 88:10:36 PanodicS # Panodic(ShenZhen) Electronics Limted 88:12:4E Qualcomm # Qualcomm Atheros 88:14:2B Protonic # Protonic Holland @@ -20794,6 +21039,7 @@ 88:53:D4 HuaweiTe # Huawei Technologies Co., Ltd 88:57:6D XtaElect # XTA Electronics Ltd 88:5A:92 Cisco +88:5B:DD Aerohive # Aerohive Networks Inc. 88:5C:4F AlcatelL # Alcatel Lucent 88:61:5A SianoMob # Siano Mobile Silicon Ltd. 88:68:5C Shenzhen # Shenzhen ChuangDao & Perpetual Eternal Technology Co.,Ltd @@ -20826,6 +21072,7 @@ 88:AC:C1 Generito # Generiton Co., Ltd. 88:AE:1D CompalIn # COMPAL INFORMATION(KUNSHAN)CO.,LTD 88:B1:68 DeltaCon # Delta Control GmbH +88:B1:E1 Airtight # AirTight Networks, Inc. 88:B6:27 GembirdE # Gembird Europe BV 88:BA:7F Qfiednet # Qfiednet Co., Ltd. 88:BF:D5 SimpleAu # Simple Audio Ltd @@ -21003,6 +21250,7 @@ 90:7A:0A GebrBode # Gebr. Bode GmbH & Co KG 90:7A:28 BeijingM # Beijing Morncloud Information And Technology Co. Ltd. 90:7A:F1 SnupiTec # SNUPI Technologies +90:7E:BA UtekTech # UTEK TECHNOLOGY (SHENZHEN) CO.,LTD 90:7F:61 ChiconyE # Chicony Electronics Co., Ltd. 90:82:60 Ieee1904 # IEEE 1904.1 Working Group 90:83:7A GeneralE # General Electric Water & Process Technologies @@ -21010,7 +21258,6 @@ 90:88:A2 IonicsTe # IONICS TECHNOLOGY ME LTDA 90:8C:44 HKZongmu # H.K ZONGMU TECHNOLOGY CO., LTD. 90:8D:1D GhTechno # GH Technologies -90:8F:93 Makerbot # MakerBot Industries 90:8F:CF UnoSyste # UNO System Co., Ltd 90:90:3C TrisonTe # TRISON TECHNOLOGY CORPORATION 90:90:60 RsiVideo # RSI VIDEO TECHNOLOGIES @@ -21025,6 +21272,7 @@ 90:A7:83 JswPacif # JSW PACIFIC CORPORATION 90:A7:C1 PakedgeD # Pakedge Device and Software Inc. 90:AC:3F Brightsi # BrightSign LLC +90:AE:1B Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 90:B1:1C Dell # Dell Inc. 90:B1:34 ArrisGro # ARRIS Group, Inc. 90:B2:1F Apple @@ -21044,7 +21292,7 @@ 90:DA:4E Avanu 90:DB:46 E-LeadEl # E-LEAD ELECTRONIC CO., LTD 90:DF:B7 SMSSmart # s.m.s smart microwave sensors GmbH -90:E0:F0 HarmanIn # Harman International +90:E0:F0 Ieee1722 # IEEE 1722a Working Group 90:E2:BA IntelCor # Intel Corporate 90:E6:BA AsustekC # ASUSTek COMPUTER INC. 90:EA:60 SpiLaser # SPI Lasers Ltd @@ -21087,6 +21335,7 @@ 94:4A:09 BitwiseC # BitWise Controls 94:50:47 Rechnerb # Rechnerbetriebsgruppe 94:51:03 SamsungE # Samsung Electronics +94:51:BF HyundaiE # Hyundai ESG 94:59:2D EkeBuild # EKE Building Technology Systems Ltd 94:5B:7E Trilobit # TRILOBIT LTDA. 94:61:24 Pason # Pason Systems @@ -21117,6 +21366,7 @@ 94:BA:31 Visionte # Visiontec da Amazônia Ltda. 94:BA:56 Shenzhen # Shenzhen Coship Electronics Co., Ltd. 94:BF:1E Eflow/Sm # eflow Inc. / Smart Device Planning and Development Division +94:C0:14 SorterSp # Sorter Sp. j. Konrad Grzeszczyk MichaA, Ziomek 94:C1:50 2wire # 2Wire Inc 94:C3:E4 ScaSchuc # SCA Schucker Gmbh & Co KG 94:C4:E9 Powerlay # PowerLayer Microsystems HongKong Limited @@ -21167,8 +21417,10 @@ 98:2D:56 Resoluti # Resolution Audio 98:30:00 BeijingK # Beijing KEMACOM Technologies Co., Ltd. 98:30:71 Daikyung # DAIKYUNG VASCOM +98:34:9D KraussMa # Krauss Maffei Technologies GmbH 98:35:71 Sub10 # Sub10 Systems Ltd 98:35:B8 Assemble # Assembled Products Corporation +98:37:13 PtNavico # PT.Navicom Indonesia 98:3B:16 AmpakTec # AMPAK Technology Inc 98:3F:9F ChinaSsj # China SSJ (Suzhou) Network Technology Inc. 98:42:46 SolIndus # SOL INDUSTRY PTE., LTD @@ -21190,6 +21442,7 @@ 98:5E:1B Conversd # ConversDigital Co., Ltd. 98:60:22 Emw # EMW Co., Ltd. 98:66:EA Industri # Industrial Control Communications, Inc. +98:6B:3D ArrisGro # ARRIS Group, Inc. 98:6C:F5 Zte # zte corporation 98:6D:C8 ToshibaM # TOSHIBA MITSUBISHI-ELECTRIC INDUSTRIAL SYSTEMS CORPORATION 98:73:C4 SageElec # Sage Electronic Engineering LLC @@ -21212,6 +21465,7 @@ 98:B8:E3 Apple 98:BC:57 SvaTechn # SVA TECHNOLOGIES CO.LTD 98:BC:99 Edeltech # Edeltech Co.,Ltd. +98:BE:94 Ibm 98:C0:EB GlobalRe # Global Regency Ltd 98:C8:45 Packetac # PacketAccess 98:CD:B4 Virident # Virident Systems, Inc. @@ -21251,6 +21505,7 @@ 9C:22:0E TascanSe # TASCAN Service GmbH 9C:28:40 Discover # Discovery Technology,LTD.. 9C:28:BF Continen # Continental Automotive Czech Republic s.r.o. +9C:28:EF HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 9C:2A:70 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 9C:31:78 FoshanHu # Foshan Huadian Intelligent Communications Teachnologies Co.,Ltd 9C:31:B6 KuliteSe # Kulite Semiconductor Products Inc @@ -21278,6 +21533,7 @@ 9C:5E:73 CalibreU # Calibre UK Ltd 9C:61:1D Omni-IdU # Omni-ID USA, Inc. 9C:64:5E HarmanCo # Harman Consumer Group +9C:65:B0 SamsungE # Samsung Electronics Co.,Ltd 9C:65:F9 AcsipTec # AcSiP Technology Corp. 9C:66:50 GlodioTe # Glodio Technolies Co.,Ltd Tianjin Branch 9C:6A:BE QeesAps # QEES ApS. @@ -21318,6 +21574,7 @@ 9C:C7:D1 Sharp # SHARP Corporation 9C:CA:D9 Nokia # Nokia Corporation 9C:CD:82 ChengUei # CHENG UEI PRECISION INDUSTRY CO.,LTD +9C:D2:1E HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 9C:D2:4B Zte # zte corporation 9C:D3:6D Netgear # NETGEAR INC., 9C:D6:43 D-LinkIn # D-Link International @@ -21332,7 +21589,9 @@ 9C:F6:7D RicardoP # Ricardo Prague, s.r.o. 9C:F8:DB Shenzhen # shenzhen eyunmei technology co,.ltd 9C:F9:38 ArevaNp # AREVA NP GmbH +9C:FB:F1 Mesomati # MESOMATIC GmbH & Co.KG 9C:FF:BE Otsl # OTSL Inc. +A0:02:DC AmazonTe # Amazon Technologies Inc. A0:03:63 RobertBo # Robert Bosch Healthcare GmbH A0:07:98 SamsungE # Samsung Electronics A0:07:B6 Advanced # Advanced Technical Support, Inc. @@ -21350,6 +21609,7 @@ A0:21:95 SamsungE # Samsung Electronics Digital Imaging A0:21:B7 Netgear A0:23:1B Telecomp # TeleComp R&D Corp. +A0:2B:B8 HewlettP # Hewlett Packard A0:2E:F3 UnitedIn # United Integrated Services Co., Led. A0:36:9F IntelCor # Intel Corporate A0:36:F0 Comprehe # Comprehensive Power @@ -21416,7 +21676,9 @@ A0:C6:EC Shenzhen # ShenZhen ANYK Technology Co.,LTD A0:CE:C8 CeLink # CE LINK LIMITED A0:CF:5B Cisco # CISCO SYSTEMS, INC. +A0:D1:2A AxproTec # AXPRO Technology Inc. A0:D3:C1 HewlettP # Hewlett Packard +A0:DA:92 NanjingG # Nanjing Glarun Atten Technology Co. Ltd. A0:DC:04 Becker-A # Becker-Antriebe GmbH A0:DD:97 Polarlin # PolarLink Technologies, Ltd A0:DD:E5 Sharp # SHARP Corporation @@ -21438,6 +21700,7 @@ A0:F4:19 Nokia # Nokia Corporation A0:F4:50 Htc # HTC Corporation A0:F4:59 Fn-LinkT # FN-LINK TECHNOLOGY LIMITED +A0:FC:6E Telegraf # Telegrafia a.s. A0:FE:91 AvatAuto # AVAT Automation GmbH A4:01:30 Abisyste # ABIsystems Co., LTD A4:05:9E StaInfin # STA Infinity LLP @@ -21459,6 +21722,8 @@ A4:33:D1 Fibrlink # Fibrlink Communications Co.,Ltd. A4:38:FC PlasticL # Plastic Logic A4:3A:69 Vers # Vers Inc +A4:3B:FA IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. +A4:3D:78 Guangdon # GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD A4:46:6B EocTechn # EOC Technology A4:46:FA AmtranVi # AmTRAN Video Corporation A4:4B:15 SunCupid # Sun Cupid Technology (HK) LTD @@ -21472,6 +21737,7 @@ A4:5A:1C Smart-El # smart-electronic GmbH A4:5C:27 Nintendo # Nintendo Co., Ltd. A4:5D:36 HewlettP # Hewlett Packard +A4:60:32 MrvCommu # MRV Communications (Networks) LTD A4:67:06 Apple A4:6C:C1 LtiReene # LTi REEnergy GmbH A4:6E:79 DftSyste # DFT System Co.Ltd @@ -21481,7 +21747,9 @@ A4:7A:A4 ArrisGro # ARRIS Group, Inc. A4:7A:CF VibicomC # VIBICOM COMMUNICATIONS INC. A4:7C:14 Chargest # ChargeStorm AB -A4:7C:1F GlobalMi # Global Microwave Systems Inc. +A4:7C:1F Cobham # Cobham plc +A4:7E:39 Zte # zte corporation +A4:81:EE Nokia # Nokia Corporation A4:85:6B QElectro # Q Electronics Ltd A4:89:5B ArkInfos # ARK INFOSOLUTIONS PVT LTD A4:90:05 ChinaGre # CHINA GREATWALL COMPUTER SHENZHEN CO.,LTD @@ -21489,8 +21757,10 @@ A4:97:BB HitachiI # Hitachi Industrial Equipment Systems Co.,Ltd A4:99:47 HuaweiTe # Huawei Technologies Co., Ltd A4:99:81 FujianEl # FuJian Elite Power Tech CO.,LTD. +A4:9A:58 SamsungE # Samsung Electronics Co.,Ltd A4:9B:13 Burrough # Burroughs Payment Systems, Inc. A4:9E:DB Autocrib # AutoCrib, Inc. +A4:9F:85 LyveMind # Lyve Minds, Inc A4:9F:89 Shanghai # Shanghai Rui Rui Communication Technology Co.Ltd. A4:A2:4A CiscoSpv # Cisco SPVTG A4:A8:0F Shenzhen # Shenzhen Coship Electronics Co., Ltd. @@ -21591,6 +21861,7 @@ A8:98:C6 Shinbo # Shinbo Co., Ltd. A8:99:5C Aizo # aizo ag A8:9B:10 Inmotion # inMotion Ltd. +A8:A6:68 Zte # zte corporation A8:AD:3D Alcatel- # Alcatel-Lucent Shanghai Bell Co., Ltd A8:B0:AE Leoni A8:B1:D4 Cisco # CISCO SYSTEMS, INC. @@ -21610,6 +21881,7 @@ A8:EF:26 Tritonwa # Tritonwave A8:F2:74 SamsungE # Samsung Electronics A8:F4:70 FujianNe # Fujian Newland Communication Science Technologies Co.,Ltd. +A8:F7:E0 PlanetTe # PLANET Technology Corporation A8:F9:4B EltexEnt # Eltex Enterprise Ltd. A8:FA:D8 Apple A8:FB:70 WisesecL # WiseSec L.t.d @@ -21689,8 +21961,11 @@ AC:A0:16 Cisco # CISCO SYSTEMS, INC. AC:A2:2C BaycityT # Baycity Technologies Ltd AC:A4:30 Peerless # Peerless AV +AC:A9:19 Trekstor # TrekStor GmbH +AC:A9:A0 Audioeng # Audioengine, Ltd. AC:AB:8D LyngsoMa # Lyngso Marine A/S AC:B3:13 ArrisGro # ARRIS Group, Inc. +AC:B8:59 UnibandE # Uniband Electronic Corp, AC:BD:0B Imac # IMAC CO.,LTD AC:BE:75 UfineTec # Ufine Technologies Co.,Ltd. AC:BE:B6 Visualed # Visualedge Technology Co., Ltd. @@ -21729,6 +22004,7 @@ AC:F7:F3 Xiaomi # XIAOMI CORPORATION AC:F9:7E Elesys # ELESYS INC. AC:FD:EC Apple # Apple, Inc +B0:00:B4 Cisco B0:05:94 LiteonTe # Liteon Technology Corporation B0:12:03 Dynamics # Dynamics Hong Kong Limited B0:12:66 Futaba-K # Futaba-Kikaku @@ -21737,6 +22013,7 @@ B0:1B:7C OntrolAS # Ontrol A.S. B0:1C:91 Elim # Elim Co B0:24:F3 Progeny # Progeny Systems +B0:25:AA Private B0:34:95 Apple B0:35:8D Nokia # Nokia Corporation B0:38:29 Siliconw # Siliconware Precision Industries Co., Ltd. @@ -21748,12 +22025,15 @@ B0:4C:05 Freseniu # Fresenius Medical Care Deutschland GmbH B0:50:BC Shenzhen # SHENZHEN BASICOM ELECTRONIC CO.,LTD. B0:51:8E HollTech # Holl technology CO.Ltd. +B0:57:06 ValloxOy # Vallox Oy B0:58:C4 Broadcas # Broadcast Microwave Services, Inc B0:5B:1F ThermoFi # THERMO FISHER SCIENTIFIC S.P.A. B0:5C:E5 Nokia # Nokia Corporation +B0:61:C7 Ericsson # Ericsson-LG Enterprise B0:65:63 Shanghai # Shanghai Railway Communication Factory B0:65:BD Apple B0:68:B6 Hangzhou # Hangzhou OYE Technology Co. Ltd +B0:69:71 DeiSales # DEI Sales, Inc. B0:6C:BF 3alityDi # 3ality Digital Systems GmbH B0:75:0C QaCafe # QA Cafe B0:75:D5 Zte # ZTE Corporation @@ -21800,7 +22080,9 @@ B0:CF:4D Mi-ZoneT # MI-Zone Technology Ireland B0:D0:9C SamsungE # Samsung Electronics Co.,Ltd B0:D2:F5 Vello # Vello Systems, Inc. +B0:D5:9D Shenzhen # Shenzhen Zowee Technology Co., Ltd B0:D7:C5 StpKft # STP KFT +B0:DA:00 CeraElec # CERA ELECTRONIQUE B0:DF:3A SamsungE # Samsung Electronics Co.,Ltd B0:E3:9D CatSyste # CAT SYSTEM CO.,LTD. B0:E5:0E Nrg # NRG SYSTEMS INC @@ -21856,6 +22138,7 @@ B4:62:38 Exablox B4:62:93 SamsungE # Samsung Electronics Co.,Ltd B4:62:AD Raytest # raytest GmbH +B4:66:98 ZealabsS # Zealabs srl B4:67:E9 QingdaoG # Qingdao GoerTek Technology Co., Ltd. B4:74:9F AskeyCom # askey computer corp B4:75:0E BelkinIn # Belkin International Inc. @@ -21901,6 +22184,7 @@ B4:E9:B0 Cisco B4:ED:19 PieDigit # Pie Digital, Inc. B4:ED:54 WohlerTe # Wohler Technologies +B4:EE:B4 AskeyCom # ASKEY COMPUTER CORP B4:EE:D4 TexasIns # Texas Instruments B4:F0:AB Apple B4:F2:E8 Pace # Pace plc @@ -21922,6 +22206,7 @@ B8:27:EB Raspberr # Raspberry Pi Foundation B8:28:8B ParkerHa # Parker Hannifin B8:29:F7 BlasterT # Blaster Tech +B8:2A:72 Dell # Dell Inc B8:2A:DC EfrEurop # EFR Europäische Funk-Rundsteuerung GmbH B8:2C:A0 Honeywel # Honeywell HomMed B8:30:A8 Road-Tra # Road-Track Telematics Development @@ -21946,14 +22231,17 @@ B8:64:91 CkTeleco # CK Telecom Ltd B8:65:3B Bolymin # Bolymin, Inc. B8:6B:23 Toshiba +B8:6C:E8 SamsungE # Samsung Electronics Co.,Ltd B8:70:F4 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD. B8:74:24 Viessman # Viessmann Elektronik GmbH B8:74:47 Converge # Convergence Technologies +B8:75:C0 Paypal # PayPal, Inc. B8:76:3F HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. B8:77:C3 DecagonD # Decagon Devices, Inc. B8:78:2E Apple B8:79:7E SecureMe # Secure Meters (UK) Limited B8:7A:C9 Siemens # Siemens Ltd. +B8:7C:F2 Aerohive # Aerohive Networks Inc. B8:87:1E GoodMind # Good Mind Industries Co., Ltd. B8:87:A8 StepAhea # Step Ahead Innovations Inc. B8:88:E3 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD @@ -21990,7 +22278,7 @@ B8:C7:16 Fiberhom # Fiberhome Telecommunication Technologies Co.,LTD B8:C7:5D Apple B8:C8:55 Shanghai # Shanghai GBCOM Communication Technology Co.,Ltd. -B8:CA:3A DellPcba # Dell PCBA Test +B8:CA:3A Dell # Dell Inc B8:CD:93 Penetek # Penetek, Inc B8:CD:A7 MaxelerT # Maxeler Technologies Ltd. B8:D0:6F Guangzho # GUANGZHOU HKUST FOK YING TUNG RESEARCH INSTITUTE @@ -22073,6 +22361,7 @@ BC:88:93 Villbau # VILLBAU Ltd. BC:8B:55 NppEliks # NPP ELIKS America Inc. DBA T&M Atlantic BC:8C:CD SamsungE # Samsung Electro Mechanics co.,LTD. +BC:8D:0E Alcatel- # Alcatel-Lucent BC:92:6B Apple BC:96:80 Shenzhen # Shenzhen Gongjin Electronics Co.,Ltd BC:98:89 Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. @@ -22140,6 +22429,7 @@ C0:58:A7 Pico # Pico Systems Co., Ltd. C0:5E:6F VStonkau # V. Stonkaus firma "Kodinis Raktas" C0:5E:79 Shenzhen # SHENZHEN HUAXUN ARK TECHNOLOGIES CO.,LTD +C0:61:18 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. C0:62:6B Cisco # CISCO SYSTEMS, INC. C0:63:94 Apple C0:64:C6 Nokia # Nokia Corporation @@ -22160,6 +22450,7 @@ C0:91:34 Procurve # ProCurve Networking by HP C0:98:E5 Universi # University of Michigan C0:9C:92 Coby +C0:9D:26 TopiconH # Topicon HK Lmd. C0:9F:42 Apple C0:A0:BB D-LinkIn # D-Link International C0:A0:C7 Fairfiel # FAIRFIELD INDUSTRIES @@ -22217,6 +22508,7 @@ C4:27:95 Technico # Technicolor USA Inc. C4:29:1D KlemsanE # KLEMSAN ELEKTRIK ELEKTRONIK SAN.VE TIC.AS. C4:2C:03 Apple +C4:34:6B HewlettP # Hewlett Packard C4:36:DA Rustelet # Rusteletech Ltd. C4:38:D3 Tagatec # TAGATEC CO.,LTD C4:39:3A SmcNetwo # SMC Networks Inc @@ -22241,11 +22533,13 @@ C4:59:76 FugooCoo # Fugoo Coorporation C4:5D:D8 HdmiForu # HDMI Forum C4:60:44 EverexEl # Everex Electronics Limited +C4:62:6B ZptVigan # ZPT Vigantice C4:62:EA SamsungE # Samsung Electronics Co.,Ltd C4:63:54 U-Raku # U-Raku, Inc. C4:64:13 Cisco # CISCO SYSTEMS, INC. C4:67:B5 Libraton # Libratone A/S C4:6A:B7 XiaomiTe # Xiaomi Technology,Inc. +C4:6B:B4 Myidkey C4:6D:F1 Datagrav # DataGravity C4:6E:1F Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD C4:71:30 FonTechn # Fon Technology S.L. @@ -22261,6 +22555,7 @@ C4:82:4E Changzho # Changzhou Uchip Electronics Co., LTD. C4:85:08 IntelCor # Intel Corporate C4:88:E5 SamsungE # Samsung Electronics Co.,Ltd +C4:91:3A Shenzhen # Shenzhen Sanland Electronic Co., ltd. C4:93:00 8devices C4:93:13 100fioNe # 100fio networks technology llc C4:93:80 Speedyte # Speedytel technology @@ -22304,11 +22599,12 @@ C8:19:F7 SamsungE # Samsung Electronics Co.,Ltd C8:1A:FE Dlogic # DLOGIC GmbH C8:1E:8E AdvSecur # ADV Security (S) Pte Ltd -C8:1F:66 DellPcba # Dell Inc PCBA Test +C8:1F:66 Dell # Dell Inc C8:20:8E Storaged # Storagedata C8:29:2A BarunEle # Barun Electronics C8:2A:14 Apple C8:2E:94 HalfaEnt # Halfa Enterprise Co., Ltd. +C8:31:68 Ezex # eZEX corporation C8:32:32 HuntingI # Hunting Innova C8:33:4B Apple C8:35:B8 Ericsson # Ericsson, EAB/RWI/K @@ -22346,6 +22642,7 @@ C8:97:9F Nokia # Nokia Corporation C8:9C:1D Cisco # CISCO SYSTEMS, INC. C8:9C:DC Elitegro # ELITEGROUP COMPUTER SYSTEM CO., LTD. +C8:9F:1D Shenzhen # SHENZHEN COMMUNICATION TECHNOLOGIES CO.,LTD C8:9F:42 VdiiInno # VDII Innovation AB C8:A0:30 TexasIns # Texas Instruments C8:A1:B6 Shenzhen # Shenzhen Longway Technologies Co., Ltd @@ -22359,6 +22656,7 @@ C8:AF:40 MarcoSys # marco Systemanalyse und Entwicklung GmbH C8:B3:73 Cisco-Li # Cisco-Linksys, LLC C8:B5:B7 Apple +C8:BA:94 SamsungE # Samsung Electro Mechanics co., LTD. C8:BB:D3 Embrane C8:BC:C8 Apple C8:BE:19 D-LinkIn # D-Link International @@ -22373,6 +22671,7 @@ C8:D2:C1 JetlunSh # Jetlun (Shenzhen) Corporation C8:D3:A3 D-LinkIn # D-Link International C8:D4:29 Muehlbau # Muehlbauer AG +C8:D5:90 FlightDa # FLIGHT DATA SYSTEMS C8:D5:FE Shenzhen # Shenzhen Zowee Technology Co., Ltd C8:D7:19 CiscoCon # Cisco Consumer Products, LLC C8:DD:C9 LenovoMo # Lenovo Mobile Communication Technology Ltd. @@ -22387,6 +22686,7 @@ C8:F3:6B YamatoSc # Yamato Scale Co.,Ltd. C8:F3:86 Shenzhen # Shenzhen Xiaoniao Technology Co.,Ltd C8:F4:06 Avaya # Avaya, Inc +C8:F6:50 Apple C8:F6:8D SETechno # S.E.TECHNOLOGIES LIMITED C8:F7:04 Building # Building Block Video C8:F7:33 IntelCor # Intel Corporate @@ -22399,6 +22699,7 @@ CC:04:B4 SelectCo # Select Comfort CC:05:1B SamsungE # Samsung Electronics Co.,Ltd CC:07:AB SamsungE # Samsung Electronics Co.,Ltd +CC:07:E4 LenovoMo # Lenovo Mobile Communication Technology Ltd. CC:08:E0 Apple CC:09:C8 Imaqliq # IMAQLIQ LTD CC:0C:DA Miljovak # Miljovakt AS @@ -22459,6 +22760,7 @@ CC:96:A0 Shenzhen # Shenzhen Huawei Communication Technologies Co., Ltd CC:9E:00 Nintendo # Nintendo Co., Ltd. CC:9F:35 Transbit # Transbit Sp. z o.o. +CC:A0:E5 DzgMeter # DZG Metering GmbH CC:A3:74 Guangdon # Guangdong Guanglian Electronic Technology Co.Ltd CC:A4:62 ArrisGro # ARRIS Group, Inc. CC:A6:14 AifaTech # AIFA TECHNOLOGY CORP. @@ -22466,11 +22768,13 @@ CC:B2:55 D-LinkIn # D-Link International CC:B3:F8 FujitsuI # FUJITSU ISOTEC LIMITED CC:B5:5A Fraunhof # Fraunhofer ITWM +CC:B6:91 Necmagnu # NECMagnusCommunications CC:B8:88 AnbSecur # AnB Securite s.a. CC:B8:F1 EagleKin # EAGLE KINGDOM TECHNOLOGIES LIMITED CC:BD:35 Steinel # Steinel GmbH CC:BE:71 Optilogi # OptiLogix BV CC:C1:04 AppliedT # Applied Technical Systems +CC:C3:EA Motorola # Motorola Mobility LLC CC:C5:0A Shenzhen # SHENZHEN DAJIAHAO TECHNOLOGY CO.,LTD CC:C6:2B Tri-Syst # Tri-Systems Corporation CC:C8:D7 CiasElet # CIAS Elettronica srl @@ -22482,6 +22786,7 @@ CC:D5:39 Cisco CC:D8:11 AiconnTe # Aiconn Technology Corporation CC:D9:E9 ScrEngin # SCR Engineers Ltd. +CC:E1:D5 Buffalo # Buffalo Inc. CC:E7:98 MySocial # My Social Stuff CC:E7:DF American # American Magnetics, Inc. CC:E8:AC SoyeaTec # SOYEA Technology Co.,Ltd. @@ -22527,6 +22832,7 @@ D0:58:75 ActiveCo # Active Control Technology Inc. D0:59:C3 Ceramicr # CeraMicro Technology Corporation D0:5A:0F I-BtDigi # I-BT DIGITAL CO.,LTD +D0:5F:B8 TexasIns # Texas Instruments D0:5F:CE HitachiD # Hitachi Data Systems D0:63:4D MeikoMas # Meiko Maschinenbau GmbH & Co. KG D0:63:B4 Solidrun # SolidRun Ltd. @@ -22534,10 +22840,12 @@ D0:67:E5 Dell # Dell Inc D0:69:9E LuminexL # LUMINEX Lighting Control Equipment D0:69:D0 VertoMed # Verto Medical Solutions, LLC +D0:72:DC Cisco D0:73:7F Mini-Cir # Mini-Circuits D0:73:8E DongOhPr # DONG OH PRECISION CO., LTD. D0:73:D5 LifiLabs # LIFI LABS MANAGEMENT PTY LTD D0:75:BE RenoA&E # Reno A&E +D0:76:50 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. D0:7A:B5 HuaweiTe # Huawei Technologies Co., Ltd D0:7D:E5 ForwardP # Forward Pay Systems, Inc. D0:7E:28 HewlettP # Hewlett Packard @@ -22566,6 +22874,7 @@ D0:C2:82 Cisco # CISCO SYSTEMS, INC. D0:C4:2F Tamagawa # Tamagawa Seiki Co.,Ltd. D0:C7:89 Cisco +D0:C7:C0 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. D0:CD:E1 Scientec # Scientech Electronics D0:CF:5E EnergyMi # Energy Micro AS D0:D0:FD Cisco # CISCO SYSTEMS, INC. @@ -22607,6 +22916,7 @@ D4:1E:35 TohoElec # TOHO Electronics INC. D4:1F:0C TviVisio # TVI Vision Oy D4:20:6D Htc # HTC Corporation +D4:21:22 Sercomm # Sercomm Corporation D4:22:3F LenovoMo # Lenovo Mobile Communication Technology Ltd. D4:22:4E AlcatelL # Alcatel Lucent D4:27:51 Infopia # Infopia Co., Ltd @@ -22634,6 +22944,7 @@ D4:5D:42 Nokia # Nokia Corporation D4:64:F7 ChengduU # CHENGDU USEE DIGITAL TECHNOLOGY CO., LTD D4:66:A8 RiedoNet # Riedo Networks GmbH +D4:67:61 SahabTec # SAHAB TECHNOLOGY D4:67:E7 Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. D4:68:67 Neoventu # Neoventus Design Group D4:6A:91 SnapAv # Snap AV @@ -22657,6 +22968,7 @@ D4:94:A1 TexasIns # Texas Instruments D4:95:24 CloverNe # Clover Network, Inc. D4:96:DF SungjinC # SUNGJIN C&T CO.,LTD +D4:97:0B Xiaomi # XIAOMI CORPORATION D4:9A:20 Apple D4:9C:28 JaybirdG # JayBird Gear LLC D4:9C:8E Universi # University of FUKUI @@ -22670,6 +22982,7 @@ D4:AD:2D Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. D4:AE:52 Dell # Dell Inc D4:B1:10 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD +D4:B4:3E Messcomp # Messcomp Datentechnik GmbH D4:BE:D9 Dell # Dell Inc D4:BF:2D SeContro # SE Controls Asia Pacific Ltd D4:BF:7F Upvel @@ -22680,6 +22993,7 @@ D4:CA:6E U-Blox # u-blox AG D4:CB:AF Nokia # Nokia Corporation D4:CE:B8 Enatel # Enatel LTD +D4:CF:F9 Shenzhen # Shenzhen Sen5 Technology Co., Ltd. D4:D1:84 AdbBroad # ADB Broadband Italia D4:D2:49 PowerEth # Power Ethernet D4:D5:0D Southwes # Southwest Microwave, Inc @@ -22687,6 +23001,7 @@ D4:D8:98 KoreaCno # Korea CNO Tech Co., Ltd D4:D9:19 Gopro D4:DF:57 Alpinion # Alpinion Medical Systems +D4:E0:8E Valuehd # ValueHD Corporation D4:E3:2C SSiedleS # S. Siedle & Sohne D4:E3:3F Alcatel- # Alcatel-Lucent D4:E8:B2 SamsungE # Samsung Electronics @@ -22726,6 +23041,7 @@ D8:42:AC Shanghai # Shanghai Feixun Communication Co.,Ltd. D8:46:06 SiliconV # Silicon Valley Global Marketing D8:49:0B HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD +D8:49:2F Canon # CANON INC. D8:4B:2A Cognitas # Cognitas Technologies, Inc. D8:50:E6 AsustekC # ASUSTek COMPUTER INC. D8:54:3A TexasIns # Texas Instruments @@ -22733,7 +23049,7 @@ D8:58:D7 CzNicZSP # CZ.NIC, z.s.p.o. D8:5D:4C Tp-LinkT # TP-LINK Technologies Co.,Ltd. D8:5D:84 CaxSoft # CAx soft GmbH -D8:61:94 Objetivo # Objetivos y Sevicios de Valor Añadido +D8:61:94 Objetivo # Objetivos y Sevicios de Valor Añadido D8:62:DB Eno # Eno Inc. D8:65:95 ToySMyth # Toy's Myth Inc. D8:66:C6 Shenzhen # Shenzhen Daystar Technology Co.,ltd @@ -22747,6 +23063,7 @@ D8:78:E5 KuhnSa # KUHN SA D8:79:88 HonHaiPr # Hon Hai Precision Ind. Co., Ltd. D8:7C:DD Sanix # SANIX INCORPORATED +D8:7E:B1 XOWare # x.o.ware, inc. D8:81:CE Ahn # AHN INC. D8:8A:3B Unit-Em D8:90:E8 SamsungE # Samsung Electronics Co.,Ltd @@ -22755,6 +23072,7 @@ D8:96:95 Apple D8:97:3B EmersonN # Emerson Network Power Embedded Power D8:97:60 C2Develo # C2 Development, Inc. +D8:97:7C GreyInno # Grey Innovation D8:9D:67 HewlettP # Hewlett Packard D8:9D:B9 Emegatec # eMegatech International Corp. D8:9E:3F Apple @@ -22767,6 +23085,7 @@ D8:B1:2A Panasoni # Panasonic Mobile Communications Co., Ltd. D8:B3:77 Htc # HTC Corporation D8:B6:C1 Networka # NetworkAccountant, Inc. +D8:B6:D6 BluTethe # Blu Tether Limited D8:B8:F6 Nantwork # Nantworks D8:B9:0E TripleDo # Triple Domain Vision Co.,Ltd. D8:BF:4C VictoryC # Victory Concept Electronics Limited @@ -22775,6 +23094,7 @@ D8:C6:91 HichanTe # Hichan Technology Corp. D8:C7:C8 ArubaNet # Aruba Networks D8:C9:9D EaDispla # EA DISPLAY LIMITED +D8:CF:9C Apple D8:D1:CB Apple D8:D2:7C JemaEner # JEMA ENERGY, SA D8:D3:85 Hewlett- # Hewlett-Packard Company @@ -22785,6 +23105,7 @@ D8:DC:E9 KunshanE # Kunshan Erlab ductless filtration system Co.,Ltd D8:DD:5F Balmuda # BALMUDA Inc. D8:DD:FD TexasIns # Texas Instruments +D8:DE:CE Isung # ISUNG CO.,LTD D8:DF:0D Beronet # beroNet GmbH D8:E3:AE CirtecMe # CIRTEC MEDICAL SYSTEMS D8:E7:2B OnpathTe # OnPATH Technologies @@ -22820,6 +23141,7 @@ DC:30:9C Heyrex # Heyrex Limited DC:33:50 Techsat # TechSAT GmbH DC:37:D2 HunanHkt # Hunan HKT Electronic Technology Co., Ltd +DC:38:E1 JuniperN # Juniper networks DC:3A:5E Roku # Roku, Inc DC:3C:2E Manufact # Manufacturing System Insights, Inc. DC:3C:84 TicomGeo # Ticom Geomatics, Inc. @@ -22831,6 +23153,7 @@ DC:57:26 Power-On # Power-One DC:5E:36 Paterson # Paterson Technology DC:64:7C CRSIimot # C.R.S. iiMotion GmbH +DC:66:3A ApacerTe # Apacer Technology Inc. DC:6F:00 Livescri # Livescribe, Inc. DC:6F:08 BayStora # Bay Storage Technology DC:70:14 Private @@ -22959,6 +23282,7 @@ E0:CA:94 AskeyCom # Askey Computer E0:CB:1D Private E0:CB:4E AsustekC # ASUSTek COMPUTER INC. +E0:CB:EE SamsungE # Samsung Electronics Co.,Ltd E0:CE:C3 AskeyCom # ASKEY COMPUTER CORP E0:CF:2D Gemintek # Gemintek Corporation E0:D1:0A Katouden # Katoudenkikougyousyo co ltd @@ -22987,6 +23311,7 @@ E2:0C:0F Kingston # Kingston Technologies E4:04:39 TomtomSo # TomTom Software Ltd E4:11:5B HewlettP # Hewlett Packard +E4:12:18 Shenzhen # ShenZhen Rapoo Technology Co., Ltd. E4:12:1D SamsungE # Samsung Electronics Co.,Ltd E4:12:89 Topsyste # topsystem Systemhaus GmbH E4:1C:4B V2Techno # V2 TECHNOLOGY, INC. @@ -23050,6 +23375,7 @@ E4:C7:22 Cisco E4:C8:06 CeiecEle # Ceiec Electric Technology Inc. E4:CE:8F Apple +E4:D3:32 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. E4:D3:F1 Cisco E4:D5:3D HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. E4:D7:1D OrayaThe # Oraya Therapeutics @@ -23060,6 +23386,7 @@ E4:EE:FD Mr&DManu # MR&D Manufacturing E4:F3:65 Time-O-M # Time-O-Matic, Inc. E4:F3:E3 Shanghai # Shanghai iComhome Co.,Ltd. +E4:F4:C6 Netgear E4:F7:A1 Datafox # Datafox GmbH E4:FA:1D PadPerip # PAD Peripheral Advanced Design Inc. E4:FF:DD Electron # ELECTRON INDIA @@ -23161,6 +23488,7 @@ E8:EA:6A Startech # StarTech.com E8:EA:DA DenkoviA # Denkovi Assembly Electroncs LTD E8:ED:F3 Cisco +E8:EF:89 OpmexTec # OPMEX Tech. E8:F1:B0 Sagemcom # SAGEMCOM SAS E8:F2:26 MillsonC # MILLSON CUSTOM SOLUTIONS INC. E8:F9:28 RftechSr # RFTECH SRL @@ -23170,6 +23498,7 @@ EC:11:20 Flodesig # FloDesign Wind Turbine Corporation EC:14:F6 Biocontr # BioControl AS EC:17:2F Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. +EC:17:66 Research # Research Centre Module EC:1A:59 BelkinIn # Belkin International Inc. EC:21:9F VidaboxL # VidaBox LLC EC:22:57 JiangsuN # JiangSu NanJing University Electronic Information Technology Co.,Ltd @@ -23177,6 +23506,7 @@ EC:23:68 Intelliv # IntelliVoice Co.,Ltd. EC:2A:F0 Ypsomed # Ypsomed AG EC:2C:49 Universi # University of Tokyo +EC:2E:4E Hitachi- # HITACHI-LG DATA STORAGE INC EC:30:91 Cisco # CISCO SYSTEMS, INC. EC:35:86 Apple EC:3B:F0 Novelsat @@ -23231,6 +23561,7 @@ EC:DE:3D LampreyN # Lamprey Networks, Inc. EC:E0:9B SamsungE # Samsung electronics CO., LTD EC:E1:A9 Cisco +EC:E5:12 Tado # tado GmbH EC:E5:55 Hirschma # Hirschmann Automation EC:E7:44 OmntecMf # Omntec mfg. inc EC:E9:0B SistemaS # SISTEMA SOLUCOES ELETRONICAS LTDA - EASYTECH @@ -23240,7 +23571,8 @@ EC:F0:0E Abocom EC:F2:36 Neomonta # NEOMONTANA ELECTRONICS EC:F3:5B Nokia # Nokia Corporation -EC:F4:BB DellPcba # Dell Inc PCBA Test +EC:F4:BB Dell # Dell Inc +EC:F7:2B HdDigita # HD DIGITAL TECH CO., LTD. EC:FA:AA Ims # The IMS Company EC:FC:55 AEberle # A. Eberle GmbH & Co. KG EC:FE:7E Blueradi # BlueRadios, Inc. @@ -23250,8 +23582,9 @@ F0:07:86 Shandong # Shandong Bittel Electronics Co., Ltd F0:08:F1 SamsungE # Samsung Electronics Co.,Ltd F0:13:C3 Shenzhen # SHENZHEN FENDA TECHNOLOGY CO., LTD +F0:15:A0 Kyungdon # KyungDong One Co., Ltd. F0:1C:13 LgElectr # LG Electronics -F0:1F:AF DellPcba # Dell Inc PCBA Test +F0:1F:AF Dell # Dell Inc F0:21:9D Cal-Comp # Cal-Comp Electronics & Communications Company Ltd. F0:23:29 ShowaDen # SHOWA DENKI CO.,LTD. F0:24:05 OpusHigh # OPUS High Technology Corporation @@ -23298,6 +23631,7 @@ F0:84:C9 Zte # zte corporation F0:8A:28 JiangsuH # JIANGSU HENGSION ELECTRONIC S and T CO.,LTD F0:8B:FE Costel # COSTEL.,CO.LTD +F0:8C:FB Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. F0:8E:DB Veloclou # VeloCloud Networks F0:92:1C HewlettP # Hewlett Packard F0:93:3A Nxtconec # NxtConect @@ -23351,6 +23685,7 @@ F4:03:21 BenextBV # BeNeXt B.V. F4:04:4C Valencet # ValenceTech Limited F4:06:8D Devolo # devolo AG +F4:06:A5 Hangzhou # Hangzhou Bianfeng Networking technology Co., Ltd. F4:0B:93 Research # Research In Motion F4:0F:9B Wavelink F4:15:FD Shanghai # Shanghai Pateo Electronic Equipment Manufacturing Co., Ltd. @@ -23413,6 +23748,7 @@ F4:B7:2A TimeInte # TIME INTERCONNECT LTD F4:B7:E2 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. F4:BD:7C ChengduJ # Chengdu jinshi communication Co., LTD +F4:C4:47 CoagentI # Coagent International Enterprise Limited F4:C6:D7 Blackned # blackned GmbH F4:C7:14 Shenzhen # Shenzhen Huawei Communication Technologies Co., Ltd F4:C7:95 WeyElekt # WEY Elektronik AG @@ -23466,6 +23802,7 @@ F8:46:2D SyntecIn # SYNTEC Incorporation F8:47:2D X2genDig # X2gen Digital Corp. Ltd F8:48:97 Hitachi # Hitachi, Ltd. +F8:4A:73 Eumtech # EUMTECH CO., LTD F8:4A:7F Innometr # Innometriks Inc F8:4A:BF HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD F8:4F:57 Cisco @@ -23478,6 +23815,7 @@ F8:5C:45 IcNexus # IC Nexus Co. Ltd. F8:5F:2A Nokia # Nokia Corporation F8:62:AA Xn # xn systems +F8:66:01 SuzhouCh # Suzhou Chi-tek information technology Co., Ltd F8:66:F2 Cisco # CISCO SYSTEMS, INC. F8:69:71 SeibuEle # Seibu Electric Co., F8:6E:CF Arcx # Arcx Inc @@ -23507,9 +23845,9 @@ F8:A9:DE Puissanc # PUISSANCE PLUS F8:AA:8A AxviewTe # Axview Technology (Shenzhen) Co.,Ltd F8:AC:6D Deltenna # Deltenna Ltd -F8:B1:56 DellPcba # Dell Inc PCBA Test +F8:B1:56 Dell # Dell Inc F8:B5:99 Guangzho # Guangzhou CHNAVS Digital Technology Co.,Ltd -F8:BC:12 DellPcba # Dell Inc PCBA Test +F8:BC:12 Dell # Dell Inc F8:C0:01 JuniperN # Juniper Networks F8:C0:91 Highgate # Highgates Technology F8:C6:78 Carefusi # Carefusion @@ -23525,7 +23863,7 @@ F8:DA:F4 TaishanO # Taishan Online Technology Co., Ltd. F8:DB:4C PnyTechn # PNY Technologies, INC. F8:DB:7F Htc # HTC Corporation -F8:DB:88 DellPcba # Dell Inc PCBA Test +F8:DB:88 Dell # Dell Inc F8:DC:7A Variscit # Variscite LTD F8:DF:A8 Zte # ZTE Corporation F8:E0:79 Motorola # Motorola Mobility LLC @@ -23580,6 +23918,7 @@ FC:44:99 SwarcoLe # Swarco LEA d.o.o. FC:45:5F JiangxiS # JIANGXI SHANSHUI OPTOELECTRONIC TECHNOLOGY CO.,LTD FC:48:EF HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD +FC:4A:E9 Castlene # Castlenet Technology Inc. FC:4B:1C Intersen # INTERSENSOR S.R.L. FC:4B:BC SunplusT # Sunplus Technology Co., Ltd. FC:4D:D4 Universa # Universal Global Scientific Industrial Co., Ltd. @@ -23614,6 +23953,7 @@ FC:B0:C4 Shanghai # Shanghai DareGlobal Technologies Co., Ltd FC:BB:A1 Shenzhen # Shenzhen Minicreate Technology Co.,Ltd FC:C2:3D Atmel # Atmel Corporation +FC:C2:DE MurataMa # Murata Manufacturing Co., Ltd. FC:C7:34 SamsungE # Samsung Electronics Co.,Ltd FC:C8:97 Zte # ZTE Corporation FC:CC:E4 Ascon # Ascon Ltd. @@ -23624,14 +23964,17 @@ FC:D8:17 BeijingH # Beijing Hesun Technologies Co.Ltd. FC:DB:96 Enervall # ENERVALLEY CO., LTD FC:DD:55 Shenzhen # Shenzhen WeWins wireless Co.,Ltd +FC:E1:86 A3m # A3M Co., LTD FC:E1:92 SichuanJ # Sichuan Jinwangtong Electronic Science&Technology Co,.Ltd FC:E1:D9 StableIm # Stable Imaging Solutions LLC FC:E2:3F ClayPaky # CLAY PAKY SPA FC:E5:57 Nokia # Nokia Corporation FC:E8:92 Hangzhou # Hangzhou Lancable Technology Co.,Ltd FC:ED:B9 Arrayent +FC:F1:52 Sony # Sony Corporation FC:F1:CD Optex-Fa # OPTEX-FA CO.,LTD. FC:F5:28 ZyxelCom # ZyXEL Communications Corporation +FC:F6:47 Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. FC:F8:AE IntelCor # Intel Corporate FC:F8:B7 TronteqE # TRONTEQ Electronic FC:FA:F7 Shanghai # Shanghai Baud Data Communication Co.,Ltd. @@ -23641,7 +23984,7 @@ # # Well-known addresses. # -# $Id: manuf 54118 2013-12-15 15:19:21Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/manuf.tmpl wireshark-1.10.6/manuf.tmpl --- wireshark-1.10.5/manuf.tmpl 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/manuf.tmpl 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # # /etc/manuf - Ethernet vendor codes, and well-known MAC addresses # -# $Id: manuf.tmpl 48572 2013-03-26 21:53:09Z jake $ +# $Id$ # # Laurent Deniel # diff -Nru wireshark-1.10.5/merge.c wireshark-1.10.6/merge.c --- wireshark-1.10.5/merge.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/merge.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright 2013, Scott Renfro * - * $Id: merge.c 47088 2013-01-15 02:17:16Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/mergecap.c wireshark-1.10.6/mergecap.c --- wireshark-1.10.5/mergecap.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/mergecap.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* Combine two dump files, either by appending or by merging by timestamp * - * $Id: mergecap.c 48222 2013-03-10 11:51:25Z tuexen $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -47,7 +47,7 @@ #include "wsutil/wsgetopt.h" #endif -#include "svnversion.h" +#include "version.h" #include "merge.h" #include "wsutil/file_util.h" @@ -108,8 +108,8 @@ { fprintf(stderr, "Mergecap %s" -#ifdef SVNVERSION - " (" SVNVERSION " from " SVNPATH ")" +#ifdef GITVERSION + " (" GITVERSION " from " GITBRANCH ")" #endif "\n", VERSION); fprintf(stderr, "Merge two or more capture files into one.\n"); diff -Nru wireshark-1.10.5/merge.h wireshark-1.10.6/merge.h --- wireshark-1.10.5/merge.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/merge.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* merge.h * Definitions for routines for merging files. * - * $Id: merge.h 44338 2012-08-08 14:06:29Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/NEWS wireshark-1.10.6/NEWS --- wireshark-1.10.5/NEWS 2013-12-19 19:13:26.000000000 +0000 +++ wireshark-1.10.6/NEWS 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ - Wireshark 1.10.5 Release Notes + Wireshark 1.10.6 Release Notes __________________________________________________________ What is Wireshark? @@ -13,18 +13,59 @@ Bug Fixes The following vulnerabilities have been fixed. + * [1]wnpa-sec-2014-01 + The NFS dissector could crash. Discovered by Moshe Kaplan. + ([2]Bug 9672) + Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 + [3]CVE-2014-2281 + * [4]wnpa-sec-2014-02 + The M3UA dissector could crash. Discovered by Laurent + Butti. ([5]Bug 9699) + Versions affected: 1.10.0 to 1.10.5 + [6]CVE-2014-2282 + * [7]wnpa-sec-2014-03 + The RLC dissector could crash. ([8]Bug 9730) + Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 + [9]CVE-2014-2283 + * [10]wnpa-sec-2014-04 + The MPEG file parser could overflow a buffer. Discovered by + Wesley Neelen. ([11]Bug 9843) + Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 + [12]CVE-2014-2299 The following bugs have been fixed: - * Wireshark stops showing new packets but dumpcap keeps - writing them to the temp file. ([1]Bug 9571) - * Wireshark 1.10.4 shuts down when promiscuous mode is - unchecked. ([2]Bug 9577) - * Homeplug dissector bug: STATUS_ACCESS_VIOLATION: dissector - accessed an invalid memory address. ([3]Bug 9578) + * Customized OUI is not recognized correctly during + dissection. ([13]Bug 9122) + * Properly decode CAPWAP Data Keep-Alives. ([14]Bug 9165) + * Build failure with GTK 3.10 - GTK developers have gone + insane. ([15]Bug 9340) + * SIGSEGV/SIGABRT during free of TvbRange using a chained + dissector in lua. ([16]Bug 9483) + * MPLS dissector no longer registers itself in "ppp.protocol" + table. ([17]Bug 9492) + * Tshark doesn't display the longer data fields (mbtcp). + ([18]Bug 9572) + * DMX-CHAN disector does not clear strbuf between rows. + ([19]Bug 9598) + * Dissector bug, protocol SDP: proto.c:4214: failed assertion + "length >= 0". ([20]Bug 9633) + * False error: capture file appears to be damaged or corrupt. + ([21]Bug 9634) + * SMPP field source_telematics_id field length different from + spec. ([22]Bug 9649) + * Lua: bitop library is missing in Lua 5.2. ([23]Bug 9720) + * GTPv1-C / MM Context / Authentication quintuplet / RAND is + not correct. ([24]Bug 9722) + * Lua: ProtoField.new() is buggy. ([25]Bug 9725) + * Lua: ProtoField.bool() VALUESTRING argument is not optional + but was supposed to be. ([26]Bug 9728) + * Problem with CAPWAP Wireshark Dissector. ([27]Bug 9752) + * nas-eps dissector: CS Service notification dissection stops + after Paging identity IE. ([28]Bug 9789) New and Updated Features - There are no new features in this release. + IPv4 checksum verfification is now disabled by default. New Protocol Support @@ -32,26 +73,26 @@ Updated Protocol Support - GSM BSSMAP, GSM BSSMAP LE, GSM SMS, Homeplug, NAS-EPS, and - SGSAP + AppleTalk, CAPWAP, DMX-CHAN, DSI, DVB-CI, ESS, GTPv1, IEEE + 802a, M3UA, Modbus/TCP, NAS-EPS, NFS, OpenSafety, SDP, and SMPP New and Updated Capture File Support - There is no updated capture file support in this release. + libpcap, MPEG, and pcap-ng __________________________________________________________ Getting Wireshark Wireshark source code and installation packages are available - from [4]http://www.wireshark.org/download.html. + from [29]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 [5]download page on - the Wireshark web site. + of third-party packages can be found on the [30]download page + on the Wireshark web site. __________________________________________________________ File Locations @@ -64,76 +105,101 @@ Known Problems - Dumpcap might not quit if Wireshark or TShark crashes. ([6]Bug + Dumpcap might not quit if Wireshark or TShark crashes. ([31]Bug 1419) - The BER dissector might infinitely loop. ([7]Bug 1516) + The BER dissector might infinitely loop. ([32]Bug 1516) Capture filters aren't applied when capturing from named pipes. - ([8]Bug 1814) + ([33]Bug 1814) Filtering tshark captures with read filters (-R) no longer - works. ([9]Bug 2234) + works. ([34]Bug 2234) The 64-bit Windows installer does not support Kerberos - decryption. ([10]Win64 development page) + decryption. ([35]Win64 development page) - Resolving ([11]Bug 9044) reopens ([12]Bug 3528) so that + Resolving ([36]Bug 9044) reopens ([37]Bug 3528) so that Wireshark no longer automatically decodes gzip data when following a TCP stream. - Application crash when changing real-time option. ([13]Bug + Application crash when changing real-time option. ([38]Bug 4035) - Hex pane display issue after startup. ([14]Bug 4056) + Hex pane display issue after startup. ([39]Bug 4056) - Packet list rows are oversized. ([15]Bug 4357) + Packet list rows are oversized. ([40]Bug 4357) Summary pane selected frame highlighting not maintained. - ([16]Bug 4445) + ([41]Bug 4445) Wireshark and TShark will display incorrect delta times in some - cases. ([17]Bug 4985) + cases. ([42]Bug 4985) __________________________________________________________ Getting Help - Community support is available on [18]Wireshark's Q&A site and + Community support is available on [43]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 [19]the web site. + on [44]the web site. Official Wireshark training and certification are available - from [20]Wireshark University. + from [45]Wireshark University. __________________________________________________________ Frequently Asked Questions - A complete FAQ is available on the [21]Wireshark web site. + A complete FAQ is available on the [46]Wireshark web site. __________________________________________________________ - Last updated 2013-12-19 09:40:33 PST + Last updated 2014-03-06 13:50:43 PST References - 1. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9571 - 2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9577 - 3. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9578 - 4. http://www.wireshark.org/download.html - 5. http://www.wireshark.org/download.html#thirdparty - 6. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 - 7. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 - 8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814 - 9. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 - 10. https://wiki.wireshark.org/Development/Win64 - 11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 - 12. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 - 13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 - 14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 - 15. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 - 16. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4445 - 17. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 - 18. http://ask.wireshark.org/ - 19. http://www.wireshark.org/lists/ - 20. http://www.wiresharktraining.com/ - 21. http://www.wireshark.org/faq.html + 1. https://www.wireshark.org/security/wnpa-sec-2014-01.html + 2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9672 + 3. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-2281 + 4. https://www.wireshark.org/security/wnpa-sec-2014-02.html + 5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9699 + 6. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-2282 + 7. https://www.wireshark.org/security/wnpa-sec-2014-03.html + 8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9730 + 9. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-2283 + 10. https://www.wireshark.org/security/wnpa-sec-2014-04.html + 11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9843 + 12. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-2299 + 13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9122 + 14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9165 + 15. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9340 + 16. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9483 + 17. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492 + 18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9572 + 19. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9598 + 20. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9633 + 21. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9634 + 22. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9649 + 23. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9720 + 24. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9722 + 25. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9725 + 26. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9728 + 27. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9752 + 28. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9789 + 29. http://www.wireshark.org/download.html + 30. http://www.wireshark.org/download.html#thirdparty + 31. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 + 32. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 + 33. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814 + 34. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 + 35. https://wiki.wireshark.org/Development/Win64 + 36. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 + 37. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 + 38. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 + 39. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 + 40. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 + 41. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4445 + 42. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 + 43. http://ask.wireshark.org/ + 44. http://www.wireshark.org/lists/ + 45. http://www.wiresharktraining.com/ + 46. http://www.wireshark.org/faq.html diff -Nru wireshark-1.10.5/packaging/macosx/ChmodBPF/ChmodBPF wireshark-1.10.6/packaging/macosx/ChmodBPF/ChmodBPF --- wireshark-1.10.5/packaging/macosx/ChmodBPF/ChmodBPF 2013-04-22 18:04:15.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/ChmodBPF/ChmodBPF 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # -# $Id: ChmodBPF 37093 2011-05-12 18:02:00Z gerald $ +# $Id$ . /etc/rc.common diff -Nru wireshark-1.10.5/packaging/macosx/Info.plist wireshark-1.10.6/packaging/macosx/Info.plist --- wireshark-1.10.5/packaging/macosx/Info.plist 2013-12-19 19:14:51.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/Info.plist 2014-03-07 18:08:35.000000000 +0000 @@ -1,6 +1,6 @@ - + @@ -9,7 +9,7 @@ CFBundleExecutable Wireshark CFBundleGetInfoString - 1.10.5, Copyright 1998-2013 Wireshark Development Team + 1.10.6, Copyright 1998-2014 Wireshark Development Team CFBundleIconFile Wireshark.icns CFBundleIdentifier @@ -56,13 +56,13 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.10.5 + 1.10.6 CFBundleSignature Wshk CFBundleVersion - 1.10.5 + 1.10.6 NSHumanReadableCopyright - Copyright 1998-2013 Wireshark Developers, GNU General Public License. + Copyright 1998-2014 Wireshark Developers, GNU General Public License. LSMinimumSystemVersion 10.3 diff -Nru wireshark-1.10.5/packaging/macosx/Info.plist.in wireshark-1.10.6/packaging/macosx/Info.plist.in --- wireshark-1.10.5/packaging/macosx/Info.plist.in 2013-04-22 18:04:15.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/Info.plist.in 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ - + @@ -9,7 +9,7 @@ CFBundleExecutable Wireshark CFBundleGetInfoString - @VERSION@, Copyright 1998-2013 Wireshark Development Team + @VERSION@, Copyright 1998-2014 Wireshark Development Team CFBundleIconFile Wireshark.icns CFBundleIdentifier @@ -62,7 +62,7 @@ CFBundleVersion @VERSION@ NSHumanReadableCopyright - Copyright 1998-2013 Wireshark Developers, GNU General Public License. + Copyright 1998-2014 Wireshark Developers, GNU General Public License. LSMinimumSystemVersion 10.3 diff -Nru wireshark-1.10.5/packaging/macosx/native-gtk/build-gtk.sh wireshark-1.10.6/packaging/macosx/native-gtk/build-gtk.sh --- wireshark-1.10.5/packaging/macosx/native-gtk/build-gtk.sh 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/native-gtk/build-gtk.sh 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: build-gtk.sh 24640 2008-03-15 18:31:52Z gerald $ +# $Id$ # # Based on the Imendio 'build-gtk.sh' script. # diff -Nru wireshark-1.10.5/packaging/macosx/native-gtk/config.h wireshark-1.10.6/packaging/macosx/native-gtk/config.h --- wireshark-1.10.5/packaging/macosx/native-gtk/config.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/native-gtk/config.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ -/* $Id: config.h 37812 2011-06-28 09:00:11Z stig $ */ +/* $Id$ */ /* poll doesn't work on devices */ #define BROKEN_POLL 1 diff -Nru wireshark-1.10.5/packaging/macosx/native-gtk/glibconfig.h wireshark-1.10.6/packaging/macosx/native-gtk/glibconfig.h --- wireshark-1.10.5/packaging/macosx/native-gtk/glibconfig.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/native-gtk/glibconfig.h 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * This is a generated file. Please modify 'configure.in' */ - /* $Id: glibconfig.h 24640 2008-03-15 18:31:52Z gerald $ */ + /* $Id$ */ #ifndef __G_LIBCONFIG_H__ #define __G_LIBCONFIG_H__ diff -Nru wireshark-1.10.5/packaging/macosx/osx-app.sh wireshark-1.10.6/packaging/macosx/osx-app.sh --- wireshark-1.10.5/packaging/macosx/osx-app.sh 2013-11-11 20:12:54.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/osx-app.sh 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/bash # -# $Id: osx-app.sh 53254 2013-11-11 19:40:46Z gerald $ +# $Id$ # # USAGE # osx-app [-s] [-l /path/to/libraries] -bp /path/to/wireshark/bin -p /path/to/Info.plist diff -Nru wireshark-1.10.5/packaging/macosx/osx-dmg.sh.in wireshark-1.10.6/packaging/macosx/osx-dmg.sh.in --- wireshark-1.10.5/packaging/macosx/osx-dmg.sh.in 2013-11-11 19:28:48.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/osx-dmg.sh.in 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/bash # -# $Id: osx-dmg.sh.in 53251 2013-11-11 19:22:06Z gerald $ +# $Id$ # # USAGE # osx-dmg [-s] -p /path/to/Wireshark.app diff -Nru wireshark-1.10.5/packaging/macosx/Resources/bin/getdisplay.sh wireshark-1.10.6/packaging/macosx/Resources/bin/getdisplay.sh --- wireshark-1.10.5/packaging/macosx/Resources/bin/getdisplay.sh 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/Resources/bin/getdisplay.sh 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: getdisplay.sh 24640 2008-03-15 18:31:52Z gerald $ +# $Id$ # # Author: Aaron Voisine diff -Nru wireshark-1.10.5/packaging/macosx/Resources/bin/wireshark wireshark-1.10.6/packaging/macosx/Resources/bin/wireshark --- wireshark-1.10.5/packaging/macosx/Resources/bin/wireshark 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/Resources/bin/wireshark 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: wireshark 32751 2010-05-11 13:42:13Z morriss $ +# $Id$ # # Author: Aaron Voisine # Wireshark Modifications: diff -Nru wireshark-1.10.5/packaging/macosx/Resources/etc/fonts/fonts.conf wireshark-1.10.6/packaging/macosx/Resources/etc/fonts/fonts.conf --- wireshark-1.10.5/packaging/macosx/Resources/etc/fonts/fonts.conf 2013-04-22 18:04:15.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/Resources/etc/fonts/fonts.conf 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ - + diff -Nru wireshark-1.10.5/packaging/macosx/Resources/MenuBar.nib/info.nib wireshark-1.10.6/packaging/macosx/Resources/MenuBar.nib/info.nib --- wireshark-1.10.5/packaging/macosx/Resources/MenuBar.nib/info.nib 2013-04-22 18:04:15.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/Resources/MenuBar.nib/info.nib 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ - + IBDocumentLocation diff -Nru wireshark-1.10.5/packaging/macosx/Resources/MenuBar.nib/objects.xib wireshark-1.10.6/packaging/macosx/Resources/MenuBar.nib/objects.xib --- wireshark-1.10.5/packaging/macosx/Resources/MenuBar.nib/objects.xib 2013-04-22 18:04:15.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/Resources/MenuBar.nib/objects.xib 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ - + IBCarbonFramework diff -Nru wireshark-1.10.5/packaging/macosx/Resources/openDoc wireshark-1.10.6/packaging/macosx/Resources/openDoc --- wireshark-1.10.5/packaging/macosx/Resources/openDoc 2013-04-22 18:04:15.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/Resources/openDoc 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: openDoc 24640 2008-03-15 18:31:52Z gerald $ +# $Id$ # # Author: Aaron Voisine # Inkscape Modifications: Michael Wybrow diff -Nru wireshark-1.10.5/packaging/macosx/Resources/ProgressWindow.nib/info.nib wireshark-1.10.6/packaging/macosx/Resources/ProgressWindow.nib/info.nib --- wireshark-1.10.5/packaging/macosx/Resources/ProgressWindow.nib/info.nib 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/Resources/ProgressWindow.nib/info.nib 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ - + IBDocumentLocation diff -Nru wireshark-1.10.5/packaging/macosx/Resources/ProgressWindow.nib/objects.xib wireshark-1.10.6/packaging/macosx/Resources/ProgressWindow.nib/objects.xib --- wireshark-1.10.5/packaging/macosx/Resources/ProgressWindow.nib/objects.xib 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/Resources/ProgressWindow.nib/objects.xib 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ - + IBCarbonFramework diff -Nru wireshark-1.10.5/packaging/macosx/Resources/script wireshark-1.10.6/packaging/macosx/Resources/script --- wireshark-1.10.5/packaging/macosx/Resources/script 2013-04-22 18:04:15.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/Resources/script 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: script 32449 2010-04-12 16:26:27Z morriss $ +# $Id$ # # Author: Aaron Voisine # Wireshark (Inkscape) Modifications: Michael Wybrow diff -Nru wireshark-1.10.5/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/gtkrc wireshark-1.10.6/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/gtkrc --- wireshark-1.10.5/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/gtkrc 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/gtkrc 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # # GTK theme to be used on Mac OS X, to mimic the appearance of Tiger # -# $Id: gtkrc 24640 2008-03-15 18:31:52Z gerald $ +# $Id$ # # Heavily based on Clearlooks-Quicksilver # Scrollbars from OSX-theme by Lauri Taimila (lauri@taimila.com) diff -Nru wireshark-1.10.5/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc wireshark-1.10.6/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc --- wireshark-1.10.5/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # # GTK theme to be used on Mac OS X, to mimic the appearance of Tiger # -# $Id: pre_gtkrc 29571 2009-08-26 19:58:23Z guy $ +# $Id$ # # Heavily based on Clearlooks-Quicksilver # Scrollbars from OSX-theme by Lauri Taimila (lauri@taimila.com) diff -Nru wireshark-1.10.5/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh wireshark-1.10.6/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh --- wireshark-1.10.5/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/bash # -# $Id: copy-slider.sh 24640 2008-03-15 18:31:52Z gerald $ +# $Id$ cp -f slider-vert.png slider-vert-prelight.png cp -f slider-vert.png slider-horiz-prelight.png diff -Nru wireshark-1.10.5/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh wireshark-1.10.6/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh --- wireshark-1.10.5/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/bash # -# $Id: copy-slider.sh 24640 2008-03-15 18:31:52Z gerald $ +# $Id$ cp -f slider-vert.png slider-vert-prelight.png cp -f slider-vert.png slider-horiz-prelight.png diff -Nru wireshark-1.10.5/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh wireshark-1.10.6/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh --- wireshark-1.10.5/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: sync_osx_look.sh 24640 2008-03-15 18:31:52Z gerald $ +# $Id$ # # Reads defaults from Apple preferences and modifies GTK accordingly # diff -Nru wireshark-1.10.5/packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib wireshark-1.10.6/packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib --- wireshark-1.10.5/packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ - + IBFramework Version diff -Nru wireshark-1.10.5/packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib wireshark-1.10.6/packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib --- wireshark-1.10.5/packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ - + IBCarbonFramework diff -Nru wireshark-1.10.5/packaging/macosx/ScriptExec/Info.plist wireshark-1.10.6/packaging/macosx/ScriptExec/Info.plist --- wireshark-1.10.5/packaging/macosx/ScriptExec/Info.plist 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/ScriptExec/Info.plist 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ - + CFBundleDevelopmentRegion diff -Nru wireshark-1.10.5/packaging/macosx/ScriptExec/main.c wireshark-1.10.6/packaging/macosx/ScriptExec/main.c --- wireshark-1.10.5/packaging/macosx/ScriptExec/main.c 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/ScriptExec/main.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ This is the executable that goes into Platypus apps Copyright (C) 2003 Sveinbjorn Thordarson - $Id: main.c 48892 2013-04-17 01:44:00Z guy $ + $Id$ With modifications by Aaron Voisine for gimp.app With modifications by Marianne gagnon for Wilber-loves-apple diff -Nru wireshark-1.10.5/packaging/macosx/ScriptExec/MenuBar.nib/info.nib wireshark-1.10.6/packaging/macosx/ScriptExec/MenuBar.nib/info.nib --- wireshark-1.10.5/packaging/macosx/ScriptExec/MenuBar.nib/info.nib 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/ScriptExec/MenuBar.nib/info.nib 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ - + IBDocumentLocation diff -Nru wireshark-1.10.5/packaging/macosx/ScriptExec/MenuBar.nib/objects.xib wireshark-1.10.6/packaging/macosx/ScriptExec/MenuBar.nib/objects.xib --- wireshark-1.10.5/packaging/macosx/ScriptExec/MenuBar.nib/objects.xib 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/ScriptExec/MenuBar.nib/objects.xib 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ - + IBCarbonFramework diff -Nru wireshark-1.10.5/packaging/macosx/ScriptExec/openDoc wireshark-1.10.6/packaging/macosx/ScriptExec/openDoc --- wireshark-1.10.5/packaging/macosx/ScriptExec/openDoc 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/ScriptExec/openDoc 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: openDoc 24640 2008-03-15 18:31:52Z gerald $ +# $Id$ echo $1; diff -Nru wireshark-1.10.5/packaging/macosx/ScriptExec/script wireshark-1.10.6/packaging/macosx/ScriptExec/script --- wireshark-1.10.5/packaging/macosx/ScriptExec/script 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/ScriptExec/script 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: script 24640 2008-03-15 18:31:52Z gerald $ +# $Id$ echo $1; diff -Nru wireshark-1.10.5/packaging/macosx/ScriptExec/version.plist wireshark-1.10.6/packaging/macosx/ScriptExec/version.plist --- wireshark-1.10.5/packaging/macosx/ScriptExec/version.plist 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/ScriptExec/version.plist 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ - + BuildVersion diff -Nru wireshark-1.10.5/packaging/macosx/utility-launcher wireshark-1.10.6/packaging/macosx/utility-launcher --- wireshark-1.10.5/packaging/macosx/utility-launcher 2013-04-22 18:04:15.000000000 +0000 +++ wireshark-1.10.6/packaging/macosx/utility-launcher 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: utility-launcher 26612 2008-10-28 21:53:39Z stig $ +# $Id$ # # Wireshark CLI utility launcher diff -Nru wireshark-1.10.5/packaging/Makefile.am wireshark-1.10.6/packaging/Makefile.am --- wireshark-1.10.5/packaging/Makefile.am 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/packaging/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Makefile.am 35752 2011-02-02 06:14:27Z jake $ +# $Id$ # SUBDIRS = macosx rpm svr4 nsis diff -Nru wireshark-1.10.5/packaging/Makefile.in wireshark-1.10.6/packaging/Makefile.in --- wireshark-1.10.5/packaging/Makefile.in 2013-12-19 19:13:48.000000000 +0000 +++ wireshark-1.10.6/packaging/Makefile.in 2014-03-07 18:07:37.000000000 +0000 @@ -360,7 +360,7 @@ wiresharkfilter_man = @wiresharkfilter_man@ # -# $Id: Makefile.am 35752 2011-02-02 06:14:27Z jake $ +# $Id$ # SUBDIRS = macosx rpm svr4 nsis MAINTAINERCLEANFILES = \ diff -Nru wireshark-1.10.5/packaging/Makefile.nmake wireshark-1.10.6/packaging/Makefile.nmake --- wireshark-1.10.5/packaging/Makefile.nmake 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/packaging/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake 35750 2011-02-02 02:52:53Z wmeier $ +# $Id$ # include ../config.nmake diff -Nru wireshark-1.10.5/packaging/nsis/custom_mibs.txt wireshark-1.10.6/packaging/nsis/custom_mibs.txt --- wireshark-1.10.5/packaging/nsis/custom_mibs.txt 2013-04-22 18:04:15.000000000 +0000 +++ wireshark-1.10.6/packaging/nsis/custom_mibs.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -; $Id: custom_mibs.txt 43819 2012-07-19 08:02:50Z etxrab $ +; $Id$ ; Add your custom SNMP MIBS directives here ; Example: ; Point to the dir of the MIBS diff -Nru wireshark-1.10.5/packaging/nsis/Custom.nmake wireshark-1.10.6/packaging/nsis/Custom.nmake --- wireshark-1.10.5/packaging/nsis/Custom.nmake 2013-04-22 18:04:15.000000000 +0000 +++ wireshark-1.10.6/packaging/nsis/Custom.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Custom.nmake 46448 2012-12-07 20:02:01Z cmaynard $ +# $Id$ # # Add your custom plugins here CUSTOM_PLUGINS= \ diff -Nru wireshark-1.10.5/packaging/nsis/Makefile.am wireshark-1.10.6/packaging/nsis/Makefile.am --- wireshark-1.10.5/packaging/nsis/Makefile.am 2013-04-22 18:04:15.000000000 +0000 +++ wireshark-1.10.6/packaging/nsis/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 47224 2013-01-23 12:08:15Z etxrab $ +# $Id$ # MAINTAINERCLEANFILES = \ Makefile.in diff -Nru wireshark-1.10.5/packaging/nsis/Makefile.in wireshark-1.10.6/packaging/nsis/Makefile.in --- wireshark-1.10.5/packaging/nsis/Makefile.in 2013-12-19 19:13:48.000000000 +0000 +++ wireshark-1.10.6/packaging/nsis/Makefile.in 2014-03-07 18:07:37.000000000 +0000 @@ -319,7 +319,7 @@ wireshark_man = @wireshark_man@ wiresharkfilter_man = @wiresharkfilter_man@ -# $Id: Makefile.am 47224 2013-01-23 12:08:15Z etxrab $ +# $Id$ # MAINTAINERCLEANFILES = \ Makefile.in diff -Nru wireshark-1.10.5/packaging/nsis/Makefile.nmake wireshark-1.10.6/packaging/nsis/Makefile.nmake --- wireshark-1.10.5/packaging/nsis/Makefile.nmake 2013-04-23 17:42:17.000000000 +0000 +++ wireshark-1.10.6/packaging/nsis/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake 48999 2013-04-23 17:36:23Z gerald $ +# $Id$ # # NSIS is a free packager/installer/uninstaller program for Win32. # It was originally written for the Winamp package, but various diff -Nru wireshark-1.10.5/packaging/nsis/uninstall.nsi wireshark-1.10.6/packaging/nsis/uninstall.nsi --- wireshark-1.10.5/packaging/nsis/uninstall.nsi 2013-07-17 01:24:19.000000000 +0000 +++ wireshark-1.10.6/packaging/nsis/uninstall.nsi 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ ; ; uninstall.nsi ; -; $Id: uninstall.nsi 50687 2013-07-17 01:18:54Z gerald $ +; $Id$ ; Create an installer that only writes an uninstaller. ; http://nsis.sourceforge.net/Signing_an_Uninstaller diff -Nru wireshark-1.10.5/packaging/nsis/wireshark.nsi wireshark-1.10.6/packaging/nsis/wireshark.nsi --- wireshark-1.10.5/packaging/nsis/wireshark.nsi 2013-09-06 00:02:10.000000000 +0000 +++ wireshark-1.10.6/packaging/nsis/wireshark.nsi 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ ; ; wireshark.nsi ; -; $Id: wireshark.nsi 51793 2013-09-05 23:56:49Z guy $ +; $Id$ ; Set the compression mechanism first. diff -Nru wireshark-1.10.5/packaging/portableapps/win32/Installer.nsi wireshark-1.10.6/packaging/portableapps/win32/Installer.nsi --- wireshark-1.10.5/packaging/portableapps/win32/Installer.nsi 2013-04-22 18:04:15.000000000 +0000 +++ wireshark-1.10.6/packaging/portableapps/win32/Installer.nsi 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ ; Installer.nsi - installs Wireshark Portable onto a PortableApps enabled device -; $Id: Installer.nsi 48328 2013-03-15 21:46:25Z gerald $ +; $Id$ ;Copyright 2007 John T. Haller diff -Nru wireshark-1.10.5/packaging/portableapps/win32/Makefile.nmake wireshark-1.10.6/packaging/portableapps/win32/Makefile.nmake --- wireshark-1.10.5/packaging/portableapps/win32/Makefile.nmake 2013-04-22 18:04:15.000000000 +0000 +++ wireshark-1.10.6/packaging/portableapps/win32/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake 47825 2013-02-22 16:51:43Z alagoutte $ +# $Id$ # include ../../../config.nmake diff -Nru wireshark-1.10.5/packaging/portableapps/win32/makenmake.pl wireshark-1.10.6/packaging/portableapps/win32/makenmake.pl --- wireshark-1.10.5/packaging/portableapps/win32/makenmake.pl 2013-04-22 18:04:15.000000000 +0000 +++ wireshark-1.10.6/packaging/portableapps/win32/makenmake.pl 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # # makenmake.pl - create a nmake file from a generic manifest file that will create the appropriate PortableApp structure -# $Id: makenmake.pl 47833 2013-02-23 09:58:46Z alagoutte $ +# $Id$ # print q{ diff -Nru wireshark-1.10.5/packaging/portableapps/win32/readme.txt wireshark-1.10.6/packaging/portableapps/win32/readme.txt --- wireshark-1.10.5/packaging/portableapps/win32/readme.txt 2013-04-22 18:04:15.000000000 +0000 +++ wireshark-1.10.6/packaging/portableapps/win32/readme.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: readme.txt 28717 2009-06-13 08:20:46Z gal $ +$Id$ Portable Wireshark ================== diff -Nru wireshark-1.10.5/packaging/portableapps/win32/WiresharkPortable.nsi wireshark-1.10.6/packaging/portableapps/win32/WiresharkPortable.nsi --- wireshark-1.10.5/packaging/portableapps/win32/WiresharkPortable.nsi 2013-04-22 18:04:15.000000000 +0000 +++ wireshark-1.10.6/packaging/portableapps/win32/WiresharkPortable.nsi 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ ; WiresharkPortable.nsi - runs Wireshark Portable from a PortableApps enabled device -; $Id: WiresharkPortable.nsi 35300 2010-12-29 20:41:53Z cmaynard $ +; $Id$ ;Copyright (C) 2004-2007 John T. Haller of PortableApps.com diff -Nru wireshark-1.10.5/packaging/portableapps/win32/WiresharkPortable.tmpl wireshark-1.10.6/packaging/portableapps/win32/WiresharkPortable.tmpl --- wireshark-1.10.5/packaging/portableapps/win32/WiresharkPortable.tmpl 2013-04-22 18:04:15.000000000 +0000 +++ wireshark-1.10.6/packaging/portableapps/win32/WiresharkPortable.tmpl 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # # WirersharkPortable.ini - settings for configure the running of WiresharkPortable # -# $Id: WiresharkPortable.tmpl 28880 2009-06-29 13:01:54Z gal $ +# $Id$ # [WiresharkPortable] diff -Nru wireshark-1.10.5/packaging/rpm/Makefile.am wireshark-1.10.6/packaging/rpm/Makefile.am --- wireshark-1.10.5/packaging/rpm/Makefile.am 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/packaging/rpm/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 34996 2010-11-21 19:03:17Z wmeier $ +# $Id$ # SUBDIRS = SPECS diff -Nru wireshark-1.10.5/packaging/rpm/Makefile.in wireshark-1.10.6/packaging/rpm/Makefile.in --- wireshark-1.10.5/packaging/rpm/Makefile.in 2013-12-19 19:13:48.000000000 +0000 +++ wireshark-1.10.6/packaging/rpm/Makefile.in 2014-03-07 18:07:37.000000000 +0000 @@ -359,7 +359,7 @@ wireshark_man = @wireshark_man@ wiresharkfilter_man = @wiresharkfilter_man@ -# $Id: Makefile.am 34996 2010-11-21 19:03:17Z wmeier $ +# $Id$ # SUBDIRS = SPECS MAINTAINERCLEANFILES = \ diff -Nru wireshark-1.10.5/packaging/rpm/SPECS/Makefile.am wireshark-1.10.6/packaging/rpm/SPECS/Makefile.am --- wireshark-1.10.5/packaging/rpm/SPECS/Makefile.am 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/packaging/rpm/SPECS/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 34996 2010-11-21 19:03:17Z wmeier $ +# $Id$ # MAINTAINERCLEANFILES = \ Makefile.in diff -Nru wireshark-1.10.5/packaging/rpm/SPECS/Makefile.in wireshark-1.10.6/packaging/rpm/SPECS/Makefile.in --- wireshark-1.10.5/packaging/rpm/SPECS/Makefile.in 2013-12-19 19:13:49.000000000 +0000 +++ wireshark-1.10.6/packaging/rpm/SPECS/Makefile.in 2014-03-07 18:07:37.000000000 +0000 @@ -320,7 +320,7 @@ wireshark_man = @wireshark_man@ wiresharkfilter_man = @wiresharkfilter_man@ -# $Id: Makefile.am 34996 2010-11-21 19:03:17Z wmeier $ +# $Id$ # MAINTAINERCLEANFILES = \ Makefile.in diff -Nru wireshark-1.10.5/packaging/rpm/SPECS/wireshark.spec.in wireshark-1.10.6/packaging/rpm/SPECS/wireshark.spec.in --- wireshark-1.10.5/packaging/rpm/SPECS/wireshark.spec.in 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/packaging/rpm/SPECS/wireshark.spec.in 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # Note that this is NOT a relocatable package -# $Id: wireshark.spec.in 48612 2013-03-28 14:17:38Z morriss $ +# $Id$ # @configure_input@ # Set these to 1 if you want to ensure your package inclues support for them: @@ -241,7 +241,7 @@ %else %if %{use_wireshark_group} && %{setcap_dumpcap} # Setcap but only executable by members of the 'wireshark' group -%attr(0750, root, wireshark) %caps(cap_net_raw,cap_net_admin=eip) %{_bindir}/dumpcap +%attr(0750, root, wireshark) %caps(cap_net_raw,cap_net_admin=ep) %{_bindir}/dumpcap %else %if %{setuid_dumpcap} # Setuid and executable by all @@ -249,7 +249,7 @@ %else %if %{setcap_dumpcap} # Setcap and executable by all -%attr(0755, root, root) %caps(cap_net_raw,cap_net_admin=eip) %{_bindir}/dumpcap +%attr(0755, root, root) %caps(cap_net_raw,cap_net_admin=ep) %{_bindir}/dumpcap %else # Executable by all but with no special permissions %attr(0755, root, root) %{_bindir}/dumpcap diff -Nru wireshark-1.10.5/packaging/svr4/checkinstall.in wireshark-1.10.6/packaging/svr4/checkinstall.in --- wireshark-1.10.5/packaging/svr4/checkinstall.in 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/packaging/svr4/checkinstall.in 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ # This is a modified version of a script written by mark@metalab.unc.edu . # The original is at http://metalab.unc.edu/pub/packages/solaris/sparc/html/creating.solaris.packages.html . # -# $Id: checkinstall.in 41594 2012-03-16 03:39:51Z guy $ +# $Id$ # PKG_CONFIG=@PKG_CONFIG@ diff -Nru wireshark-1.10.5/packaging/svr4/Makefile.am wireshark-1.10.6/packaging/svr4/Makefile.am --- wireshark-1.10.5/packaging/svr4/Makefile.am 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/packaging/svr4/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Makefile.am 34996 2010-11-21 19:03:17Z wmeier $ +# $Id$ # DISTCLEANFILES = \ Prototype diff -Nru wireshark-1.10.5/packaging/svr4/Makefile.in wireshark-1.10.6/packaging/svr4/Makefile.in --- wireshark-1.10.5/packaging/svr4/Makefile.in 2013-12-19 19:13:49.000000000 +0000 +++ wireshark-1.10.6/packaging/svr4/Makefile.in 2014-03-07 18:07:37.000000000 +0000 @@ -321,7 +321,7 @@ wiresharkfilter_man = @wiresharkfilter_man@ # -# $Id: Makefile.am 34996 2010-11-21 19:03:17Z wmeier $ +# $Id$ # DISTCLEANFILES = \ Prototype diff -Nru wireshark-1.10.5/packaging/svr4/mkpkg wireshark-1.10.6/packaging/svr4/mkpkg --- wireshark-1.10.5/packaging/svr4/mkpkg 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/packaging/svr4/mkpkg 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ # This is a modified version of a script written by mark@metalab.unc.edu . # The original is at http://metalab.unc.edu/pub/packages/solaris/sparc/html/creating.solaris.packages.html . # -# $Id: mkpkg 34996 2010-11-21 19:03:17Z wmeier $ +# $Id$ # if [ "$1" != "" ] ; then pkg=$1 diff -Nru wireshark-1.10.5/packaging/svr4/pkginfo.in wireshark-1.10.6/packaging/svr4/pkginfo.in --- wireshark-1.10.5/packaging/svr4/pkginfo.in 2013-04-22 18:04:16.000000000 +0000 +++ wireshark-1.10.6/packaging/svr4/pkginfo.in 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: pkginfo.in 41594 2012-03-16 03:39:51Z guy $ +# $Id$ # @configure_input@ PKG="@PACKAGE@" NAME="@PACKAGE@ @VERSION@" diff -Nru wireshark-1.10.5/packaging/u3/tools/Makefile.nmake wireshark-1.10.6/packaging/u3/tools/Makefile.nmake --- wireshark-1.10.5/packaging/u3/tools/Makefile.nmake 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/u3/tools/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake 45231 2012-10-01 11:47:36Z morriss $ +# $Id$ # include ../../../config.nmake diff -Nru wireshark-1.10.5/packaging/u3/tools/README.txt wireshark-1.10.6/packaging/u3/tools/README.txt --- wireshark-1.10.5/packaging/u3/tools/README.txt 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/u3/tools/README.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.txt 21694 2007-05-06 08:15:17Z gal $ +$Id$ utest.exe is a UUID generator based on the example code provided in RFC4122 and using the gcrypt libraries for the MD5/SHA1 algorithms. It has only been tested on Windows to date. diff -Nru wireshark-1.10.5/packaging/u3/tools/sysdep.c wireshark-1.10.6/packaging/u3/tools/sysdep.c --- wireshark-1.10.5/packaging/u3/tools/sysdep.c 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/u3/tools/sysdep.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* sysdep.c * UUID system dependent routines * - * $Id: sysdep.c 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/packaging/u3/tools/sysdep.h wireshark-1.10.6/packaging/u3/tools/sysdep.h --- wireshark-1.10.5/packaging/u3/tools/sysdep.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/u3/tools/sysdep.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* sysdep.h * UUID system dependent routines * - * $Id: sysdep.h 47802 2013-02-21 18:23:29Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/packaging/u3/tools/utest.c wireshark-1.10.6/packaging/u3/tools/utest.c --- wireshark-1.10.5/packaging/u3/tools/utest.c 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/u3/tools/utest.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* utest.c * UUID generation test harness and Wireshark Namespace UUID generation * - * $Id: utest.c 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/packaging/u3/tools/uuid.c wireshark-1.10.6/packaging/u3/tools/uuid.c --- wireshark-1.10.5/packaging/u3/tools/uuid.c 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/u3/tools/uuid.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* uuid.c * UUID generation * - * $Id: uuid.c 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/packaging/u3/tools/uuid.h wireshark-1.10.6/packaging/u3/tools/uuid.h --- wireshark-1.10.5/packaging/u3/tools/uuid.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/u3/tools/uuid.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* uuid.h * UUID generation * - * $Id: uuid.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/packaging/u3/win32/Makefile.nmake wireshark-1.10.6/packaging/u3/win32/Makefile.nmake --- wireshark-1.10.5/packaging/u3/win32/Makefile.nmake 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/u3/win32/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake 43246 2012-06-13 23:04:57Z gerald $ +# $Id$ # include ../../../config.nmake diff -Nru wireshark-1.10.5/packaging/u3/win32/makenmake.pl wireshark-1.10.6/packaging/u3/win32/makenmake.pl --- wireshark-1.10.5/packaging/u3/win32/makenmake.pl 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/u3/win32/makenmake.pl 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # # makenmake.pl - create a nmake file from a generic manifest file that will create the appropriate U3 structure -# $Id: makenmake.pl 45659 2012-10-19 17:47:34Z gerald $ +# $Id$ # print q{ diff -Nru wireshark-1.10.5/packaging/u3/win32/README.txt wireshark-1.10.6/packaging/u3/win32/README.txt --- wireshark-1.10.5/packaging/u3/win32/README.txt 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/u3/win32/README.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.txt 48335 2013-03-16 00:00:21Z gerald $ +$Id$ U3 == diff -Nru wireshark-1.10.5/packaging/u3/win32/u3util.c wireshark-1.10.6/packaging/u3/win32/u3util.c --- wireshark-1.10.5/packaging/u3/win32/u3util.c 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/u3/win32/u3util.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* u3util.c * Utility routines for U3 device support * - * $Id: u3util.c 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/packaging/u3/win32/u3util.exe.manifest wireshark-1.10.6/packaging/u3/win32/u3util.exe.manifest --- wireshark-1.10.5/packaging/u3/win32/u3util.exe.manifest 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/u3/win32/u3util.exe.manifest 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/packaging/u3/win32/wireshark.bat wireshark-1.10.6/packaging/u3/win32/wireshark.bat --- wireshark-1.10.5/packaging/u3/win32/wireshark.bat 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/packaging/u3/win32/wireshark.bat 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ :: constitute the U3 package. :: Also used to test the U3 package build. :: -:: $Id: wireshark.bat 43536 2012-06-28 22:56:06Z darkjames $ +:: $Id$ :: :: Wireshark - Network traffic analyzer :: By Gerald Combs diff -Nru wireshark-1.10.5/packaging/ws-manifest.pl wireshark-1.10.6/packaging/ws-manifest.pl --- wireshark-1.10.5/packaging/ws-manifest.pl 2013-05-06 23:45:35.000000000 +0000 +++ wireshark-1.10.6/packaging/ws-manifest.pl 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # # ws-manifest.pl - create a generic manifest file (including u3 information) from the wireshark.nsi -# $Id: ws-manifest.pl 49190 2013-05-06 23:31:24Z gerald $ +# $Id$ # # These are the known directories in the distribution and where they should live on a U3 device diff -Nru wireshark-1.10.5/packet-range.c wireshark-1.10.6/packet-range.c --- wireshark-1.10.5/packet-range.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/packet-range.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-range.c * Packet range routines (save, print, ...) * - * $Id: packet-range.c 45333 2012-10-05 18:52:42Z gerald $ + * $Id$ * * Dick Gooris * Ulf Lamping diff -Nru wireshark-1.10.5/packet-range.h wireshark-1.10.6/packet-range.h --- wireshark-1.10.5/packet-range.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/packet-range.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-range.h * Packet range routines (save, print, ...) * - * $Id: packet-range.h 45333 2012-10-05 18:52:42Z gerald $ + * $Id$ * * Dick Gooris * Ulf Lamping diff -Nru wireshark-1.10.5/pcapio.c wireshark-1.10.6/pcapio.c --- wireshark-1.10.5/pcapio.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/pcapio.c 2014-03-07 18:07:16.000000000 +0000 @@ -16,7 +16,7 @@ * * Libpcap's pcap_dump() also doesn't return any error indications. * - * $Id: pcapio.c 46898 2013-01-02 16:25:33Z tuexen $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/pcapio.h wireshark-1.10.6/pcapio.h --- wireshark-1.10.5/pcapio.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/pcapio.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* pcapio.h * Declarations of our own routins for writing libpcap files. * - * $Id: pcapio.h 46891 2013-01-02 04:01:22Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/asn1/asn1.c wireshark-1.10.6/plugins/asn1/asn1.c --- wireshark-1.10.5/plugins/asn1/asn1.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/asn1/asn1.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* asn1.c * Routines for ASN.1 BER dissection * - * $Id: asn1.c 48869 2013-04-16 00:00:09Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/asn1/asn1.h wireshark-1.10.6/plugins/asn1/asn1.h --- wireshark-1.10.5/plugins/asn1/asn1.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/asn1/asn1.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* asn1.h * Definitions for ASN.1 BER dissection * - * $Id: asn1.h 48869 2013-04-16 00:00:09Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/asn1/CMakeLists.txt wireshark-1.10.6/plugins/asn1/CMakeLists.txt --- wireshark-1.10.5/plugins/asn1/CMakeLists.txt 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/asn1/CMakeLists.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/asn1/Makefile.am wireshark-1.10.6/plugins/asn1/Makefile.am --- wireshark-1.10.5/plugins/asn1/Makefile.am 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/asn1/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for ASN.1 plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/asn1/Makefile.common wireshark-1.10.6/plugins/asn1/Makefile.common --- wireshark-1.10.5/plugins/asn1/Makefile.common 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/asn1/Makefile.common 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47596 2013-02-09 20:15:18Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/asn1/Makefile.in wireshark-1.10.6/plugins/asn1/Makefile.in --- wireshark-1.10.5/plugins/asn1/Makefile.in 2013-12-19 19:13:49.000000000 +0000 +++ wireshark-1.10.6/plugins/asn1/Makefile.in 2014-03-07 18:07:37.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for ASN.1 plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -42,7 +42,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -67,7 +67,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47596 2013-02-09 20:15:18Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/asn1/Makefile.nmake wireshark-1.10.6/plugins/asn1/Makefile.nmake --- wireshark-1.10.5/plugins/asn1/Makefile.nmake 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/asn1/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.nmake # nmake file for ASN.1 plugin # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # include ..\..\config.nmake diff -Nru wireshark-1.10.5/plugins/asn1/moduleinfo.nmake wireshark-1.10.6/plugins/asn1/moduleinfo.nmake --- wireshark-1.10.5/plugins/asn1/moduleinfo.nmake 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/asn1/moduleinfo.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: moduleinfo.nmake 20157 2006-12-19 22:23:22Z jake $ +# $Id$ # # The name diff -Nru wireshark-1.10.5/plugins/asn1/packet-asn1.c wireshark-1.10.6/plugins/asn1/packet-asn1.c --- wireshark-1.10.5/plugins/asn1/packet-asn1.c 2013-07-17 22:26:24.000000000 +0000 +++ wireshark-1.10.6/plugins/asn1/packet-asn1.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright (c) 2003 by Matthijs Melchior * - * $Id: packet-asn1.c 50710 2013-07-17 22:20:12Z gerald $ + * $Id$ * * A plugin for: * diff -Nru wireshark-1.10.5/plugins/Custom.m4.example wireshark-1.10.6/plugins/Custom.m4.example --- wireshark-1.10.5/plugins/Custom.m4.example 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/Custom.m4.example 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Custom.m4.example 45142 2012-09-25 21:02:13Z jake $ +# $Id$ # m4_define([_CUSTOM_AC_OUTPUT_], [plugins/foo/Makefile]) diff -Nru wireshark-1.10.5/plugins/Custom.make.example wireshark-1.10.6/plugins/Custom.make.example --- wireshark-1.10.5/plugins/Custom.make.example 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/Custom.make.example 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Custom.make.example 45142 2012-09-25 21:02:13Z jake $ +# $Id$ # _CUSTOM_SUBDIRS_ = \ diff -Nru wireshark-1.10.5/plugins/Custom.nmake.example wireshark-1.10.6/plugins/Custom.nmake.example --- wireshark-1.10.5/plugins/Custom.nmake.example 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/Custom.nmake.example 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Custom.nmake.example 45142 2012-09-25 21:02:13Z jake $ +# $Id$ # include ..\config.nmake diff -Nru wireshark-1.10.5/plugins/docsis/CMakeLists.txt wireshark-1.10.6/plugins/docsis/CMakeLists.txt --- wireshark-1.10.5/plugins/docsis/CMakeLists.txt 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/CMakeLists.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/Makefile.am wireshark-1.10.6/plugins/docsis/Makefile.am --- wireshark-1.10.5/plugins/docsis/Makefile.am 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for DOCSIS plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/Makefile.common wireshark-1.10.6/plugins/docsis/Makefile.common --- wireshark-1.10.5/plugins/docsis/Makefile.common 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/Makefile.common 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47596 2013-02-09 20:15:18Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/Makefile.in wireshark-1.10.6/plugins/docsis/Makefile.in --- wireshark-1.10.5/plugins/docsis/Makefile.in 2013-12-19 19:13:49.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/Makefile.in 2014-03-07 18:07:37.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for DOCSIS plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -42,7 +42,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -67,7 +67,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47596 2013-02-09 20:15:18Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/Makefile.nmake wireshark-1.10.6/plugins/docsis/Makefile.nmake --- wireshark-1.10.5/plugins/docsis/Makefile.nmake 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.nmake # nmake file for DOCSIS plugin # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # include ..\..\config.nmake diff -Nru wireshark-1.10.5/plugins/docsis/moduleinfo.nmake wireshark-1.10.6/plugins/docsis/moduleinfo.nmake --- wireshark-1.10.5/plugins/docsis/moduleinfo.nmake 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/moduleinfo.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: moduleinfo.nmake 20159 2006-12-19 22:23:56Z jake $ +# $Id$ # # The name diff -Nru wireshark-1.10.5/plugins/docsis/packet-bintrngreq.c wireshark-1.10.6/plugins/docsis/packet-bintrngreq.c --- wireshark-1.10.5/plugins/docsis/packet-bintrngreq.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-bintrngreq.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DOCSIS 3.0 Bonded Intial Ranging Request Message dissection. * Copyright 2009, Geoffrey Kimball * - * $Id: packet-bintrngreq.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-bpkmattr.c wireshark-1.10.6/plugins/docsis/packet-bpkmattr.c --- wireshark-1.10.5/plugins/docsis/packet-bpkmattr.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-bpkmattr.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Baseline Privacy Key Management Attributes dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-bpkmattr.c 47607 2013-02-10 16:31:52Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-bpkmreq.c wireshark-1.10.6/plugins/docsis/packet-bpkmreq.c --- wireshark-1.10.5/plugins/docsis/packet-bpkmreq.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-bpkmreq.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Baseline Privacy Key Management Request dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-bpkmreq.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-bpkmrsp.c wireshark-1.10.6/plugins/docsis/packet-bpkmrsp.c --- wireshark-1.10.5/plugins/docsis/packet-bpkmrsp.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-bpkmrsp.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Baseline Privacy Key Management Response dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-bpkmrsp.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-cmctrlreq.c wireshark-1.10.6/plugins/docsis/packet-cmctrlreq.c --- wireshark-1.10.5/plugins/docsis/packet-cmctrlreq.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-cmctrlreq.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DOCSIS 3.0 CM Control Request Message dissection. * Copyright 2010, Guido Reismueller * - * $Id: packet-cmctrlreq.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-cmctrlrsp.c wireshark-1.10.6/plugins/docsis/packet-cmctrlrsp.c --- wireshark-1.10.5/plugins/docsis/packet-cmctrlrsp.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-cmctrlrsp.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DOCSIS 3.0 CM Control Response Message dissection. * Copyright 2010, Guido Reismueller * - * $Id: packet-cmctrlrsp.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-cmstatus.c wireshark-1.10.6/plugins/docsis/packet-cmstatus.c --- wireshark-1.10.5/plugins/docsis/packet-cmstatus.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-cmstatus.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DOCSIS 3.0 CM-STATUS Report Message dissection. * Copyright 2011, Hendrik Robbel * - * $Id: packet-cmstatus.c 47045 2013-01-13 02:03:55Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-dbcack.c wireshark-1.10.6/plugins/docsis/packet-dbcack.c --- wireshark-1.10.5/plugins/docsis/packet-dbcack.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-dbcack.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DOCSIS 3.0 Dynamic Bonding Change Acknowledge Message dissection. * Copyright 2010, Guido Reismueller * - * $Id: packet-dbcack.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-dbcreq.c wireshark-1.10.6/plugins/docsis/packet-dbcreq.c --- wireshark-1.10.5/plugins/docsis/packet-dbcreq.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-dbcreq.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DOCSIS 3.0 Dynamic Bonding Change Request Message dissection. * Copyright 2010, Guido Reismueller * - * $Id: packet-dbcreq.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-dbcrsp.c wireshark-1.10.6/plugins/docsis/packet-dbcrsp.c --- wireshark-1.10.5/plugins/docsis/packet-dbcrsp.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-dbcrsp.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DOCSIS 3.0 Dynamic Bonding Change Response Message dissection. * Copyright 2010, Guido Reismueller * - * $Id: packet-dbcrsp.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-dccack.c wireshark-1.10.6/plugins/docsis/packet-dccack.c --- wireshark-1.10.5/plugins/docsis/packet-dccack.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-dccack.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DCC Acknowledge Message dissection * Copyright 2004, Darryl Hymel * - * $Id: packet-dccack.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-dccreq.c wireshark-1.10.6/plugins/docsis/packet-dccreq.c --- wireshark-1.10.5/plugins/docsis/packet-dccreq.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-dccreq.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DCC Request Message dissection * Copyright 2004, Darryl Hymel * - * $Id: packet-dccreq.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-dccrsp.c wireshark-1.10.6/plugins/docsis/packet-dccrsp.c --- wireshark-1.10.5/plugins/docsis/packet-dccrsp.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-dccrsp.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DCC Response Message dissection * Copyright 2004, Darryl Hymel * - * $Id: packet-dccrsp.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-dcd.c wireshark-1.10.6/plugins/docsis/packet-dcd.c --- wireshark-1.10.5/plugins/docsis/packet-dcd.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-dcd.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DCD Message dissection * Copyright 2004, Darryl Hymel * - * $Id: packet-dcd.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-docsis.c wireshark-1.10.6/plugins/docsis/packet-docsis.c --- wireshark-1.10.5/plugins/docsis/packet-docsis.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-docsis.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for docsis dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-docsis.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-dpvreq.c wireshark-1.10.6/plugins/docsis/packet-dpvreq.c --- wireshark-1.10.5/plugins/docsis/packet-dpvreq.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-dpvreq.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DOCSIS 3.0 DOCSIS Path Verify Response Message dissection. * Copyright 2010, Guido Reismueller * - * $Id: packet-dpvreq.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-dpvrsp.c wireshark-1.10.6/plugins/docsis/packet-dpvrsp.c --- wireshark-1.10.5/plugins/docsis/packet-dpvrsp.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-dpvrsp.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for DOCSIS 3.0 DOCSIS Path Verify Request Message dissection. * Copyright 2010, Guido Reismueller * - * $Id: packet-dpvrsp.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-dsaack.c wireshark-1.10.6/plugins/docsis/packet-dsaack.c --- wireshark-1.10.5/plugins/docsis/packet-dsaack.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-dsaack.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Dynamic Service Addition Acknowledge dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-dsaack.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-dsareq.c wireshark-1.10.6/plugins/docsis/packet-dsareq.c --- wireshark-1.10.5/plugins/docsis/packet-dsareq.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-dsareq.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Dynamic Service Addition Request dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-dsareq.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-dsarsp.c wireshark-1.10.6/plugins/docsis/packet-dsarsp.c --- wireshark-1.10.5/plugins/docsis/packet-dsarsp.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-dsarsp.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Dynamic Service Addition Response dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-dsarsp.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-dscack.c wireshark-1.10.6/plugins/docsis/packet-dscack.c --- wireshark-1.10.5/plugins/docsis/packet-dscack.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-dscack.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Dynamic Service Change Acknowledge dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-dscack.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-dscreq.c wireshark-1.10.6/plugins/docsis/packet-dscreq.c --- wireshark-1.10.5/plugins/docsis/packet-dscreq.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-dscreq.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Dynamic Service Change Request dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-dscreq.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-dscrsp.c wireshark-1.10.6/plugins/docsis/packet-dscrsp.c --- wireshark-1.10.5/plugins/docsis/packet-dscrsp.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-dscrsp.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Dynamic Service Change Response dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-dscrsp.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-dsdreq.c wireshark-1.10.6/plugins/docsis/packet-dsdreq.c --- wireshark-1.10.5/plugins/docsis/packet-dsdreq.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-dsdreq.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Dynamic Service Delete Request dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-dsdreq.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-dsdrsp.c wireshark-1.10.6/plugins/docsis/packet-dsdrsp.c --- wireshark-1.10.5/plugins/docsis/packet-dsdrsp.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-dsdrsp.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Dynamic Service Delete Response dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-dsdrsp.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-intrngreq.c wireshark-1.10.6/plugins/docsis/packet-intrngreq.c --- wireshark-1.10.5/plugins/docsis/packet-intrngreq.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-intrngreq.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Intial Ranging Request Message dissection * Copyright 2003, Brian Wheeler * - * $Id: packet-intrngreq.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-macmgmt.c wireshark-1.10.6/plugins/docsis/packet-macmgmt.c --- wireshark-1.10.5/plugins/docsis/packet-macmgmt.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-macmgmt.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for docsis Mac Management Header dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-macmgmt.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-map.c wireshark-1.10.6/plugins/docsis/packet-map.c --- wireshark-1.10.5/plugins/docsis/packet-map.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-map.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* Copyright 2002, Anand V. Narwani * - * $Id: packet-map.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-mdd.c wireshark-1.10.6/plugins/docsis/packet-mdd.c --- wireshark-1.10.5/plugins/docsis/packet-mdd.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-mdd.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /* packet-mdd.c - * $Id: packet-mdd.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * Routines for MDD Message dissection * Copyright 2007, Bruno Verstuyft * diff -Nru wireshark-1.10.5/plugins/docsis/packet-regack.c wireshark-1.10.6/plugins/docsis/packet-regack.c --- wireshark-1.10.5/plugins/docsis/packet-regack.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-regack.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Registration Acknowledge Message dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-regack.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-regreq.c wireshark-1.10.6/plugins/docsis/packet-regreq.c --- wireshark-1.10.5/plugins/docsis/packet-regreq.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-regreq.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Registration Request dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-regreq.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-regreqmp.c wireshark-1.10.6/plugins/docsis/packet-regreqmp.c --- wireshark-1.10.5/plugins/docsis/packet-regreqmp.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-regreqmp.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /* packet-regreqmp.c - * $Id: packet-regreqmp.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * Routines for REG-REQ-MP Message dissection * Copyright 2007, Bruno Verstuyft * diff -Nru wireshark-1.10.5/plugins/docsis/packet-regrsp.c wireshark-1.10.6/plugins/docsis/packet-regrsp.c --- wireshark-1.10.5/plugins/docsis/packet-regrsp.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-regrsp.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Registration Response Message dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-regrsp.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-regrspmp.c wireshark-1.10.6/plugins/docsis/packet-regrspmp.c --- wireshark-1.10.5/plugins/docsis/packet-regrspmp.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-regrspmp.c 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ * * Based on packet-regrsp.c (by Anand V. Narwani ) * - * $Id: packet-regrspmp.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-rngreq.c wireshark-1.10.6/plugins/docsis/packet-rngreq.c --- wireshark-1.10.5/plugins/docsis/packet-rngreq.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-rngreq.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Ranging Request Message dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-rngreq.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-rngrsp.c wireshark-1.10.6/plugins/docsis/packet-rngrsp.c --- wireshark-1.10.5/plugins/docsis/packet-rngrsp.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-rngrsp.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Ranging Response Message dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-rngrsp.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-sync.c wireshark-1.10.6/plugins/docsis/packet-sync.c --- wireshark-1.10.5/plugins/docsis/packet-sync.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-sync.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /* packet-sync.c - * $Id: packet-sync.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * Routines for Sync Message dissection * Copyright 2007, Bruno Verstuyft * diff -Nru wireshark-1.10.5/plugins/docsis/packet-tlv.c wireshark-1.10.6/plugins/docsis/packet-tlv.c --- wireshark-1.10.5/plugins/docsis/packet-tlv.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-tlv.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines to Dissect Appendix C TLV's * Copyright 2002, Anand V. Narwani * - * $Id: packet-tlv.c 47607 2013-02-10 16:31:52Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-tlv-cmctrl.c wireshark-1.10.6/plugins/docsis/packet-tlv-cmctrl.c --- wireshark-1.10.5/plugins/docsis/packet-tlv-cmctrl.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-tlv-cmctrl.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines to Dissect TLV's for CM-Control Messages * Copyright 2010, Guido Reismueller * - * $Id: packet-tlv-cmctrl.c 47607 2013-02-10 16:31:52Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-tlv.h wireshark-1.10.6/plugins/docsis/packet-tlv.h --- wireshark-1.10.5/plugins/docsis/packet-tlv.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-tlv.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Contains Definitions for Configuration types * Copyright 2002, Anand V. Narwani * - * $Id: packet-tlv.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-type29ucd.c wireshark-1.10.6/plugins/docsis/packet-type29ucd.c --- wireshark-1.10.5/plugins/docsis/packet-type29ucd.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-type29ucd.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Type 29 UCD - DOCSIS 2.0 only - Message dissection * Copyright 2003, Brian Wheeler * - * $Id: packet-type29ucd.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-uccreq.c wireshark-1.10.6/plugins/docsis/packet-uccreq.c --- wireshark-1.10.5/plugins/docsis/packet-uccreq.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-uccreq.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Upstream Channel Change Request dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-uccreq.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-uccrsp.c wireshark-1.10.6/plugins/docsis/packet-uccrsp.c --- wireshark-1.10.5/plugins/docsis/packet-uccrsp.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-uccrsp.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Upstream Channel Change Response dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-uccrsp.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-ucd.c wireshark-1.10.6/plugins/docsis/packet-ucd.c --- wireshark-1.10.5/plugins/docsis/packet-ucd.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-ucd.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for UCD Message dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-ucd.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/docsis/packet-vendor.c wireshark-1.10.6/plugins/docsis/packet-vendor.c --- wireshark-1.10.5/plugins/docsis/packet-vendor.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/docsis/packet-vendor.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for Vendor Specific Encodings dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-vendor.c 47607 2013-02-10 16:31:52Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/ethercat/CMakeLists.txt wireshark-1.10.6/plugins/ethercat/CMakeLists.txt --- wireshark-1.10.5/plugins/ethercat/CMakeLists.txt 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/CMakeLists.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/ethercat/Makefile.am wireshark-1.10.6/plugins/ethercat/Makefile.am --- wireshark-1.10.5/plugins/ethercat/Makefile.am 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for EtherCAT plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/ethercat/Makefile.common wireshark-1.10.6/plugins/ethercat/Makefile.common --- wireshark-1.10.5/plugins/ethercat/Makefile.common 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/Makefile.common 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/ethercat/Makefile.in wireshark-1.10.6/plugins/ethercat/Makefile.in --- wireshark-1.10.5/plugins/ethercat/Makefile.in 2013-12-19 19:13:49.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/Makefile.in 2014-03-07 18:07:37.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for EtherCAT plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -42,7 +42,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -67,7 +67,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/ethercat/Makefile.nmake wireshark-1.10.6/plugins/ethercat/Makefile.nmake --- wireshark-1.10.5/plugins/ethercat/Makefile.nmake 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.nmake # nmake file for EtherCAT plugin # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # include ..\..\config.nmake diff -Nru wireshark-1.10.5/plugins/ethercat/moduleinfo.nmake wireshark-1.10.6/plugins/ethercat/moduleinfo.nmake --- wireshark-1.10.5/plugins/ethercat/moduleinfo.nmake 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/moduleinfo.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: moduleinfo.nmake 23177 2007-10-14 21:01:01Z jake $ +# $Id$ # # The name diff -Nru wireshark-1.10.5/plugins/ethercat/packet-ams.c wireshark-1.10.6/plugins/ethercat/packet-ams.c --- wireshark-1.10.5/plugins/ethercat/packet-ams.c 2013-09-09 17:40:16.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/packet-ams.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ams.c * Routines for ethercat packet disassembly * - * $Id: packet-ams.c 51870 2013-09-09 17:34:35Z gerald $ + * $Id$ * * Copyright (c) 2007 by Beckhoff Automation GmbH * diff -Nru wireshark-1.10.5/plugins/ethercat/packet-ams.h wireshark-1.10.6/plugins/ethercat/packet-ams.h --- wireshark-1.10.5/plugins/ethercat/packet-ams.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/packet-ams.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ams.h * - * $Id: packet-ams.h 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Copyright (c) 2007 by Beckhoff Automation GmbH * diff -Nru wireshark-1.10.5/plugins/ethercat/packet-ecatmb.c wireshark-1.10.6/plugins/ethercat/packet-ecatmb.c --- wireshark-1.10.5/plugins/ethercat/packet-ecatmb.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/packet-ecatmb.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ecatmb.c * Routines for EtherCAT packet disassembly * - * $Id: packet-ecatmb.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Copyright (c) 2007 by Beckhoff Automation GmbH * diff -Nru wireshark-1.10.5/plugins/ethercat/packet-ecatmb.h wireshark-1.10.6/plugins/ethercat/packet-ecatmb.h --- wireshark-1.10.5/plugins/ethercat/packet-ecatmb.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/packet-ecatmb.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ecatmb.h * - * $Id: packet-ecatmb.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Copyright (c) 2007 by Beckhoff Automation GmbH * diff -Nru wireshark-1.10.5/plugins/ethercat/packet-esl.c wireshark-1.10.6/plugins/ethercat/packet-esl.c --- wireshark-1.10.5/plugins/ethercat/packet-esl.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/packet-esl.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-esl.c * Routines for EtherCAT Switch Link disassembly * - * $Id: packet-esl.c 45071 2012-09-23 16:25:28Z darkjames $ + * $Id$ * * Copyright (c) 2007 by Beckhoff Automation GmbH * diff -Nru wireshark-1.10.5/plugins/ethercat/packet-ethercat-datagram.c wireshark-1.10.6/plugins/ethercat/packet-ethercat-datagram.c --- wireshark-1.10.5/plugins/ethercat/packet-ethercat-datagram.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/packet-ethercat-datagram.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ethercat-datagram.c * Routines for ethercat packet disassembly * - * $Id: packet-ethercat-datagram.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Copyright (c) 2007 by Beckhoff Automation GmbH * diff -Nru wireshark-1.10.5/plugins/ethercat/packet-ethercat-datagram.h wireshark-1.10.6/plugins/ethercat/packet-ethercat-datagram.h --- wireshark-1.10.5/plugins/ethercat/packet-ethercat-datagram.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/packet-ethercat-datagram.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ethercat-datagram.h * - * $Id: packet-ethercat-datagram.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Copyright (c) 2007 by Beckhoff Automation GmbH * diff -Nru wireshark-1.10.5/plugins/ethercat/packet-ethercat-frame.c wireshark-1.10.6/plugins/ethercat/packet-ethercat-frame.c --- wireshark-1.10.5/plugins/ethercat/packet-ethercat-frame.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/packet-ethercat-frame.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ethercat-frame.c * Routines for ethercat packet disassembly * - * $Id: packet-ethercat-frame.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Copyright (c) 2007 by Beckhoff Automation GmbH * diff -Nru wireshark-1.10.5/plugins/ethercat/packet-ethercat-frame.h wireshark-1.10.6/plugins/ethercat/packet-ethercat-frame.h --- wireshark-1.10.5/plugins/ethercat/packet-ethercat-frame.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/packet-ethercat-frame.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* paket-ethercat-frame.h * - * $Id: packet-ethercat-frame.h 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Copyright (c) 2007 by Beckhoff Automation GmbH * diff -Nru wireshark-1.10.5/plugins/ethercat/packet-ioraw.c wireshark-1.10.6/plugins/ethercat/packet-ioraw.c --- wireshark-1.10.5/plugins/ethercat/packet-ioraw.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/packet-ioraw.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-ioraw.c * Routines for ethercat packet disassembly * - * $Id: packet-ioraw.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Copyright (c) 2007 by Beckhoff Automation GmbH * diff -Nru wireshark-1.10.5/plugins/ethercat/packet-ioraw.h wireshark-1.10.6/plugins/ethercat/packet-ioraw.h --- wireshark-1.10.5/plugins/ethercat/packet-ioraw.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/packet-ioraw.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-ioraw.h * - * $Id: packet-ioraw.h 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Copyright (c) 2007 by Beckhoff Automation GmbH * diff -Nru wireshark-1.10.5/plugins/ethercat/packet-nv.c wireshark-1.10.6/plugins/ethercat/packet-nv.c --- wireshark-1.10.5/plugins/ethercat/packet-nv.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/packet-nv.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-nv.c * Routines for ethercat packet disassembly * - * $Id: packet-nv.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Copyright (c) 2007 by Beckhoff Automation GmbH * diff -Nru wireshark-1.10.5/plugins/ethercat/packet-nv.h wireshark-1.10.6/plugins/ethercat/packet-nv.h --- wireshark-1.10.5/plugins/ethercat/packet-nv.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/ethercat/packet-nv.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* packet-nv.h * - * $Id: packet-nv.h 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Copyright (c) 2007 by Beckhoff Automation GmbH * diff -Nru wireshark-1.10.5/plugins/gryphon/CMakeLists.txt wireshark-1.10.6/plugins/gryphon/CMakeLists.txt --- wireshark-1.10.5/plugins/gryphon/CMakeLists.txt 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/gryphon/CMakeLists.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/gryphon/Makefile.am wireshark-1.10.6/plugins/gryphon/Makefile.am --- wireshark-1.10.5/plugins/gryphon/Makefile.am 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/gryphon/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # By Steve Limkemann # Copyright 1998 Steve Limkemann # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/gryphon/Makefile.common wireshark-1.10.6/plugins/gryphon/Makefile.common --- wireshark-1.10.5/plugins/gryphon/Makefile.common 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/gryphon/Makefile.common 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/gryphon/Makefile.in wireshark-1.10.6/plugins/gryphon/Makefile.in --- wireshark-1.10.5/plugins/gryphon/Makefile.in 2013-12-19 19:13:49.000000000 +0000 +++ wireshark-1.10.6/plugins/gryphon/Makefile.in 2014-03-07 18:07:37.000000000 +0000 @@ -20,7 +20,7 @@ # By Steve Limkemann # Copyright 1998 Steve Limkemann # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -44,7 +44,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -69,7 +69,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/gryphon/Makefile.nmake wireshark-1.10.6/plugins/gryphon/Makefile.nmake --- wireshark-1.10.5/plugins/gryphon/Makefile.nmake 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/gryphon/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.nmake # nmake file for Gryphon plugin # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # include ..\..\config.nmake diff -Nru wireshark-1.10.5/plugins/gryphon/moduleinfo.nmake wireshark-1.10.6/plugins/gryphon/moduleinfo.nmake --- wireshark-1.10.5/plugins/gryphon/moduleinfo.nmake 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/gryphon/moduleinfo.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: moduleinfo.nmake 20161 2006-12-19 22:24:40Z jake $ +# $Id$ # # The name diff -Nru wireshark-1.10.5/plugins/gryphon/packet-gryphon.c wireshark-1.10.6/plugins/gryphon/packet-gryphon.c --- wireshark-1.10.5/plugins/gryphon/packet-gryphon.c 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/gryphon/packet-gryphon.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * By Steve Limkemann * Copyright 1998 Steve Limkemann * - * $Id: packet-gryphon.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/gryphon/packet-gryphon.h wireshark-1.10.6/plugins/gryphon/packet-gryphon.h --- wireshark-1.10.5/plugins/gryphon/packet-gryphon.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/gryphon/packet-gryphon.h 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * By Steve Limkemann * Copyright 1998 Steve Limkemann * - * $Id: packet-gryphon.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/irda/CMakeLists.txt wireshark-1.10.6/plugins/irda/CMakeLists.txt --- wireshark-1.10.5/plugins/irda/CMakeLists.txt 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/irda/CMakeLists.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/irda/irda-appl.h wireshark-1.10.6/plugins/irda/irda-appl.h --- wireshark-1.10.5/plugins/irda/irda-appl.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/irda/irda-appl.h 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * By Jan Kiszka * Copyright 2003 Jan Kiszka * - * $Id: irda-appl.h 46928 2013-01-04 05:22:43Z mmann $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/irda/Makefile.am wireshark-1.10.6/plugins/irda/Makefile.am --- wireshark-1.10.5/plugins/irda/Makefile.am 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/irda/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for IrDA plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/irda/Makefile.common wireshark-1.10.6/plugins/irda/Makefile.common --- wireshark-1.10.5/plugins/irda/Makefile.common 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/irda/Makefile.common 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/irda/Makefile.in wireshark-1.10.6/plugins/irda/Makefile.in --- wireshark-1.10.5/plugins/irda/Makefile.in 2013-12-19 19:13:49.000000000 +0000 +++ wireshark-1.10.6/plugins/irda/Makefile.in 2014-03-07 18:07:37.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for IrDA plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -42,7 +42,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -67,7 +67,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/irda/Makefile.nmake wireshark-1.10.6/plugins/irda/Makefile.nmake --- wireshark-1.10.5/plugins/irda/Makefile.nmake 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/irda/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.nmake # nmake file for Wireshark plugin # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # include ..\..\config.nmake diff -Nru wireshark-1.10.5/plugins/irda/moduleinfo.nmake wireshark-1.10.6/plugins/irda/moduleinfo.nmake --- wireshark-1.10.5/plugins/irda/moduleinfo.nmake 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/irda/moduleinfo.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: moduleinfo.nmake 20162 2006-12-19 22:25:09Z jake $ +# $Id$ # # The name diff -Nru wireshark-1.10.5/plugins/irda/packet-ircomm.c wireshark-1.10.6/plugins/irda/packet-ircomm.c --- wireshark-1.10.5/plugins/irda/packet-ircomm.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/irda/packet-ircomm.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for IrCOMM dissection * Copyright 2003 Jan Kiszka * - * $Id: packet-ircomm.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/irda/packet-irda.c wireshark-1.10.6/plugins/irda/packet-irda.c --- wireshark-1.10.5/plugins/irda/packet-irda.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/irda/packet-irda.c 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ * Extended by Jan Kiszka * Copyright 2003 Jan Kiszka * - * $Id: packet-irda.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/irda/packet-sir.c wireshark-1.10.6/plugins/irda/packet-sir.c --- wireshark-1.10.5/plugins/irda/packet-sir.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/irda/packet-sir.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * @copyright Copyright 2004 Shaun Jackman * @license GPL * - * $Id: packet-sir.c 48869 2013-04-16 00:00:09Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/m2m/CMakeLists.txt wireshark-1.10.6/plugins/m2m/CMakeLists.txt --- wireshark-1.10.5/plugins/m2m/CMakeLists.txt 2013-04-22 18:04:12.000000000 +0000 +++ wireshark-1.10.6/plugins/m2m/CMakeLists.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/m2m/Makefile.am wireshark-1.10.6/plugins/m2m/Makefile.am --- wireshark-1.10.5/plugins/m2m/Makefile.am 2013-04-22 18:04:12.000000000 +0000 +++ wireshark-1.10.6/plugins/m2m/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for M2M plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/m2m/Makefile.common wireshark-1.10.6/plugins/m2m/Makefile.common --- wireshark-1.10.5/plugins/m2m/Makefile.common 2013-04-22 18:04:12.000000000 +0000 +++ wireshark-1.10.6/plugins/m2m/Makefile.common 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/m2m/Makefile.in wireshark-1.10.6/plugins/m2m/Makefile.in --- wireshark-1.10.5/plugins/m2m/Makefile.in 2013-12-19 19:13:49.000000000 +0000 +++ wireshark-1.10.6/plugins/m2m/Makefile.in 2014-03-07 18:07:37.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for M2M plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -42,7 +42,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -67,7 +67,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/m2m/Makefile.nmake wireshark-1.10.6/plugins/m2m/Makefile.nmake --- wireshark-1.10.5/plugins/m2m/Makefile.nmake 2013-04-22 18:04:12.000000000 +0000 +++ wireshark-1.10.6/plugins/m2m/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.nmake # nmake file for M2M plugin # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # include ..\..\config.nmake diff -Nru wireshark-1.10.5/plugins/m2m/moduleinfo.h wireshark-1.10.6/plugins/m2m/moduleinfo.h --- wireshark-1.10.5/plugins/m2m/moduleinfo.h 2013-04-22 18:04:12.000000000 +0000 +++ wireshark-1.10.6/plugins/m2m/moduleinfo.h 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ * * Author: Lu Pan * - * $Id: moduleinfo.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/m2m/moduleinfo.nmake wireshark-1.10.6/plugins/m2m/moduleinfo.nmake --- wireshark-1.10.5/plugins/m2m/moduleinfo.nmake 2013-04-22 18:04:12.000000000 +0000 +++ wireshark-1.10.6/plugins/m2m/moduleinfo.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: moduleinfo.nmake 21960 2007-05-27 18:33:13Z guy $ +# $Id$ # # The name diff -Nru wireshark-1.10.5/plugins/m2m/packet-m2m.c wireshark-1.10.6/plugins/m2m/packet-m2m.c --- wireshark-1.10.5/plugins/m2m/packet-m2m.c 2013-04-22 18:04:12.000000000 +0000 +++ wireshark-1.10.6/plugins/m2m/packet-m2m.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: packet-m2m.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/m2m/wimax_tlv.c wireshark-1.10.6/plugins/m2m/wimax_tlv.c --- wireshark-1.10.5/plugins/m2m/wimax_tlv.c 2013-04-22 18:04:12.000000000 +0000 +++ wireshark-1.10.6/plugins/m2m/wimax_tlv.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: wimax_tlv.c 47978 2013-03-01 19:05:25Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/Makefile.am wireshark-1.10.6/plugins/Makefile.am --- wireshark-1.10.5/plugins/Makefile.am 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Wireshark plugins # -# $Id: Makefile.am 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/Makefile.in wireshark-1.10.6/plugins/Makefile.in --- wireshark-1.10.5/plugins/Makefile.in 2013-12-19 19:13:49.000000000 +0000 +++ wireshark-1.10.6/plugins/Makefile.in 2014-03-07 18:07:37.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for Wireshark plugins # -# $Id: Makefile.am 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/Makefile.nmake wireshark-1.10.6/plugins/Makefile.nmake --- wireshark-1.10.5/plugins/Makefile.nmake 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake 43844 2012-07-20 01:21:27Z mmann $ +# $Id$ # include ..\config.nmake diff -Nru wireshark-1.10.5/plugins/mate/CMakeLists.txt wireshark-1.10.6/plugins/mate/CMakeLists.txt --- wireshark-1.10.5/plugins/mate/CMakeLists.txt 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/mate/CMakeLists.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/mate/Makefile.am wireshark-1.10.6/plugins/mate/Makefile.am --- wireshark-1.10.5/plugins/mate/Makefile.am 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/mate/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for MATE Wireshark plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/mate/Makefile.common wireshark-1.10.6/plugins/mate/Makefile.common --- wireshark-1.10.5/plugins/mate/Makefile.common 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/mate/Makefile.common 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47596 2013-02-09 20:15:18Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/mate/Makefile.in wireshark-1.10.6/plugins/mate/Makefile.in --- wireshark-1.10.5/plugins/mate/Makefile.in 2013-12-19 19:13:49.000000000 +0000 +++ wireshark-1.10.6/plugins/mate/Makefile.in 2014-03-07 18:07:37.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for MATE Wireshark plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -42,7 +42,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -67,7 +67,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47596 2013-02-09 20:15:18Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/mate/Makefile.nmake wireshark-1.10.6/plugins/mate/Makefile.nmake --- wireshark-1.10.5/plugins/mate/Makefile.nmake 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/mate/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.nmake # nmake file for mate plugin # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # include ..\..\config.nmake diff -Nru wireshark-1.10.5/plugins/mate/mate_grammar.lemon wireshark-1.10.6/plugins/mate/mate_grammar.lemon --- wireshark-1.10.5/plugins/mate/mate_grammar.lemon 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/mate/mate_grammar.lemon 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright 2005, Luis E. Garcia Ontanon * -* $Id: mate_grammar.lemon 48449 2013-03-21 03:07:23Z wmeier $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/mate/mate.h wireshark-1.10.6/plugins/mate/mate.h --- wireshark-1.10.5/plugins/mate/mate.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/mate/mate.h 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2004, Luis E. Garcia Ontanon * -* $Id: mate.h 45015 2012-09-20 01:29:52Z morriss $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/mate/mate_parser.c wireshark-1.10.6/plugins/mate/mate_parser.c --- wireshark-1.10.5/plugins/mate/mate_parser.c 2013-12-19 19:22:20.000000000 +0000 +++ wireshark-1.10.6/plugins/mate/mate_parser.c 2014-03-07 18:14:36.000000000 +0000 @@ -726,7 +726,7 @@ * * Copyright 2004, Luis E. Garcia Ontanon * - * $Id: mate_parser.l 48449 2013-03-21 03:07:23Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/mate/mate_parser.l wireshark-1.10.6/plugins/mate/mate_parser.l --- wireshark-1.10.5/plugins/mate/mate_parser.l 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/mate/mate_parser.l 2014-03-07 18:07:16.000000000 +0000 @@ -26,7 +26,7 @@ * * Copyright 2004, Luis E. Garcia Ontanon * - * $Id: mate_parser.l 48449 2013-03-21 03:07:23Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/mate/mate_runtime.c wireshark-1.10.6/plugins/mate/mate_runtime.c --- wireshark-1.10.5/plugins/mate/mate_runtime.c 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/mate/mate_runtime.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2004, Luis E. Garcia Ontanon * -* $Id: mate_runtime.c 48449 2013-03-21 03:07:23Z wmeier $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/mate/mate_setup.c wireshark-1.10.6/plugins/mate/mate_setup.c --- wireshark-1.10.5/plugins/mate/mate_setup.c 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/mate/mate_setup.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2004, Luis E. Garcia Ontanon * -* $Id: mate_setup.c 48449 2013-03-21 03:07:23Z wmeier $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/mate/mate_util.c wireshark-1.10.6/plugins/mate/mate_util.c --- wireshark-1.10.5/plugins/mate/mate_util.c 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/mate/mate_util.c 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ * * Copyright 2004, Luis E. Garcia Ontanon * -* $Id: mate_util.c 48450 2013-03-21 14:29:58Z wmeier $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/mate/mate_util.h wireshark-1.10.6/plugins/mate/mate_util.h --- wireshark-1.10.5/plugins/mate/mate_util.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/mate/mate_util.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * * Copyright 2004, Luis E. Garcia Ontanon * -* $Id: mate_util.h 47893 2013-02-26 01:30:56Z wmeier $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/mate/moduleinfo.nmake wireshark-1.10.6/plugins/mate/moduleinfo.nmake --- wireshark-1.10.5/plugins/mate/moduleinfo.nmake 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/mate/moduleinfo.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: moduleinfo.nmake 20176 2006-12-19 22:30:38Z jake $ +# $Id$ # # The name diff -Nru wireshark-1.10.5/plugins/mate/packet-mate.c wireshark-1.10.6/plugins/mate/packet-mate.c --- wireshark-1.10.5/plugins/mate/packet-mate.c 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/mate/packet-mate.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2004, Luis E. Garcia Ontanon * - * $Id: packet-mate.c 48449 2013-03-21 03:07:23Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/opcua/ChangeLog wireshark-1.10.6/plugins/opcua/ChangeLog --- wireshark-1.10.5/plugins/opcua/ChangeLog 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/ChangeLog 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: ChangeLog 27974 2009-04-06 18:30:04Z jake $ +$Id$ Overview of changes in OpcUa plugin: diff -Nru wireshark-1.10.5/plugins/opcua/CMakeLists.txt wireshark-1.10.6/plugins/opcua/CMakeLists.txt --- wireshark-1.10.5/plugins/opcua/CMakeLists.txt 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/CMakeLists.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/opcua/Makefile.am wireshark-1.10.6/plugins/opcua/Makefile.am --- wireshark-1.10.5/plugins/opcua/Makefile.am 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for OpcUa plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Adapted by Gerhard Gappmeier for OpcUa # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/plugins/opcua/Makefile.common wireshark-1.10.6/plugins/opcua/Makefile.common --- wireshark-1.10.5/plugins/opcua/Makefile.common 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/Makefile.common 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Adapted by Gerhard Gappmeier for OpcUa # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/plugins/opcua/Makefile.in wireshark-1.10.6/plugins/opcua/Makefile.in --- wireshark-1.10.5/plugins/opcua/Makefile.in 2013-12-19 19:13:50.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/Makefile.in 2014-03-07 18:07:38.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for OpcUa plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Adapted by Gerhard Gappmeier for OpcUa # Wireshark - Network traffic analyzer @@ -43,7 +43,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -68,7 +68,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Adapted by Gerhard Gappmeier for OpcUa # Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/plugins/opcua/Makefile.nmake wireshark-1.10.6/plugins/opcua/Makefile.nmake --- wireshark-1.10.5/plugins/opcua/Makefile.nmake 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.nmake # nmake file for OpcUa plugin # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # include ..\..\config.nmake diff -Nru wireshark-1.10.5/plugins/opcua/moduleinfo.nmake wireshark-1.10.6/plugins/opcua/moduleinfo.nmake --- wireshark-1.10.5/plugins/opcua/moduleinfo.nmake 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/moduleinfo.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: moduleinfo.nmake 27974 2009-04-06 18:30:04Z jake $ +# $Id$ # # The name diff -Nru wireshark-1.10.5/plugins/opcua/opcua_application_layer.c wireshark-1.10.6/plugins/opcua/opcua_application_layer.c --- wireshark-1.10.5/plugins/opcua/opcua_application_layer.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_application_layer.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_application_layer.c 45015 2012-09-20 01:29:52Z morriss $ +** $Id$ ** ** Copyright (C) 2006-2007 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_application_layer.h wireshark-1.10.6/plugins/opcua/opcua_application_layer.h --- wireshark-1.10.5/plugins/opcua/opcua_application_layer.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_application_layer.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_application_layer.h 36283 2011-03-23 08:03:02Z stig $ +** $Id$ ** ** Copyright (C) 2006-2007 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua.c wireshark-1.10.6/plugins/opcua/opcua.c --- wireshark-1.10.5/plugins/opcua/opcua.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua.c 48491 2013-03-22 23:59:54Z guy $ +** $Id$ ** ** Copyright (C) 2006-2007 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_complextypeparser.c wireshark-1.10.6/plugins/opcua/opcua_complextypeparser.c --- wireshark-1.10.5/plugins/opcua/opcua_complextypeparser.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_complextypeparser.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_complextypeparser.c 47673 2013-02-15 15:24:39Z eapache $ +** $Id$ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_complextypeparser.h wireshark-1.10.6/plugins/opcua/opcua_complextypeparser.h --- wireshark-1.10.5/plugins/opcua/opcua_complextypeparser.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_complextypeparser.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_complextypeparser.h 47673 2013-02-15 15:24:39Z eapache $ +** $Id$ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_enumparser.c wireshark-1.10.6/plugins/opcua/opcua_enumparser.c --- wireshark-1.10.5/plugins/opcua/opcua_enumparser.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_enumparser.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_enumparser.c 47673 2013-02-15 15:24:39Z eapache $ +** $Id$ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_enumparser.h wireshark-1.10.6/plugins/opcua/opcua_enumparser.h --- wireshark-1.10.5/plugins/opcua/opcua_enumparser.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_enumparser.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_enumparser.h 47673 2013-02-15 15:24:39Z eapache $ +** $Id$ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_extensionobjectids.h wireshark-1.10.6/plugins/opcua/opcua_extensionobjectids.h --- wireshark-1.10.5/plugins/opcua/opcua_extensionobjectids.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_extensionobjectids.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_extensionobjectids.h 47673 2013-02-15 15:24:39Z eapache $ +** $Id$ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_extensionobjecttable.c wireshark-1.10.6/plugins/opcua/opcua_extensionobjecttable.c --- wireshark-1.10.5/plugins/opcua/opcua_extensionobjecttable.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_extensionobjecttable.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_extensionobjecttable.c 47673 2013-02-15 15:24:39Z eapache $ +** $Id$ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_hfindeces.c wireshark-1.10.6/plugins/opcua/opcua_hfindeces.c --- wireshark-1.10.5/plugins/opcua/opcua_hfindeces.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_hfindeces.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_hfindeces.c 47673 2013-02-15 15:24:39Z eapache $ +** $Id$ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_hfindeces.h wireshark-1.10.6/plugins/opcua/opcua_hfindeces.h --- wireshark-1.10.5/plugins/opcua/opcua_hfindeces.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_hfindeces.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_hfindeces.h 47673 2013-02-15 15:24:39Z eapache $ +** $Id$ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_identifiers.h wireshark-1.10.6/plugins/opcua/opcua_identifiers.h --- wireshark-1.10.5/plugins/opcua/opcua_identifiers.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_identifiers.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_identifiers.h 42000 2012-04-09 20:06:27Z darkjames $ +** $Id$ ** ** Copyright (C) 2006-2007 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_security_layer.c wireshark-1.10.6/plugins/opcua/opcua_security_layer.c --- wireshark-1.10.5/plugins/opcua/opcua_security_layer.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_security_layer.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_security_layer.c 45015 2012-09-20 01:29:52Z morriss $ +** $Id$ ** ** Copyright (C) 2006-2007 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_security_layer.h wireshark-1.10.6/plugins/opcua/opcua_security_layer.h --- wireshark-1.10.5/plugins/opcua/opcua_security_layer.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_security_layer.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_security_layer.h 21784 2007-05-15 09:53:26Z ulfl $ +** $Id$ ** ** Copyright (C) 2006-2007 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_serviceids.h wireshark-1.10.6/plugins/opcua/opcua_serviceids.h --- wireshark-1.10.5/plugins/opcua/opcua_serviceids.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_serviceids.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_serviceids.h 32577 2010-04-27 13:50:43Z morriss $ +** $Id$ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_serviceparser.c wireshark-1.10.6/plugins/opcua/opcua_serviceparser.c --- wireshark-1.10.5/plugins/opcua/opcua_serviceparser.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_serviceparser.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_serviceparser.c 47673 2013-02-15 15:24:39Z eapache $ +** $Id$ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_serviceparser.h wireshark-1.10.6/plugins/opcua/opcua_serviceparser.h --- wireshark-1.10.5/plugins/opcua/opcua_serviceparser.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_serviceparser.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_serviceparser.h 47673 2013-02-15 15:24:39Z eapache $ +** $Id$ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_servicetable.c wireshark-1.10.6/plugins/opcua/opcua_servicetable.c --- wireshark-1.10.5/plugins/opcua/opcua_servicetable.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_servicetable.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_servicetable.c 47673 2013-02-15 15:24:39Z eapache $ +** $Id$ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_simpletypes.c wireshark-1.10.6/plugins/opcua/opcua_simpletypes.c --- wireshark-1.10.5/plugins/opcua/opcua_simpletypes.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_simpletypes.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_simpletypes.c 47673 2013-02-15 15:24:39Z eapache $ +** $Id$ ** ** Copyright (C) 2006-2007 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_simpletypes.h wireshark-1.10.6/plugins/opcua/opcua_simpletypes.h --- wireshark-1.10.5/plugins/opcua/opcua_simpletypes.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_simpletypes.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_simpletypes.h 42000 2012-04-09 20:06:27Z darkjames $ +** $Id$ ** ** Copyright (C) 2006-2007 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_transport_layer.c wireshark-1.10.6/plugins/opcua/opcua_transport_layer.c --- wireshark-1.10.5/plugins/opcua/opcua_transport_layer.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_transport_layer.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_transport_layer.c 47673 2013-02-15 15:24:39Z eapache $ +** $Id$ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/opcua_transport_layer.h wireshark-1.10.6/plugins/opcua/opcua_transport_layer.h --- wireshark-1.10.5/plugins/opcua/opcua_transport_layer.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/opcua_transport_layer.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -** $Id: opcua_transport_layer.h 46436 2012-12-07 09:33:40Z etxrab $ +** $Id$ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com diff -Nru wireshark-1.10.5/plugins/opcua/plugin.rc.in wireshark-1.10.6/plugins/opcua/plugin.rc.in --- wireshark-1.10.5/plugins/opcua/plugin.rc.in 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/opcua/plugin.rc.in 2014-03-07 18:07:16.000000000 +0000 @@ -1,34 +1,34 @@ -#include "winver.h" - -VS_VERSION_INFO VERSIONINFO - FILEVERSION @RC_MODULE_VERSION@ - PRODUCTVERSION @RC_VERSION@ - FILEFLAGSMASK 0x0L -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG -#else - FILEFLAGS 0 -#endif - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_DLL -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0" - VALUE "FileDescription", "OPC Unified Architecture Dissector\0" - VALUE "FileVersion", "@MODULE_VERSION@\0" - VALUE "InternalName", "@PACKAGE@ @MODULE_VERSION@\0" - VALUE "LegalCopyright", "Copyright © 1998 Gerald Combs , Gilbert Ramirez and others\0" - VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" - VALUE "ProductName", "Wireshark\0" - VALUE "ProductVersion", "@VERSION@\0" - VALUE "Comments", "Build with @MSVC_VARIANT@\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END +#include "winver.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @RC_MODULE_VERSION@ + PRODUCTVERSION @RC_VERSION@ + FILEFLAGSMASK 0x0L +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0 +#endif + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_DLL +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0" + VALUE "FileDescription", "OPC Unified Architecture Dissector\0" + VALUE "FileVersion", "@MODULE_VERSION@\0" + VALUE "InternalName", "@PACKAGE@ @MODULE_VERSION@\0" + VALUE "LegalCopyright", "Copyright © 1998 Gerald Combs , Gilbert Ramirez and others\0" + VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" + VALUE "ProductName", "Wireshark\0" + VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff -Nru wireshark-1.10.5/plugins/profinet/ChangeLog wireshark-1.10.6/plugins/profinet/ChangeLog --- wireshark-1.10.5/plugins/profinet/ChangeLog 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/profinet/ChangeLog 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: ChangeLog 20177 2006-12-19 22:44:35Z ulfl $ +$Id$ Overview of changes in Art-Net Ethereal plugin: diff -Nru wireshark-1.10.5/plugins/profinet/CMakeLists.txt wireshark-1.10.6/plugins/profinet/CMakeLists.txt --- wireshark-1.10.5/plugins/profinet/CMakeLists.txt 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/profinet/CMakeLists.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/profinet/Makefile.am wireshark-1.10.6/plugins/profinet/Makefile.am --- wireshark-1.10.5/plugins/profinet/Makefile.am 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/profinet/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for PROFINET plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/profinet/Makefile.common wireshark-1.10.6/plugins/profinet/Makefile.common --- wireshark-1.10.5/plugins/profinet/Makefile.common 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/profinet/Makefile.common 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/profinet/Makefile.in wireshark-1.10.6/plugins/profinet/Makefile.in --- wireshark-1.10.5/plugins/profinet/Makefile.in 2013-12-19 19:13:50.000000000 +0000 +++ wireshark-1.10.6/plugins/profinet/Makefile.in 2014-03-07 18:07:38.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for PROFINET plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -42,7 +42,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -67,7 +67,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/profinet/Makefile.nmake wireshark-1.10.6/plugins/profinet/Makefile.nmake --- wireshark-1.10.5/plugins/profinet/Makefile.nmake 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/profinet/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.nmake # nmake file for PROFINET plugin # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # include ..\..\config.nmake diff -Nru wireshark-1.10.5/plugins/profinet/moduleinfo.nmake wireshark-1.10.6/plugins/profinet/moduleinfo.nmake --- wireshark-1.10.5/plugins/profinet/moduleinfo.nmake 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/profinet/moduleinfo.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: moduleinfo.nmake 27748 2009-03-16 21:40:00Z ulfl $ +# $Id$ # # The name diff -Nru wireshark-1.10.5/plugins/profinet/packet-dcerpc-pn-io.c wireshark-1.10.6/plugins/profinet/packet-dcerpc-pn-io.c --- wireshark-1.10.5/plugins/profinet/packet-dcerpc-pn-io.c 2013-07-17 22:26:24.000000000 +0000 +++ wireshark-1.10.6/plugins/profinet/packet-dcerpc-pn-io.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-dcerpc-pn-io.c * Routines for PROFINET IO dissection. * - * $Id: packet-dcerpc-pn-io.c 50710 2013-07-17 22:20:12Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/profinet/packet-dcom-cba-acco.c wireshark-1.10.6/plugins/profinet/packet-dcom-cba-acco.c --- wireshark-1.10.5/plugins/profinet/packet-dcom-cba-acco.c 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/profinet/packet-dcom-cba-acco.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-dcom-cba-acco.c * Routines for DCOM CBA * - * $Id: packet-dcom-cba-acco.c 48039 2013-03-03 18:45:23Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/profinet/packet-dcom-cba-acco.h wireshark-1.10.6/plugins/profinet/packet-dcom-cba-acco.h --- wireshark-1.10.5/plugins/profinet/packet-dcom-cba-acco.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/profinet/packet-dcom-cba-acco.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-dcom-cba-acco.h * Routines for DCOM CBA * - * $Id: packet-dcom-cba-acco.h 48039 2013-03-03 18:45:23Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/profinet/packet-dcom-cba.c wireshark-1.10.6/plugins/profinet/packet-dcom-cba.c --- wireshark-1.10.5/plugins/profinet/packet-dcom-cba.c 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/profinet/packet-dcom-cba.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-dcom-cba.c * Routines for DCOM CBA * - * $Id: packet-dcom-cba.c 48039 2013-03-03 18:45:23Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/profinet/packet-pn.c wireshark-1.10.6/plugins/profinet/packet-pn.c --- wireshark-1.10.5/plugins/profinet/packet-pn.c 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/profinet/packet-pn.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-pn.c * Common functions for other PROFINET protocols like IO, CBA, DCP, ... * - * $Id: packet-pn.c 46529 2012-12-13 18:17:47Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/profinet/packet-pn-dcp.c wireshark-1.10.6/plugins/profinet/packet-pn-dcp.c --- wireshark-1.10.5/plugins/profinet/packet-pn-dcp.c 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/profinet/packet-pn-dcp.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for PN-DCP (PROFINET Discovery and basic Configuration Protocol) * packet dissection. * - * $Id: packet-pn-dcp.c 48039 2013-03-03 18:45:23Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/profinet/packet-pn.h wireshark-1.10.6/plugins/profinet/packet-pn.h --- wireshark-1.10.5/plugins/profinet/packet-pn.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/profinet/packet-pn.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* packet-pn.h * Common functions for other PROFINET protocols like DCP, MRP, ... * - * $Id: packet-pn.h 46522 2012-12-12 18:47:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/profinet/packet-pn-mrp.c wireshark-1.10.6/plugins/profinet/packet-pn-mrp.c --- wireshark-1.10.5/plugins/profinet/packet-pn-mrp.c 2013-09-09 17:40:16.000000000 +0000 +++ wireshark-1.10.6/plugins/profinet/packet-pn-mrp.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for PN-MRP (PROFINET Media Redundancy Protocol) * packet dissection. * - * $Id: packet-pn-mrp.c 51870 2013-09-09 17:34:35Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/profinet/packet-pn-mrrt.c wireshark-1.10.6/plugins/profinet/packet-pn-mrrt.c --- wireshark-1.10.5/plugins/profinet/packet-pn-mrrt.c 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/profinet/packet-pn-mrrt.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for PN-MRRT (PROFINET Media Redundancy for cyclic realtime data) * packet dissection. * - * $Id: packet-pn-mrrt.c 46529 2012-12-13 18:17:47Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/profinet/packet-pn-ptcp.c wireshark-1.10.6/plugins/profinet/packet-pn-ptcp.c --- wireshark-1.10.5/plugins/profinet/packet-pn-ptcp.c 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/profinet/packet-pn-ptcp.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for PN-PTCP (PROFINET Precision Time Clock Protocol) * packet dissection. * - * $Id: packet-pn-ptcp.c 46529 2012-12-13 18:17:47Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/profinet/packet-pn-rt.c wireshark-1.10.6/plugins/profinet/packet-pn-rt.c --- wireshark-1.10.5/plugins/profinet/packet-pn-rt.c 2013-07-22 22:01:24.000000000 +0000 +++ wireshark-1.10.6/plugins/profinet/packet-pn-rt.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * This is the base for other PROFINET protocols like IO, CBA, DCP, ... * (the "content subdissectors" will register themselves using a heuristic) * - * $Id: packet-pn-rt.c 50801 2013-07-22 21:55:48Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/stats_tree/AUTHORS wireshark-1.10.6/plugins/stats_tree/AUTHORS --- wireshark-1.10.5/plugins/stats_tree/AUTHORS 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/stats_tree/AUTHORS 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: AUTHORS 13442 2005-02-20 05:39:24Z jmayer $ +$Id$ Author: Luis E. Garcia Ontanon diff -Nru wireshark-1.10.5/plugins/stats_tree/CMakeLists.txt wireshark-1.10.6/plugins/stats_tree/CMakeLists.txt --- wireshark-1.10.5/plugins/stats_tree/CMakeLists.txt 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/stats_tree/CMakeLists.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/stats_tree/Makefile.am wireshark-1.10.6/plugins/stats_tree/Makefile.am --- wireshark-1.10.5/plugins/stats_tree/Makefile.am 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/stats_tree/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for stats_tree Wireshark plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/stats_tree/Makefile.common wireshark-1.10.6/plugins/stats_tree/Makefile.common --- wireshark-1.10.5/plugins/stats_tree/Makefile.common 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/stats_tree/Makefile.common 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/stats_tree/Makefile.in wireshark-1.10.6/plugins/stats_tree/Makefile.in --- wireshark-1.10.5/plugins/stats_tree/Makefile.in 2013-12-19 19:13:50.000000000 +0000 +++ wireshark-1.10.6/plugins/stats_tree/Makefile.in 2014-03-07 18:07:38.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for stats_tree Wireshark plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -42,7 +42,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -67,7 +67,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/stats_tree/Makefile.nmake wireshark-1.10.6/plugins/stats_tree/Makefile.nmake --- wireshark-1.10.5/plugins/stats_tree/Makefile.nmake 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/stats_tree/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.nmake # nmake file for stats_tree plugin # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # include ..\..\config.nmake diff -Nru wireshark-1.10.5/plugins/stats_tree/moduleinfo.nmake wireshark-1.10.6/plugins/stats_tree/moduleinfo.nmake --- wireshark-1.10.5/plugins/stats_tree/moduleinfo.nmake 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/stats_tree/moduleinfo.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: moduleinfo.nmake 20151 2006-12-19 07:06:25Z jake $ +# $Id$ # # The name diff -Nru wireshark-1.10.5/plugins/stats_tree/NEWS wireshark-1.10.6/plugins/stats_tree/NEWS --- wireshark-1.10.5/plugins/stats_tree/NEWS 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/stats_tree/NEWS 2014-03-07 18:07:16.000000000 +0000 @@ -1 +1 @@ -$Id: NEWS 13442 2005-02-20 05:39:24Z jmayer $ +$Id$ diff -Nru wireshark-1.10.5/plugins/stats_tree/pinfo_stats_tree.c wireshark-1.10.6/plugins/stats_tree/pinfo_stats_tree.c --- wireshark-1.10.5/plugins/stats_tree/pinfo_stats_tree.c 2013-10-29 23:01:21.000000000 +0000 +++ wireshark-1.10.6/plugins/stats_tree/pinfo_stats_tree.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * * (c) 2005, Luis E. G. Ontanon * -* $Id: pinfo_stats_tree.c 52974 2013-10-29 22:55:21Z gerald $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/stats_tree/pinfo_stats_tree.h wireshark-1.10.6/plugins/stats_tree/pinfo_stats_tree.h --- wireshark-1.10.5/plugins/stats_tree/pinfo_stats_tree.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/stats_tree/pinfo_stats_tree.h 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * * (c) 2005, Luis E. G. Ontanon * -* $Id: pinfo_stats_tree.h 43536 2012-06-28 22:56:06Z darkjames $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/stats_tree/stats_tree_plugin.c wireshark-1.10.6/plugins/stats_tree/stats_tree_plugin.c --- wireshark-1.10.5/plugins/stats_tree/stats_tree_plugin.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/stats_tree/stats_tree_plugin.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Stats tree plugin registration file * Automatically generated by make_stat_tree_registration.pl * -* $Id: stats_tree_plugin.c 47992 2013-03-01 23:53:11Z rbalint $ +* $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/unistim/audio.h wireshark-1.10.6/plugins/unistim/audio.h --- wireshark-1.10.5/plugins/unistim/audio.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/unistim/audio.h 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * definitions for audio manager messages * Copyright 2007 Don Newton * - * $Id: audio.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/unistim/basic.h wireshark-1.10.6/plugins/unistim/basic.h --- wireshark-1.10.5/plugins/unistim/basic.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/unistim/basic.h 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * definitions for basic manager messages * Copyright 2007 Don Newton * - * $Id: basic.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/unistim/broadcast.h wireshark-1.10.6/plugins/unistim/broadcast.h --- wireshark-1.10.5/plugins/unistim/broadcast.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/unistim/broadcast.h 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * definitions for broadcast manager messages * Copyright 2007 Don Newton * - * $Id: broadcast.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/unistim/CMakeLists.txt wireshark-1.10.6/plugins/unistim/CMakeLists.txt --- wireshark-1.10.5/plugins/unistim/CMakeLists.txt 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/unistim/CMakeLists.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/unistim/defines.h wireshark-1.10.6/plugins/unistim/defines.h --- wireshark-1.10.5/plugins/unistim/defines.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/unistim/defines.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Contains all bitmask defines for unistim dissecting * Copyright 2007 Don Newton * - * $Id: defines.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/unistim/display.h wireshark-1.10.6/plugins/unistim/display.h --- wireshark-1.10.5/plugins/unistim/display.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/unistim/display.h 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * definitions for display manager messages * Copyright 2007 Don Newton * - * $Id: display.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/unistim/expansion.h wireshark-1.10.6/plugins/unistim/expansion.h --- wireshark-1.10.5/plugins/unistim/expansion.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/unistim/expansion.h 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * definitions for basic manager messages * Copyright 2007 Don Newton * - * $Id: expansion.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/unistim/key.h wireshark-1.10.6/plugins/unistim/key.h --- wireshark-1.10.5/plugins/unistim/key.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/unistim/key.h 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * definitions for key manager messages * Copyright 2007 Don Newton * - * $Id: key.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/unistim/Makefile.am wireshark-1.10.6/plugins/unistim/Makefile.am --- wireshark-1.10.5/plugins/unistim/Makefile.am 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/unistim/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ # Automake file for Nortel Unistim plugin # Copyright 2007, Don Newton # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/unistim/Makefile.common wireshark-1.10.6/plugins/unistim/Makefile.common --- wireshark-1.10.5/plugins/unistim/Makefile.common 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/unistim/Makefile.common 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ # b) portable between both files # Copyright 2007 Don Newton # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/unistim/Makefile.in wireshark-1.10.6/plugins/unistim/Makefile.in --- wireshark-1.10.5/plugins/unistim/Makefile.in 2013-12-19 19:13:50.000000000 +0000 +++ wireshark-1.10.6/plugins/unistim/Makefile.in 2014-03-07 18:07:38.000000000 +0000 @@ -19,7 +19,7 @@ # Automake file for Nortel Unistim plugin # Copyright 2007, Don Newton # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -43,7 +43,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -69,7 +69,7 @@ # b) portable between both files # Copyright 2007 Don Newton # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/unistim/Makefile.nmake wireshark-1.10.6/plugins/unistim/Makefile.nmake --- wireshark-1.10.5/plugins/unistim/Makefile.nmake 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/unistim/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.nmake # nmake file for Unistim plugin # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # include ..\..\config.nmake diff -Nru wireshark-1.10.5/plugins/unistim/moduleinfo.nmake wireshark-1.10.6/plugins/unistim/moduleinfo.nmake --- wireshark-1.10.5/plugins/unistim/moduleinfo.nmake 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/unistim/moduleinfo.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: moduleinfo.nmake 22558 2007-08-20 20:50:29Z jake $ +# $Id$ # # The name diff -Nru wireshark-1.10.5/plugins/unistim/network.h wireshark-1.10.6/plugins/unistim/network.h --- wireshark-1.10.5/plugins/unistim/network.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/unistim/network.h 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * definitions for network manager messages * Copyright 2007 Don Newton * - * $Id: network.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/unistim/packet-unistim.c wireshark-1.10.6/plugins/unistim/packet-unistim.c --- wireshark-1.10.5/plugins/unistim/packet-unistim.c 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/unistim/packet-unistim.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for unistim packet dissection * Copyright 2007 Don Newton * - * $Id: packet-unistim.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/unistim/packet-unistim.h wireshark-1.10.6/plugins/unistim/packet-unistim.h --- wireshark-1.10.5/plugins/unistim/packet-unistim.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/unistim/packet-unistim.h 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * definitions and function prototypes for main dissectors * Copyright 2007 Don Newton * - * $Id: packet-unistim.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/unistim/uftp.h wireshark-1.10.6/plugins/unistim/uftp.h --- wireshark-1.10.5/plugins/unistim/uftp.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/unistim/uftp.h 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * definitions for uftp commands and messages * Copyright 2007 Chad Singer * - * $Id: uftp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/CMakeLists.txt wireshark-1.10.6/plugins/wimax/CMakeLists.txt --- wireshark-1.10.5/plugins/wimax/CMakeLists.txt 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/CMakeLists.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/crc.c wireshark-1.10.6/plugins/wimax/crc.c --- wireshark-1.10.5/plugins/wimax/crc.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/crc.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Mike Harvey * - * $Id: crc.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/crc_data.c wireshark-1.10.6/plugins/wimax/crc_data.c --- wireshark-1.10.5/plugins/wimax/crc_data.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/crc_data.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Mike Harvey * - * $Id: crc_data.c 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/crc.h wireshark-1.10.6/plugins/wimax/crc.h --- wireshark-1.10.5/plugins/wimax/crc.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/crc.h 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Mike Harvey * - * $Id: crc.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/mac_hd_generic_decoder.c wireshark-1.10.6/plugins/wimax/mac_hd_generic_decoder.c --- wireshark-1.10.5/plugins/wimax/mac_hd_generic_decoder.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/mac_hd_generic_decoder.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: mac_hd_generic_decoder.c 48491 2013-03-22 23:59:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/mac_hd_type1_decoder.c wireshark-1.10.6/plugins/wimax/mac_hd_type1_decoder.c --- wireshark-1.10.5/plugins/wimax/mac_hd_type1_decoder.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/mac_hd_type1_decoder.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: mac_hd_type1_decoder.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/mac_hd_type2_decoder.c wireshark-1.10.6/plugins/wimax/mac_hd_type2_decoder.c --- wireshark-1.10.5/plugins/wimax/mac_hd_type2_decoder.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/mac_hd_type2_decoder.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: mac_hd_type2_decoder.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/mac_mgmt_msg_decoder.c wireshark-1.10.6/plugins/wimax/mac_mgmt_msg_decoder.c --- wireshark-1.10.5/plugins/wimax/mac_mgmt_msg_decoder.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/mac_mgmt_msg_decoder.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: mac_mgmt_msg_decoder.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/Makefile.am wireshark-1.10.6/plugins/wimax/Makefile.am --- wireshark-1.10.5/plugins/wimax/Makefile.am 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Wireshark WiMAX Plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/Makefile.common wireshark-1.10.6/plugins/wimax/Makefile.common --- wireshark-1.10.5/plugins/wimax/Makefile.common 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/Makefile.common 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/Makefile.in wireshark-1.10.6/plugins/wimax/Makefile.in --- wireshark-1.10.5/plugins/wimax/Makefile.in 2013-12-19 19:13:50.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/Makefile.in 2014-03-07 18:07:38.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for Wireshark WiMAX Plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -42,7 +42,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -67,7 +67,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/Makefile.nmake wireshark-1.10.6/plugins/wimax/Makefile.nmake --- wireshark-1.10.5/plugins/wimax/Makefile.nmake 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.nmake # nmake file for WiMAX plugin # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # include ..\..\config.nmake diff -Nru wireshark-1.10.5/plugins/wimax/moduleinfo.nmake wireshark-1.10.6/plugins/wimax/moduleinfo.nmake --- wireshark-1.10.5/plugins/wimax/moduleinfo.nmake 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/moduleinfo.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: moduleinfo.nmake 21960 2007-05-27 18:33:13Z guy $ +# $Id$ # # The name diff -Nru wireshark-1.10.5/plugins/wimax/msg_aas_beam.c wireshark-1.10.6/plugins/wimax/msg_aas_beam.c --- wireshark-1.10.5/plugins/wimax/msg_aas_beam.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_aas_beam.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: msg_aas_beam.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_aas_fbck.c wireshark-1.10.6/plugins/wimax/msg_aas_fbck.c --- wireshark-1.10.5/plugins/wimax/msg_aas_fbck.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_aas_fbck.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: msg_aas_fbck.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_arq.c wireshark-1.10.6/plugins/wimax/msg_arq.c --- wireshark-1.10.5/plugins/wimax/msg_arq.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_arq.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: John R. Underwood * - * $Id: msg_arq.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_clk_cmp.c wireshark-1.10.6/plugins/wimax/msg_clk_cmp.c --- wireshark-1.10.5/plugins/wimax/msg_clk_cmp.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_clk_cmp.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: msg_clk_cmp.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_dcd.c wireshark-1.10.6/plugins/wimax/msg_dcd.c --- wireshark-1.10.5/plugins/wimax/msg_dcd.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_dcd.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: msg_dcd.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_dlmap.c wireshark-1.10.6/plugins/wimax/msg_dlmap.c --- wireshark-1.10.5/plugins/wimax/msg_dlmap.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_dlmap.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Mike Harvey * - * $Id: msg_dlmap.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_dreg.c wireshark-1.10.6/plugins/wimax/msg_dreg.c --- wireshark-1.10.5/plugins/wimax/msg_dreg.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_dreg.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: John R. Underwood * - * $Id: msg_dreg.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_dsa.c wireshark-1.10.6/plugins/wimax/msg_dsa.c --- wireshark-1.10.5/plugins/wimax/msg_dsa.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_dsa.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: msg_dsa.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_dsc.c wireshark-1.10.6/plugins/wimax/msg_dsc.c --- wireshark-1.10.5/plugins/wimax/msg_dsc.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_dsc.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: msg_dsc.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_dsd.c wireshark-1.10.6/plugins/wimax/msg_dsd.c --- wireshark-1.10.5/plugins/wimax/msg_dsd.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_dsd.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: msg_dsd.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_dsx_rvd.c wireshark-1.10.6/plugins/wimax/msg_dsx_rvd.c --- wireshark-1.10.5/plugins/wimax/msg_dsx_rvd.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_dsx_rvd.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: msg_dsx_rvd.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_fpc.c wireshark-1.10.6/plugins/wimax/msg_fpc.c --- wireshark-1.10.5/plugins/wimax/msg_fpc.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_fpc.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: John R. Underwood * - * $Id: msg_fpc.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_pkm.c wireshark-1.10.6/plugins/wimax/msg_pkm.c --- wireshark-1.10.5/plugins/wimax/msg_pkm.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_pkm.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: msg_pkm.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_pmc.c wireshark-1.10.6/plugins/wimax/msg_pmc.c --- wireshark-1.10.5/plugins/wimax/msg_pmc.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_pmc.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: John R. Underwood * - * $Id: msg_pmc.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_prc_lt_ctrl.c wireshark-1.10.6/plugins/wimax/msg_prc_lt_ctrl.c --- wireshark-1.10.5/plugins/wimax/msg_prc_lt_ctrl.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_prc_lt_ctrl.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: John R. Underwood * - * $Id: msg_prc_lt_ctrl.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_reg_req.c wireshark-1.10.6/plugins/wimax/msg_reg_req.c --- wireshark-1.10.5/plugins/wimax/msg_reg_req.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_reg_req.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: John R. Underwood * - * $Id: msg_reg_req.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_reg_rsp.c wireshark-1.10.6/plugins/wimax/msg_reg_rsp.c --- wireshark-1.10.5/plugins/wimax/msg_reg_rsp.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_reg_rsp.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: John R. Underwood * - * $Id: msg_reg_rsp.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_rep.c wireshark-1.10.6/plugins/wimax/msg_rep.c --- wireshark-1.10.5/plugins/wimax/msg_rep.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_rep.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: msg_rep.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_res_cmd.c wireshark-1.10.6/plugins/wimax/msg_res_cmd.c --- wireshark-1.10.5/plugins/wimax/msg_res_cmd.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_res_cmd.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: msg_res_cmd.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_rng_req.c wireshark-1.10.6/plugins/wimax/msg_rng_req.c --- wireshark-1.10.5/plugins/wimax/msg_rng_req.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_rng_req.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: John R. Underwood * - * $Id: msg_rng_req.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_rng_rsp.c wireshark-1.10.6/plugins/wimax/msg_rng_rsp.c --- wireshark-1.10.5/plugins/wimax/msg_rng_rsp.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_rng_rsp.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: John R. Underwood * - * $Id: msg_rng_rsp.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_sbc.c wireshark-1.10.6/plugins/wimax/msg_sbc.c --- wireshark-1.10.5/plugins/wimax/msg_sbc.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_sbc.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: msg_sbc.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_ucd.c wireshark-1.10.6/plugins/wimax/msg_ucd.c --- wireshark-1.10.5/plugins/wimax/msg_ucd.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_ucd.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: msg_ucd.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/msg_ulmap.c wireshark-1.10.6/plugins/wimax/msg_ulmap.c --- wireshark-1.10.5/plugins/wimax/msg_ulmap.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/msg_ulmap.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Mike Harvey * - * $Id: msg_ulmap.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/packet-wmx.c wireshark-1.10.6/plugins/wimax/packet-wmx.c --- wireshark-1.10.5/plugins/wimax/packet-wmx.c 2013-10-29 22:10:50.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/packet-wmx.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: packet-wmx.c 52970 2013-10-29 21:58:59Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/wimax_bits.h wireshark-1.10.6/plugins/wimax/wimax_bits.h --- wireshark-1.10.5/plugins/wimax/wimax_bits.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/wimax_bits.h 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Mike Harvey * - * $Id: wimax_bits.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/wimax_cdma_code_decoder.c wireshark-1.10.6/plugins/wimax/wimax_cdma_code_decoder.c --- wireshark-1.10.5/plugins/wimax/wimax_cdma_code_decoder.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/wimax_cdma_code_decoder.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: wimax_cdma_code_decoder.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/wimax_compact_dlmap_ie_decoder.c wireshark-1.10.6/plugins/wimax/wimax_compact_dlmap_ie_decoder.c --- wireshark-1.10.5/plugins/wimax/wimax_compact_dlmap_ie_decoder.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/wimax_compact_dlmap_ie_decoder.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: wimax_compact_dlmap_ie_decoder.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/wimax_compact_ulmap_ie_decoder.c wireshark-1.10.6/plugins/wimax/wimax_compact_ulmap_ie_decoder.c --- wireshark-1.10.5/plugins/wimax/wimax_compact_ulmap_ie_decoder.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/wimax_compact_ulmap_ie_decoder.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: wimax_compact_ulmap_ie_decoder.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/wimax_fch_decoder.c wireshark-1.10.6/plugins/wimax/wimax_fch_decoder.c --- wireshark-1.10.5/plugins/wimax/wimax_fch_decoder.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/wimax_fch_decoder.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: wimax_fch_decoder.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/wimax_ffb_decoder.c wireshark-1.10.6/plugins/wimax/wimax_ffb_decoder.c --- wireshark-1.10.5/plugins/wimax/wimax_ffb_decoder.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/wimax_ffb_decoder.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: wimax_ffb_decoder.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/wimax_hack_decoder.c wireshark-1.10.6/plugins/wimax/wimax_hack_decoder.c --- wireshark-1.10.5/plugins/wimax/wimax_hack_decoder.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/wimax_hack_decoder.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: wimax_hack_decoder.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/wimax_harq_map_decoder.c wireshark-1.10.6/plugins/wimax/wimax_harq_map_decoder.c --- wireshark-1.10.5/plugins/wimax/wimax_harq_map_decoder.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/wimax_harq_map_decoder.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: wimax_harq_map_decoder.c 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/wimax_mac.h wireshark-1.10.6/plugins/wimax/wimax_mac.h --- wireshark-1.10.5/plugins/wimax/wimax_mac.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/wimax_mac.h 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: wimax_mac.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/wimax_pdu_decoder.c wireshark-1.10.6/plugins/wimax/wimax_pdu_decoder.c --- wireshark-1.10.5/plugins/wimax/wimax_pdu_decoder.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/wimax_pdu_decoder.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: wimax_pdu_decoder.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/wimax_phy_attributes_decoder.c wireshark-1.10.6/plugins/wimax/wimax_phy_attributes_decoder.c --- wireshark-1.10.5/plugins/wimax/wimax_phy_attributes_decoder.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/wimax_phy_attributes_decoder.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: wimax_phy_attributes_decoder.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/wimax_tlv.c wireshark-1.10.6/plugins/wimax/wimax_tlv.c --- wireshark-1.10.5/plugins/wimax/wimax_tlv.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/wimax_tlv.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: wimax_tlv.c 47978 2013-03-01 19:05:25Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/wimax_tlv.h wireshark-1.10.6/plugins/wimax/wimax_tlv.h --- wireshark-1.10.5/plugins/wimax/wimax_tlv.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/wimax_tlv.h 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: wimax_tlv.h 47978 2013-03-01 19:05:25Z pascal $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/wimax_utils.c wireshark-1.10.6/plugins/wimax/wimax_utils.c --- wireshark-1.10.5/plugins/wimax/wimax_utils.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/wimax_utils.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: wimax_utils.c 47617 2013-02-10 20:52:21Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimax/wimax_utils.h wireshark-1.10.6/plugins/wimax/wimax_utils.h --- wireshark-1.10.5/plugins/wimax/wimax_utils.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimax/wimax_utils.h 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Author: Lu Pan * - * $Id: wimax_utils.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimaxasncp/CMakeLists.txt wireshark-1.10.6/plugins/wimaxasncp/CMakeLists.txt --- wireshark-1.10.5/plugins/wimaxasncp/CMakeLists.txt 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimaxasncp/CMakeLists.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimaxasncp/Makefile.am wireshark-1.10.6/plugins/wimaxasncp/Makefile.am --- wireshark-1.10.5/plugins/wimaxasncp/Makefile.am 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimaxasncp/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for wimaxasncp plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimaxasncp/Makefile.common wireshark-1.10.6/plugins/wimaxasncp/Makefile.common --- wireshark-1.10.5/plugins/wimaxasncp/Makefile.common 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimaxasncp/Makefile.common 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47593 2013-02-09 19:30:18Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimaxasncp/Makefile.in wireshark-1.10.6/plugins/wimaxasncp/Makefile.in --- wireshark-1.10.5/plugins/wimaxasncp/Makefile.in 2013-12-19 19:13:51.000000000 +0000 +++ wireshark-1.10.6/plugins/wimaxasncp/Makefile.in 2014-03-07 18:07:38.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for wimaxasncp plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -42,7 +42,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -67,7 +67,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47593 2013-02-09 19:30:18Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimaxasncp/Makefile.nmake wireshark-1.10.6/plugins/wimaxasncp/Makefile.nmake --- wireshark-1.10.5/plugins/wimaxasncp/Makefile.nmake 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimaxasncp/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.nmake # nmake file for wimaxasncp plugin # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # include ..\..\config.nmake diff -Nru wireshark-1.10.5/plugins/wimaxasncp/moduleinfo.nmake wireshark-1.10.6/plugins/wimaxasncp/moduleinfo.nmake --- wireshark-1.10.5/plugins/wimaxasncp/moduleinfo.nmake 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimaxasncp/moduleinfo.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: moduleinfo.nmake 22800 2007-09-06 10:05:41Z martinm $ +# $Id$ # # The name diff -Nru wireshark-1.10.5/plugins/wimaxasncp/packet-wimaxasncp.c wireshark-1.10.6/plugins/wimaxasncp/packet-wimaxasncp.c --- wireshark-1.10.5/plugins/wimaxasncp/packet-wimaxasncp.c 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimaxasncp/packet-wimaxasncp.c 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ * * Author: Stephen Croll * - * $Id: packet-wimaxasncp.c 47751 2013-02-19 23:17:07Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimaxasncp/wimaxasncp_dict.c wireshark-1.10.6/plugins/wimaxasncp/wimaxasncp_dict.c --- wireshark-1.10.5/plugins/wimaxasncp/wimaxasncp_dict.c 2013-12-19 19:22:39.000000000 +0000 +++ wireshark-1.10.6/plugins/wimaxasncp/wimaxasncp_dict.c 2014-03-07 18:14:51.000000000 +0000 @@ -869,7 +869,7 @@ ** wimaxasncp_dict.h ** WIMAXASNCP Dictionary Import Routines ** - ** $Id: wimaxasncp_dict.l 48439 2013-03-20 05:59:22Z etxrab $ + ** $Id$ ** ** (c) 2007, Luis E. Garcia Ontanon ** (c) 2007, Stephen Croll diff -Nru wireshark-1.10.5/plugins/wimaxasncp/wimaxasncp_dict.h wireshark-1.10.6/plugins/wimaxasncp/wimaxasncp_dict.h --- wireshark-1.10.5/plugins/wimaxasncp/wimaxasncp_dict.h 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimaxasncp/wimaxasncp_dict.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ ** wimaxasncp_dict.h ** WIMAXASNCP Dictionary Import Routines ** - ** $Id: wimaxasncp_dict.h 48907 2013-04-18 02:04:18Z guy $ + ** $Id$ ** ** (c) 2007, Stephen Croll ** diff -Nru wireshark-1.10.5/plugins/wimaxasncp/wimaxasncp_dict.l wireshark-1.10.6/plugins/wimaxasncp/wimaxasncp_dict.l --- wireshark-1.10.5/plugins/wimaxasncp/wimaxasncp_dict.l 2013-04-22 18:04:13.000000000 +0000 +++ wireshark-1.10.6/plugins/wimaxasncp/wimaxasncp_dict.l 2014-03-07 18:07:16.000000000 +0000 @@ -36,7 +36,7 @@ ** wimaxasncp_dict.h ** WIMAXASNCP Dictionary Import Routines ** - ** $Id: wimaxasncp_dict.l 48439 2013-03-20 05:59:22Z etxrab $ + ** $Id$ ** ** (c) 2007, Luis E. Garcia Ontanon ** (c) 2007, Stephen Croll diff -Nru wireshark-1.10.5/plugins/wimaxmacphy/CMakeLists.txt wireshark-1.10.6/plugins/wimaxmacphy/CMakeLists.txt --- wireshark-1.10.5/plugins/wimaxmacphy/CMakeLists.txt 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/wimaxmacphy/CMakeLists.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 43853 2012-07-20 11:04:18Z jmayer $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimaxmacphy/Makefile.am wireshark-1.10.6/plugins/wimaxmacphy/Makefile.am --- wireshark-1.10.5/plugins/wimaxmacphy/Makefile.am 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/wimaxmacphy/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for wimaxmacphy plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimaxmacphy/Makefile.common wireshark-1.10.6/plugins/wimaxmacphy/Makefile.common --- wireshark-1.10.5/plugins/wimaxmacphy/Makefile.common 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/wimaxmacphy/Makefile.common 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimaxmacphy/Makefile.in wireshark-1.10.6/plugins/wimaxmacphy/Makefile.in --- wireshark-1.10.5/plugins/wimaxmacphy/Makefile.in 2013-12-19 19:13:51.000000000 +0000 +++ wireshark-1.10.6/plugins/wimaxmacphy/Makefile.in 2014-03-07 18:07:38.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for wimaxmacphy plugin # -# $Id: Makefile.am 48261 2013-03-12 06:53:39Z jake $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -42,7 +42,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -67,7 +67,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47579 2013-02-09 05:31:15Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimaxmacphy/Makefile.nmake wireshark-1.10.6/plugins/wimaxmacphy/Makefile.nmake --- wireshark-1.10.5/plugins/wimaxmacphy/Makefile.nmake 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/wimaxmacphy/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.nmake # nmake file for wimaxmacphy plugin # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # include ..\..\config.nmake diff -Nru wireshark-1.10.5/plugins/wimaxmacphy/moduleinfo.nmake wireshark-1.10.6/plugins/wimaxmacphy/moduleinfo.nmake --- wireshark-1.10.5/plugins/wimaxmacphy/moduleinfo.nmake 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/wimaxmacphy/moduleinfo.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: moduleinfo.nmake 43848 2012-07-20 05:46:45Z pascal $ +# $Id$ # # The name diff -Nru wireshark-1.10.5/plugins/wimaxmacphy/packet-wimaxmacphy.c wireshark-1.10.6/plugins/wimaxmacphy/packet-wimaxmacphy.c --- wireshark-1.10.5/plugins/wimaxmacphy/packet-wimaxmacphy.c 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/wimaxmacphy/packet-wimaxmacphy.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for wimaxmacphy (WiMAX MAX PHY over Ethernet) packet dissection * Copyright 2008, Mobile Metrics - http://mobilemetrics.net/ * - * $Id: packet-wimaxmacphy.c 46287 2012-11-29 16:22:54Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/plugins/wimaxmacphy/packet-wimaxmacphy.h wireshark-1.10.6/plugins/wimaxmacphy/packet-wimaxmacphy.h --- wireshark-1.10.5/plugins/wimaxmacphy/packet-wimaxmacphy.h 2013-04-22 18:04:14.000000000 +0000 +++ wireshark-1.10.6/plugins/wimaxmacphy/packet-wimaxmacphy.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* $Id: packet-wimaxmacphy.h 48869 2013-04-16 00:00:09Z eapache $ +/* $Id$ * * Routines for wimaxmacphy (WiMAX MAX SHY over Ethernet) packet dissection * Copyright 2008, Mobile Metrics - http://mobilemetrics.net/ diff -Nru wireshark-1.10.5/print.c wireshark-1.10.6/print.c --- wireshark-1.10.5/print.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/print.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* print.c * Routines for printing packet analysis trees. * - * $Id: print.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Gilbert Ramirez * @@ -1207,7 +1207,7 @@ fputs("%% the page title\n", output->fh); ps_clean_string(psbuffer, filename, MAX_PS_LINE_LENGTH); - fprintf(output->fh, "/ws_pagetitle (%s - Wireshark " VERSION "%s) def\n", psbuffer, wireshark_svnversion); + fprintf(output->fh, "/ws_pagetitle (%s - Wireshark " VERSION "%s) def\n", psbuffer, wireshark_gitversion); fputs("\n", output->fh); return !ferror(output->fh); } diff -Nru wireshark-1.10.5/print.h wireshark-1.10.6/print.h --- wireshark-1.10.5/print.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/print.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* print.h * Definitions for printing packet analysis trees. * - * $Id: print.h 46465 2012-12-08 02:42:40Z mmann $ + * $Id$ * * Gilbert Ramirez * diff -Nru wireshark-1.10.5/proto_hier_stats.c wireshark-1.10.6/proto_hier_stats.c --- wireshark-1.10.5/proto_hier_stats.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/proto_hier_stats.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* proto_hier_stats.c * Routines for calculating statistics based on protocol. * - * $Id: proto_hier_stats.c 45601 2012-10-16 21:50:57Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/proto_hier_stats.h wireshark-1.10.6/proto_hier_stats.h --- wireshark-1.10.5/proto_hier_stats.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/proto_hier_stats.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* proto_hier_stats.h * - * $Id: proto_hier_stats.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ps.h wireshark-1.10.6/ps.h --- wireshark-1.10.5/ps.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/ps.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* ps.h * Definitions for generating PostScript(R) packet output. * - * $Id: ps.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Gilbert Ramirez * diff -Nru wireshark-1.10.5/radius/custom.includes wireshark-1.10.6/radius/custom.includes --- wireshark-1.10.5/radius/custom.includes 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/custom.includes 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ # -# Version $Id: custom.includes 47224 2013-01-23 12:08:15Z etxrab $ +# Version $Id$ # Add custom Radius files her in the format $INCLUDE dictionary.foo # diff -Nru wireshark-1.10.5/radius/dictionary wireshark-1.10.6/radius/dictionary --- wireshark-1.10.5/radius/dictionary 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # -*- text -*- # -# Version $Id: dictionary 47224 2013-01-23 12:08:15Z etxrab $ +# Version $Id$ # # 2011-05-24 Updated based upon FreeRadius v2.1.10 dictionary file # - Added: acme, alcatel.sr, iea, motorola.wimax, rfc4603, rfc 5580, rfc5607, rfc5904, wichorus diff -Nru wireshark-1.10.5/radius/dictionary.3com wireshark-1.10.6/radius/dictionary.3com --- wireshark-1.10.5/radius/dictionary.3com 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.3com 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # 3com SuperStack Firewall dictionary # Bought from Sonicwall, apparently, from Enterprise number 8741. # -# $Id: dictionary.3com 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR 3com 43 diff -Nru wireshark-1.10.5/radius/dictionary.3gpp wireshark-1.10.6/radius/dictionary.3gpp --- wireshark-1.10.5/radius/dictionary.3gpp 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.3gpp 2014-03-07 18:07:16.000000000 +0000 @@ -8,7 +8,7 @@ # [wireshark] 2009-07-07: Updated FreeRadius 2.1.6 dictionary.3gpp # based upon the above specification. # -# $Id: dictionary.3gpp 43691 2012-07-13 16:56:11Z pascal $ +# $Id$ # VENDOR 3GPP 10415 diff -Nru wireshark-1.10.5/radius/dictionary.3gpp2 wireshark-1.10.6/radius/dictionary.3gpp2 --- wireshark-1.10.5/radius/dictionary.3gpp2 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.3gpp2 2014-03-07 18:07:16.000000000 +0000 @@ -10,7 +10,7 @@ # "Version: 2.0" # "Version Date: November 2008" # -# $Id: dictionary.3gpp2 48883 2013-04-16 18:12:23Z etxrab $ +# $Id$ # # [wireshark] 2009-07-08 - FreeRadius 2.6.1 dictionary.3gpp2 updated from the 3GPP2 X.S0011-005-D v2.0 spec # diff -Nru wireshark-1.10.5/radius/dictionary.acc wireshark-1.10.6/radius/dictionary.acc --- wireshark-1.10.5/radius/dictionary.acc 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.acc 2014-03-07 18:07:16.000000000 +0000 @@ -7,7 +7,7 @@ # # Version: @(#)dictionary.acc 1.00 smarzloff 21-Jun-1999 # -# $Id: dictionary.acc 34995 2010-11-21 18:57:21Z wmeier $ +# $Id$ # VENDOR Acc 5 diff -Nru wireshark-1.10.5/radius/dictionary.acme wireshark-1.10.6/radius/dictionary.acme --- wireshark-1.10.5/radius/dictionary.acme 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.acme 2014-03-07 18:07:16.000000000 +0000 @@ -7,7 +7,7 @@ # # Version: 6.2.0 30-Oct-2009 Hadriel Kaplan # -# $Id: dictionary.acme 37375 2011-05-24 16:30:32Z wmeier $ +# $Id$ # VENDOR Acme 9148 diff -Nru wireshark-1.10.5/radius/dictionary.airespace wireshark-1.10.6/radius/dictionary.airespace --- wireshark-1.10.5/radius/dictionary.airespace 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.airespace 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ # # As found on the net. # -# $Id: dictionary.airespace 37382 2011-05-24 20:59:34Z wmeier $ +# $Id$ # VENDOR Airespace 14179 diff -Nru wireshark-1.10.5/radius/dictionary.alcatel wireshark-1.10.6/radius/dictionary.alcatel --- wireshark-1.10.5/radius/dictionary.alcatel 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.alcatel 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # Alcatel Broadband Access Server dictionary. # -# $Id: dictionary.alcatel 29020 2009-07-08 13:38:59Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.alcatel-lucent.xylan wireshark-1.10.6/radius/dictionary.alcatel-lucent.xylan --- wireshark-1.10.5/radius/dictionary.alcatel-lucent.xylan 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.alcatel-lucent.xylan 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # Alcatel-Lucent Xylan dictionary # -# $Id: dictionary.alcatel-lucent.xylan 41474 2012-03-10 18:30:20Z alagoutte $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.alcatel.sr wireshark-1.10.6/radius/dictionary.alcatel.sr --- wireshark-1.10.5/radius/dictionary.alcatel.sr 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.alcatel.sr 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # Alcatel-Lucent Service Router dictionary. # -# $Id: dictionary.alcatel.sr 37375 2011-05-24 16:30:32Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.alteon wireshark-1.10.6/radius/dictionary.alteon --- wireshark-1.10.5/radius/dictionary.alteon 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.alteon 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ # # Alteon Webswitch # -# $Id: dictionary.alteon 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR Alteon 1872 diff -Nru wireshark-1.10.5/radius/dictionary.altiga wireshark-1.10.6/radius/dictionary.altiga --- wireshark-1.10.5/radius/dictionary.altiga 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.altiga 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # -*- text -*- # Altiga vendor attributes # -# $Id: dictionary.altiga 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR Altiga 3076 diff -Nru wireshark-1.10.5/radius/dictionary.alvarion wireshark-1.10.6/radius/dictionary.alvarion --- wireshark-1.10.5/radius/dictionary.alvarion 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.alvarion 2014-03-07 18:07:16.000000000 +0000 @@ -27,7 +27,7 @@ # Why anyone thought this was a good idea is beyond rational # understanding. # -# $Id: dictionary.alvarion 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.apc wireshark-1.10.6/radius/dictionary.apc --- wireshark-1.10.5/radius/dictionary.apc 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.apc 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # http://nam-en.apc.com/cgi-bin/nam_en.cfg/php/enduser/std_adp.php?p_faqid=8012 # -# $Id: dictionary.apc 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.aptis wireshark-1.10.6/radius/dictionary.aptis --- wireshark-1.10.5/radius/dictionary.aptis 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.aptis 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # -*- text -*- # -# $Id: dictionary.aptis 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR Aptis 2637 diff -Nru wireshark-1.10.5/radius/dictionary.aruba wireshark-1.10.6/radius/dictionary.aruba --- wireshark-1.10.5/radius/dictionary.aruba 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.aruba 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ # # As posted to the list. # -# Version: $Id: dictionary.aruba 48051 2013-03-04 17:14:24Z alagoutte $ +# Version: $Id$ # VENDOR Aruba 14823 BEGIN-VENDOR Aruba diff -Nru wireshark-1.10.5/radius/dictionary.ascend wireshark-1.10.6/radius/dictionary.ascend --- wireshark-1.10.5/radius/dictionary.ascend 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.ascend 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # Ascend dictionary. # -# $Id: dictionary.ascend 35091 2010-12-01 17:34:26Z etxrab $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.asn wireshark-1.10.6/radius/dictionary.asn --- wireshark-1.10.5/radius/dictionary.asn 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.asn 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # # Taken from http://svn.asn.pl/misc/freeradius/dictionary.asn # -# $Id: dictionary.asn 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.audiocodes wireshark-1.10.6/radius/dictionary.audiocodes --- wireshark-1.10.5/radius/dictionary.audiocodes 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.audiocodes 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # # http://www.audiocodes.com/filehandler.ashx?fileid=36358 # -# $Id: dictionary.audiocodes 37376 2011-05-24 17:18:34Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.avaya wireshark-1.10.6/radius/dictionary.avaya --- wireshark-1.10.5/radius/dictionary.avaya 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.avaya 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # -*- text -*- # # Avaya P330 dictionary file -# $Id: dictionary.avaya 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # # http://support.avaya.com/elmodocs2/p330/P330/Configuring%20FreeRadius.pdf # diff -Nru wireshark-1.10.5/radius/dictionary.azaire wireshark-1.10.6/radius/dictionary.azaire --- wireshark-1.10.5/radius/dictionary.azaire 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.azaire 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # Azaire VSAs # -# $Id: dictionary.azaire 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.bay wireshark-1.10.6/radius/dictionary.bay --- wireshark-1.10.5/radius/dictionary.bay 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.bay 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ # From MegaZone , as posted to the bay-isp list. # Modified for libradius by Alan DeKok # -# $Id: dictionary.bay 34995 2010-11-21 18:57:21Z wmeier $ +# $Id$ # VENDOR Bay-Networks 1584 # now Nortel diff -Nru wireshark-1.10.5/radius/dictionary.bintec wireshark-1.10.6/radius/dictionary.bintec --- wireshark-1.10.5/radius/dictionary.bintec 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.bintec 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # -*- text -*- # # Bintec dictionary -# $Id: dictionary.bintec 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # # # diff -Nru wireshark-1.10.5/radius/dictionary.bristol wireshark-1.10.6/radius/dictionary.bristol --- wireshark-1.10.5/radius/dictionary.bristol 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.bristol 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ # # RoamNode VSA's # -# Version: $Id: dictionary.bristol 28996 2009-07-07 17:52:03Z wmeier $ +# Version: $Id$ # VENDOR Bristol 4363 diff -Nru wireshark-1.10.5/radius/dictionary.cablelabs wireshark-1.10.6/radius/dictionary.cablelabs --- wireshark-1.10.5/radius/dictionary.cablelabs 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.cablelabs 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # CableLabs # -# $Id: dictionary.cablelabs 28998 2009-07-07 19:40:17Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.cabletron wireshark-1.10.6/radius/dictionary.cabletron --- wireshark-1.10.5/radius/dictionary.cabletron 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.cabletron 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # -*- text -*- # # http://www.cabletron.com (now http://www.enterasys.com) -# $Id: dictionary.cabletron 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR Cabletron 52 diff -Nru wireshark-1.10.5/radius/dictionary.chillispot wireshark-1.10.6/radius/dictionary.chillispot --- wireshark-1.10.5/radius/dictionary.chillispot 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.chillispot 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # http://www.chillispot.org # http://coova.org/wiki/index.php/CoovaChilli # -# $Id: dictionary.chillispot 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.cisco wireshark-1.10.6/radius/dictionary.cisco --- wireshark-1.10.5/radius/dictionary.cisco 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.cisco 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # Accounting VSAs originally by # "Marcelo M. Sosa Lugones" # -# Version: $Id: dictionary.cisco 37528 2011-06-03 01:05:22Z guy $ +# Version: $Id$ # # For documentation on Cisco RADIUS attributes, see: # diff -Nru wireshark-1.10.5/radius/dictionary.cisco.bbsm wireshark-1.10.6/radius/dictionary.cisco.bbsm --- wireshark-1.10.5/radius/dictionary.cisco.bbsm 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.cisco.bbsm 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ # # http://www.cisco.com/univercd/cc/td/doc/product/access/acs_soft/csacs4nt/csnt30/user/ad.htm # -# $Id: dictionary.cisco.bbsm 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR Cisco-BBSM 5263 diff -Nru wireshark-1.10.5/radius/dictionary.cisco.vpn3000 wireshark-1.10.6/radius/dictionary.cisco.vpn3000 --- wireshark-1.10.5/radius/dictionary.cisco.vpn3000 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.cisco.vpn3000 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ # http://www.cisco.com/univercd/cc/td/doc/product/access/acs_soft/csacs4nt/acs31/acsuser/ad.htm # http://www.cisco.com/en/US/docs/security/vpn3000/vpn3000_47/configuration/guide/ldapapp.html#wp1564468 ## [wireshark] # -# $Id: dictionary.cisco.vpn3000 29026 2009-07-08 17:23:58Z wmeier $ +# $Id$ # VENDOR Cisco-VPN3000 3076 diff -Nru wireshark-1.10.5/radius/dictionary.cisco.vpn5000 wireshark-1.10.6/radius/dictionary.cisco.vpn5000 --- wireshark-1.10.5/radius/dictionary.cisco.vpn5000 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.cisco.vpn5000 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ # # http://www.cisco.com/univercd/cc/td/doc/product/access/acs_soft/csacs4nt/csnt30/user/ad.htm # -# $Id: dictionary.cisco.vpn5000 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR Cisco-VPN5000 255 diff -Nru wireshark-1.10.5/radius/dictionary.clavister wireshark-1.10.6/radius/dictionary.clavister --- wireshark-1.10.5/radius/dictionary.clavister 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.clavister 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # Clavister VSAs # -# $Id: dictionary.clavister 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.colubris wireshark-1.10.6/radius/dictionary.colubris --- wireshark-1.10.5/radius/dictionary.colubris 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.colubris 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # # Vendor-specific attributes # -# $Id: dictionary.colubris 34995 2010-11-21 18:57:21Z wmeier $ +# $Id$ # BEGIN-VENDOR Colubris diff -Nru wireshark-1.10.5/radius/dictionary.columbia_university wireshark-1.10.6/radius/dictionary.columbia_university --- wireshark-1.10.5/radius/dictionary.columbia_university 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.columbia_university 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # # http://www.cs.columbia.edu/IRT/cinema/release/radius_notes.html # -# $Id: dictionary.columbia_university 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR Columbia-University 11862 diff -Nru wireshark-1.10.5/radius/dictionary.compat wireshark-1.10.6/radius/dictionary.compat --- wireshark-1.10.5/radius/dictionary.compat 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.compat 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ # Move the $INCLUDE in the main dictionary file to the end if you want # these names to be used in the "details" logfile. # -# $Id: dictionary.compat 37377 2011-05-24 18:24:29Z wmeier $ +# $Id$ # ATTRIBUTE Password 2 string encrypt=1 ATTRIBUTE Client-Id 4 ipaddr diff -Nru wireshark-1.10.5/radius/dictionary.cosine wireshark-1.10.6/radius/dictionary.cosine --- wireshark-1.10.5/radius/dictionary.cosine 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.cosine 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # Cosine IPSX Dictionary # -# $Id: dictionary.cosine 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.dhcp wireshark-1.10.6/radius/dictionary.dhcp --- wireshark-1.10.5/radius/dictionary.dhcp 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.dhcp 2014-03-07 18:07:16.000000000 +0000 @@ -9,7 +9,7 @@ # # http://www.bind9.net/rfc-dhcp # -# $Id: dictionary.dhcp 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.digium wireshark-1.10.6/radius/dictionary.digium --- wireshark-1.10.5/radius/dictionary.digium 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.digium 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ # # http://bugs.digium.com/file_download.php\?file_id=9688\&type=bug # -# $Id: dictionary.digium 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.eltex wireshark-1.10.6/radius/dictionary.eltex --- wireshark-1.10.5/radius/dictionary.eltex 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.eltex 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # # dictionary.eltex # -# $Id: dictionary.eltex 37384 2011-05-25 00:30:09Z wmeier $ +# $Id$ # VENDOR Eltex 35265 diff -Nru wireshark-1.10.5/radius/dictionary.epygi wireshark-1.10.6/radius/dictionary.epygi --- wireshark-1.10.5/radius/dictionary.epygi 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.epygi 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ # # dictionary.Epygi # -# $Id: dictionary.epygi 34995 2010-11-21 18:57:21Z wmeier $ +# $Id$ # VENDOR Epygi 16459 diff -Nru wireshark-1.10.5/radius/dictionary.ericsson wireshark-1.10.6/radius/dictionary.ericsson --- wireshark-1.10.5/radius/dictionary.ericsson 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.ericsson 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # Ericsson dictionary # -# $Id: dictionary.ericsson 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.erx wireshark-1.10.6/radius/dictionary.erx --- wireshark-1.10.5/radius/dictionary.erx 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.erx 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # Juniper's (was Unisphere's) broadband RAS # From Terje Krogdahl # -# Version: $Id: dictionary.erx 47517 2013-02-06 13:18:25Z etxrab $ +# Version: $Id$ # # This dictionary applies to access services on Juniper JUNOS (M/MX) diff -Nru wireshark-1.10.5/radius/dictionary.extreme wireshark-1.10.6/radius/dictionary.extreme --- wireshark-1.10.5/radius/dictionary.extreme 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.extreme 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Dictionary for Extreme Networks VSA's. # http://www.extremenetworks.com/ # -# $Id: dictionary.extreme 37377 2011-05-24 18:24:29Z wmeier $ +# $Id$ # VENDOR Extreme 1916 diff -Nru wireshark-1.10.5/radius/dictionary.fortinet wireshark-1.10.6/radius/dictionary.fortinet --- wireshark-1.10.5/radius/dictionary.fortinet 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.fortinet 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ # Fortinet's VSA's # As posted to the list by Richie Lee. # -# $Id: dictionary.fortinet 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.foundry wireshark-1.10.6/radius/dictionary.foundry --- wireshark-1.10.5/radius/dictionary.foundry 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.foundry 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ # # As posted to the list by Thomas Keitel # -# Version: $Id: dictionary.foundry 37405 2011-05-26 02:59:25Z wmeier $ +# Version: $Id$ # VENDOR Foundry 1991 diff -Nru wireshark-1.10.5/radius/dictionary.freeradius wireshark-1.10.6/radius/dictionary.freeradius --- wireshark-1.10.5/radius/dictionary.freeradius 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.freeradius 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ # # The FreeRADIUS Vendor-Specific dictionary. # -# Version: $Id: dictionary.freeradius 37377 2011-05-24 18:24:29Z wmeier $ +# Version: $Id$ # # For a complete list of Private Enterprise Codes, see: # diff -Nru wireshark-1.10.5/radius/dictionary.freeradius.internal wireshark-1.10.6/radius/dictionary.freeradius.internal --- wireshark-1.10.5/radius/dictionary.freeradius.internal 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.freeradius.internal 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ # # Non Protocol Attributes used by FreeRADIUS # -# $Id: dictionary.freeradius.internal 37377 2011-05-24 18:24:29Z wmeier $ +# $Id$ # # The attributes number ranges are allocates as follows: diff -Nru wireshark-1.10.5/radius/dictionary.freeswitch wireshark-1.10.6/radius/dictionary.freeswitch --- wireshark-1.10.5/radius/dictionary.freeswitch 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.freeswitch 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ # # cparker@segv.org # -# Version: $Id: dictionary.freeswitch 28946 2009-07-06 12:39:58Z wmeier $ +# Version: $Id$ # VENDOR Freeswitch 27880 diff -Nru wireshark-1.10.5/radius/dictionary.gandalf wireshark-1.10.6/radius/dictionary.gandalf --- wireshark-1.10.5/radius/dictionary.gandalf 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.gandalf 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ # Notes: Dictionary was made specifically for the Gandalf XpressWay # RLAN with Link Authentication through RADIUS # -# $Id: dictionary.gandalf 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR Gandalf 64 diff -Nru wireshark-1.10.5/radius/dictionary.garderos wireshark-1.10.6/radius/dictionary.garderos --- wireshark-1.10.5/radius/dictionary.garderos 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.garderos 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ # # dictionary.garderos # -# Version: $Id: dictionary.garderos 28996 2009-07-07 17:52:03Z wmeier $ +# Version: $Id$ # # For documentation on Garderos attributes, see: # diff -Nru wireshark-1.10.5/radius/dictionary.gemtek wireshark-1.10.6/radius/dictionary.gemtek --- wireshark-1.10.5/radius/dictionary.gemtek 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.gemtek 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Gemtek Systems VSA's # Version: dictionary.gemtek, v1.2 2004/07/13 # -# $Id: dictionary.gemtek 34995 2010-11-21 18:57:21Z wmeier $ +# $Id$ # VENDOR Gemtek 10529 diff -Nru wireshark-1.10.5/radius/dictionary.h3c wireshark-1.10.6/radius/dictionary.h3c --- wireshark-1.10.5/radius/dictionary.h3c 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.h3c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # # http://www.h3c.com # -# $Id: dictionary.h3c 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.hp wireshark-1.10.6/radius/dictionary.hp --- wireshark-1.10.5/radius/dictionary.hp 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.hp 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # HP ProCurve VSA's # -# $Id: dictionary.hp 37377 2011-05-24 18:24:29Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.huawei wireshark-1.10.6/radius/dictionary.huawei --- wireshark-1.10.5/radius/dictionary.huawei 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.huawei 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # Dictionary for Huawei. See also dictionary.h3c # -# $Id: dictionary.huawei 37377 2011-05-24 18:24:29Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.iea wireshark-1.10.6/radius/dictionary.iea --- wireshark-1.10.5/radius/dictionary.iea 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.iea 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # RADIUS VSA Dictionary # http://www.iea-software.com # -# $Id: dictionary.iea 39596 2011-10-26 05:03:26Z etxrab $ +# $Id$ # VENDOR IEA-Software 24023 diff -Nru wireshark-1.10.5/radius/dictionary.infonet wireshark-1.10.6/radius/dictionary.infonet --- wireshark-1.10.5/radius/dictionary.infonet 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.infonet 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ # # Version: @(#)dictionary.infonet 1.00 # -# $Id: dictionary.infonet 34995 2010-11-21 18:57:21Z wmeier $ +# $Id$ # VENDOR infonet 4453 diff -Nru wireshark-1.10.5/radius/dictionary.ipunplugged wireshark-1.10.6/radius/dictionary.ipunplugged --- wireshark-1.10.5/radius/dictionary.ipunplugged 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.ipunplugged 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ # ipUnplugged # http://www.ipunplugged.com/ # -# $Id: dictionary.ipunplugged 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.issanni wireshark-1.10.6/radius/dictionary.issanni --- wireshark-1.10.5/radius/dictionary.issanni 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.issanni 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # UTStarcom Issanni DSL router. # -# $Id: dictionary.issanni 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.itk wireshark-1.10.6/radius/dictionary.itk --- wireshark-1.10.5/radius/dictionary.itk 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.itk 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # -*- text -*- # # http://www.digieurope.com/ -# $Id: dictionary.itk 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR ITK 1195 diff -Nru wireshark-1.10.5/radius/dictionary.jradius wireshark-1.10.6/radius/dictionary.jradius --- wireshark-1.10.5/radius/dictionary.jradius 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.jradius 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # jradius VSAs. See http://jradius.org # -# $Id: dictionary.jradius 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.juniper wireshark-1.10.6/radius/dictionary.juniper --- wireshark-1.10.5/radius/dictionary.juniper 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.juniper 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ # # As posted to the list by Eric Kilfoil # -# Version: $Id: dictionary.juniper 37377 2011-05-24 18:24:29Z wmeier $ +# Version: $Id$ # VENDOR Juniper 2636 diff -Nru wireshark-1.10.5/radius/dictionary.karlnet wireshark-1.10.6/radius/dictionary.karlnet --- wireshark-1.10.5/radius/dictionary.karlnet 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.karlnet 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # KarlNet Vendor-specific information # -------------------------------------- # -# $Id: dictionary.karlnet 34995 2010-11-21 18:57:21Z wmeier $ +# $Id$ # #--------------------------------------------------------------------------- diff -Nru wireshark-1.10.5/radius/dictionary.lancom wireshark-1.10.6/radius/dictionary.lancom --- wireshark-1.10.5/radius/dictionary.lancom 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.lancom 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # originally by # "Eugen K. " <> # -# $Id: dictionary.lancom 34995 2010-11-21 18:57:21Z wmeier $ +# $Id$ # VENDOR Lancom 2356 diff -Nru wireshark-1.10.5/radius/dictionary.livingston wireshark-1.10.6/radius/dictionary.livingston --- wireshark-1.10.5/radius/dictionary.livingston 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.livingston 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Vendor-Specific attributes use the SMI Network Management Private # Enterprise Code from the "Assigned Numbers" RFC # -# $Id: dictionary.livingston 34995 2010-11-21 18:57:21Z wmeier $ +# $Id$ # VENDOR Livingston 307 diff -Nru wireshark-1.10.5/radius/dictionary.localweb wireshark-1.10.6/radius/dictionary.localweb --- wireshark-1.10.5/radius/dictionary.localweb 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.localweb 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # Local-Web Accesspoints # -# $Id: dictionary.localweb 34995 2010-11-21 18:57:21Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.lucent wireshark-1.10.6/radius/dictionary.lucent --- wireshark-1.10.5/radius/dictionary.lucent 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.lucent 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # Lucent VSAs, in their own "magic" 16-bit format. # -# $Id: dictionary.lucent 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.manzara wireshark-1.10.6/radius/dictionary.manzara --- wireshark-1.10.5/radius/dictionary.manzara 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.manzara 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: dictionary.manzara 34995 2010-11-21 18:57:21Z wmeier $ +# $Id$ # VENDOR Manzara 19382 diff -Nru wireshark-1.10.5/radius/dictionary.merit wireshark-1.10.6/radius/dictionary.merit --- wireshark-1.10.5/radius/dictionary.merit 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.merit 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ # # For Merit. # -# $Id: dictionary.merit 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR Merit 61 diff -Nru wireshark-1.10.5/radius/dictionary.microsoft wireshark-1.10.6/radius/dictionary.microsoft --- wireshark-1.10.5/radius/dictionary.microsoft 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.microsoft 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ # # Microsoft's VSA's, from RFC 2548 # -# $Id: dictionary.microsoft 29000 2009-07-07 20:55:01Z wmeier $ +# $Id$ # VENDOR Microsoft 311 diff -Nru wireshark-1.10.5/radius/dictionary.mikrotik wireshark-1.10.6/radius/dictionary.mikrotik --- wireshark-1.10.5/radius/dictionary.mikrotik 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.mikrotik 2014-03-07 18:07:16.000000000 +0000 @@ -9,7 +9,7 @@ # On top of that, the sample dictionary file they provide # DOES NOT WORK. Do NOT use it. # -# $Id: dictionary.mikrotik 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR Mikrotik 14988 diff -Nru wireshark-1.10.5/radius/dictionary.motorola wireshark-1.10.6/radius/dictionary.motorola --- wireshark-1.10.5/radius/dictionary.motorola 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.motorola 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ # NOT included in the main dictionaries because of conflicts # with Ascend attributes. # -# $Id: dictionary.motorola 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.motorola.wimax wireshark-1.10.6/radius/dictionary.motorola.wimax --- wireshark-1.10.5/radius/dictionary.motorola.wimax 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.motorola.wimax 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # Motorola WiMAX attributes. # -# $Id: dictionary.motorola.wimax 37375 2011-05-24 16:30:32Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.navini wireshark-1.10.6/radius/dictionary.navini --- wireshark-1.10.5/radius/dictionary.navini 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.navini 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # By # "Paul Shields" # -# Version: $Id: dictionary.navini 28996 2009-07-07 17:52:03Z wmeier $ +# Version: $Id$ # VENDOR Navini 6504 diff -Nru wireshark-1.10.5/radius/dictionary.netscreen wireshark-1.10.6/radius/dictionary.netscreen --- wireshark-1.10.5/radius/dictionary.netscreen 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.netscreen 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # From: # http://www.netscreen.com/support/downloads/4.0_configuring_screenOS_for_NTdomain_v11.pdf # -# $Id: dictionary.netscreen 34995 2010-11-21 18:57:21Z wmeier $ +# $Id$ # VENDOR Netscreen 3224 diff -Nru wireshark-1.10.5/radius/dictionary.networkphysics wireshark-1.10.6/radius/dictionary.networkphysics --- wireshark-1.10.5/radius/dictionary.networkphysics 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.networkphysics 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # -*- text -*- # # NetworkPhysics dictionary -# $Id: dictionary.networkphysics 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # VENDOR NetworkPhysics 7119 diff -Nru wireshark-1.10.5/radius/dictionary.nexans wireshark-1.10.6/radius/dictionary.nexans --- wireshark-1.10.5/radius/dictionary.nexans 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.nexans 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ ############################################################################## # Nexans Active Networking Systems dictionary http://www.nexans.de/ans # -# Version: $Id: dictionary.nexans 28946 2009-07-06 12:39:58Z wmeier $ +# Version: $Id$ # # Hubert Theissen # diff -Nru wireshark-1.10.5/radius/dictionary.nokia wireshark-1.10.6/radius/dictionary.nokia --- wireshark-1.10.5/radius/dictionary.nokia 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.nokia 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ ###################################################################### # # Nokia dictionary -# $Id: dictionary.nokia 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # ###################################################################### diff -Nru wireshark-1.10.5/radius/dictionary.nokia.conflict wireshark-1.10.6/radius/dictionary.nokia.conflict --- wireshark-1.10.5/radius/dictionary.nokia.conflict 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.nokia.conflict 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # Nokia dictionary for attributes that conflict with other dictionaries. # -# $Id: dictionary.nokia.conflict 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.nomadix wireshark-1.10.6/radius/dictionary.nomadix --- wireshark-1.10.5/radius/dictionary.nomadix 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.nomadix 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # -*- text -*- # -# Version: $Id: dictionary.nomadix 28996 2009-07-07 17:52:03Z wmeier $ +# Version: $Id$ # VENDOR Nomadix 3309 # diff -Nru wireshark-1.10.5/radius/dictionary.nortel wireshark-1.10.6/radius/dictionary.nortel --- wireshark-1.10.5/radius/dictionary.nortel 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.nortel 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # # http://www142.nortelnetworks.com/bvdoc/setips/july04/engineeringtipstricksv12.pdf # -# $Id: dictionary.nortel 29004 2009-07-07 22:53:44Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.ntua wireshark-1.10.6/radius/dictionary.ntua --- wireshark-1.10.5/radius/dictionary.ntua 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.ntua 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # -*- text -*- # -# $Id: dictionary.ntua 34995 2010-11-21 18:57:21Z wmeier $ +# $Id$ # VENDOR NTUA 969 diff -Nru wireshark-1.10.5/radius/dictionary.openser wireshark-1.10.6/radius/dictionary.openser --- wireshark-1.10.5/radius/dictionary.openser 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.openser 2014-03-07 18:07:16.000000000 +0000 @@ -12,7 +12,7 @@ # # http://www.openser.org/docs/openser-radius-1.0.x.html # -# $Id: dictionary.openser 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.packeteer wireshark-1.10.6/radius/dictionary.packeteer --- wireshark-1.10.5/radius/dictionary.packeteer 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.packeteer 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ # Packeteer VSAs, who followed the Cisco way of putting everything # into one text string. # -# $Id: dictionary.packeteer 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.patton wireshark-1.10.6/radius/dictionary.patton --- wireshark-1.10.5/radius/dictionary.patton 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.patton 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ # # Version: @(#)dictionary.patton 5.00 urtho 20-Jan-2010 # Version: @(#)dictionary.patton 1.00 urtho 08-Sep-2006 -# $Id: dictionary.patton 37377 2011-05-24 18:24:29Z wmeier $ +# $Id$ VENDOR Patton 1768 diff -Nru wireshark-1.10.5/radius/dictionary.propel wireshark-1.10.6/radius/dictionary.propel --- wireshark-1.10.5/radius/dictionary.propel 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.propel 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ # # Found on the net. # -# $Id: dictionary.propel 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR Propel 14895 diff -Nru wireshark-1.10.5/radius/dictionary.prosoft wireshark-1.10.6/radius/dictionary.prosoft --- wireshark-1.10.5/radius/dictionary.prosoft 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.prosoft 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # Prosoft, as posted to the list. # -# $Id: dictionary.prosoft 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.quiconnect wireshark-1.10.6/radius/dictionary.quiconnect --- wireshark-1.10.5/radius/dictionary.quiconnect 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.quiconnect 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # Quiconnect VSA's. # -# $Id: dictionary.quiconnect 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.quintum wireshark-1.10.6/radius/dictionary.quintum --- wireshark-1.10.5/radius/dictionary.quintum 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.quintum 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # Copied mostly from the Cisco dictionary, by # Jeremy McNamara # -# Version: $Id: dictionary.quintum 28996 2009-07-07 17:52:03Z wmeier $ +# Version: $Id$ # VENDOR Quintum 6618 diff -Nru wireshark-1.10.5/radius/dictionary.redback wireshark-1.10.6/radius/dictionary.redback --- wireshark-1.10.5/radius/dictionary.redback 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.redback 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Redback dictionary. # # Version: 1.00 14-Sep-2000 Chris Adams -# $Id: dictionary.redback 37377 2011-05-24 18:24:29Z wmeier $ +# $Id$ # VENDOR Redback 2352 diff -Nru wireshark-1.10.5/radius/dictionary.redcreek wireshark-1.10.6/radius/dictionary.redcreek --- wireshark-1.10.5/radius/dictionary.redcreek 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.redcreek 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # -*- text -*- # # http://www.redcreek.com -# $Id: dictionary.redcreek 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR RedCreek 1958 diff -Nru wireshark-1.10.5/radius/dictionary.rfc2865 wireshark-1.10.6/radius/dictionary.rfc2865 --- wireshark-1.10.5/radius/dictionary.rfc2865 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc2865 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Attributes and values defined in RFC 2865. # http://www.ietf.org/rfc/rfc2865.txt # -# $Id: dictionary.rfc2865 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ATTRIBUTE User-Name 1 string ATTRIBUTE User-Password 2 string encrypt=1 diff -Nru wireshark-1.10.5/radius/dictionary.rfc2866 wireshark-1.10.6/radius/dictionary.rfc2866 --- wireshark-1.10.5/radius/dictionary.rfc2866 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc2866 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Attributes and values defined in RFC 2866. # http://www.ietf.org/rfc/rfc2866.txt # -# $Id: dictionary.rfc2866 37383 2011-05-25 00:07:37Z wmeier $ +# $Id$ # ATTRIBUTE Acct-Status-Type 40 integer ATTRIBUTE Acct-Delay-Time 41 integer diff -Nru wireshark-1.10.5/radius/dictionary.rfc2867 wireshark-1.10.6/radius/dictionary.rfc2867 --- wireshark-1.10.5/radius/dictionary.rfc2867 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc2867 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Attributes and values defined in RFC 2867. # http://www.ietf.org/rfc/rfc2867.txt # -# $Id: dictionary.rfc2867 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ATTRIBUTE Acct-Tunnel-Connection 68 string ATTRIBUTE Acct-Tunnel-Packets-Lost 86 integer diff -Nru wireshark-1.10.5/radius/dictionary.rfc2868 wireshark-1.10.6/radius/dictionary.rfc2868 --- wireshark-1.10.5/radius/dictionary.rfc2868 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc2868 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Attributes and values defined in RFC 2868. # http://www.ietf.org/rfc/rfc2868.txt # -# $Id: dictionary.rfc2868 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ATTRIBUTE Tunnel-Type 64 integer has_tag ATTRIBUTE Tunnel-Medium-Type 65 integer has_tag diff -Nru wireshark-1.10.5/radius/dictionary.rfc2869 wireshark-1.10.6/radius/dictionary.rfc2869 --- wireshark-1.10.5/radius/dictionary.rfc2869 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc2869 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Attributes and values defined in RFC 2869. # http://www.ietf.org/rfc/rfc2869.txt # -# $Id: dictionary.rfc2869 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ATTRIBUTE Acct-Input-Gigawords 52 integer ATTRIBUTE Acct-Output-Gigawords 53 integer diff -Nru wireshark-1.10.5/radius/dictionary.rfc3162 wireshark-1.10.6/radius/dictionary.rfc3162 --- wireshark-1.10.5/radius/dictionary.rfc3162 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc3162 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Attributes and values defined in RFC 3162. # http://www.ietf.org/rfc/rfc3162.txt # -# $Id: dictionary.rfc3162 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ATTRIBUTE NAS-IPv6-Address 95 ipv6addr ATTRIBUTE Framed-Interface-Id 96 ifid diff -Nru wireshark-1.10.5/radius/dictionary.rfc3576 wireshark-1.10.6/radius/dictionary.rfc3576 --- wireshark-1.10.5/radius/dictionary.rfc3576 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc3576 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Attributes and values defined in RFC 3576. # http://www.ietf.org/rfc/rfc3576.txt # -# $Id: dictionary.rfc3576 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ATTRIBUTE Error-Cause 101 integer diff -Nru wireshark-1.10.5/radius/dictionary.rfc3580 wireshark-1.10.6/radius/dictionary.rfc3580 --- wireshark-1.10.5/radius/dictionary.rfc3580 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc3580 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Attributes and values defined in RFC 3580. # http://www.ietf.org/rfc/rfc3580.txt # -# $Id: dictionary.rfc3580 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # VALUE Acct-Terminate-Cause Supplicant-Restart 19 VALUE Acct-Terminate-Cause Reauthentication-Failure 20 diff -Nru wireshark-1.10.5/radius/dictionary.rfc4072 wireshark-1.10.6/radius/dictionary.rfc4072 --- wireshark-1.10.5/radius/dictionary.rfc4072 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc4072 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Attributes and values defined in RFC 4072 # http://www.ietf.org/rfc/4072.txt # -# $Id: dictionary.rfc4072 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ATTRIBUTE EAP-Key-Name 102 string diff -Nru wireshark-1.10.5/radius/dictionary.rfc4372 wireshark-1.10.6/radius/dictionary.rfc4372 --- wireshark-1.10.5/radius/dictionary.rfc4372 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc4372 2014-03-07 18:07:16.000000000 +0000 @@ -3,6 +3,6 @@ # Attributes and values defined in RFC 4372. # http://www.ietf.org/rfc/4372.txt # -# $Id: dictionary.rfc4372 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ATTRIBUTE Chargeable-User-Identity 89 string diff -Nru wireshark-1.10.5/radius/dictionary.rfc4603 wireshark-1.10.6/radius/dictionary.rfc4603 --- wireshark-1.10.5/radius/dictionary.rfc4603 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc4603 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ # Attributes and values defined in RFC 4603. # http://www.ietf.org/rfc/rfc4603.txt # -# $Id: dictionary.rfc4603 37375 2011-05-24 16:30:32Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.rfc4675 wireshark-1.10.6/radius/dictionary.rfc4675 --- wireshark-1.10.5/radius/dictionary.rfc4675 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc4675 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Attributes and values defined in RFC 4675. # http://www.ietf.org/rfc/4675.txt # -# $Id: dictionary.rfc4675 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # # diff -Nru wireshark-1.10.5/radius/dictionary.rfc4679 wireshark-1.10.6/radius/dictionary.rfc4679 --- wireshark-1.10.5/radius/dictionary.rfc4679 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc4679 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Attributes and values defined in RFC 4679. # http://www.ietf.org/rfc/4679.txt # -# $Id: dictionary.rfc4679 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # VENDOR ADSL-Forum 3561 diff -Nru wireshark-1.10.5/radius/dictionary.rfc4818 wireshark-1.10.6/radius/dictionary.rfc4818 --- wireshark-1.10.5/radius/dictionary.rfc4818 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc4818 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ # Attributes and values defined in RFC 4818. # http://www.ietf.org/rfc/rfc4818.txt # -# $Id: dictionary.rfc4818 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.rfc4849 wireshark-1.10.6/radius/dictionary.rfc4849 --- wireshark-1.10.5/radius/dictionary.rfc4849 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc4849 2014-03-07 18:07:16.000000000 +0000 @@ -3,6 +3,6 @@ # Attributes and values defined in RFC 4849. # http://www.ietf.org/rfc/rfc4849.txt # -# $Id: dictionary.rfc4849 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ATTRIBUTE NAS-Filter-Rule 92 string diff -Nru wireshark-1.10.5/radius/dictionary.rfc5090 wireshark-1.10.6/radius/dictionary.rfc5090 --- wireshark-1.10.5/radius/dictionary.rfc5090 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc5090 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Attributes and values defined in RFC 5090. # http://www.ietf.org/rfc/rfc5090.txt # -# $Id: dictionary.rfc5090 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ATTRIBUTE Digest-Response 103 string ATTRIBUTE Digest-Realm 104 string diff -Nru wireshark-1.10.5/radius/dictionary.rfc5176 wireshark-1.10.6/radius/dictionary.rfc5176 --- wireshark-1.10.5/radius/dictionary.rfc5176 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc5176 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Attributes and values defined in RFC 5176. # http://www.ietf.org/rfc/rfc5176.txt # -# $Id: dictionary.rfc5176 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # VALUE Error-Cause Invalid-Attribute-Value 407 VALUE Error-Cause Multiple-Session-Selection-Unsupported 508 diff -Nru wireshark-1.10.5/radius/dictionary.rfc5580 wireshark-1.10.6/radius/dictionary.rfc5580 --- wireshark-1.10.5/radius/dictionary.rfc5580 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc5580 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Attributes and values defined in RFC 5580. # http://www.ietf.org/rfc/rfc5580.txt # -# $Id: dictionary.rfc5580 37375 2011-05-24 16:30:32Z wmeier $ +# $Id$ # # One ASCII character of Namespace ID diff -Nru wireshark-1.10.5/radius/dictionary.rfc5607 wireshark-1.10.6/radius/dictionary.rfc5607 --- wireshark-1.10.5/radius/dictionary.rfc5607 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc5607 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Attributes and values defined in RFC 5607. # http://www.ietf.org/rfc/rfc5607.txt # -# $Id: dictionary.rfc5607 37375 2011-05-24 16:30:32Z wmeier $ +# $Id$ # VALUE Service-Type Framed-Management 18 diff -Nru wireshark-1.10.5/radius/dictionary.rfc5904 wireshark-1.10.6/radius/dictionary.rfc5904 --- wireshark-1.10.5/radius/dictionary.rfc5904 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.rfc5904 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Attributes and values defined in RFC 5904. # http://www.ietf.org/rfc/rfc5904.txt # -# $Id: dictionary.rfc5904 37375 2011-05-24 16:30:32Z wmeier $ +# $Id$ # # The next two attributes are continued, like EAP-Message/ diff -Nru wireshark-1.10.5/radius/dictionary.riverstone wireshark-1.10.6/radius/dictionary.riverstone --- wireshark-1.10.5/radius/dictionary.riverstone 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.riverstone 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ # Riverstone Networks' RADIUS VSAs # *** For RapidOS Versions 9.1 and above ONLY *** # -# $Id: dictionary.riverstone 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.roaringpenguin wireshark-1.10.6/radius/dictionary.roaringpenguin --- wireshark-1.10.5/radius/dictionary.roaringpenguin 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.roaringpenguin 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # Roaring Penguin attributes # -# $Id: dictionary.roaringpenguin 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.shasta wireshark-1.10.6/radius/dictionary.shasta --- wireshark-1.10.5/radius/dictionary.shasta 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.shasta 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # Nortel Shasta VSAs # Andre Gustavo de C. Albuquerque # -# $Id: dictionary.shasta 34995 2010-11-21 18:57:21Z wmeier $ +# $Id$ # VENDOR Shasta 3199 diff -Nru wireshark-1.10.5/radius/dictionary.shiva wireshark-1.10.6/radius/dictionary.shiva --- wireshark-1.10.5/radius/dictionary.shiva 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.shiva 2014-03-07 18:07:16.000000000 +0000 @@ -14,7 +14,7 @@ # the main dictionary file. # # Version: 1.00 27-Apr-1999 contributed by Alan DeKok -# $Id: dictionary.shiva 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR Shiva 166 diff -Nru wireshark-1.10.5/radius/dictionary.slipstream wireshark-1.10.6/radius/dictionary.slipstream --- wireshark-1.10.5/radius/dictionary.slipstream 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.slipstream 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # Created based on # slipstream_sp_6.0_installation_and_configuration_guide.pdf # -# $Id: dictionary.slipstream 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.sofaware wireshark-1.10.6/radius/dictionary.sofaware --- wireshark-1.10.5/radius/dictionary.sofaware 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.sofaware 2014-03-07 18:07:16.000000000 +0000 @@ -20,7 +20,7 @@ # SofaWare-UFP : "true" / "false" # The user can /cannot overwrite the URL Filtering policy # -# $Id: dictionary.sofaware 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.sonicwall wireshark-1.10.6/radius/dictionary.sonicwall --- wireshark-1.10.5/radius/dictionary.sonicwall 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.sonicwall 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ # # Sonicwall Firewall dictionary # -# $Id: dictionary.sonicwall 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR SonicWall 8741 diff -Nru wireshark-1.10.5/radius/dictionary.springtide wireshark-1.10.6/radius/dictionary.springtide --- wireshark-1.10.5/radius/dictionary.springtide 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.springtide 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # SpringTide VSAs # -# $Id: dictionary.springtide 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.telebit wireshark-1.10.6/radius/dictionary.telebit --- wireshark-1.10.5/radius/dictionary.telebit 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.telebit 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # -*- text -*- # # Telebit dictionary -# $Id: dictionary.telebit 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR Telebit 117 diff -Nru wireshark-1.10.5/radius/dictionary.telkom wireshark-1.10.6/radius/dictionary.telkom --- wireshark-1.10.5/radius/dictionary.telkom 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.telkom 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # Used to convey Telkom Specific Information in proxied requests # EDS 20031007 eddie@saix.net # -# $Id: dictionary.telkom 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.trapeze wireshark-1.10.6/radius/dictionary.trapeze --- wireshark-1.10.5/radius/dictionary.trapeze 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.trapeze 2014-03-07 18:07:16.000000000 +0000 @@ -7,7 +7,7 @@ # # For assistance, email support@trapezenetworks.com. # -# $Id: dictionary.trapeze 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # # VENDOR Trapeze 14525 diff -Nru wireshark-1.10.5/radius/dictionary.tropos wireshark-1.10.6/radius/dictionary.tropos --- wireshark-1.10.5/radius/dictionary.tropos 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.tropos 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # See support@tropos.com # -# $Id: dictionary.tropos 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## VENDOR Tropos 14529 diff -Nru wireshark-1.10.5/radius/dictionary.t_systems_nova wireshark-1.10.6/radius/dictionary.t_systems_nova --- wireshark-1.10.5/radius/dictionary.t_systems_nova 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.t_systems_nova 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # T-Systems-Nova # -# $Id: dictionary.t_systems_nova 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # ############################################################################## VENDOR T-Systems-Nova 16787 diff -Nru wireshark-1.10.5/radius/dictionary.ukerna wireshark-1.10.6/radius/dictionary.ukerna --- wireshark-1.10.5/radius/dictionary.ukerna 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.ukerna 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ # # GSS-EAP VSAs # -# $Id: dictionary.ukerna 37385 2011-05-25 00:40:35Z wmeier $ +# $Id$ # VENDOR UKERNA 25622 diff -Nru wireshark-1.10.5/radius/dictionary.unix wireshark-1.10.6/radius/dictionary.unix --- wireshark-1.10.5/radius/dictionary.unix 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.unix 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ # # Allegedly for ProFTPd. # -# $Id: dictionary.unix 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR Unix 4 diff -Nru wireshark-1.10.5/radius/dictionary.usr wireshark-1.10.6/radius/dictionary.usr --- wireshark-1.10.5/radius/dictionary.usr 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.usr 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # Taken from the dictionary included with the USR RADIUS server, # and adjusted a bit. # -# Version: $Id: dictionary.usr 48883 2013-04-16 18:12:23Z etxrab $ +# Version: $Id$ # # diff -Nru wireshark-1.10.5/radius/dictionary.utstarcom wireshark-1.10.6/radius/dictionary.utstarcom --- wireshark-1.10.5/radius/dictionary.utstarcom 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.utstarcom 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # UT Starcom (China) # -# $Id: dictionary.utstarcom 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.valemount wireshark-1.10.6/radius/dictionary.valemount --- wireshark-1.10.5/radius/dictionary.valemount 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.valemount 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Valemount Networks Corporation specific radius attributes # networks@valemount.com # -# $Id: dictionary.valemount 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # VENDOR ValemountNetworks 16313 diff -Nru wireshark-1.10.5/radius/dictionary.versanet wireshark-1.10.6/radius/dictionary.versanet --- wireshark-1.10.5/radius/dictionary.versanet 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.versanet 2014-03-07 18:07:16.000000000 +0000 @@ -21,7 +21,7 @@ # # Version: @(#)dictionary.versanet 1.00 22-Jul-1999 support@versanetcomm.com # -# $Id: dictionary.versanet 34995 2010-11-21 18:57:21Z wmeier $ +# $Id$ # VENDOR Versanet 2180 diff -Nru wireshark-1.10.5/radius/dictionary.vqp wireshark-1.10.6/radius/dictionary.vqp --- wireshark-1.10.5/radius/dictionary.vqp 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.vqp 2014-03-07 18:07:16.000000000 +0000 @@ -8,7 +8,7 @@ # # The default destination port is 1589. # -# $Id: dictionary.vqp 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.walabi wireshark-1.10.6/radius/dictionary.walabi --- wireshark-1.10.5/radius/dictionary.walabi 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.walabi 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # # Walabi Store & Forward FAX attributes. # -# $Id: dictionary.walabi 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.waverider wireshark-1.10.6/radius/dictionary.waverider --- wireshark-1.10.5/radius/dictionary.waverider 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.waverider 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # -*- text -*- # # http://www.waverider.com/ -# $Id: dictionary.waverider 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # VENDOR Waverider 2979 diff -Nru wireshark-1.10.5/radius/dictionary.wichorus wireshark-1.10.6/radius/dictionary.wichorus --- wireshark-1.10.5/radius/dictionary.wichorus 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.wichorus 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # Dictionary for WiChorus Inc. VSA's. # http://www.wichorus.com/ # -# Version: $Id: dictionary.wichorus 37375 2011-05-24 16:30:32Z wmeier $ +# Version: $Id$ # VENDOR Wichorus 27030 diff -Nru wireshark-1.10.5/radius/dictionary.wimax wireshark-1.10.6/radius/dictionary.wimax --- wireshark-1.10.5/radius/dictionary.wimax 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.wimax 2014-03-07 18:07:16.000000000 +0000 @@ -51,7 +51,7 @@ # ############################################################################## # -# $Id: dictionary.wimax 29002 2009-07-07 22:20:56Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.wimax.wichorus wireshark-1.10.6/radius/dictionary.wimax.wichorus --- wireshark-1.10.5/radius/dictionary.wimax.wichorus 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.wimax.wichorus 2014-03-07 18:07:16.000000000 +0000 @@ -7,7 +7,7 @@ # ############################################################################## # -# $Id: dictionary.wimax.wichorus 37376 2011-05-24 17:18:34Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/radius/dictionary.wispr wireshark-1.10.6/radius/dictionary.wispr --- wireshark-1.10.5/radius/dictionary.wispr 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.wispr 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # VSAs originally by # "James Underwood" # -# Version: $Id: dictionary.wispr 28996 2009-07-07 17:52:03Z wmeier $ +# Version: $Id$ # # For documentation on WISPr RADIUS attributes, see: # diff -Nru wireshark-1.10.5/radius/dictionary.xedia wireshark-1.10.6/radius/dictionary.xedia --- wireshark-1.10.5/radius/dictionary.xedia 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.xedia 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ # XEDIA, AP series routers # From Yard RADIUS, and Piotr Orlewicz, porlewicz@teleton.pl www.real-data.pl # -# $Id: dictionary.xedia 28996 2009-07-07 17:52:03Z wmeier $ +# $Id$ # ############################################################################# VENDOR Xedia 838 diff -Nru wireshark-1.10.5/radius/dictionary.zyxel wireshark-1.10.6/radius/dictionary.zyxel --- wireshark-1.10.5/radius/dictionary.zyxel 2013-04-22 18:05:19.000000000 +0000 +++ wireshark-1.10.6/radius/dictionary.zyxel 2014-03-07 18:07:16.000000000 +0000 @@ -8,7 +8,7 @@ # # http://www.zyxel.com/support/supportnote/p200/ap_note/isdn/radius.htm # -# $Id: dictionary.zyxel 28946 2009-07-06 12:39:58Z wmeier $ +# $Id$ # ############################################################################## diff -Nru wireshark-1.10.5/randpkt.c wireshark-1.10.6/randpkt.c --- wireshark-1.10.5/randpkt.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/randpkt.c 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ * Creates random packet traces. Useful for debugging sniffers by testing * assumptions about the veracity of the data found in the packet. * - * $Id: randpkt.c 47758 2013-02-20 01:19:42Z gerald $ + * $Id$ * * Copyright (C) 1999 by Gilbert Ramirez * diff -Nru wireshark-1.10.5/rawshark.c wireshark-1.10.6/rawshark.c --- wireshark-1.10.5/rawshark.c 2013-09-09 18:34:32.000000000 +0000 +++ wireshark-1.10.6/rawshark.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* rawshark.c * - * $Id: rawshark.c 51874 2013-09-09 18:28:56Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -188,7 +188,7 @@ "See http://www.wireshark.org for more information.\n" "\n" "%s", - wireshark_svnversion, get_copyright_info()); + wireshark_gitversion, get_copyright_info()); } else { output = stderr; } @@ -417,7 +417,7 @@ "%s" "\n" "%s", - wireshark_svnversion, get_copyright_info(), comp_info_str->str, + wireshark_gitversion, get_copyright_info(), comp_info_str->str, runtime_info_str->str); } @@ -468,7 +468,7 @@ "%s" "\n" "%s", - wireshark_svnversion, comp_info_str->str, runtime_info_str->str); + wireshark_gitversion, comp_info_str->str, runtime_info_str->str); #ifdef _WIN32 arg_list_utf_16to8(argc, argv); diff -Nru wireshark-1.10.5/README wireshark-1.10.6/README --- wireshark-1.10.5/README 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/README 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README 39593 2011-10-26 04:51:48Z guy $ +$Id$ General Information ------- ----------- diff -Nru wireshark-1.10.5/README.aix wireshark-1.10.6/README.aix --- wireshark-1.10.5/README.aix 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/README.aix 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.aix 44630 2012-08-23 11:11:24Z jmayer $ +$Id$ libpcap 0.7.1 and later appear to work on AIX when using AIX's native BPF; that appears to work better than DLPI does. Note that you may have diff -Nru wireshark-1.10.5/README.bsd wireshark-1.10.6/README.bsd --- wireshark-1.10.5/README.bsd 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/README.bsd 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.bsd 38834 2011-09-01 04:35:57Z etxrab $ +$Id$ Installing Wireshark on FreeBSD/OpenBSD/NetBSD/DragonFly BSD ======================================================================== diff -Nru wireshark-1.10.5/README.cmake wireshark-1.10.6/README.cmake --- wireshark-1.10.5/README.cmake 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/README.cmake 2014-03-07 18:07:11.000000000 +0000 @@ -1,6 +1,6 @@ Explain the cmake build system for wireshark - $Id: README.cmake 47880 2013-02-25 18:12:28Z rbalint $ + $Id$ Notice diff -Nru wireshark-1.10.5/README.DECT wireshark-1.10.6/README.DECT --- wireshark-1.10.5/README.DECT 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/README.DECT 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.DECT 38834 2011-09-01 04:35:57Z etxrab $ +$Id$ Description: ============ diff -Nru wireshark-1.10.5/README.hpux wireshark-1.10.6/README.hpux --- wireshark-1.10.5/README.hpux 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/README.hpux 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.hpux 38834 2011-09-01 04:35:57Z etxrab $ +$Id$ Contents: diff -Nru wireshark-1.10.5/README.irix wireshark-1.10.6/README.irix --- wireshark-1.10.5/README.irix 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/README.irix 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.irix 44630 2012-08-23 11:11:24Z jmayer $ +$Id$ 1. Some problems seen by one person who tried to build Ethereal on IRIX; your mileage may vary. Some comments have been added. diff -Nru wireshark-1.10.5/README.linux wireshark-1.10.6/README.linux --- wireshark-1.10.5/README.linux 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/README.linux 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.linux 18501 2006-06-17 12:21:54Z sahlberg $ +$Id$ In order to capture packets (with Wireshark/TShark, tcpdump, or any other libpcap-based packet capture program) on a Linux system, the diff -Nru wireshark-1.10.5/README.macos wireshark-1.10.6/README.macos --- wireshark-1.10.5/README.macos 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/README.macos 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.macos 46953 2013-01-05 19:42:04Z guy $ +$Id$ This file tries to help building Wireshark for (Mac) OS X (Wireshark does not work on earlier versions of Mac OS). diff -Nru wireshark-1.10.5/README.tru64 wireshark-1.10.6/README.tru64 --- wireshark-1.10.5/README.tru64 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/README.tru64 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.tru64 18501 2006-06-17 12:21:54Z sahlberg $ +$Id$ The following instructions are applicable to Tru64 UNIX (formerly Digital UNIX (formerly DEC OSF/1)) version 4.0, and diff -Nru wireshark-1.10.5/README.vmware wireshark-1.10.6/README.vmware --- wireshark-1.10.5/README.vmware 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/README.vmware 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.vmware 18501 2006-06-17 12:21:54Z sahlberg $ +$Id$ If you are a registered user of VMware on Linux, you can contact their support staff via e-mail and ask for a libpcap patch which will allow diff -Nru wireshark-1.10.5/README.windows wireshark-1.10.6/README.windows --- wireshark-1.10.5/README.windows 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/README.windows 2014-03-07 18:07:11.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.windows 32440 2010-04-09 21:42:51Z gerald $ +$Id$ Installing Wireshark on Windows ============================= diff -Nru wireshark-1.10.5/register.h wireshark-1.10.6/register.h --- wireshark-1.10.5/register.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/register.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* register.h * Definitions for protocol registration * - * $Id: register.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/reordercap.c wireshark-1.10.6/reordercap.c --- wireshark-1.10.5/reordercap.c 2013-07-26 21:57:23.000000000 +0000 +++ wireshark-1.10.6/reordercap.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* Reorder the frames from an input dump file, and write to output dump file. * Martin Mathieson and Jakub Jawadzki * - * $Id: reordercap.c 50936 2013-07-26 21:51:57Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -44,8 +44,8 @@ static void usage(void) { fprintf(stderr, "Reordercap %s" -#ifdef SVNVERSION - " (" SVNVERSION " from " SVNPATH ")" +#ifdef GITVERSION + " (" GITVERSION " from " GITBRANCH ")" #endif "\n", VERSION); fprintf(stderr, "Reorder timestamps of input file frames into output file.\n"); diff -Nru wireshark-1.10.5/ringbuffer.c wireshark-1.10.6/ringbuffer.c --- wireshark-1.10.5/ringbuffer.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/ringbuffer.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* ringbuffer.c * Routines for packet capture windows * - * $Id: ringbuffer.c 48673 2013-03-31 16:19:53Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ringbuffer.h wireshark-1.10.6/ringbuffer.h --- wireshark-1.10.5/ringbuffer.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/ringbuffer.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* ringbuffer.h * Definitions for capture ringbuffer files * - * $Id: ringbuffer.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/services wireshark-1.10.6/services --- wireshark-1.10.5/services 2013-12-15 15:25:13.000000000 +0000 +++ wireshark-1.10.6/services 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # This is a local copy of the IANA port-numbers file. # -# $Id: services 54118 2013-12-15 15:19:21Z gerald $ +# $Id$ # # Wireshark uses it to resolve port numbers into human readable # service names, e.g. TCP port 80 -> http. @@ -1605,8 +1605,8 @@ icp 1112/tcp # Intelligent Communication Protocol [Mark_H_David] [Mark_H_David] icp 1112/udp # Intelligent Communication Protocol [Mark_H_David] [Mark_H_David] ltp-deepspace 1113/tcp # Licklider Transmission Protocol [RFC5326] -ltp-deepspace 1113/udp # Licklider Transmission Protocol [RFC5326] -ltp-deepspace 1113/dccp # Licklider Transmission Protocol [Hans_Kruse] [Hans_Kruse] 2013-11-12 [RFC-irtf-dtnrg-dgram-clayer-05] 7107696 +ltp-deepspace 1113/udp # Licklider Transmission Protocol 2014-02-21 [RFC5326][RFC-irtf-dtnrg-dgram-clayer] +ltp-deepspace 1113/dccp # Licklider Transmission Protocol 2013-11-12 2014-02-21 [RFC-irtf-dtnrg-dgram-clayer-05] 7107696 mini-sql 1114/tcp # Mini SQL [David_Hughes] [David_Hughes] mini-sql 1114/udp # Mini SQL [David_Hughes] [David_Hughes] ardus-trns 1115/tcp # ARDUS Transfer @@ -1808,8 +1808,8 @@ groove-dpp 1211/udp # Groove DPP [Ken_Moore] [Ken_Moore] lupa 1212/tcp # lupa [Barney_Wolff] [Barney_Wolff] lupa 1212/udp # lupa [Barney_Wolff] [Barney_Wolff] -mpc-lifenet 1213/tcp # MPC LIFENET [Ward_Silver] [Ward_Silver] -mpc-lifenet 1213/udp # MPC LIFENET [Ward_Silver] [Ward_Silver] +mpc-lifenet 1213/tcp # Medtronic/Physio-Control LIFENET [Physio-Control_Inc] [Kevin_Drew] 2014-02-14 +mpc-lifenet 1213/udp # Medtronic/Physio-Control LIFENET [Physio-Control_Inc] [Kevin_Drew] 2014-02-14 kazaa 1214/tcp # KAZAA [Ahti_Heinla] [Ahti_Heinla] kazaa 1214/udp # KAZAA [Ahti_Heinla] [Ahti_Heinla] scanstat-1 1215/tcp # scanSTAT 1.0 [William_Scheding] [William_Scheding] @@ -5126,8 +5126,8 @@ iwlistener 2866/udp # iwlistener [Fred_Surr] [Fred_Surr] esps-portal 2867/tcp # esps-portal [Nicholas_Stowfis] [Nicholas_Stowfis] esps-portal 2867/udp # esps-portal [Nicholas_Stowfis] [Nicholas_Stowfis] -npep-messaging 2868/tcp # NPEP Messaging [Kristian_A_Bognaes] [Kristian_A_Bognaes] -npep-messaging 2868/udp # NPEP Messaging [Kristian_A_Bognaes] [Kristian_A_Bognaes] +npep-messaging 2868/tcp # Norman Proprietaqry Events Protocol [Norman_Safeground_AS] [Kristian_A_Bognaes] 2014-01-15 +npep-messaging 2868/udp # Norman Proprietaqry Events Protocol [Norman_Safeground_AS] [Kristian_A_Bognaes] 2014-01-15 icslap 2869/tcp # ICSLAP [Richard_Lamb] [Richard_Lamb] icslap 2869/udp # ICSLAP [Richard_Lamb] [Richard_Lamb] daishi 2870/tcp # daishi [Patrick_Chipman] [Patrick_Chipman] @@ -5371,8 +5371,8 @@ identify 2987/udp # identify hippad 2988/tcp # HIPPA Reporting Protocol [William_Randolph_Roy] [William_Randolph_Roy] hippad 2988/udp # HIPPA Reporting Protocol [William_Randolph_Roy] [William_Randolph_Roy] -zarkov 2989/tcp # ZARKOV Intelligent Agent Communication [Robin_Felix] [Robin_Felix] -zarkov 2989/udp # ZARKOV Intelligent Agent Communication [Robin_Felix] [Robin_Felix] +zarkov 2989/tcp # ZARKOV Intelligent Agent Communication [Robin_Felix] [Robin_Felix] 2014-02-17 +zarkov 2989/udp # ZARKOV Intelligent Agent Communication [Robin_Felix] [Robin_Felix] 2014-02-17 boscap 2990/tcp # BOSCAP [Dirk_Hillbrecht] [Dirk_Hillbrecht] boscap 2990/udp # BOSCAP [Dirk_Hillbrecht] [Dirk_Hillbrecht] wkstn-mon 2991/tcp # WKSTN-MON [William_David] [William_David] @@ -5872,8 +5872,8 @@ dwmsgserver 3228/udp # DiamondWave MSG Server [Varma_Bhupatiraju] [Varma_Bhupatiraju] global-cd-port 3229/tcp # Global CD Port [Vitaly_Revsin_2] [Vitaly_Revsin_2] global-cd-port 3229/udp # Global CD Port [Vitaly_Revsin_2] [Vitaly_Revsin_2] -sftdst-port 3230/tcp # Software Distributor Port [Andrea_Lanza] [Andrea_Lanza] -sftdst-port 3230/udp # Software Distributor Port [Andrea_Lanza] [Andrea_Lanza] +sftdst-port 3230/tcp # Software Distributor Port [Andrea_Lanza] [Andrea_Lanza] 2014-02-21 +sftdst-port 3230/udp # Software Distributor Port [Andrea_Lanza] [Andrea_Lanza] 2014-02-21 vidigo 3231/tcp # VidiGo communication (previous was: Delta Solutions Direct) [Peter_Ijkhout] [Peter_Ijkhout] vidigo 3231/udp # VidiGo communication (previous was: Delta Solutions Direct) [Peter_Ijkhout] [Peter_Ijkhout] mdtp 3232/tcp # MDT port 2012-02-21 [RFC6513] @@ -8010,12 +8010,13 @@ rsip 4555/tcp # RSIP Port [RFC3103] rsip 4555/udp # RSIP Port [RFC3103] dtn-bundle-tcp 4556/tcp # DTN Bundle TCP CL Protocol -dtn-bundle-udp 4556/udp # DTN Bundle UDP CL Protocol [Michael_Demmer] [Michael_Demmer] 2006-11 -dtn-bundle-dccp 4556/dccp # DTN Bundle DCCP CL Protocol [Hans_Kruse] [Hans_Kruse] 2013-11-12 [RFC-irtf-dtnrg-dgram-clayer-05] 1685351985 +dtn-bundle 4556/udp # DTN Bundle UDP CL Protocol 2006-11 2014-02-21 [RFC-irtf-dtnrg-dgram-clayer] +dtn-bundle 4556/dccp # DTN Bundle DCCP CL Protocol 2013-11-12 2014-02-21 [RFC-irtf-dtnrg-dgram-clayer] 1685351985 mtcevrunqss 4557/udp # Marathon everRun Quorum Service Server [David_Schwartz_2] [David_Schwartz_2] 2009-06-18 mtcevrunqman 4558/udp # Marathon everRun Quorum Service Manager [David_Schwartz_2] [David_Schwartz_2] 2009-06-18 hylafax 4559/tcp # HylaFAX [Lee_Howard] [Lee_Howard] 2002-03 hylafax 4559/udp # HylaFAX [Lee_Howard] [Lee_Howard] 2002-03 +amahi-anywhere 4563/tcp # Amahi Anywhere [Amahi] [Carlos_Puchol] 2014-02-27 kwtc 4566/tcp # Kids Watch Time Control Service [Larry_Zarou] [Larry_Zarou] 2006-10 kwtc 4566/udp # Kids Watch Time Control Service [Larry_Zarou] [Larry_Zarou] 2006-10 tram 4567/tcp # TRAM [Joe_Wesley] [Joe_Wesley] @@ -8249,8 +8250,8 @@ lyskom 4894/udp # LysKOM Protocol A [Per_Cederqvist] [Per_Cederqvist] radmin-port 4899/tcp # RAdmin Port [Dmitri_Znosko] [Dmitri_Znosko] 2003-03 radmin-port 4899/udp # RAdmin Port [Dmitri_Znosko] [Dmitri_Znosko] 2003-03 -hfcs 4900/tcp # HyperFileSQL Client/Server Database Engine [Jerome_AERTS] [Jerome_AERTS] 2010-11-30 -hfcs 4900/udp # HyperFileSQL Client/Server Database Engine [Jerome_AERTS] [Jerome_AERTS] 2010-11-30 +hfcs 4900/tcp # HFSQL Client/Server Database Engine [PC_SOFT] [Jerome_AERTS_2] 2006-03-02 2014-02-02 +hfcs 4900/udp # HFSQL Client/Server Database Engine [PC_SOFT] [Jerome_AERTS_2] 2006-03-02 2014-02-02 flr-agent 4901/tcp # FileLocator Remote Search AgentIANA assigned this well-formed service name as a replacement for "flr_agent". [David_Vest] [David_Vest] 2008-11-19 flr_agent 4901/tcp # FileLocator Remote Search Agent [David_Vest] [David_Vest] 2008-11-19 This entry is an alias to "flr-agent".This entry is now historic, not usable for use with manycommon service discovery mechanisms. magiccontrol 4902/tcp # magicCONROL RF and Data Interface [Andreas_Spalenski] [Andreas_Spalenski] 2008-11-24 @@ -8293,8 +8294,8 @@ busycal 4990/udp # BusySync Calendar Synch. Protocol [David_Riggle] [David_Riggle] 2008-01-07 Defined TXT keys: Proprietary 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 -hfcs-manager 4999/tcp # HyperFileSQL Client/Server Database Engine Manager [Jerome_AERTS] [Jerome_AERTS] 2010-11-30 -hfcs-manager 4999/udp # HyperFileSQL Client/Server Database Engine Manager [Jerome_AERTS] [Jerome_AERTS] 2010-11-30 +hfcs-manager 4999/tcp # HFSQL Client/Server Database Engine Manager [PC_SOFT] [Jerome_AERTS_2] 2006-03-02 2014-02-02 +hfcs-manager 4999/udp # HFSQL Client/Server Database Engine Manager [PC_SOFT] [Jerome_AERTS_2] 2006-03-02 2014-02-02 commplex-main 5000/tcp # commplex-main 5000/udp # commplex-link 5001/tcp # @@ -9029,7 +9030,7 @@ iconstructsrv 6077/tcp # iConstruct Server [iConstruct_Aus_Pty_Ltd] [Afshin_Jafari] 2012-12-21 p25cai 6082/udp # APCO Project 25 Common Air Interface - UDP encapsulation [APCO_Project] [APCO_Project] 2011-05-13 miami-bcast 6083/udp # telecomsoftware miami broadcast [Peter_Steiner] [Peter_Steiner] 2011-02-22 -reload-config 6084/tcp # Peer to Peer Infrastructure [IESG] [IETF_Chair] 2009-01-29 2013-03-26 [RFC-ietf-p2psip-base-26] +reload-config 6084/tcp # Peer to Peer Infrastructure Configuration [IESG] [IETF_Chair] 2009-01-29 2013-03-26 [RFC6940] konspire2b 6085/tcp # konspire2b p2p network [Jason_Rohrer] [Jason_Rohrer] 2002-10 konspire2b 6085/udp # konspire2b p2p network [Jason_Rohrer] [Jason_Rohrer] 2002-10 pdtp 6086/tcp # PDTP P2P [Tony_Arcieri] [Tony_Arcieri] 2006-03 @@ -9322,7 +9323,8 @@ afesc-mc 6628/udp # AFE Stock Channel M/C [K_K_Ho] [K_K_Ho] 2004-04 mxodbc-connect 6632/tcp # eGenix mxODBC Connect [Marc_Andre_Lemburg] [Marc_Andre_Lemburg] 2009-11-13 Unauthorized Use Known on port 6632 cisco-vpath-tun 6633/udp # Cisco vPath Services Overlay [Cisco2] [Surendra_Kumar] 2012-06-11 -ovsdb 6640/tcp # Open vSwitch Database protocol [Bruce_Davie_2] [Bruce_Davie_2] 2013-07-31 [RFC-pfaff-ovsdb-proto-04] +mpls-pm 6634/udp # MPLS Performance Measurement out-of-band response [Cisco_Systems_2] [Sagar_Soni] 2014-02-20 +ovsdb 6640/tcp # Open vSwitch Database protocol [Bruce_Davie_2] [Bruce_Davie_2] 2013-07-31 [RFC7047] openflow 6653/tcp # OpenFlow [Open_Networking_Foundation] [Puneet_Agarwal] 2013-07-18 openflow 6653/udp # OpenFlow [Open_Networking_Foundation] [Puneet_Agarwal] 2013-07-18 pcs-sf-ui-man 6655/tcp # PC SOFT - Software factory UI/manager [Jerome_AERTS] [Jerome_AERTS] 2010-11-30 @@ -9350,6 +9352,7 @@ tsa 6689/tcp # Tofino Security Appliance [Scott_Howard] [Scott_Howard] 2009-10-13 tsa 6689/udp # Tofino Security Appliance [Scott_Howard] [Scott_Howard] 2009-10-13 babel 6696/udp # Babel Routing Protocol 2011-08-15 [RFC6126] +ircs-u 6697/tcp # Internet Relay Chat via TLS/SSL 2014-02-11 [RFC-hartmann-default-port-for-irc-via-tls-ssl-09] kti-icad-srvr 6701/tcp # KTI/ICAD Nameserver [Stanley_Knutson] [Stanley_Knutson] kti-icad-srvr 6701/udp # KTI/ICAD Nameserver [Stanley_Knutson] [Stanley_Knutson] e-design-net 6702/tcp # e-Design network [Janos_Lerch] [Janos_Lerch] 2006-02 @@ -9375,7 +9378,7 @@ plysrv-https 6771/udp # PolyServe https [Mike_Spitzer] [Mike_Spitzer] 2005-08 ntz-tracker 6777/tcp # netTsunami Tracker [Tomahawk_Holdings] [Sagara_Wijetunga] 2013-05-01 ntz-p2p-storage 6778/tcp # netTsunami p2p storage system [Tomahawk_Holdings] [Sagara_Wijetunga] 2013-05-01 -bfd-lag 6784/udp # Bidirectional Forwarding Detection (BFD) on Link Aggregation Group (LAG) Interfaces [IESG] [IETF_Chair] 2012-11-08 [draft-mmm-bfd-on-lags-05] +bfd-lag 6784/udp # Bidirectional Forwarding Detection (BFD) on Link Aggregation Group (LAG) Interfaces [IESG] [BFD_Chairs] 2012-11-08 2014-01-09 [RFC7130] dgpf-exchg 6785/tcp # DGPF Individual Exchange [Thomas_Weise] [Thomas_Weise] 2006-04 dgpf-exchg 6785/udp # DGPF Individual Exchange [Thomas_Weise] [Thomas_Weise] 2006-04 smc-jmx 6786/tcp # Sun Java Web Console JMX [Bill_Edwards] [Bill_Edwards] 2005-08 @@ -9530,6 +9533,7 @@ zsecure 7173/tcp # zSecure Server [Hans_Schoone] [Hans_Schoone] 2010-10-01 clutild 7174/tcp # Clutild [Cheryl_Stoutenburg] [Cheryl_Stoutenburg] clutild 7174/udp # Clutild [Cheryl_Stoutenburg] [Cheryl_Stoutenburg] +janus-disc 7181/udp # Janus Guidewire Enterprise Discovery Service Bus [Guidewire_Software_Inc] [Luca_Debiasi] 2014-02-06 fodms 7200/tcp # FODMS FLIP [David_Anthony] [David_Anthony] fodms 7200/udp # FODMS FLIP [David_Anthony] [David_Anthony] dlip 7201/tcp # DLIP [Albert_Manfredi] [Albert_Manfredi] @@ -9538,6 +9542,7 @@ ramp 7227/udp # Registry A $ M Protocol [John_Havard] [John_Havard] 2003-11 citrixupp 7228/tcp # Citrix Universal Printing Port [Gary_Barton] [Gary_Barton] 2011-02-24 citrixuppg 7229/tcp # Citrix UPP Gateway [Gary_Barton] [Gary_Barton] 2011-02-24 +aspcoordination 7235/udp # ASP Coordination Protocol [Wi-Fi_Alliance_2] [Mick_Conley] 2013-12-31 display 7236/tcp # Wi-Fi Alliance Wi-Fi Display Protocol [Wi-Fi_Alliance] [Thomas_Sciorilli] 2012-04-09 Defined TXT keys: _display.tcp. Display Protocol pads 7237/tcp # PADS (Public Area Display System) Server [Willie_Jan_Bons] [Willie_Jan_Bons] 2011-03-10 cnap 7262/tcp # Calypso Network Access Protocol [Scott_Halberg] [Scott_Halberg] 2009-06-02 @@ -9855,6 +9860,7 @@ xprint-server 8100/tcp # Xprint Server [John_McKernan] [John_McKernan] xprint-server 8100/udp # Xprint Server [John_McKernan] [John_McKernan] ldoms-migr 8101/tcp # Logical Domains Migration [Liam_Merwick] [Liam_Merwick] 2009-01-16 +kz-migr 8102/tcp # Oracle Kernel zones migration server [Oracle_4] [John_Levon] 2013-12-24 mtl8000-matrix 8115/tcp # MTL8000 Matrix [David_Pinch] [David_Pinch] 2002-04 mtl8000-matrix 8115/udp # MTL8000 Matrix [David_Pinch] [David_Pinch] 2002-04 cp-cluster 8116/tcp # Check Point Clustering [Roni_Moshitzky] [Roni_Moshitzky] @@ -9891,6 +9897,7 @@ proremote 8183/tcp # ProRemote [Alex_Lelievre] [Alex_Lelievre] 2009-08-18 itach 8184/tcp # Remote iTach Connection [Barend_Jacobus_van_d] [Barend_Jacobus_van_d] 2010-04-27 itach 8184/udp # Remote iTach Connection [Barend_Jacobus_van_d] [Barend_Jacobus_van_d] 2010-04-27 +limnerpressure 8191/tcp # Limner Pressure [Aaron_Kleinsteiber] [Aaron_Kleinsteiber] 2014-01-16 spytechphone 8192/tcp # SpyTech Phone Service [Bill_Kay] [Bill_Kay] 2006-04 spytechphone 8192/udp # SpyTech Phone Service [Bill_Kay] [Bill_Kay] 2006-04 blp1 8194/tcp # Bloomberg data API [Albert_Hou] [Albert_Hou] 2006-05 @@ -9989,6 +9996,7 @@ fmtp 8500/udp # Flight Message Transfer Protocol [Eivan_Cerasi] [Eivan_Cerasi] 2003-12 cmtp-mgt 8501/tcp # CYTEL Message Transfer Management cmtp-av 8501/udp # CYTEL Message Transfer Audio and Video [Frank_Jakel] [Frank_Jakel] 2011-04-29 +ftnmtp 8502/tcp # FTN Message Transfer Protocol [Yuri_Myakotin] [Yuri_Myakotin] 2014-01-07 rtsp-alt 8554/tcp # RTSP Alternate (see port 554) [Stephen_Casner_2] [Stephen_Casner_2] rtsp-alt 8554/udp # RTSP Alternate (see port 554) [Stephen_Casner_2] [Stephen_Casner_2] d-fence 8555/tcp # SYMAX D-FENCE [Thomas_Geisel] [Thomas_Geisel] 2003-01 @@ -10088,6 +10096,7 @@ http-wmap 8990/udp # webmail HTTP service [Fred_Batty] [Fred_Batty] 2007-12-03 https-wmap 8991/tcp # webmail HTTPS service [Fred_Batty] [Fred_Batty] 2007-12-03 https-wmap 8991/udp # webmail HTTPS service [Fred_Batty] [Fred_Batty] 2007-12-03 +canto-roboflow 8998/tcp # Canto RoboFlow Control [Canto] [Thomas_Schleu_2] 2014-02-26 bctp 8999/tcp # Brodos Crypto Trade Protocol [Alexander_Sahler] [Alexander_Sahler] 2002-02 bctp 8999/udp # Brodos Crypto Trade Protocol [Alexander_Sahler] [Alexander_Sahler] 2002-02 cslistener 9000/tcp # CSlistener [David_Jones] [David_Jones] @@ -10329,6 +10338,7 @@ peocoll 9631/tcp # Peovica Collector [Adrian_Hungate] [Adrian_Hungate] 2009-09-14 mc-comm 9632/udp # Mobile-C Communications [David_Ko_2] [David_Ko_2] 2009-09-14 pqsflows 9640/tcp # ProQueSys Flows Service [Sarene_Caiazza] [Sarene_Caiazza] 2010-04-27 +zoomcp 9666/tcp # Zoom Control Panel Game Server Management [Zoom_Control_Panel] [Joshua_Pedroza] 2014-02-26 xmms2 9667/tcp # Cross-platform Music Multiplexing System [Juho_Herttua] [Juho_Herttua] 2009-04-14 xmms2 9667/udp # Cross-platform Music Multiplexing System [Juho_Herttua] [Juho_Herttua] tec5-sdctp 9668/tcp # tec5 Spectral Device Control Protocol [Michael_Muth] [Michael_Muth] 2009-05-11 @@ -10515,6 +10525,9 @@ irisa 11000/udp # IRISA [V_A_Brauner] [V_A_Brauner] metasys 11001/tcp # Metasys [Tobin_Schuster] [Tobin_Schuster] metasys 11001/udp # Metasys [Tobin_Schuster] [Tobin_Schuster] +cefd-vmp 10023/udp # Comtech EF-Data's Vipersat Management Protocol [Comtech] [Nathan_Jeffords] 2014-01-23 +weave 11095/tcp # Nest device-to-device and device-to-service application protocol [Nest_Labs_Inc] [Grant_Erickson] 2014-01-16 +weave 11095/udp # Nest device-to-device and device-to-service application protocol [Nest_Labs_Inc] [Grant_Erickson] 2014-01-16 origo-sync 11103/tcp # OrigoDB Server Sync Interface [Devrex_Labs] [Robert_Friberg] 2013-03-29 netapp-icmgmt 11104/tcp # NetApp Intercluster Management [Craig_Everhart] [Craig_Everhart] 2010-07-06 netapp-icdata 11105/tcp # NetApp Intercluster Data [Craig_Everhart] [Craig_Everhart] 2010-07-06 @@ -10700,6 +10713,7 @@ hde-lcesrvr-2 14937/udp # hde-lcesrvr-2 [Horizon_Digital_Ente] [Horizon_Digital_Ente] hydap 15000/tcp # Hypack Data Aquisition [HYPACK_Inc] [Mircea_Neacsu] 2011-10-27 hydap 15000/udp # Hypack Data Aquisition [HYPACK_Inc] [Mircea_Neacsu] 2011-10-27 +onep-tls 15002/tcp # Open Network Environment TLS [Cisco_3] [Andrew_Thurber] 2014-01-21 v2g-secc 15118/udp # v2g Supply Equipment Communication Controller Discovery Protocol [Holger_Lochner] [Holger_Lochner] 2011-04-06 xpilot 15345/tcp # XPilot Contact Port [Bert_Gijsbers] [Bert_Gijsbers] xpilot 15345/udp # XPilot Contact Port [Bert_Gijsbers] [Bert_Gijsbers] @@ -11324,4 +11338,6 @@ com-bardac-dw 48556/udp # com-bardac-dw [Nicholas_J_Howes] [Nicholas_J_Howes] iqobject 48619/tcp # iqobject [Bjorn_de_Bonnenfant] [Bjorn_de_Bonnenfant] 2003-11 iqobject 48619/udp # iqobject [Bjorn_de_Bonnenfant] [Bjorn_de_Bonnenfant] 2003-11 +robotraconteur 48653/tcp # Robot Raconteur transport [Wason_Technology_LLC] [John_Wason] 2014-01-27 +robotraconteur 48653/udp # Robot Raconteur transport [Wason_Technology_LLC] [John_Wason] 2014-01-27 matahari 49000/tcp # Matahari Broker [Matahari_Project] [Zane_Bitter] 2011-08-31 diff -Nru wireshark-1.10.5/stat_menu.h wireshark-1.10.6/stat_menu.h --- wireshark-1.10.5/stat_menu.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/stat_menu.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* stat_menu.h * Menu definitions for use by stats * - * $Id: stat_menu.h 37560 2011-06-05 23:04:11Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/summary.c wireshark-1.10.6/summary.c --- wireshark-1.10.5/summary.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/summary.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* summary.c * Routines for capture file summary info * - * $Id: summary.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/summary.h wireshark-1.10.6/summary.h --- wireshark-1.10.5/summary.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/summary.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* summary.h * Definitions for capture file summary data * - * $Id: summary.h 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/svnversion.h wireshark-1.10.6/svnversion.h --- wireshark-1.10.5/svnversion.h 2013-12-19 19:15:19.000000000 +0000 +++ wireshark-1.10.6/svnversion.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -#define SVNVERSION "SVN Rev 54262" -#define SVNPATH "/trunk-1.10" diff -Nru wireshark-1.10.5/sync_pipe.h wireshark-1.10.6/sync_pipe.h --- wireshark-1.10.5/sync_pipe.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/sync_pipe.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Low-level synchronization pipe routines for use by Wireshark/TShark * and dumpcap * - * $Id: sync_pipe.h 46985 2013-01-07 16:26:45Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/sync_pipe_write.c wireshark-1.10.6/sync_pipe_write.c --- wireshark-1.10.5/sync_pipe_write.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/sync_pipe_write.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* sync_pipe_write.c * - * $Id: sync_pipe_write.c 46779 2012-12-26 12:14:59Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/tap-megaco-common.c wireshark-1.10.6/tap-megaco-common.c --- wireshark-1.10.5/tap-megaco-common.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/tap-megaco-common.c 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2008 Ericsson AB * By Balint Reczey * - * $Id: tap-megaco-common.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/tap-megaco-common.h wireshark-1.10.6/tap-megaco-common.h --- wireshark-1.10.5/tap-megaco-common.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/tap-megaco-common.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-rtp-common.h * MEGACO statistics handler functions used by tshark and wireshark * - * $Id: tap-megaco-common.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Copyright 2008, Ericsson AB * By Balint Reczey diff -Nru wireshark-1.10.5/tap-rtp-common.c wireshark-1.10.6/tap-rtp-common.c --- wireshark-1.10.5/tap-rtp-common.c 2013-06-03 17:50:27.000000000 +0000 +++ wireshark-1.10.6/tap-rtp-common.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-rtp-common.c * RTP stream handler functions used by tshark and wireshark * - * $Id: tap-rtp-common.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Copyright 2008, Ericsson AB * By Balint Reczey diff -Nru wireshark-1.10.5/tap-rtp-common.h wireshark-1.10.6/tap-rtp-common.h --- wireshark-1.10.5/tap-rtp-common.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/tap-rtp-common.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-rtp-common.h * RTP streams handler functions used by tshark and wireshark * - * $Id: tap-rtp-common.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Copyright 2008, Ericsson AB * By Balint Reczey diff -Nru wireshark-1.10.5/tempfile.c wireshark-1.10.6/tempfile.c --- wireshark-1.10.5/tempfile.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/tempfile.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tempfile.c * Routines to create temporary files * - * $Id: tempfile.c 47300 2013-01-26 15:51:01Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/tempfile.h wireshark-1.10.6/tempfile.h --- wireshark-1.10.5/tempfile.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/tempfile.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tempfile.h * Declarations of routines to create temporary files * - * $Id: tempfile.h 47300 2013-01-26 15:51:01Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/text2pcap.c wireshark-1.10.6/text2pcap.c --- wireshark-1.10.5/text2pcap.c 2013-07-29 09:29:14.000000000 +0000 +++ wireshark-1.10.6/text2pcap.c 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ * * (c) Copyright 2001 Ashok Narayanan * - * $Id: text2pcap.c 51009 2013-07-29 08:38:16Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -135,7 +135,7 @@ #include "pcapio.h" #include "text2pcap.h" -#include "svnversion.h" +#include "version.h" #ifdef _WIN32 #include @@ -788,8 +788,8 @@ gboolean success; if (use_pcapng) { -#ifdef SVNVERSION - const char *appname = "text2pcap (" SVNVERSION " from " SVNPATH ")"; +#ifdef GITVERSION + const char *appname = "text2pcap (" GITVERSION " from " GITBRANCH ")"; #else const char *appname = "text2pcap"; #endif @@ -1278,8 +1278,8 @@ { fprintf(stderr, "Text2pcap %s" -#ifdef SVNVERSION - " (" SVNVERSION " from " SVNPATH ")" +#ifdef GITVERSION + " (" GITVERSION " from " GITBRANCH ")" #endif "\n" "Generate a capture file from an ASCII hexdump of packets.\n" diff -Nru wireshark-1.10.5/text2pcap.h wireshark-1.10.6/text2pcap.h --- wireshark-1.10.5/text2pcap.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/text2pcap.h 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ * * (c) Copyright 2001 Ashok Narayanan * - * $Id: text2pcap.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/text2pcap-scanner.c wireshark-1.10.6/text2pcap-scanner.c --- wireshark-1.10.5/text2pcap-scanner.c 2013-12-19 19:24:08.000000000 +0000 +++ wireshark-1.10.6/text2pcap-scanner.c 2014-03-07 18:15:58.000000000 +0000 @@ -509,7 +509,7 @@ * * (c) Copyright 2001 Ashok Narayanan * - * $Id: text2pcap-scanner.l 47616 2013-02-10 20:21:05Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/text2pcap-scanner.l wireshark-1.10.6/text2pcap-scanner.l --- wireshark-1.10.5/text2pcap-scanner.l 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/text2pcap-scanner.l 2014-03-07 18:07:16.000000000 +0000 @@ -20,7 +20,7 @@ * * (c) Copyright 2001 Ashok Narayanan * - * $Id: text2pcap-scanner.l 47616 2013-02-10 20:21:05Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/timestats.c wireshark-1.10.6/timestats.c --- wireshark-1.10.5/timestats.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/timestats.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * routines for time statistics * Copyrigth 2003 Lars Roland * - * $Id: timestats.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/timestats.h wireshark-1.10.6/timestats.h --- wireshark-1.10.5/timestats.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/timestats.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines and definitions for time statistics * Copyrigth 2003 Lars Roland * - * $Id: timestats.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/tools/asn2wrs.py wireshark-1.10.6/tools/asn2wrs.py --- wireshark-1.10.5/tools/asn2wrs.py 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/asn2wrs.py 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # ASN.1 to Wireshark dissector compiler # 2004 Tomas Kukosa # -# $Id: asn2wrs.py 48812 2013-04-10 21:24:19Z gerald $ +# $Id$ # """ASN.1 to Wireshark dissector compiler""" diff -Nru wireshark-1.10.5/tools/checkAPIs.pl wireshark-1.10.6/tools/checkAPIs.pl --- wireshark-1.10.5/tools/checkAPIs.pl 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/checkAPIs.pl 2014-03-07 18:07:16.000000000 +0000 @@ -9,7 +9,7 @@ # Usage: # checkAPIs.pl [-M] [-g group1] [-g group2] [-s summary-group1] [-s summary-group2] [--nocheck-value-string-array-null-termination] file1 file2 ... # -# $Id: checkAPIs.pl 48340 2013-03-16 09:53:19Z martink $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/checkhf.pl wireshark-1.10.6/tools/checkhf.pl --- wireshark-1.10.5/tools/checkhf.pl 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/checkhf.pl 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ # # Usage: checkhf.pl [--debug=?] # -# $Id: checkhf.pl 47612 2013-02-10 18:40:54Z wmeier $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/compare-abis.sh wireshark-1.10.6/tools/compare-abis.sh --- wireshark-1.10.5/tools/compare-abis.sh 2013-09-10 15:45:18.000000000 +0000 +++ wireshark-1.10.6/tools/compare-abis.sh 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ # Compare ABIs of two Wireshark working copies -# $Id: compare-abis.sh 51931 2013-09-10 15:39:51Z gerald $ +# $Id$ # Tested with abi-compliance-checker 1.96.1 diff -Nru wireshark-1.10.5/tools/cppcheck/cppcheck.sh wireshark-1.10.6/tools/cppcheck/cppcheck.sh --- wireshark-1.10.5/tools/cppcheck/cppcheck.sh 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/cppcheck/cppcheck.sh 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # Script to run CppCheck Static Analyzer. # http://cppcheck.sourceforge.net/ # -# $Id: cppcheck.sh 45542 2012-10-14 19:30:33Z eapache $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/dfilter-test.py wireshark-1.10.6/tools/dfilter-test.py --- wireshark-1.10.5/tools/dfilter-test.py 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/dfilter-test.py 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ """ # -# $Id: dfilter-test.py 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Copyright (C) 2003 by Gilbert Ramirez # diff -Nru wireshark-1.10.5/tools/extract_asn1_from_spec.pl wireshark-1.10.6/tools/extract_asn1_from_spec.pl --- wireshark-1.10.5/tools/extract_asn1_from_spec.pl 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/extract_asn1_from_spec.pl 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -#$Id: extract_asn1_from_spec.pl 47034 2013-01-11 19:31:15Z pascal $ +#$Id$ #!/usr/bin/perl # 2011 Vincent Helfre and Erwan Yvin # This script extracts the ASN1 definition from and TS 36.331/36.355/25.331 diff -Nru wireshark-1.10.5/tools/fix-encoding-args.pl wireshark-1.10.6/tools/fix-encoding-args.pl --- wireshark-1.10.5/tools/fix-encoding-args.pl 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/fix-encoding-args.pl 2014-03-07 18:07:16.000000000 +0000 @@ -19,7 +19,7 @@ # - ptvcursor_add_with_subtree !! ToDo: encoding arg not last arg # # -# $Id: fix-encoding-args.pl 47533 2013-02-07 17:24:32Z wmeier $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/fixhf.pl wireshark-1.10.6/tools/fixhf.pl --- wireshark-1.10.5/tools/fixhf.pl 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/fixhf.pl 2014-03-07 18:07:16.000000000 +0000 @@ -10,7 +10,7 @@ # Usage: # fixhf.pl file1 [file2 file3 ...] # -# $Id: fixhf.pl 43538 2012-06-28 23:18:38Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/fuzz-test.sh wireshark-1.10.6/tools/fuzz-test.sh --- wireshark-1.10.5/tools/fuzz-test.sh 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/fuzz-test.sh 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/bash # -# $Id: fuzz-test.sh 48895 2013-04-17 17:23:41Z gerald $ +# $Id$ # Fuzz-testing script for TShark # diff -Nru wireshark-1.10.5/tools/idl2wrs wireshark-1.10.6/tools/idl2wrs --- wireshark-1.10.5/tools/idl2wrs 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/idl2wrs 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: idl2wrs 39984 2011-11-22 13:53:06Z rbalint $ +# $Id$ # # File : idl2wrs # diff -Nru wireshark-1.10.5/tools/indexcap.py wireshark-1.10.6/tools/indexcap.py --- wireshark-1.10.5/tools/indexcap.py 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/indexcap.py 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ # # Copyright 2009, Kovarththanan Rajaratnam # -# $Id: indexcap.py 44175 2012-07-31 23:16:26Z morriss $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/install_rpms_for_devel.sh wireshark-1.10.6/tools/install_rpms_for_devel.sh --- wireshark-1.10.5/tools/install_rpms_for_devel.sh 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/install_rpms_for_devel.sh 2014-03-07 18:07:16.000000000 +0000 @@ -10,7 +10,7 @@ # # Copyright 2013 Jeff Morriss # -# $Id: install_rpms_for_devel.sh 48624 2013-03-28 16:59:21Z morriss $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/lemon/cppmagic.h wireshark-1.10.6/tools/lemon/cppmagic.h --- wireshark-1.10.5/tools/lemon/cppmagic.h 2013-04-22 18:04:28.000000000 +0000 +++ wireshark-1.10.6/tools/lemon/cppmagic.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* $Id: cppmagic.h 11400 2004-07-18 00:24:25Z guy $ */ +/* $Id$ */ /**************************************** CPP definitions ***************/ diff -Nru wireshark-1.10.5/tools/lemon/lemon.c wireshark-1.10.6/tools/lemon/lemon.c --- wireshark-1.10.5/tools/lemon/lemon.c 2013-07-17 23:27:22.000000000 +0000 +++ wireshark-1.10.6/tools/lemon/lemon.c 2014-03-07 18:07:16.000000000 +0000 @@ -26,7 +26,7 @@ ** http://www.hwaci.com/drh/ ** ** Updated to sqlite lemon version 1.59 -** $Id: lemon.c 50712 2013-07-17 23:21:12Z gerald $ +** $Id$ */ #include "config.h" diff -Nru wireshark-1.10.5/tools/lemon/lemonflex-head.inc wireshark-1.10.6/tools/lemon/lemonflex-head.inc --- wireshark-1.10.5/tools/lemon/lemonflex-head.inc 2013-04-22 18:04:28.000000000 +0000 +++ wireshark-1.10.6/tools/lemon/lemonflex-head.inc 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* $Id: lemonflex-head.inc 11400 2004-07-18 00:24:25Z guy $ */ +/* $Id$ */ /* This file is #include'd at the top of a Lex/Flex scanner for use with the Lemon parser. You must have #define'd: diff -Nru wireshark-1.10.5/tools/lemon/lemonflex-tail.inc wireshark-1.10.6/tools/lemon/lemonflex-tail.inc --- wireshark-1.10.5/tools/lemon/lemonflex-tail.inc 2013-04-22 18:04:28.000000000 +0000 +++ wireshark-1.10.6/tools/lemon/lemonflex-tail.inc 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* $Id: lemonflex-tail.inc 25172 2008-04-25 17:24:29Z wmeier $ */ +/* $Id$ */ /* This file is #include'd at the bottom of a Lex/Flex scanner for use with the Lemon parser. You must have #define'd: diff -Nru wireshark-1.10.5/tools/lemon/lempar.c wireshark-1.10.6/tools/lemon/lempar.c --- wireshark-1.10.5/tools/lemon/lempar.c 2013-07-17 23:27:22.000000000 +0000 +++ wireshark-1.10.6/tools/lemon/lempar.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /* Driver template for the LEMON parser generator. -* $Id: lempar.c 50712 2013-07-17 23:21:12Z gerald $ +* $Id$ * ** Copyright 1991-1995 by D. Richard Hipp. ** diff -Nru wireshark-1.10.5/tools/lemon/Makefile.am wireshark-1.10.6/tools/lemon/Makefile.am --- wireshark-1.10.5/tools/lemon/Makefile.am 2013-04-22 18:04:28.000000000 +0000 +++ wireshark-1.10.6/tools/lemon/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # Makefile.am # -# $Id: Makefile.am 45050 2012-09-21 21:29:18Z morriss $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/lemon/Makefile.in wireshark-1.10.6/tools/lemon/Makefile.in --- wireshark-1.10.5/tools/lemon/Makefile.in 2013-12-19 19:13:51.000000000 +0000 +++ wireshark-1.10.6/tools/lemon/Makefile.in 2014-03-07 18:07:38.000000000 +0000 @@ -17,7 +17,7 @@ # Makefile.am # -# $Id: Makefile.am 45050 2012-09-21 21:29:18Z morriss $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/lemon/Makefile.nmake wireshark-1.10.6/tools/lemon/Makefile.nmake --- wireshark-1.10.5/tools/lemon/Makefile.nmake 2013-04-22 18:04:28.000000000 +0000 +++ wireshark-1.10.6/tools/lemon/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ ## Makefile for building wireshark.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 45050 2012-09-21 21:29:18Z morriss $ +# $Id$ include ..\..\config.nmake diff -Nru wireshark-1.10.5/tools/lemon/README wireshark-1.10.6/tools/lemon/README --- wireshark-1.10.5/tools/lemon/README 2013-04-22 18:04:28.000000000 +0000 +++ wireshark-1.10.6/tools/lemon/README 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README 13781 2005-03-16 22:09:30Z etxrab $ +$Id$ The Lemon Parser Generator's home page is: diff -Nru wireshark-1.10.5/tools/list_protos_in_cap.sh wireshark-1.10.6/tools/list_protos_in_cap.sh --- wireshark-1.10.5/tools/list_protos_in_cap.sh 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/list_protos_in_cap.sh 2014-03-07 18:07:16.000000000 +0000 @@ -13,7 +13,7 @@ # # Copyright 2012 Jeff Morriss # -# $Id: list_protos_in_cap.sh 44175 2012-07-31 23:16:26Z morriss $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/make-dissector-reg wireshark-1.10.6/tools/make-dissector-reg --- wireshark-1.10.5/tools/make-dissector-reg 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/make-dissector-reg 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh # -# $Id: make-dissector-reg 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # # diff -Nru wireshark-1.10.5/tools/make-dissector-reg.py wireshark-1.10.6/tools/make-dissector-reg.py --- wireshark-1.10.5/tools/make-dissector-reg.py 2013-09-07 01:25:16.000000000 +0000 +++ wireshark-1.10.6/tools/make-dissector-reg.py 2014-03-07 18:07:16.000000000 +0000 @@ -9,7 +9,7 @@ # seds for each input file. I wrote this python version so that # less processes would have to be started. # -# $Id: make-dissector-reg.py 51809 2013-09-07 01:19:23Z gerald $ +# $Id$ import os import sys @@ -19,7 +19,7 @@ from stat import * VERSION_KEY = '_VERSION' -CUR_VERSION = '$Id: make-dissector-reg.py 51809 2013-09-07 01:19:23Z gerald $' +CUR_VERSION = '$Id$' # # The first argument is the directory in which the source files live. diff -Nru wireshark-1.10.5/tools/Makefile.am wireshark-1.10.6/tools/Makefile.am --- wireshark-1.10.5/tools/Makefile.am 2013-08-07 16:49:22.000000000 +0000 +++ wireshark-1.10.6/tools/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Wireshark # -# $Id: Makefile.am 51190 2013-08-07 16:43:53Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/Makefile.in wireshark-1.10.6/tools/Makefile.in --- wireshark-1.10.5/tools/Makefile.in 2013-12-19 19:13:51.000000000 +0000 +++ wireshark-1.10.6/tools/Makefile.in 2014-03-07 18:07:38.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for Wireshark # -# $Id: Makefile.am 51190 2013-08-07 16:43:53Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/Makefile.nmake wireshark-1.10.6/tools/Makefile.nmake --- wireshark-1.10.5/tools/Makefile.nmake 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ ## Makefile for building wireshark.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 27734 2009-03-15 22:40:29Z gerald $ +# $Id$ all: lemon diff -Nru wireshark-1.10.5/tools/make-manuf wireshark-1.10.6/tools/make-manuf --- wireshark-1.10.5/tools/make-manuf 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/make-manuf 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# $Id: make-manuf 48865 2013-04-15 23:16:20Z gerald $ +# $Id$ # # Make-manuf - Creates a file containing ethernet OUIs and their # company IDs. It merges the databases at IEEE and @@ -38,9 +38,11 @@ $wkatmpl = "wka.tmpl"; $outfile = "manuf"; $inheader = 1; +# According to http://standards.ieee.org/regauthmaint.html +# the IEEE is adding OUI-28 in January 2014. $oui_url = "http://standards.ieee.org/develop/regauth/oui/oui.txt"; $iab_url = "http://standards.ieee.org/develop/regauth/iab/iab.txt"; -$oui36_url = "http://standards.ieee.org/develop/regauth/oui36/oui36.txt"; +$oui36_url = "http://standards.ieee.org/develop/regauth/oui36/oui36.txt"; $cb_url = "http://www.cavebear.com/archive/cavebear/Ethernet/Ethernet.txt"; %oui_list = (); $hp = "[0-9a-fA-F]{2}"; @@ -48,15 +50,21 @@ $cb_re = "$hp$hp$hp"; $ieee_re = "$hp-$hp-$hp"; -$tmpl_added = 0; -$cb_added = 0; -$cb_skipped = 0; -$oui_added = 0; -$oui_skipped = 0; -$iab_added = 0; -$iab_skipped = 0; +$min_entries = 100; + +$tmpl_added = 0; +$cb_added = 0; +$cb_skipped = 0; +$cb_total = 0; +$oui_added = 0; +$oui_skipped = 0; +$oui_total = 0; +$iab_added = 0; +$iab_skipped = 0; +$iab_total = 0; $oui36_added = 0; $oui36_skipped = 0; +$oui36_total = 0; sub shorten { @@ -138,8 +146,11 @@ $iab_added++; } } + $iab_total++; } +if ($iab_total < $min_entries) { die "Too few IAB entries ($iab_total)\n"; } + # Add IEEE entries for OUI-36 $ieee_list = fetch($oui36_url); @@ -163,8 +174,11 @@ $oui36_added++; } } + $oui36_total++; } +if ($oui36_total < $min_entries) { die "Too few OUI-36 entries ($oui36_total)\n"; } + # Add IEEE entries for OUIs not yet known. $ieee_list = fetch($oui_url); @@ -182,8 +196,11 @@ $oui_added++; } } + $oui_total++; } +if ($oui_total < $min_entries) { die "Too few OUI entries ($oui_total)\n"; } + # Add CaveBear entries for OUIs not yet known. $cb_list = fetch($cb_url); @@ -203,8 +220,11 @@ $cb_added++; } } + $cb_total++; } +if ($cb_total < $min_entries) { die "Too few CaveBear entries ($cb_total)\n"; } + # Write output file open (OUT, "> $outfile") || diff -Nru wireshark-1.10.5/tools/make-services.py wireshark-1.10.6/tools/make-services.py --- wireshark-1.10.5/tools/make-services.py 2013-08-07 16:49:22.000000000 +0000 +++ wireshark-1.10.6/tools/make-services.py 2014-03-07 18:07:16.000000000 +0000 @@ -149,7 +149,7 @@ out.write('''\ # This is a local copy of the IANA port-numbers file. # -# $Id: make-services.py 51190 2013-08-07 16:43:53Z gerald $ +# $Id$ # # Wireshark uses it to resolve port numbers into human readable # service names, e.g. TCP port 80 -> http. diff -Nru wireshark-1.10.5/tools/make-sminmpec.pl wireshark-1.10.6/tools/make-sminmpec.pl --- wireshark-1.10.5/tools/make-sminmpec.pl 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/make-sminmpec.pl 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ # create the sminmpec.c file from # http://www.iana.org/assignments/enterprise-numbers # -# $Id: make-sminmpec.pl 44997 2012-09-19 01:37:13Z morriss $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/make-tapreg-dotc wireshark-1.10.6/tools/make-tapreg-dotc --- wireshark-1.10.5/tools/make-tapreg-dotc 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/make-tapreg-dotc 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh # -# $Id: make-tapreg-dotc 30297 2009-10-04 10:51:53Z krj $ +# $Id$ # # diff -Nru wireshark-1.10.5/tools/make-tap-reg.py wireshark-1.10.6/tools/make-tap-reg.py --- wireshark-1.10.5/tools/make-tap-reg.py 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/make-tap-reg.py 2014-03-07 18:07:16.000000000 +0000 @@ -9,7 +9,7 @@ # seds for each input file. I wrote this python version so that # less processes would have to be started. # -# $Id: make-tap-reg.py 48812 2013-04-10 21:24:19Z gerald $ +# $Id$ import os import sys @@ -35,7 +35,7 @@ final_filename = "tshark-tap-register.c" cache_filename = "tshark-tap-register-cache.pkl" else: - print "Unknown output type '%s'" % registertype + print("Unknown output type '%s'" % registertype) sys.exit(1) @@ -53,7 +53,7 @@ filenames.append("%s/%s" % (srcdir, file)) if len(filenames) < 1: - print "No files found" + print("No files found") sys.exit(1) @@ -89,7 +89,7 @@ for filename in filenames: file = open(filename) cur_mtime = os.fstat(file.fileno())[ST_MTIME] - if cache and cache.has_key(filename): + if cache and filename in cache: cdict = cache[filename] if cur_mtime == cdict['mtime']: # print "Pulling %s from cache" % (filename) @@ -123,7 +123,7 @@ # Make sure we actually processed something if len(regs['tap_reg']) < 1: - print "No protocol registrations found" + print("No protocol registrations found") sys.exit(1) # Sort the lists to make them pretty diff -Nru wireshark-1.10.5/tools/ncp2222.py wireshark-1.10.6/tools/ncp2222.py --- wireshark-1.10.5/tools/ncp2222.py 2013-04-22 21:38:17.000000000 +0000 +++ wireshark-1.10.6/tools/ncp2222.py 2014-03-07 18:07:16.000000000 +0000 @@ -25,7 +25,7 @@ for a badly-formatted HTML version of the same PDF. -$Id: ncp2222.py 48991 2013-04-22 21:32:55Z gerald $ +$Id$ Portions Copyright (c) 2000-2002 by Gilbert Ramirez . @@ -52,29 +52,29 @@ import getopt import traceback -errors = {} -groups = {} -packets = [] -compcode_lists = None -ptvc_lists = None -msg = None +errors = {} +groups = {} +packets = [] +compcode_lists = None +ptvc_lists = None +msg = None reply_var = None -REC_START = 0 -REC_LENGTH = 1 -REC_FIELD = 2 -REC_ENDIANNESS = 3 -REC_VAR = 4 -REC_REPEAT = 5 -REC_REQ_COND = 6 - -NO_VAR = -1 -NO_REPEAT = -1 -NO_REQ_COND = -1 -NO_LENGTH_CHECK = -2 +REC_START = 0 +REC_LENGTH = 1 +REC_FIELD = 2 +REC_ENDIANNESS = 3 +REC_VAR = 4 +REC_REPEAT = 5 +REC_REQ_COND = 6 + +NO_VAR = -1 +NO_REPEAT = -1 +NO_REQ_COND = -1 +NO_LENGTH_CHECK = -2 -PROTO_LENGTH_UNKNOWN = -1 +PROTO_LENGTH_UNKNOWN = -1 global_highest_var = -1 global_req_cond = {} @@ -88,1241 +88,1244 @@ ############################################################################## class UniqueCollection: - """The UniqueCollection class stores objects which can be compared to other - objects of the same class. If two objects in the collection are equivalent, - only one is stored.""" - - def __init__(self, name): - "Constructor" - self.name = name - self.members = [] - self.member_reprs = {} - - def Add(self, object): - """Add an object to the members lists, if a comparable object - doesn't already exist. The object that is in the member list, that is - either the object that was added or the comparable object that was - already in the member list, is returned.""" - - r = repr(object) - # Is 'object' a duplicate of some other member? - if self.member_reprs.has_key(r): - return self.member_reprs[r] - else: - self.member_reprs[r] = object - self.members.append(object) - return object - - def Members(self): - "Returns the list of members." - return self.members - - def HasMember(self, object): - "Does the list of members contain the object?" - if self.members_reprs.has_key(repr(object)): - return 1 - else: - return 0 + """The UniqueCollection class stores objects which can be compared to other + objects of the same class. If two objects in the collection are equivalent, + only one is stored.""" + + def __init__(self, name): + "Constructor" + self.name = name + self.members = [] + self.member_reprs = {} + + def Add(self, object): + """Add an object to the members lists, if a comparable object + doesn't already exist. The object that is in the member list, that is + either the object that was added or the comparable object that was + already in the member list, is returned.""" + + r = repr(object) + # Is 'object' a duplicate of some other member? + if r in self.member_reprs: + return self.member_reprs[r] + else: + self.member_reprs[r] = object + self.members.append(object) + return object + + def Members(self): + "Returns the list of members." + return self.members + + def HasMember(self, object): + "Does the list of members contain the object?" + if repr(object) in self.members_reprs: + return 1 + else: + return 0 # This list needs to be defined before the NCP types are defined, # because the NCP types are defined in the global scope, not inside # a function's scope. -ptvc_lists = UniqueCollection('PTVC Lists') +ptvc_lists = UniqueCollection('PTVC Lists') ############################################################################## class NamedList: - "NamedList's keep track of PTVC's and Completion Codes" - def __init__(self, name, list): - "Constructor" - self.name = name - self.list = list - - def __cmp__(self, other): - "Compare this NamedList to another" - - if isinstance(other, NamedList): - return cmp(self.list, other.list) - else: - return 0 - - - def Name(self, new_name = None): - "Get/Set name of list" - if new_name != None: - self.name = new_name - return self.name - - def Records(self): - "Returns record lists" - return self.list - - def Null(self): - "Is there no list (different from an empty list)?" - return self.list == None - - def Empty(self): - "It the list empty (different from a null list)?" - assert(not self.Null()) - - if self.list: - return 0 - else: - return 1 + "NamedList's keep track of PTVC's and Completion Codes" + def __init__(self, name, list): + "Constructor" + self.name = name + self.list = list + + def __cmp__(self, other): + "Compare this NamedList to another" + + if isinstance(other, NamedList): + return cmp(self.list, other.list) + else: + return 0 + + + def Name(self, new_name = None): + "Get/Set name of list" + if new_name != None: + self.name = new_name + return self.name + + def Records(self): + "Returns record lists" + return self.list + + def Null(self): + "Is there no list (different from an empty list)?" + return self.list == None + + def Empty(self): + "It the list empty (different from a null list)?" + assert(not self.Null()) + + if self.list: + return 0 + else: + return 1 - def __repr__(self): - return repr(self.list) + def __repr__(self): + return repr(self.list) class PTVC(NamedList): - """ProtoTree TVBuff Cursor List ("PTVC List") Class""" + """ProtoTree TVBuff Cursor List ("PTVC List") Class""" - def __init__(self, name, records): - "Constructor" - NamedList.__init__(self, name, []) - - global global_highest_var - - expected_offset = None - highest_var = -1 - - named_vars = {} - - # Make a PTVCRecord object for each list in 'records' - for record in records: - offset = record[REC_START] - length = record[REC_LENGTH] - field = record[REC_FIELD] - endianness = record[REC_ENDIANNESS] - - # Variable - var_name = record[REC_VAR] - if var_name: - # Did we already define this var? - if named_vars.has_key(var_name): - sys.exit("%s has multiple %s vars." % \ - (name, var_name)) - - highest_var = highest_var + 1 - var = highest_var - if highest_var > global_highest_var: - global_highest_var = highest_var - named_vars[var_name] = var - else: - var = NO_VAR - - # Repeat - repeat_name = record[REC_REPEAT] - if repeat_name: - # Do we have this var? - if not named_vars.has_key(repeat_name): - sys.exit("%s does not have %s var defined." % \ - (name, var_name)) - repeat = named_vars[repeat_name] - else: - repeat = NO_REPEAT - - # Request Condition - req_cond = record[REC_REQ_COND] - if req_cond != NO_REQ_COND: - global_req_cond[req_cond] = None - - ptvc_rec = PTVCRecord(field, length, endianness, var, repeat, req_cond) - - if expected_offset == None: - expected_offset = offset - - elif expected_offset == -1: - pass - - elif expected_offset != offset and offset != -1: - msg.write("Expected offset in %s for %s to be %d\n" % \ - (name, field.HFName(), expected_offset)) - sys.exit(1) - - # We can't make a PTVC list from a variable-length - # packet, unless the fields can tell us at run time - # how long the packet is. That is, nstring8 is fine, since - # the field has an integer telling us how long the string is. - # Fields that don't have a length determinable at run-time - # cannot be variable-length. - if type(ptvc_rec.Length()) == type(()): - if isinstance(ptvc_rec.Field(), nstring): - expected_offset = -1 - pass - elif isinstance(ptvc_rec.Field(), nbytes): - expected_offset = -1 - pass - elif isinstance(ptvc_rec.Field(), struct): - expected_offset = -1 - pass - else: - field = ptvc_rec.Field() - assert 0, "Cannot make PTVC from %s, type %s" % \ - (field.HFName(), field) - - elif expected_offset > -1: - if ptvc_rec.Length() < 0: - expected_offset = -1 - else: - expected_offset = expected_offset + ptvc_rec.Length() - - - self.list.append(ptvc_rec) - - def ETTName(self): - return "ett_%s" % (self.Name(),) - - - def Code(self): - x = "static const ptvc_record %s[] = {\n" % (self.Name()) - for ptvc_rec in self.list: - x = x + "\t%s,\n" % (ptvc_rec.Code()) - x = x + "\t{ NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }\n" - x = x + "};\n" - return x - - def __repr__(self): - x = "" - for ptvc_rec in self.list: - x = x + repr(ptvc_rec) - return x + def __init__(self, name, records): + "Constructor" + NamedList.__init__(self, name, []) + + global global_highest_var + + expected_offset = None + highest_var = -1 + + named_vars = {} + + # Make a PTVCRecord object for each list in 'records' + for record in records: + offset = record[REC_START] + length = record[REC_LENGTH] + field = record[REC_FIELD] + endianness = record[REC_ENDIANNESS] + + # Variable + var_name = record[REC_VAR] + if var_name: + # Did we already define this var? + if var_name in named_vars: + sys.exit("%s has multiple %s vars." % \ + (name, var_name)) + + highest_var = highest_var + 1 + var = highest_var + if highest_var > global_highest_var: + global_highest_var = highest_var + named_vars[var_name] = var + else: + var = NO_VAR + + # Repeat + repeat_name = record[REC_REPEAT] + if repeat_name: + # Do we have this var? + if repeat_name not in named_vars: + sys.exit("%s does not have %s var defined." % \ + (name, var_name)) + repeat = named_vars[repeat_name] + else: + repeat = NO_REPEAT + + # Request Condition + req_cond = record[REC_REQ_COND] + if req_cond != NO_REQ_COND: + global_req_cond[req_cond] = None + + ptvc_rec = PTVCRecord(field, length, endianness, var, repeat, req_cond) + + if expected_offset == None: + expected_offset = offset + + elif expected_offset == -1: + pass + + elif expected_offset != offset and offset != -1: + msg.write("Expected offset in %s for %s to be %d\n" % \ + (name, field.HFName(), expected_offset)) + sys.exit(1) + + # We can't make a PTVC list from a variable-length + # packet, unless the fields can tell us at run time + # how long the packet is. That is, nstring8 is fine, since + # the field has an integer telling us how long the string is. + # Fields that don't have a length determinable at run-time + # cannot be variable-length. + if type(ptvc_rec.Length()) == type(()): + if isinstance(ptvc_rec.Field(), nstring): + expected_offset = -1 + pass + elif isinstance(ptvc_rec.Field(), nbytes): + expected_offset = -1 + pass + elif isinstance(ptvc_rec.Field(), struct): + expected_offset = -1 + pass + else: + field = ptvc_rec.Field() + assert 0, "Cannot make PTVC from %s, type %s" % \ + (field.HFName(), field) + + elif expected_offset > -1: + if ptvc_rec.Length() < 0: + expected_offset = -1 + else: + expected_offset = expected_offset + ptvc_rec.Length() + + + self.list.append(ptvc_rec) + + def ETTName(self): + return "ett_%s" % (self.Name(),) + + + def Code(self): + x = "static const ptvc_record %s[] = {\n" % (self.Name()) + for ptvc_rec in self.list: + x = x + "\t%s,\n" % (ptvc_rec.Code()) + x = x + "\t{ NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }\n" + x = x + "};\n" + return x + + def __repr__(self): + x = "" + for ptvc_rec in self.list: + x = x + repr(ptvc_rec) + return x class PTVCBitfield(PTVC): - def __init__(self, name, vars): - NamedList.__init__(self, name, []) + def __init__(self, name, vars): + NamedList.__init__(self, name, []) - for var in vars: - ptvc_rec = PTVCRecord(var, var.Length(), var.Endianness(), - NO_VAR, NO_REPEAT, NO_REQ_COND) - self.list.append(ptvc_rec) - - def Code(self): - ett_name = self.ETTName() - x = "static gint %s = -1;\n" % (ett_name,) - - x = x + "static const ptvc_record ptvc_%s[] = {\n" % (self.Name()) - for ptvc_rec in self.list: - x = x + "\t%s,\n" % (ptvc_rec.Code()) - x = x + "\t{ NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }\n" - x = x + "};\n" - - x = x + "static const sub_ptvc_record %s = {\n" % (self.Name(),) - x = x + "\t&%s,\n" % (ett_name,) - x = x + "\tNULL,\n" - x = x + "\tptvc_%s,\n" % (self.Name(),) - x = x + "};\n" - return x + for var in vars: + ptvc_rec = PTVCRecord(var, var.Length(), var.Endianness(), + NO_VAR, NO_REPEAT, NO_REQ_COND) + self.list.append(ptvc_rec) + + def Code(self): + ett_name = self.ETTName() + x = "static gint %s = -1;\n" % (ett_name,) + + x = x + "static const ptvc_record ptvc_%s[] = {\n" % (self.Name()) + for ptvc_rec in self.list: + x = x + "\t%s,\n" % (ptvc_rec.Code()) + x = x + "\t{ NULL, 0, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }\n" + x = x + "};\n" + + x = x + "static const sub_ptvc_record %s = {\n" % (self.Name(),) + x = x + "\t&%s,\n" % (ett_name,) + x = x + "\tNULL,\n" + x = x + "\tptvc_%s,\n" % (self.Name(),) + x = x + "};\n" + return x class PTVCRecord: - def __init__(self, field, length, endianness, var, repeat, req_cond): - "Constructor" - self.field = field - self.length = length - self.endianness = endianness - self.var = var - self.repeat = repeat - self.req_cond = req_cond - - def __cmp__(self, other): - "Comparison operator" - if self.field != other.field: - return 1 - elif self.length < other.length: - return -1 - elif self.length > other.length: - return 1 - elif self.endianness != other.endianness: - return 1 - else: - return 0 - - def Code(self): - # Nice textual representations - if self.var == NO_VAR: - var = "NO_VAR" - else: - var = self.var - - if self.repeat == NO_REPEAT: - repeat = "NO_REPEAT" - else: - repeat = self.repeat - - if self.req_cond == NO_REQ_COND: - req_cond = "NO_REQ_COND" - else: - req_cond = global_req_cond[self.req_cond] - assert req_cond != None - - if isinstance(self.field, struct): - return self.field.ReferenceString(var, repeat, req_cond) - else: - return self.RegularCode(var, repeat, req_cond) - - def RegularCode(self, var, repeat, req_cond): - "String representation" - endianness = 'BE' - if self.endianness == LE: - endianness = 'LE' - - length = None - - if type(self.length) == type(0): - length = self.length - else: - # This is for cases where a length is needed - # in order to determine a following variable-length, - # like nstring8, where 1 byte is needed in order - # to determine the variable length. - var_length = self.field.Length() - if var_length > 0: - length = var_length - - if length == PROTO_LENGTH_UNKNOWN: - # XXX length = "PROTO_LENGTH_UNKNOWN" - pass - - assert length, "Length not handled for %s" % (self.field.HFName(),) - - sub_ptvc_name = self.field.PTVCName() - if sub_ptvc_name != "NULL": - sub_ptvc_name = "&%s" % (sub_ptvc_name,) - - - return "{ &%s, %s, %s, %s, %s, %s, %s, %s }" % \ - (self.field.HFName(), length, sub_ptvc_name, - endianness, var, repeat, req_cond, - self.field.SpecialFmt()) - - def Offset(self): - return self.offset - - def Length(self): - return self.length - - def Field(self): - return self.field - - def __repr__(self): - return "{%s len=%s end=%s var=%s rpt=%s rqc=%s}" % \ - (self.field.HFName(), self.length, - self.endianness, self.var, self.repeat, self.req_cond) + def __init__(self, field, length, endianness, var, repeat, req_cond): + "Constructor" + self.field = field + self.length = length + self.endianness = endianness + self.var = var + self.repeat = repeat + self.req_cond = req_cond + + def __cmp__(self, other): + "Comparison operator" + if self.field != other.field: + return 1 + elif self.length < other.length: + return -1 + elif self.length > other.length: + return 1 + elif self.endianness != other.endianness: + return 1 + else: + return 0 + + def Code(self): + # Nice textual representations + if self.var == NO_VAR: + var = "NO_VAR" + else: + var = self.var + + if self.repeat == NO_REPEAT: + repeat = "NO_REPEAT" + else: + repeat = self.repeat + + if self.req_cond == NO_REQ_COND: + req_cond = "NO_REQ_COND" + else: + req_cond = global_req_cond[self.req_cond] + assert req_cond != None + + if isinstance(self.field, struct): + return self.field.ReferenceString(var, repeat, req_cond) + else: + return self.RegularCode(var, repeat, req_cond) + + def RegularCode(self, var, repeat, req_cond): + "String representation" + endianness = 'BE' + if self.endianness == LE: + endianness = 'LE' + + length = None + + if type(self.length) == type(0): + length = self.length + else: + # This is for cases where a length is needed + # in order to determine a following variable-length, + # like nstring8, where 1 byte is needed in order + # to determine the variable length. + var_length = self.field.Length() + if var_length > 0: + length = var_length + + if length == PROTO_LENGTH_UNKNOWN: + # XXX length = "PROTO_LENGTH_UNKNOWN" + pass + + assert length, "Length not handled for %s" % (self.field.HFName(),) + + sub_ptvc_name = self.field.PTVCName() + if sub_ptvc_name != "NULL": + sub_ptvc_name = "&%s" % (sub_ptvc_name,) + + + return "{ &%s, %s, %s, %s, %s, %s, %s, %s }" % \ + (self.field.HFName(), length, sub_ptvc_name, + endianness, var, repeat, req_cond, + self.field.SpecialFmt()) + + def Offset(self): + return self.offset + + def Length(self): + return self.length + + def Field(self): + return self.field + + def __repr__(self): + return "{%s len=%s end=%s var=%s rpt=%s rqc=%s}" % \ + (self.field.HFName(), self.length, + self.endianness, self.var, self.repeat, self.req_cond) ############################################################################## class NCP: - "NCP Packet class" - def __init__(self, func_code, description, group, has_length=1): - "Constructor" - self.func_code = func_code - self.description = description - self.group = group - self.codes = None - self.request_records = None - self.reply_records = None - self.has_length = has_length - self.req_cond_size = None - self.req_info_str = None - - if not groups.has_key(group): - msg.write("NCP 0x%x has invalid group '%s'\n" % \ - (self.func_code, group)) - sys.exit(1) - - if self.HasSubFunction(): - # NCP Function with SubFunction - self.start_offset = 10 - else: - # Simple NCP Function - self.start_offset = 7 - - def ReqCondSize(self): - return self.req_cond_size - - def ReqCondSizeVariable(self): - self.req_cond_size = REQ_COND_SIZE_VARIABLE - - def ReqCondSizeConstant(self): - self.req_cond_size = REQ_COND_SIZE_CONSTANT - - def FunctionCode(self, part=None): - "Returns the function code for this NCP packet." - if part == None: - return self.func_code - elif part == 'high': - if self.HasSubFunction(): - return (self.func_code & 0xff00) >> 8 - else: - return self.func_code - elif part == 'low': - if self.HasSubFunction(): - return self.func_code & 0x00ff - else: - return 0x00 - else: - msg.write("Unknown directive '%s' for function_code()\n" % (part)) - sys.exit(1) - - def HasSubFunction(self): - "Does this NPC packet require a subfunction field?" - if self.func_code <= 0xff: - return 0 - else: - return 1 - - def HasLength(self): - return self.has_length - - def Description(self): - return self.description - - def Group(self): - return self.group - - def PTVCRequest(self): - return self.ptvc_request - - def PTVCReply(self): - return self.ptvc_reply - - def Request(self, size, records=[], **kwargs): - self.request_size = size - self.request_records = records - if self.HasSubFunction(): - if self.HasLength(): - self.CheckRecords(size, records, "Request", 10) - else: - self.CheckRecords(size, records, "Request", 8) - else: - self.CheckRecords(size, records, "Request", 7) - self.ptvc_request = self.MakePTVC(records, "request") - - if kwargs.has_key("info_str"): - self.req_info_str = kwargs["info_str"] - - def Reply(self, size, records=[]): - self.reply_size = size - self.reply_records = records - self.CheckRecords(size, records, "Reply", 8) - self.ptvc_reply = self.MakePTVC(records, "reply") - - def CheckRecords(self, size, records, descr, min_hdr_length): - "Simple sanity check" - if size == NO_LENGTH_CHECK: - return - min = size - max = size - if type(size) == type(()): - min = size[0] - max = size[1] - - lower = min_hdr_length - upper = min_hdr_length - - for record in records: - rec_size = record[REC_LENGTH] - rec_lower = rec_size - rec_upper = rec_size - if type(rec_size) == type(()): - rec_lower = rec_size[0] - rec_upper = rec_size[1] - - lower = lower + rec_lower - upper = upper + rec_upper - - error = 0 - if min != lower: - msg.write("%s records for 2222/0x%x sum to %d bytes minimum, but param1 shows %d\n" \ - % (descr, self.FunctionCode(), lower, min)) - error = 1 - if max != upper: - msg.write("%s records for 2222/0x%x sum to %d bytes maximum, but param1 shows %d\n" \ - % (descr, self.FunctionCode(), upper, max)) - error = 1 - - if error == 1: - sys.exit(1) - - - def MakePTVC(self, records, name_suffix): - """Makes a PTVC out of a request or reply record list. Possibly adds - it to the global list of PTVCs (the global list is a UniqueCollection, - so an equivalent PTVC may already be in the global list).""" - - name = "%s_%s" % (self.CName(), name_suffix) - ptvc = PTVC(name, records) - return ptvc_lists.Add(ptvc) - - def CName(self): - "Returns a C symbol based on the NCP function code" - return "ncp_0x%x" % (self.func_code) - - def InfoStrName(self): - "Returns a C symbol based on the NCP function code, for the info_str" - return "info_str_0x%x" % (self.func_code) - - def Variables(self): - """Returns a list of variables used in the request and reply records. - A variable is listed only once, even if it is used twice (once in - the request, once in the reply).""" - - variables = {} - if self.request_records: - for record in self.request_records: - var = record[REC_FIELD] - variables[var.HFName()] = var - - sub_vars = var.SubVariables() - for sv in sub_vars: - variables[sv.HFName()] = sv - - if self.reply_records: - for record in self.reply_records: - var = record[REC_FIELD] - variables[var.HFName()] = var - - sub_vars = var.SubVariables() - for sv in sub_vars: - variables[sv.HFName()] = sv - - return variables.values() - - def CalculateReqConds(self): - """Returns a list of request conditions (dfilter text) used - in the reply records. A request condition is listed only once,""" - texts = {} - if self.reply_records: - for record in self.reply_records: - text = record[REC_REQ_COND] - if text != NO_REQ_COND: - texts[text] = None - - if len(texts) == 0: - self.req_conds = None - return None - - dfilter_texts = texts.keys() - dfilter_texts.sort() - name = "%s_req_cond_indexes" % (self.CName(),) - return NamedList(name, dfilter_texts) - - def GetReqConds(self): - return self.req_conds - - def SetReqConds(self, new_val): - self.req_conds = new_val - - - def CompletionCodes(self, codes=None): - """Sets or returns the list of completion - codes. Internally, a NamedList is used to store the - completion codes, but the caller of this function never - realizes that because Python lists are the input and - output.""" - - if codes == None: - return self.codes - - # Sanity check - okay = 1 - for code in codes: - if not errors.has_key(code): - msg.write("Errors table does not have key 0x%04x for NCP=0x%x\n" % (code, - self.func_code)) - okay = 0 - - # Delay the exit until here so that the programmer can get - # the complete list of missing error codes - if not okay: - sys.exit(1) - - # Create CompletionCode (NamedList) object and possible - # add it to the global list of completion code lists. - name = "%s_errors" % (self.CName(),) - codes.sort() - codes_list = NamedList(name, codes) - self.codes = compcode_lists.Add(codes_list) - - self.Finalize() - - def Finalize(self): - """Adds the NCP object to the global collection of NCP - objects. This is done automatically after setting the - CompletionCode list. Yes, this is a shortcut, but it makes - our list of NCP packet definitions look neater, since an - explicit "add to global list of packets" is not needed.""" + "NCP Packet class" + def __init__(self, func_code, description, group, has_length=1): + "Constructor" + self.__code__ = func_code + self.description = description + self.group = group + self.codes = None + self.request_records = None + self.reply_records = None + self.has_length = has_length + self.req_cond_size = None + self.req_info_str = None + + if group not in groups: + msg.write("NCP 0x%x has invalid group '%s'\n" % \ + (self.__code__, group)) + sys.exit(1) + + if self.HasSubFunction(): + # NCP Function with SubFunction + self.start_offset = 10 + else: + # Simple NCP Function + self.start_offset = 7 + + def ReqCondSize(self): + return self.req_cond_size + + def ReqCondSizeVariable(self): + self.req_cond_size = REQ_COND_SIZE_VARIABLE + + def ReqCondSizeConstant(self): + self.req_cond_size = REQ_COND_SIZE_CONSTANT + + def FunctionCode(self, part=None): + "Returns the function code for this NCP packet." + if part == None: + return self.__code__ + elif part == 'high': + if self.HasSubFunction(): + return (self.__code__ & 0xff00) >> 8 + else: + return self.__code__ + elif part == 'low': + if self.HasSubFunction(): + return self.__code__ & 0x00ff + else: + return 0x00 + else: + msg.write("Unknown directive '%s' for function_code()\n" % (part)) + sys.exit(1) + + def HasSubFunction(self): + "Does this NPC packet require a subfunction field?" + if self.__code__ <= 0xff: + return 0 + else: + return 1 + + def HasLength(self): + return self.has_length + + def Description(self): + return self.description + + def Group(self): + return self.group + + def PTVCRequest(self): + return self.ptvc_request + + def PTVCReply(self): + return self.ptvc_reply + + def Request(self, size, records=[], **kwargs): + self.request_size = size + self.request_records = records + if self.HasSubFunction(): + if self.HasLength(): + self.CheckRecords(size, records, "Request", 10) + else: + self.CheckRecords(size, records, "Request", 8) + else: + self.CheckRecords(size, records, "Request", 7) + self.ptvc_request = self.MakePTVC(records, "request") + + if "info_str" in kwargs: + self.req_info_str = kwargs["info_str"] + + def Reply(self, size, records=[]): + self.reply_size = size + self.reply_records = records + self.CheckRecords(size, records, "Reply", 8) + self.ptvc_reply = self.MakePTVC(records, "reply") + + def CheckRecords(self, size, records, descr, min_hdr_length): + "Simple sanity check" + if size == NO_LENGTH_CHECK: + return + min = size + max = size + if type(size) == type(()): + min = size[0] + max = size[1] + + lower = min_hdr_length + upper = min_hdr_length + + for record in records: + rec_size = record[REC_LENGTH] + rec_lower = rec_size + rec_upper = rec_size + if type(rec_size) == type(()): + rec_lower = rec_size[0] + rec_upper = rec_size[1] + + lower = lower + rec_lower + upper = upper + rec_upper + + error = 0 + if min != lower: + msg.write("%s records for 2222/0x%x sum to %d bytes minimum, but param1 shows %d\n" \ + % (descr, self.FunctionCode(), lower, min)) + error = 1 + if max != upper: + msg.write("%s records for 2222/0x%x sum to %d bytes maximum, but param1 shows %d\n" \ + % (descr, self.FunctionCode(), upper, max)) + error = 1 + + if error == 1: + sys.exit(1) + + + def MakePTVC(self, records, name_suffix): + """Makes a PTVC out of a request or reply record list. Possibly adds + it to the global list of PTVCs (the global list is a UniqueCollection, + so an equivalent PTVC may already be in the global list).""" + + name = "%s_%s" % (self.CName(), name_suffix) + ptvc = PTVC(name, records) + return ptvc_lists.Add(ptvc) + + def CName(self): + "Returns a C symbol based on the NCP function code" + return "ncp_0x%x" % (self.__code__) + + def InfoStrName(self): + "Returns a C symbol based on the NCP function code, for the info_str" + return "info_str_0x%x" % (self.__code__) + + def Variables(self): + """Returns a list of variables used in the request and reply records. + A variable is listed only once, even if it is used twice (once in + the request, once in the reply).""" + + variables = {} + if self.request_records: + for record in self.request_records: + var = record[REC_FIELD] + variables[var.HFName()] = var + + sub_vars = var.SubVariables() + for sv in sub_vars: + variables[sv.HFName()] = sv + + if self.reply_records: + for record in self.reply_records: + var = record[REC_FIELD] + variables[var.HFName()] = var + + sub_vars = var.SubVariables() + for sv in sub_vars: + variables[sv.HFName()] = sv + + return list(variables.values()) + + def CalculateReqConds(self): + """Returns a list of request conditions (dfilter text) used + in the reply records. A request condition is listed only once,""" + texts = {} + if self.reply_records: + for record in self.reply_records: + text = record[REC_REQ_COND] + if text != NO_REQ_COND: + texts[text] = None + + if len(texts) == 0: + self.req_conds = None + return None + + dfilter_texts = list(texts.keys()) + dfilter_texts.sort() + name = "%s_req_cond_indexes" % (self.CName(),) + return NamedList(name, dfilter_texts) + + def GetReqConds(self): + return self.req_conds + + def SetReqConds(self, new_val): + self.req_conds = new_val + + + def CompletionCodes(self, codes=None): + """Sets or returns the list of completion + codes. Internally, a NamedList is used to store the + completion codes, but the caller of this function never + realizes that because Python lists are the input and + output.""" + + if codes == None: + return self.codes + + # Sanity check + okay = 1 + for code in codes: + if code not in errors: + msg.write("Errors table does not have key 0x%04x for NCP=0x%x\n" % (code, + self.__code__)) + okay = 0 + + # Delay the exit until here so that the programmer can get + # the complete list of missing error codes + if not okay: + sys.exit(1) + + # Create CompletionCode (NamedList) object and possible + # add it to the global list of completion code lists. + name = "%s_errors" % (self.CName(),) + codes.sort() + codes_list = NamedList(name, codes) + self.codes = compcode_lists.Add(codes_list) + + self.Finalize() + + def Finalize(self): + """Adds the NCP object to the global collection of NCP + objects. This is done automatically after setting the + CompletionCode list. Yes, this is a shortcut, but it makes + our list of NCP packet definitions look neater, since an + explicit "add to global list of packets" is not needed.""" - # Add packet to global collection of packets - packets.append(self) + # Add packet to global collection of packets + packets.append(self) def rec(start, length, field, endianness=None, **kw): - return _rec(start, length, field, endianness, kw) + return _rec(start, length, field, endianness, kw) def srec(field, endianness=None, **kw): - return _rec(-1, -1, field, endianness, kw) + return _rec(-1, -1, field, endianness, kw) def _rec(start, length, field, endianness, kw): - # If endianness not explicitly given, use the field's - # default endiannes. - if endianness == None: - endianness = field.Endianness() - - # Setting a var? - if kw.has_key("var"): - # Is the field an INT ? - if not isinstance(field, CountingNumber): - sys.exit("Field %s used as count variable, but not integer." \ - % (field.HFName())) - var = kw["var"] - else: - var = None - - # If 'var' not used, 'repeat' can be used. - if not var and kw.has_key("repeat"): - repeat = kw["repeat"] - else: - repeat = None - - # Request-condition ? - if kw.has_key("req_cond"): - req_cond = kw["req_cond"] - else: - req_cond = NO_REQ_COND + # If endianness not explicitly given, use the field's + # default endiannes. + if endianness == None: + endianness = field.Endianness() + + # Setting a var? + if "var" in kw: + # Is the field an INT ? + if not isinstance(field, CountingNumber): + sys.exit("Field %s used as count variable, but not integer." \ + % (field.HFName())) + var = kw["var"] + else: + var = None + + # If 'var' not used, 'repeat' can be used. + if not var and "repeat" in kw: + repeat = kw["repeat"] + else: + repeat = None + + # Request-condition ? + if "req_cond" in kw: + req_cond = kw["req_cond"] + else: + req_cond = NO_REQ_COND - return [start, length, field, endianness, var, repeat, req_cond] + return [start, length, field, endianness, var, repeat, req_cond] ############################################################################## -LE = 1 # Little-Endian -BE = 0 # Big-Endian -NA = -1 # Not Applicable +LE = 1 # Little-Endian +BE = 0 # Big-Endian +NA = -1 # Not Applicable class Type: - " Virtual class for NCP field types" - type = "Type" - ftype = None - disp = "BASE_DEC" - endianness = NA - values = [] + " Virtual class for NCP field types" + type = "Type" + ftype = None + disp = "BASE_DEC" + endianness = NA + values = [] - def __init__(self, abbrev, descr, bytes, endianness = NA): - self.abbrev = abbrev - self.descr = descr - self.bytes = bytes - self.endianness = endianness - self.hfname = "hf_ncp_" + self.abbrev - self.special_fmt = "NCP_FMT_NONE" + def __init__(self, abbrev, descr, bytes, endianness = NA): + self.abbrev = abbrev + self.descr = descr + self.bytes = bytes + self.endianness = endianness + self.hfname = "hf_ncp_" + self.abbrev + self.special_fmt = "NCP_FMT_NONE" - def Length(self): - return self.bytes + def Length(self): + return self.bytes - def Abbreviation(self): - return self.abbrev + def Abbreviation(self): + return self.abbrev - def Description(self): - return self.descr + def Description(self): + return self.descr - def HFName(self): - return self.hfname + def HFName(self): + return self.hfname - def DFilter(self): - return "ncp." + self.abbrev + def DFilter(self): + return "ncp." + self.abbrev - def WiresharkFType(self): - return self.ftype + def WiresharkFType(self): + return self.ftype - def Display(self, newval=None): - if newval != None: - self.disp = newval - return self.disp + def Display(self, newval=None): + if newval != None: + self.disp = newval + return self.disp - def ValuesName(self): - return "NULL" + def ValuesName(self): + return "NULL" - def Mask(self): - return 0 + def Mask(self): + return 0 - def Endianness(self): - return self.endianness + def Endianness(self): + return self.endianness - def SubVariables(self): - return [] + def SubVariables(self): + return [] - def PTVCName(self): - return "NULL" + def PTVCName(self): + return "NULL" - def NWDate(self): - self.special_fmt = "NCP_FMT_NW_DATE" + def NWDate(self): + self.special_fmt = "NCP_FMT_NW_DATE" - def NWTime(self): - self.special_fmt = "NCP_FMT_NW_TIME" + def NWTime(self): + self.special_fmt = "NCP_FMT_NW_TIME" - def NWUnicode(self): - self.special_fmt = "NCP_FMT_UNICODE" + def NWUnicode(self): + self.special_fmt = "NCP_FMT_UNICODE" - def SpecialFmt(self): - return self.special_fmt + def SpecialFmt(self): + return self.special_fmt - def __cmp__(self, other): - return cmp(self.hfname, other.hfname) + #def __cmp__(self, other): + # return cmp(self.hfname, other.hfname) + + def __lt__(self, other): + return (self.hfname < other.hfname) class struct(PTVC, Type): - def __init__(self, name, items, descr=None): - name = "struct_%s" % (name,) - NamedList.__init__(self, name, []) - - self.bytes = 0 - self.descr = descr - for item in items: - if isinstance(item, Type): - field = item - length = field.Length() - endianness = field.Endianness() - var = NO_VAR - repeat = NO_REPEAT - req_cond = NO_REQ_COND - elif type(item) == type([]): - field = item[REC_FIELD] - length = item[REC_LENGTH] - endianness = item[REC_ENDIANNESS] - var = item[REC_VAR] - repeat = item[REC_REPEAT] - req_cond = item[REC_REQ_COND] - else: - assert 0, "Item %s item not handled." % (item,) - - ptvc_rec = PTVCRecord(field, length, endianness, var, - repeat, req_cond) - self.list.append(ptvc_rec) - self.bytes = self.bytes + field.Length() - - self.hfname = self.name - - def Variables(self): - vars = [] - for ptvc_rec in self.list: - vars.append(ptvc_rec.Field()) - return vars - - def ReferenceString(self, var, repeat, req_cond): - return "{ PTVC_STRUCT, NO_LENGTH, &%s, NO_ENDIANNESS, %s, %s, %s, NCP_FMT_NONE }" % \ - (self.name, var, repeat, req_cond) - - def Code(self): - ett_name = self.ETTName() - x = "static gint %s = -1;\n" % (ett_name,) - x = x + "static const ptvc_record ptvc_%s[] = {\n" % (self.name,) - for ptvc_rec in self.list: - x = x + "\t%s,\n" % (ptvc_rec.Code()) - x = x + "\t{ NULL, NO_LENGTH, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }\n" - x = x + "};\n" - - x = x + "static const sub_ptvc_record %s = {\n" % (self.name,) - x = x + "\t&%s,\n" % (ett_name,) - if self.descr: - x = x + '\t"%s",\n' % (self.descr,) - else: - x = x + "\tNULL,\n" - x = x + "\tptvc_%s,\n" % (self.Name(),) - x = x + "};\n" - return x + def __init__(self, name, items, descr=None): + name = "struct_%s" % (name,) + NamedList.__init__(self, name, []) + + self.bytes = 0 + self.descr = descr + for item in items: + if isinstance(item, Type): + field = item + length = field.Length() + endianness = field.Endianness() + var = NO_VAR + repeat = NO_REPEAT + req_cond = NO_REQ_COND + elif type(item) == type([]): + field = item[REC_FIELD] + length = item[REC_LENGTH] + endianness = item[REC_ENDIANNESS] + var = item[REC_VAR] + repeat = item[REC_REPEAT] + req_cond = item[REC_REQ_COND] + else: + assert 0, "Item %s item not handled." % (item,) + + ptvc_rec = PTVCRecord(field, length, endianness, var, + repeat, req_cond) + self.list.append(ptvc_rec) + self.bytes = self.bytes + field.Length() + + self.hfname = self.name + + def Variables(self): + vars = [] + for ptvc_rec in self.list: + vars.append(ptvc_rec.Field()) + return vars + + def ReferenceString(self, var, repeat, req_cond): + return "{ PTVC_STRUCT, NO_LENGTH, &%s, NO_ENDIANNESS, %s, %s, %s, NCP_FMT_NONE }" % \ + (self.name, var, repeat, req_cond) + + def Code(self): + ett_name = self.ETTName() + x = "static gint %s = -1;\n" % (ett_name,) + x = x + "static const ptvc_record ptvc_%s[] = {\n" % (self.name,) + for ptvc_rec in self.list: + x = x + "\t%s,\n" % (ptvc_rec.Code()) + x = x + "\t{ NULL, NO_LENGTH, NULL, NO_ENDIANNESS, NO_VAR, NO_REPEAT, NO_REQ_COND, NCP_FMT_NONE }\n" + x = x + "};\n" + + x = x + "static const sub_ptvc_record %s = {\n" % (self.name,) + x = x + "\t&%s,\n" % (ett_name,) + if self.descr: + x = x + '\t"%s",\n' % (self.descr,) + else: + x = x + "\tNULL,\n" + x = x + "\tptvc_%s,\n" % (self.Name(),) + x = x + "};\n" + return x - def __cmp__(self, other): - return cmp(self.HFName(), other.HFName()) + def __cmp__(self, other): + return cmp(self.HFName(), other.HFName()) class byte(Type): - type = "byte" - ftype = "FT_UINT8" - def __init__(self, abbrev, descr): - Type.__init__(self, abbrev, descr, 1) + type = "byte" + ftype = "FT_UINT8" + def __init__(self, abbrev, descr): + Type.__init__(self, abbrev, descr, 1) class CountingNumber: - pass + pass # Same as above. Both are provided for convenience class uint8(Type, CountingNumber): - type = "uint8" - ftype = "FT_UINT8" - bytes = 1 - def __init__(self, abbrev, descr): - Type.__init__(self, abbrev, descr, 1) + type = "uint8" + ftype = "FT_UINT8" + bytes = 1 + def __init__(self, abbrev, descr): + Type.__init__(self, abbrev, descr, 1) class uint16(Type, CountingNumber): - type = "uint16" - ftype = "FT_UINT16" - def __init__(self, abbrev, descr, endianness = LE): - Type.__init__(self, abbrev, descr, 2, endianness) + type = "uint16" + ftype = "FT_UINT16" + def __init__(self, abbrev, descr, endianness = LE): + Type.__init__(self, abbrev, descr, 2, endianness) class uint24(Type, CountingNumber): - type = "uint24" - ftype = "FT_UINT24" - def __init__(self, abbrev, descr, endianness = LE): - Type.__init__(self, abbrev, descr, 3, endianness) + type = "uint24" + ftype = "FT_UINT24" + def __init__(self, abbrev, descr, endianness = LE): + Type.__init__(self, abbrev, descr, 3, endianness) class uint32(Type, CountingNumber): - type = "uint32" - ftype = "FT_UINT32" - def __init__(self, abbrev, descr, endianness = LE): - Type.__init__(self, abbrev, descr, 4, endianness) + type = "uint32" + ftype = "FT_UINT32" + def __init__(self, abbrev, descr, endianness = LE): + Type.__init__(self, abbrev, descr, 4, endianness) class uint64(Type, CountingNumber): - type = "uint64" - ftype = "FT_UINT64" - def __init__(self, abbrev, descr, endianness = LE): - Type.__init__(self, abbrev, descr, 8, endianness) + type = "uint64" + ftype = "FT_UINT64" + def __init__(self, abbrev, descr, endianness = LE): + Type.__init__(self, abbrev, descr, 8, endianness) class boolean8(uint8): - type = "boolean8" - ftype = "FT_BOOLEAN" - disp = "BASE_NONE" + type = "boolean8" + ftype = "FT_BOOLEAN" + disp = "BASE_NONE" class boolean16(uint16): - type = "boolean16" - ftype = "FT_BOOLEAN" - disp = "BASE_NONE" + type = "boolean16" + ftype = "FT_BOOLEAN" + disp = "BASE_NONE" class boolean24(uint24): - type = "boolean24" - ftype = "FT_BOOLEAN" - disp = "BASE_NONE" + type = "boolean24" + ftype = "FT_BOOLEAN" + disp = "BASE_NONE" class boolean32(uint32): - type = "boolean32" - ftype = "FT_BOOLEAN" - disp = "BASE_NONE" + type = "boolean32" + ftype = "FT_BOOLEAN" + disp = "BASE_NONE" class nstring: - pass + pass class nstring8(Type, nstring): - """A string of up to (2^8)-1 characters. The first byte - gives the string length.""" + """A string of up to (2^8)-1 characters. The first byte + gives the string length.""" - type = "nstring8" - ftype = "FT_UINT_STRING" - disp = "BASE_NONE" - def __init__(self, abbrev, descr): - Type.__init__(self, abbrev, descr, 1) + type = "nstring8" + ftype = "FT_UINT_STRING" + disp = "BASE_NONE" + def __init__(self, abbrev, descr): + Type.__init__(self, abbrev, descr, 1) class nstring16(Type, nstring): - """A string of up to (2^16)-2 characters. The first 2 bytes - gives the string length.""" + """A string of up to (2^16)-2 characters. The first 2 bytes + gives the string length.""" - type = "nstring16" - ftype = "FT_UINT_STRING" - disp = "BASE_NONE" - def __init__(self, abbrev, descr, endianness = LE): - Type.__init__(self, abbrev, descr, 2, endianness) + type = "nstring16" + ftype = "FT_UINT_STRING" + disp = "BASE_NONE" + def __init__(self, abbrev, descr, endianness = LE): + Type.__init__(self, abbrev, descr, 2, endianness) class nstring32(Type, nstring): - """A string of up to (2^32)-4 characters. The first 4 bytes - gives the string length.""" + """A string of up to (2^32)-4 characters. The first 4 bytes + gives the string length.""" - type = "nstring32" - ftype = "FT_UINT_STRING" - disp = "BASE_NONE" - def __init__(self, abbrev, descr, endianness = LE): - Type.__init__(self, abbrev, descr, 4, endianness) + type = "nstring32" + ftype = "FT_UINT_STRING" + disp = "BASE_NONE" + def __init__(self, abbrev, descr, endianness = LE): + Type.__init__(self, abbrev, descr, 4, endianness) class fw_string(Type): - """A fixed-width string of n bytes.""" + """A fixed-width string of n bytes.""" - type = "fw_string" - disp = "BASE_NONE" - ftype = "FT_STRING" + type = "fw_string" + disp = "BASE_NONE" + ftype = "FT_STRING" - def __init__(self, abbrev, descr, bytes): - Type.__init__(self, abbrev, descr, bytes) + def __init__(self, abbrev, descr, bytes): + Type.__init__(self, abbrev, descr, bytes) class stringz(Type): - "NUL-terminated string, with a maximum length" + "NUL-terminated string, with a maximum length" - type = "stringz" - disp = "BASE_NONE" - ftype = "FT_STRINGZ" - def __init__(self, abbrev, descr): - Type.__init__(self, abbrev, descr, PROTO_LENGTH_UNKNOWN) + type = "stringz" + disp = "BASE_NONE" + ftype = "FT_STRINGZ" + def __init__(self, abbrev, descr): + Type.__init__(self, abbrev, descr, PROTO_LENGTH_UNKNOWN) class val_string(Type): - """Abstract class for val_stringN, where N is number - of bits that key takes up.""" + """Abstract class for val_stringN, where N is number + of bits that key takes up.""" - type = "val_string" - disp = 'BASE_HEX' + type = "val_string" + disp = 'BASE_HEX' - def __init__(self, abbrev, descr, val_string_array, endianness = LE): - Type.__init__(self, abbrev, descr, self.bytes, endianness) - self.values = val_string_array - - def Code(self): - result = "static const value_string %s[] = {\n" \ - % (self.ValuesCName()) - for val_record in self.values: - value = val_record[0] - text = val_record[1] - value_repr = self.value_format % value - result = result + '\t{ %s,\t"%s" },\n' \ - % (value_repr, text) - - value_repr = self.value_format % 0 - result = result + "\t{ %s,\tNULL },\n" % (value_repr) - result = result + "};\n" - REC_VAL_STRING_RES = self.value_format % value - return result + def __init__(self, abbrev, descr, val_string_array, endianness = LE): + Type.__init__(self, abbrev, descr, self.bytes, endianness) + self.values = val_string_array + + def Code(self): + result = "static const value_string %s[] = {\n" \ + % (self.ValuesCName()) + for val_record in self.values: + value = val_record[0] + text = val_record[1] + value_repr = self.value_format % value + result = result + '\t{ %s,\t"%s" },\n' \ + % (value_repr, text) + + value_repr = self.value_format % 0 + result = result + "\t{ %s,\tNULL },\n" % (value_repr) + result = result + "};\n" + REC_VAL_STRING_RES = self.value_format % value + return result - def ValuesCName(self): - return "ncp_%s_vals" % (self.abbrev) + def ValuesCName(self): + return "ncp_%s_vals" % (self.abbrev) - def ValuesName(self): - return "VALS(%s)" % (self.ValuesCName()) + def ValuesName(self): + return "VALS(%s)" % (self.ValuesCName()) class val_string8(val_string): - type = "val_string8" - ftype = "FT_UINT8" - bytes = 1 - value_format = "0x%02x" + type = "val_string8" + ftype = "FT_UINT8" + bytes = 1 + value_format = "0x%02x" class val_string16(val_string): - type = "val_string16" - ftype = "FT_UINT16" - bytes = 2 - value_format = "0x%04x" + type = "val_string16" + ftype = "FT_UINT16" + bytes = 2 + value_format = "0x%04x" class val_string32(val_string): - type = "val_string32" - ftype = "FT_UINT32" - bytes = 4 - value_format = "0x%08x" + type = "val_string32" + ftype = "FT_UINT32" + bytes = 4 + value_format = "0x%08x" class bytes(Type): - type = 'bytes' - disp = "BASE_NONE" - ftype = 'FT_BYTES' + type = 'bytes' + disp = "BASE_NONE" + ftype = 'FT_BYTES' - def __init__(self, abbrev, descr, bytes): - Type.__init__(self, abbrev, descr, bytes, NA) + def __init__(self, abbrev, descr, bytes): + Type.__init__(self, abbrev, descr, bytes, NA) class nbytes: - pass + pass class nbytes8(Type, nbytes): - """A series of up to (2^8)-1 bytes. The first byte - gives the byte-string length.""" + """A series of up to (2^8)-1 bytes. The first byte + gives the byte-string length.""" - type = "nbytes8" - ftype = "FT_UINT_BYTES" - disp = "BASE_NONE" - def __init__(self, abbrev, descr, endianness = LE): - Type.__init__(self, abbrev, descr, 1, endianness) + type = "nbytes8" + ftype = "FT_UINT_BYTES" + disp = "BASE_NONE" + def __init__(self, abbrev, descr, endianness = LE): + Type.__init__(self, abbrev, descr, 1, endianness) class nbytes16(Type, nbytes): - """A series of up to (2^16)-2 bytes. The first 2 bytes - gives the byte-string length.""" + """A series of up to (2^16)-2 bytes. The first 2 bytes + gives the byte-string length.""" - type = "nbytes16" - ftype = "FT_UINT_BYTES" - disp = "BASE_NONE" - def __init__(self, abbrev, descr, endianness = LE): - Type.__init__(self, abbrev, descr, 2, endianness) + type = "nbytes16" + ftype = "FT_UINT_BYTES" + disp = "BASE_NONE" + def __init__(self, abbrev, descr, endianness = LE): + Type.__init__(self, abbrev, descr, 2, endianness) class nbytes32(Type, nbytes): - """A series of up to (2^32)-4 bytes. The first 4 bytes - gives the byte-string length.""" + """A series of up to (2^32)-4 bytes. The first 4 bytes + gives the byte-string length.""" - type = "nbytes32" - ftype = "FT_UINT_BYTES" - disp = "BASE_NONE" - def __init__(self, abbrev, descr, endianness = LE): - Type.__init__(self, abbrev, descr, 4, endianness) + type = "nbytes32" + ftype = "FT_UINT_BYTES" + disp = "BASE_NONE" + def __init__(self, abbrev, descr, endianness = LE): + Type.__init__(self, abbrev, descr, 4, endianness) class bf_uint(Type): - type = "bf_uint" - disp = None + type = "bf_uint" + disp = None - def __init__(self, bitmask, abbrev, descr, endianness=LE): - Type.__init__(self, abbrev, descr, self.bytes, endianness) - self.bitmask = bitmask + def __init__(self, bitmask, abbrev, descr, endianness=LE): + Type.__init__(self, abbrev, descr, self.bytes, endianness) + self.bitmask = bitmask - def Mask(self): - return self.bitmask + def Mask(self): + return self.bitmask class bf_val_str(bf_uint): - type = "bf_uint" - disp = None + type = "bf_uint" + disp = None - def __init__(self, bitmask, abbrev, descr, val_string_array, endiannes=LE): - bf_uint.__init__(self, bitmask, abbrev, descr, endiannes) - self.values = val_string_array + def __init__(self, bitmask, abbrev, descr, val_string_array, endiannes=LE): + bf_uint.__init__(self, bitmask, abbrev, descr, endiannes) + self.values = val_string_array - def ValuesName(self): - return "VALS(%s)" % (self.ValuesCName()) + def ValuesName(self): + return "VALS(%s)" % (self.ValuesCName()) class bf_val_str8(bf_val_str, val_string8): - type = "bf_val_str8" - ftype = "FT_UINT8" - disp = "BASE_HEX" - bytes = 1 + type = "bf_val_str8" + ftype = "FT_UINT8" + disp = "BASE_HEX" + bytes = 1 class bf_val_str16(bf_val_str, val_string16): - type = "bf_val_str16" - ftype = "FT_UINT16" - disp = "BASE_HEX" - bytes = 2 + type = "bf_val_str16" + ftype = "FT_UINT16" + disp = "BASE_HEX" + bytes = 2 class bf_val_str32(bf_val_str, val_string32): - type = "bf_val_str32" - ftype = "FT_UINT32" - disp = "BASE_HEX" - bytes = 4 + type = "bf_val_str32" + ftype = "FT_UINT32" + disp = "BASE_HEX" + bytes = 4 class bf_boolean: - disp = "BASE_NONE" + disp = "BASE_NONE" class bf_boolean8(bf_uint, boolean8, bf_boolean): - type = "bf_boolean8" - ftype = "FT_BOOLEAN" - disp = "8" - bytes = 1 + type = "bf_boolean8" + ftype = "FT_BOOLEAN" + disp = "8" + bytes = 1 class bf_boolean16(bf_uint, boolean16, bf_boolean): - type = "bf_boolean16" - ftype = "FT_BOOLEAN" - disp = "16" - bytes = 2 + type = "bf_boolean16" + ftype = "FT_BOOLEAN" + disp = "16" + bytes = 2 class bf_boolean24(bf_uint, boolean24, bf_boolean): - type = "bf_boolean24" - ftype = "FT_BOOLEAN" - disp = "24" - bytes = 3 + type = "bf_boolean24" + ftype = "FT_BOOLEAN" + disp = "24" + bytes = 3 class bf_boolean32(bf_uint, boolean32, bf_boolean): - type = "bf_boolean32" - ftype = "FT_BOOLEAN" - disp = "32" - bytes = 4 + type = "bf_boolean32" + ftype = "FT_BOOLEAN" + disp = "32" + bytes = 4 class bitfield(Type): - type = "bitfield" - disp = 'BASE_HEX' + type = "bitfield" + disp = 'BASE_HEX' - def __init__(self, vars): - var_hash = {} - for var in vars: - if isinstance(var, bf_boolean): - if not isinstance(var, self.bf_type): - print "%s must be of type %s" % \ - (var.Abbreviation(), - self.bf_type) - sys.exit(1) - var_hash[var.bitmask] = var - - bitmasks = var_hash.keys() - bitmasks.sort() - bitmasks.reverse() - - ordered_vars = [] - for bitmask in bitmasks: - var = var_hash[bitmask] - ordered_vars.append(var) - - self.vars = ordered_vars - self.ptvcname = "ncp_%s_bitfield" % (self.abbrev,) - self.hfname = "hf_ncp_%s" % (self.abbrev,) - self.sub_ptvc = PTVCBitfield(self.PTVCName(), self.vars) + def __init__(self, vars): + var_hash = {} + for var in vars: + if isinstance(var, bf_boolean): + if not isinstance(var, self.bf_type): + print("%s must be of type %s" % \ + (var.Abbreviation(), + self.bf_type)) + sys.exit(1) + var_hash[var.bitmask] = var + + bitmasks = list(var_hash.keys()) + bitmasks.sort() + bitmasks.reverse() + + ordered_vars = [] + for bitmask in bitmasks: + var = var_hash[bitmask] + ordered_vars.append(var) + + self.vars = ordered_vars + self.ptvcname = "ncp_%s_bitfield" % (self.abbrev,) + self.hfname = "hf_ncp_%s" % (self.abbrev,) + self.sub_ptvc = PTVCBitfield(self.PTVCName(), self.vars) - def SubVariables(self): - return self.vars + def SubVariables(self): + return self.vars - def SubVariablesPTVC(self): - return self.sub_ptvc + def SubVariablesPTVC(self): + return self.sub_ptvc - def PTVCName(self): - return self.ptvcname + def PTVCName(self): + return self.ptvcname class bitfield8(bitfield, uint8): - type = "bitfield8" - ftype = "FT_UINT8" - bf_type = bf_boolean8 - - def __init__(self, abbrev, descr, vars): - uint8.__init__(self, abbrev, descr) - bitfield.__init__(self, vars) + type = "bitfield8" + ftype = "FT_UINT8" + bf_type = bf_boolean8 + + def __init__(self, abbrev, descr, vars): + uint8.__init__(self, abbrev, descr) + bitfield.__init__(self, vars) class bitfield16(bitfield, uint16): - type = "bitfield16" - ftype = "FT_UINT16" - bf_type = bf_boolean16 - - def __init__(self, abbrev, descr, vars, endianness=LE): - uint16.__init__(self, abbrev, descr, endianness) - bitfield.__init__(self, vars) + type = "bitfield16" + ftype = "FT_UINT16" + bf_type = bf_boolean16 + + def __init__(self, abbrev, descr, vars, endianness=LE): + uint16.__init__(self, abbrev, descr, endianness) + bitfield.__init__(self, vars) class bitfield24(bitfield, uint24): - type = "bitfield24" - ftype = "FT_UINT24" - bf_type = bf_boolean24 - - def __init__(self, abbrev, descr, vars, endianness=LE): - uint24.__init__(self, abbrev, descr, endianness) - bitfield.__init__(self, vars) + type = "bitfield24" + ftype = "FT_UINT24" + bf_type = bf_boolean24 + + def __init__(self, abbrev, descr, vars, endianness=LE): + uint24.__init__(self, abbrev, descr, endianness) + bitfield.__init__(self, vars) class bitfield32(bitfield, uint32): - type = "bitfield32" - ftype = "FT_UINT32" - bf_type = bf_boolean32 - - def __init__(self, abbrev, descr, vars, endianness=LE): - uint32.__init__(self, abbrev, descr, endianness) - bitfield.__init__(self, vars) + type = "bitfield32" + ftype = "FT_UINT32" + bf_type = bf_boolean32 + + def __init__(self, abbrev, descr, vars, endianness=LE): + uint32.__init__(self, abbrev, descr, endianness) + bitfield.__init__(self, vars) # # Force the endianness of a field to a non-default value; used in # the list of fields of a structure. # def endian(field, endianness): - return [-1, field.Length(), field, endianness, NO_VAR, NO_REPEAT, NO_REQ_COND] + return [-1, field.Length(), field, endianness, NO_VAR, NO_REPEAT, NO_REQ_COND] ############################################################################## # NCP Field Types. Defined in Appendix A of "Programmer's Guide..." ############################################################################## -AbortQueueFlag = val_string8("abort_q_flag", "Abort Queue Flag", [ - [ 0x00, "Place at End of Queue" ], - [ 0x01, "Do Not Place Spool File, Examine Flags" ], -]) -AcceptedMaxSize = uint16("accepted_max_size", "Accepted Max Size") -AccessControl = val_string8("access_control", "Access Control", [ - [ 0x00, "Open for read by this client" ], - [ 0x01, "Open for write by this client" ], - [ 0x02, "Deny read requests from other stations" ], - [ 0x03, "Deny write requests from other stations" ], - [ 0x04, "File detached" ], - [ 0x05, "TTS holding detach" ], - [ 0x06, "TTS holding open" ], +AbortQueueFlag = val_string8("abort_q_flag", "Abort Queue Flag", [ + [ 0x00, "Place at End of Queue" ], + [ 0x01, "Do Not Place Spool File, Examine Flags" ], +]) +AcceptedMaxSize = uint16("accepted_max_size", "Accepted Max Size") +AccessControl = val_string8("access_control", "Access Control", [ + [ 0x00, "Open for read by this client" ], + [ 0x01, "Open for write by this client" ], + [ 0x02, "Deny read requests from other stations" ], + [ 0x03, "Deny write requests from other stations" ], + [ 0x04, "File detached" ], + [ 0x05, "TTS holding detach" ], + [ 0x06, "TTS holding open" ], ]) -AccessDate = uint16("access_date", "Access Date") +AccessDate = uint16("access_date", "Access Date") AccessDate.NWDate() -AccessMode = bitfield8("access_mode", "Access Mode", [ - bf_boolean8(0x01, "acc_mode_read", "Read Access"), - bf_boolean8(0x02, "acc_mode_write", "Write Access"), - bf_boolean8(0x04, "acc_mode_deny_read", "Deny Read Access"), - bf_boolean8(0x08, "acc_mode_deny_write", "Deny Write Access"), - bf_boolean8(0x10, "acc_mode_comp", "Compatibility Mode"), -]) -AccessPrivileges = bitfield8("access_privileges", "Access Privileges", [ - bf_boolean8(0x01, "acc_priv_read", "Read Privileges (files only)"), - bf_boolean8(0x02, "acc_priv_write", "Write Privileges (files only)"), - bf_boolean8(0x04, "acc_priv_open", "Open Privileges (files only)"), - bf_boolean8(0x08, "acc_priv_create", "Create Privileges (files only)"), - bf_boolean8(0x10, "acc_priv_delete", "Delete Privileges (files only)"), - bf_boolean8(0x20, "acc_priv_parent", "Parental Privileges (directories only for creating, deleting, and renaming)"), - bf_boolean8(0x40, "acc_priv_search", "Search Privileges (directories only)"), - bf_boolean8(0x80, "acc_priv_modify", "Modify File Status Flags Privileges (files and directories)"), -]) -AccessRightsMask = bitfield8("access_rights_mask", "Access Rights", [ - bf_boolean8(0x0001, "acc_rights_read", "Read Rights"), - bf_boolean8(0x0002, "acc_rights_write", "Write Rights"), - bf_boolean8(0x0004, "acc_rights_open", "Open Rights"), - bf_boolean8(0x0008, "acc_rights_create", "Create Rights"), - bf_boolean8(0x0010, "acc_rights_delete", "Delete Rights"), - bf_boolean8(0x0020, "acc_rights_parent", "Parental Rights"), - bf_boolean8(0x0040, "acc_rights_search", "Search Rights"), - bf_boolean8(0x0080, "acc_rights_modify", "Modify Rights"), -]) -AccessRightsMaskWord = bitfield16("access_rights_mask_word", "Access Rights", [ - bf_boolean16(0x0001, "acc_rights1_read", "Read Rights"), - bf_boolean16(0x0002, "acc_rights1_write", "Write Rights"), - bf_boolean16(0x0004, "acc_rights1_open", "Open Rights"), - bf_boolean16(0x0008, "acc_rights1_create", "Create Rights"), - bf_boolean16(0x0010, "acc_rights1_delete", "Delete Rights"), - bf_boolean16(0x0020, "acc_rights1_parent", "Parental Rights"), - bf_boolean16(0x0040, "acc_rights1_search", "Search Rights"), - bf_boolean16(0x0080, "acc_rights1_modify", "Modify Rights"), - bf_boolean16(0x0100, "acc_rights1_supervisor", "Supervisor Access Rights"), -]) -AccountBalance = uint32("account_balance", "Account Balance") -AccountVersion = uint8("acct_version", "Acct Version") -ActionFlag = bitfield8("action_flag", "Action Flag", [ - bf_boolean8(0x01, "act_flag_open", "Open"), - bf_boolean8(0x02, "act_flag_replace", "Replace"), - bf_boolean8(0x10, "act_flag_create", "Create"), -]) -ActiveConnBitList = fw_string("active_conn_bit_list", "Active Connection List", 512) -ActiveIndexedFiles = uint16("active_indexed_files", "Active Indexed Files") -ActualMaxBinderyObjects = uint16("actual_max_bindery_objects", "Actual Max Bindery Objects") -ActualMaxIndexedFiles = uint16("actual_max_indexed_files", "Actual Max Indexed Files") -ActualMaxOpenFiles = uint16("actual_max_open_files", "Actual Max Open Files") +AccessMode = bitfield8("access_mode", "Access Mode", [ + bf_boolean8(0x01, "acc_mode_read", "Read Access"), + bf_boolean8(0x02, "acc_mode_write", "Write Access"), + bf_boolean8(0x04, "acc_mode_deny_read", "Deny Read Access"), + bf_boolean8(0x08, "acc_mode_deny_write", "Deny Write Access"), + bf_boolean8(0x10, "acc_mode_comp", "Compatibility Mode"), +]) +AccessPrivileges = bitfield8("access_privileges", "Access Privileges", [ + bf_boolean8(0x01, "acc_priv_read", "Read Privileges (files only)"), + bf_boolean8(0x02, "acc_priv_write", "Write Privileges (files only)"), + bf_boolean8(0x04, "acc_priv_open", "Open Privileges (files only)"), + bf_boolean8(0x08, "acc_priv_create", "Create Privileges (files only)"), + bf_boolean8(0x10, "acc_priv_delete", "Delete Privileges (files only)"), + bf_boolean8(0x20, "acc_priv_parent", "Parental Privileges (directories only for creating, deleting, and renaming)"), + bf_boolean8(0x40, "acc_priv_search", "Search Privileges (directories only)"), + bf_boolean8(0x80, "acc_priv_modify", "Modify File Status Flags Privileges (files and directories)"), +]) +AccessRightsMask = bitfield8("access_rights_mask", "Access Rights", [ + bf_boolean8(0x0001, "acc_rights_read", "Read Rights"), + bf_boolean8(0x0002, "acc_rights_write", "Write Rights"), + bf_boolean8(0x0004, "acc_rights_open", "Open Rights"), + bf_boolean8(0x0008, "acc_rights_create", "Create Rights"), + bf_boolean8(0x0010, "acc_rights_delete", "Delete Rights"), + bf_boolean8(0x0020, "acc_rights_parent", "Parental Rights"), + bf_boolean8(0x0040, "acc_rights_search", "Search Rights"), + bf_boolean8(0x0080, "acc_rights_modify", "Modify Rights"), +]) +AccessRightsMaskWord = bitfield16("access_rights_mask_word", "Access Rights", [ + bf_boolean16(0x0001, "acc_rights1_read", "Read Rights"), + bf_boolean16(0x0002, "acc_rights1_write", "Write Rights"), + bf_boolean16(0x0004, "acc_rights1_open", "Open Rights"), + bf_boolean16(0x0008, "acc_rights1_create", "Create Rights"), + bf_boolean16(0x0010, "acc_rights1_delete", "Delete Rights"), + bf_boolean16(0x0020, "acc_rights1_parent", "Parental Rights"), + bf_boolean16(0x0040, "acc_rights1_search", "Search Rights"), + bf_boolean16(0x0080, "acc_rights1_modify", "Modify Rights"), + bf_boolean16(0x0100, "acc_rights1_supervisor", "Supervisor Access Rights"), +]) +AccountBalance = uint32("account_balance", "Account Balance") +AccountVersion = uint8("acct_version", "Acct Version") +ActionFlag = bitfield8("action_flag", "Action Flag", [ + bf_boolean8(0x01, "act_flag_open", "Open"), + bf_boolean8(0x02, "act_flag_replace", "Replace"), + bf_boolean8(0x10, "act_flag_create", "Create"), +]) +ActiveConnBitList = fw_string("active_conn_bit_list", "Active Connection List", 512) +ActiveIndexedFiles = uint16("active_indexed_files", "Active Indexed Files") +ActualMaxBinderyObjects = uint16("actual_max_bindery_objects", "Actual Max Bindery Objects") +ActualMaxIndexedFiles = uint16("actual_max_indexed_files", "Actual Max Indexed Files") +ActualMaxOpenFiles = uint16("actual_max_open_files", "Actual Max Open Files") ActualMaxSimultaneousTransactions = uint16("actual_max_sim_trans", "Actual Max Simultaneous Transactions") -ActualMaxUsedDirectoryEntries = uint16("actual_max_used_directory_entries", "Actual Max Used Directory Entries") -ActualMaxUsedRoutingBuffers = uint16("actual_max_used_routing_buffers", "Actual Max Used Routing Buffers") -ActualResponseCount = uint16("actual_response_count", "Actual Response Count") +ActualMaxUsedDirectoryEntries = uint16("actual_max_used_directory_entries", "Actual Max Used Directory Entries") +ActualMaxUsedRoutingBuffers = uint16("actual_max_used_routing_buffers", "Actual Max Used Routing Buffers") +ActualResponseCount = uint16("actual_response_count", "Actual Response Count") AddNameSpaceAndVol = stringz("add_nm_spc_and_vol", "Add Name Space and Volume") -AFPEntryID = uint32("afp_entry_id", "AFP Entry ID", BE) +AFPEntryID = uint32("afp_entry_id", "AFP Entry ID", BE) AFPEntryID.Display("BASE_HEX") -AllocAvailByte = uint32("alloc_avail_byte", "Bytes Available for Allocation") -AllocateMode = bitfield16("alloc_mode", "Allocate Mode", [ - bf_val_str16(0x0001, "alloc_dir_hdl", "Dir Handle Type",[ +AllocAvailByte = uint32("alloc_avail_byte", "Bytes Available for Allocation") +AllocateMode = bitfield16("alloc_mode", "Allocate Mode", [ + bf_val_str16(0x0001, "alloc_dir_hdl", "Dir Handle Type",[ [0x00, "Permanent"], [0x01, "Temporary"], ]), - bf_boolean16(0x0002, "alloc_spec_temp_dir_hdl","Special Temporary Directory Handle"), + bf_boolean16(0x0002, "alloc_spec_temp_dir_hdl","Special Temporary Directory Handle"), bf_boolean16(0x4000, "alloc_reply_lvl2","Reply Level 2"), bf_boolean16(0x8000, "alloc_dst_name_spc","Destination Name Space Input Parameter"), ]) -AllocationBlockSize = uint32("allocation_block_size", "Allocation Block Size") -AllocFreeCount = uint32("alloc_free_count", "Reclaimable Free Bytes") -ApplicationNumber = uint16("application_number", "Application Number") -ArchivedTime = uint16("archived_time", "Archived Time") +AllocationBlockSize = uint32("allocation_block_size", "Allocation Block Size") +AllocFreeCount = uint32("alloc_free_count", "Reclaimable Free Bytes") +ApplicationNumber = uint16("application_number", "Application Number") +ArchivedTime = uint16("archived_time", "Archived Time") ArchivedTime.NWTime() -ArchivedDate = uint16("archived_date", "Archived Date") +ArchivedDate = uint16("archived_date", "Archived Date") ArchivedDate.NWDate() -ArchiverID = uint32("archiver_id", "Archiver ID", BE) +ArchiverID = uint32("archiver_id", "Archiver ID", BE) ArchiverID.Display("BASE_HEX") -AssociatedNameSpace = uint8("associated_name_space", "Associated Name Space") -AttachDuringProcessing = uint16("attach_during_processing", "Attach During Processing") -AttachedIndexedFiles = uint8("attached_indexed_files", "Attached Indexed Files") -AttachWhileProcessingAttach = uint16("attach_while_processing_attach", "Attach While Processing Attach") -Attributes = uint32("attributes", "Attributes") -AttributesDef = bitfield8("attr_def", "Attributes", [ - bf_boolean8(0x01, "att_def_ro", "Read Only"), - bf_boolean8(0x02, "att_def_hidden", "Hidden"), - bf_boolean8(0x04, "att_def_system", "System"), - bf_boolean8(0x08, "att_def_execute", "Execute"), - bf_boolean8(0x10, "att_def_sub_only", "Subdirectory"), - bf_boolean8(0x20, "att_def_archive", "Archive"), - bf_boolean8(0x80, "att_def_shareable", "Shareable"), -]) -AttributesDef16 = bitfield16("attr_def_16", "Attributes", [ - bf_boolean16(0x0001, "att_def16_ro", "Read Only"), - bf_boolean16(0x0002, "att_def16_hidden", "Hidden"), - bf_boolean16(0x0004, "att_def16_system", "System"), - bf_boolean16(0x0008, "att_def16_execute", "Execute"), - bf_boolean16(0x0010, "att_def16_sub_only", "Subdirectory"), - bf_boolean16(0x0020, "att_def16_archive", "Archive"), - bf_boolean16(0x0080, "att_def16_shareable", "Shareable"), - bf_boolean16(0x1000, "att_def16_transaction", "Transactional"), - bf_boolean16(0x4000, "att_def16_read_audit", "Read Audit"), - bf_boolean16(0x8000, "att_def16_write_audit", "Write Audit"), -]) -AttributesDef32 = bitfield32("attr_def_32", "Attributes", [ - bf_boolean32(0x00000001, "att_def32_ro", "Read Only"), - bf_boolean32(0x00000002, "att_def32_hidden", "Hidden"), - bf_boolean32(0x00000004, "att_def32_system", "System"), - bf_boolean32(0x00000008, "att_def32_execute", "Execute"), - bf_boolean32(0x00000010, "att_def32_sub_only", "Subdirectory"), - bf_boolean32(0x00000020, "att_def32_archive", "Archive"), +AssociatedNameSpace = uint8("associated_name_space", "Associated Name Space") +AttachDuringProcessing = uint16("attach_during_processing", "Attach During Processing") +AttachedIndexedFiles = uint8("attached_indexed_files", "Attached Indexed Files") +AttachWhileProcessingAttach = uint16("attach_while_processing_attach", "Attach While Processing Attach") +Attributes = uint32("attributes", "Attributes") +AttributesDef = bitfield8("attr_def", "Attributes", [ + bf_boolean8(0x01, "att_def_ro", "Read Only"), + bf_boolean8(0x02, "att_def_hidden", "Hidden"), + bf_boolean8(0x04, "att_def_system", "System"), + bf_boolean8(0x08, "att_def_execute", "Execute"), + bf_boolean8(0x10, "att_def_sub_only", "Subdirectory"), + bf_boolean8(0x20, "att_def_archive", "Archive"), + bf_boolean8(0x80, "att_def_shareable", "Shareable"), +]) +AttributesDef16 = bitfield16("attr_def_16", "Attributes", [ + bf_boolean16(0x0001, "att_def16_ro", "Read Only"), + bf_boolean16(0x0002, "att_def16_hidden", "Hidden"), + bf_boolean16(0x0004, "att_def16_system", "System"), + bf_boolean16(0x0008, "att_def16_execute", "Execute"), + bf_boolean16(0x0010, "att_def16_sub_only", "Subdirectory"), + bf_boolean16(0x0020, "att_def16_archive", "Archive"), + bf_boolean16(0x0080, "att_def16_shareable", "Shareable"), + bf_boolean16(0x1000, "att_def16_transaction", "Transactional"), + bf_boolean16(0x4000, "att_def16_read_audit", "Read Audit"), + bf_boolean16(0x8000, "att_def16_write_audit", "Write Audit"), +]) +AttributesDef32 = bitfield32("attr_def_32", "Attributes", [ + bf_boolean32(0x00000001, "att_def32_ro", "Read Only"), + bf_boolean32(0x00000002, "att_def32_hidden", "Hidden"), + bf_boolean32(0x00000004, "att_def32_system", "System"), + bf_boolean32(0x00000008, "att_def32_execute", "Execute"), + bf_boolean32(0x00000010, "att_def32_sub_only", "Subdirectory"), + bf_boolean32(0x00000020, "att_def32_archive", "Archive"), bf_boolean32(0x00000040, "att_def32_execute_confirm", "Execute Confirm"), - bf_boolean32(0x00000080, "att_def32_shareable", "Shareable"), - bf_val_str32(0x00000700, "att_def32_search", "Search Mode",[ + bf_boolean32(0x00000080, "att_def32_shareable", "Shareable"), + bf_val_str32(0x00000700, "att_def32_search", "Search Mode",[ [0, "Search on all Read Only Opens"], [1, "Search on Read Only Opens with no Path"], [2, "Shell Default Search Mode"], @@ -1332,878 +1335,878 @@ [6, "Search on All Opens"], [7, "Reserved - Do not Use"], ]), - bf_boolean32(0x00000800, "att_def32_no_suballoc", "No Suballoc"), - bf_boolean32(0x00001000, "att_def32_transaction", "Transactional"), - bf_boolean32(0x00004000, "att_def32_read_audit", "Read Audit"), - bf_boolean32(0x00008000, "att_def32_write_audit", "Write Audit"), - bf_boolean32(0x00010000, "att_def32_purge", "Immediate Purge"), - bf_boolean32(0x00020000, "att_def32_reninhibit", "Rename Inhibit"), - bf_boolean32(0x00040000, "att_def32_delinhibit", "Delete Inhibit"), - bf_boolean32(0x00080000, "att_def32_cpyinhibit", "Copy Inhibit"), - bf_boolean32(0x00100000, "att_def32_file_audit", "File Audit"), - bf_boolean32(0x00200000, "att_def32_reserved", "Reserved"), - bf_boolean32(0x00400000, "att_def32_data_migrate", "Data Migrated"), - bf_boolean32(0x00800000, "att_def32_inhibit_dm", "Inhibit Data Migration"), - bf_boolean32(0x01000000, "att_def32_dm_save_key", "Data Migration Save Key"), - bf_boolean32(0x02000000, "att_def32_im_comp", "Immediate Compress"), - bf_boolean32(0x04000000, "att_def32_comp", "Compressed"), - bf_boolean32(0x08000000, "att_def32_comp_inhibit", "Inhibit Compression"), - bf_boolean32(0x10000000, "att_def32_reserved2", "Reserved"), - bf_boolean32(0x20000000, "att_def32_cant_compress", "Can't Compress"), - bf_boolean32(0x40000000, "att_def32_attr_archive", "Archive Attributes"), - bf_boolean32(0x80000000, "att_def32_reserved3", "Reserved"), + bf_boolean32(0x00000800, "att_def32_no_suballoc", "No Suballoc"), + bf_boolean32(0x00001000, "att_def32_transaction", "Transactional"), + bf_boolean32(0x00004000, "att_def32_read_audit", "Read Audit"), + bf_boolean32(0x00008000, "att_def32_write_audit", "Write Audit"), + bf_boolean32(0x00010000, "att_def32_purge", "Immediate Purge"), + bf_boolean32(0x00020000, "att_def32_reninhibit", "Rename Inhibit"), + bf_boolean32(0x00040000, "att_def32_delinhibit", "Delete Inhibit"), + bf_boolean32(0x00080000, "att_def32_cpyinhibit", "Copy Inhibit"), + bf_boolean32(0x00100000, "att_def32_file_audit", "File Audit"), + bf_boolean32(0x00200000, "att_def32_reserved", "Reserved"), + bf_boolean32(0x00400000, "att_def32_data_migrate", "Data Migrated"), + bf_boolean32(0x00800000, "att_def32_inhibit_dm", "Inhibit Data Migration"), + bf_boolean32(0x01000000, "att_def32_dm_save_key", "Data Migration Save Key"), + bf_boolean32(0x02000000, "att_def32_im_comp", "Immediate Compress"), + bf_boolean32(0x04000000, "att_def32_comp", "Compressed"), + bf_boolean32(0x08000000, "att_def32_comp_inhibit", "Inhibit Compression"), + bf_boolean32(0x10000000, "att_def32_reserved2", "Reserved"), + bf_boolean32(0x20000000, "att_def32_cant_compress", "Can't Compress"), + bf_boolean32(0x40000000, "att_def32_attr_archive", "Archive Attributes"), + bf_boolean32(0x80000000, "att_def32_reserved3", "Reserved"), ]) -AttributeValidFlag = uint32("attribute_valid_flag", "Attribute Valid Flag") +AttributeValidFlag = uint32("attribute_valid_flag", "Attribute Valid Flag") AuditFileVersionDate = uint16("audit_file_ver_date", "Audit File Version Date") AuditFileVersionDate.NWDate() -AuditFlag = val_string8("audit_flag", "Audit Flag", [ - [ 0x00, "Do NOT audit object" ], - [ 0x01, "Audit object" ], +AuditFlag = val_string8("audit_flag", "Audit Flag", [ + [ 0x00, "Do NOT audit object" ], + [ 0x01, "Audit object" ], ]) -AuditHandle = uint32("audit_handle", "Audit File Handle") +AuditHandle = uint32("audit_handle", "Audit File Handle") AuditHandle.Display("BASE_HEX") -AuditID = uint32("audit_id", "Audit ID", BE) +AuditID = uint32("audit_id", "Audit ID", BE) AuditID.Display("BASE_HEX") -AuditIDType = val_string16("audit_id_type", "Audit ID Type", [ - [ 0x0000, "Volume" ], - [ 0x0001, "Container" ], +AuditIDType = val_string16("audit_id_type", "Audit ID Type", [ + [ 0x0000, "Volume" ], + [ 0x0001, "Container" ], ]) AuditVersionDate = uint16("audit_ver_date", "Auditing Version Date") AuditVersionDate.NWDate() -AvailableBlocks = uint32("available_blocks", "Available Blocks") -AvailableClusters = uint16("available_clusters", "Available Clusters") -AvailableDirectorySlots = uint16("available_directory_slots", "Available Directory Slots") -AvailableDirEntries = uint32("available_dir_entries", "Available Directory Entries") -AvailableIndexedFiles = uint16("available_indexed_files", "Available Indexed Files") - -BackgroundAgedWrites = uint32("background_aged_writes", "Background Aged Writes") -BackgroundDirtyWrites = uint32("background_dirty_writes", "Background Dirty Writes") -BadLogicalConnectionCount = uint16("bad_logical_connection_count", "Bad Logical Connection Count") -BannerName = fw_string("banner_name", "Banner Name", 14) -BaseDirectoryID = uint32("base_directory_id", "Base Directory ID", BE) +AvailableBlocks = uint32("available_blocks", "Available Blocks") +AvailableClusters = uint16("available_clusters", "Available Clusters") +AvailableDirectorySlots = uint16("available_directory_slots", "Available Directory Slots") +AvailableDirEntries = uint32("available_dir_entries", "Available Directory Entries") +AvailableIndexedFiles = uint16("available_indexed_files", "Available Indexed Files") + +BackgroundAgedWrites = uint32("background_aged_writes", "Background Aged Writes") +BackgroundDirtyWrites = uint32("background_dirty_writes", "Background Dirty Writes") +BadLogicalConnectionCount = uint16("bad_logical_connection_count", "Bad Logical Connection Count") +BannerName = fw_string("banner_name", "Banner Name", 14) +BaseDirectoryID = uint32("base_directory_id", "Base Directory ID", BE) BaseDirectoryID.Display("BASE_HEX") -binderyContext = nstring8("bindery_context", "Bindery Context") -BitMap = bytes("bit_map", "Bit Map", 512) +binderyContext = nstring8("bindery_context", "Bindery Context") +BitMap = bytes("bit_map", "Bit Map", 512) BlockNumber = uint32("block_number", "Block Number") -BlockSize = uint16("block_size", "Block Size") -BlockSizeInSectors = uint32("block_size_in_sectors", "Block Size in Sectors") -BoardInstalled = uint8("board_installed", "Board Installed") +BlockSize = uint16("block_size", "Block Size") +BlockSizeInSectors = uint32("block_size_in_sectors", "Block Size in Sectors") +BoardInstalled = uint8("board_installed", "Board Installed") BoardNumber = uint32("board_number", "Board Number") BoardNumbers = uint32("board_numbers", "Board Numbers") -BufferSize = uint16("buffer_size", "Buffer Size") -BusString = stringz("bus_string", "Bus String") -BusType = val_string8("bus_type", "Bus Type", [ - [0x00, "ISA"], - [0x01, "Micro Channel" ], - [0x02, "EISA"], - [0x04, "PCI"], - [0x08, "PCMCIA"], - [0x10, "ISA"], +BufferSize = uint16("buffer_size", "Buffer Size") +BusString = stringz("bus_string", "Bus String") +BusType = val_string8("bus_type", "Bus Type", [ + [0x00, "ISA"], + [0x01, "Micro Channel" ], + [0x02, "EISA"], + [0x04, "PCI"], + [0x08, "PCMCIA"], + [0x10, "ISA"], [0x14, "ISA/PCI"], ]) -BytesActuallyTransferred = uint32("bytes_actually_transferred", "Bytes Actually Transferred") -BytesRead = fw_string("bytes_read", "Bytes Read", 6) -BytesToCopy = uint32("bytes_to_copy", "Bytes to Copy") -BytesWritten = fw_string("bytes_written", "Bytes Written", 6) - -CacheAllocations = uint32("cache_allocations", "Cache Allocations") -CacheBlockScrapped = uint16("cache_block_scrapped", "Cache Block Scrapped") -CacheBufferCount = uint16("cache_buffer_count", "Cache Buffer Count") -CacheBufferSize = uint16("cache_buffer_size", "Cache Buffer Size") -CacheFullWriteRequests = uint32("cache_full_write_requests", "Cache Full Write Requests") -CacheGetRequests = uint32("cache_get_requests", "Cache Get Requests") -CacheHitOnUnavailableBlock = uint16("cache_hit_on_unavailable_block", "Cache Hit On Unavailable Block") -CacheHits = uint32("cache_hits", "Cache Hits") -CacheMisses = uint32("cache_misses", "Cache Misses") -CachePartialWriteRequests = uint32("cache_partial_write_requests", "Cache Partial Write Requests") -CacheReadRequests = uint32("cache_read_requests", "Cache Read Requests") -CacheWriteRequests = uint32("cache_write_requests", "Cache Write Requests") +BytesActuallyTransferred = uint32("bytes_actually_transferred", "Bytes Actually Transferred") +BytesRead = fw_string("bytes_read", "Bytes Read", 6) +BytesToCopy = uint32("bytes_to_copy", "Bytes to Copy") +BytesWritten = fw_string("bytes_written", "Bytes Written", 6) + +CacheAllocations = uint32("cache_allocations", "Cache Allocations") +CacheBlockScrapped = uint16("cache_block_scrapped", "Cache Block Scrapped") +CacheBufferCount = uint16("cache_buffer_count", "Cache Buffer Count") +CacheBufferSize = uint16("cache_buffer_size", "Cache Buffer Size") +CacheFullWriteRequests = uint32("cache_full_write_requests", "Cache Full Write Requests") +CacheGetRequests = uint32("cache_get_requests", "Cache Get Requests") +CacheHitOnUnavailableBlock = uint16("cache_hit_on_unavailable_block", "Cache Hit On Unavailable Block") +CacheHits = uint32("cache_hits", "Cache Hits") +CacheMisses = uint32("cache_misses", "Cache Misses") +CachePartialWriteRequests = uint32("cache_partial_write_requests", "Cache Partial Write Requests") +CacheReadRequests = uint32("cache_read_requests", "Cache Read Requests") +CacheWriteRequests = uint32("cache_write_requests", "Cache Write Requests") CategoryName = stringz("category_name", "Category Name") -CCFileHandle = uint32("cc_file_handle", "File Handle") +CCFileHandle = uint32("cc_file_handle", "File Handle") CCFileHandle.Display("BASE_HEX") -CCFunction = val_string8("cc_function", "OP-Lock Flag", [ - [ 0x01, "Clear OP-Lock" ], - [ 0x02, "Acknowledge Callback" ], - [ 0x03, "Decline Callback" ], +CCFunction = val_string8("cc_function", "OP-Lock Flag", [ + [ 0x01, "Clear OP-Lock" ], + [ 0x02, "Acknowledge Callback" ], + [ 0x03, "Decline Callback" ], [ 0x04, "Level 2" ], ]) -ChangeBits = bitfield16("change_bits", "Change Bits", [ - bf_boolean16(0x0001, "change_bits_modify", "Modify Name"), - bf_boolean16(0x0002, "change_bits_fatt", "File Attributes"), - bf_boolean16(0x0004, "change_bits_cdate", "Creation Date"), - bf_boolean16(0x0008, "change_bits_ctime", "Creation Time"), - bf_boolean16(0x0010, "change_bits_owner", "Owner ID"), - bf_boolean16(0x0020, "change_bits_adate", "Archive Date"), - bf_boolean16(0x0040, "change_bits_atime", "Archive Time"), - bf_boolean16(0x0080, "change_bits_aid", "Archiver ID"), +ChangeBits = bitfield16("change_bits", "Change Bits", [ + bf_boolean16(0x0001, "change_bits_modify", "Modify Name"), + bf_boolean16(0x0002, "change_bits_fatt", "File Attributes"), + bf_boolean16(0x0004, "change_bits_cdate", "Creation Date"), + bf_boolean16(0x0008, "change_bits_ctime", "Creation Time"), + bf_boolean16(0x0010, "change_bits_owner", "Owner ID"), + bf_boolean16(0x0020, "change_bits_adate", "Archive Date"), + bf_boolean16(0x0040, "change_bits_atime", "Archive Time"), + bf_boolean16(0x0080, "change_bits_aid", "Archiver ID"), bf_boolean16(0x0100, "change_bits_udate", "Update Date"), - bf_boolean16(0x0200, "change_bits_utime", "Update Time"), - bf_boolean16(0x0400, "change_bits_uid", "Update ID"), - bf_boolean16(0x0800, "change_bits_acc_date", "Access Date"), - bf_boolean16(0x1000, "change_bits_max_acc_mask", "Maximum Access Mask"), - bf_boolean16(0x2000, "change_bits_max_space", "Maximum Space"), -]) -ChannelState = val_string8("channel_state", "Channel State", [ - [ 0x00, "Channel is running" ], - [ 0x01, "Channel is stopping" ], - [ 0x02, "Channel is stopped" ], - [ 0x03, "Channel is not functional" ], -]) -ChannelSynchronizationState = val_string8("channel_synchronization_state", "Channel Synchronization State", [ - [ 0x00, "Channel is not being used" ], - [ 0x02, "NetWare is using the channel; no one else wants it" ], - [ 0x04, "NetWare is using the channel; someone else wants it" ], - [ 0x06, "Someone else is using the channel; NetWare does not need it" ], - [ 0x08, "Someone else is using the channel; NetWare needs it" ], - [ 0x0A, "Someone else has released the channel; NetWare should use it" ], -]) -ChargeAmount = uint32("charge_amount", "Charge Amount") -ChargeInformation = uint32("charge_information", "Charge Information") -ClientCompFlag = val_string16("client_comp_flag", "Completion Flag", [ - [ 0x0000, "Successful" ], - [ 0x0001, "Illegal Station Number" ], - [ 0x0002, "Client Not Logged In" ], - [ 0x0003, "Client Not Accepting Messages" ], - [ 0x0004, "Client Already has a Message" ], - [ 0x0096, "No Alloc Space for the Message" ], - [ 0x00fd, "Bad Station Number" ], - [ 0x00ff, "Failure" ], + bf_boolean16(0x0200, "change_bits_utime", "Update Time"), + bf_boolean16(0x0400, "change_bits_uid", "Update ID"), + bf_boolean16(0x0800, "change_bits_acc_date", "Access Date"), + bf_boolean16(0x1000, "change_bits_max_acc_mask", "Maximum Access Mask"), + bf_boolean16(0x2000, "change_bits_max_space", "Maximum Space"), +]) +ChannelState = val_string8("channel_state", "Channel State", [ + [ 0x00, "Channel is running" ], + [ 0x01, "Channel is stopping" ], + [ 0x02, "Channel is stopped" ], + [ 0x03, "Channel is not functional" ], +]) +ChannelSynchronizationState = val_string8("channel_synchronization_state", "Channel Synchronization State", [ + [ 0x00, "Channel is not being used" ], + [ 0x02, "NetWare is using the channel; no one else wants it" ], + [ 0x04, "NetWare is using the channel; someone else wants it" ], + [ 0x06, "Someone else is using the channel; NetWare does not need it" ], + [ 0x08, "Someone else is using the channel; NetWare needs it" ], + [ 0x0A, "Someone else has released the channel; NetWare should use it" ], +]) +ChargeAmount = uint32("charge_amount", "Charge Amount") +ChargeInformation = uint32("charge_information", "Charge Information") +ClientCompFlag = val_string16("client_comp_flag", "Completion Flag", [ + [ 0x0000, "Successful" ], + [ 0x0001, "Illegal Station Number" ], + [ 0x0002, "Client Not Logged In" ], + [ 0x0003, "Client Not Accepting Messages" ], + [ 0x0004, "Client Already has a Message" ], + [ 0x0096, "No Alloc Space for the Message" ], + [ 0x00fd, "Bad Station Number" ], + [ 0x00ff, "Failure" ], ]) -ClientIDNumber = uint32("client_id_number", "Client ID Number", BE) +ClientIDNumber = uint32("client_id_number", "Client ID Number", BE) ClientIDNumber.Display("BASE_HEX") -ClientList = uint32("client_list", "Client List") -ClientListCount = uint16("client_list_cnt", "Client List Count") -ClientListLen = uint8("client_list_len", "Client List Length") -ClientName = nstring8("client_name", "Client Name") -ClientRecordArea = fw_string("client_record_area", "Client Record Area", 152) -ClientStation = uint8("client_station", "Client Station") -ClientStationLong = uint32("client_station_long", "Client Station") -ClientTaskNumber = uint8("client_task_number", "Client Task Number") -ClientTaskNumberLong = uint32("client_task_number_long", "Client Task Number") -ClusterCount = uint16("cluster_count", "Cluster Count") -ClustersUsedByDirectories = uint32("clusters_used_by_directories", "Clusters Used by Directories") +ClientList = uint32("client_list", "Client List") +ClientListCount = uint16("client_list_cnt", "Client List Count") +ClientListLen = uint8("client_list_len", "Client List Length") +ClientName = nstring8("client_name", "Client Name") +ClientRecordArea = fw_string("client_record_area", "Client Record Area", 152) +ClientStation = uint8("client_station", "Client Station") +ClientStationLong = uint32("client_station_long", "Client Station") +ClientTaskNumber = uint8("client_task_number", "Client Task Number") +ClientTaskNumberLong = uint32("client_task_number_long", "Client Task Number") +ClusterCount = uint16("cluster_count", "Cluster Count") +ClustersUsedByDirectories = uint32("clusters_used_by_directories", "Clusters Used by Directories") ClustersUsedByExtendedDirectories = uint32("clusters_used_by_extended_dirs", "Clusters Used by Extended Directories") -ClustersUsedByFAT = uint32("clusters_used_by_fat", "Clusters Used by FAT") +ClustersUsedByFAT = uint32("clusters_used_by_fat", "Clusters Used by FAT") CodePage = uint32("code_page", "Code Page") ComCnts = uint16("com_cnts", "Communication Counters") -Comment = nstring8("comment", "Comment") -CommentType = uint16("comment_type", "Comment Type") -CompletionCode = uint32("ncompletion_code", "Completion Code") -CompressedDataStreamsCount = uint32("compressed_data_streams_count", "Compressed Data Streams Count") -CompressedLimboDataStreamsCount = uint32("compressed_limbo_data_streams_count", "Compressed Limbo Data Streams Count") -CompressedSectors = uint32("compressed_sectors", "Compressed Sectors") +Comment = nstring8("comment", "Comment") +CommentType = uint16("comment_type", "Comment Type") +CompletionCode = uint32("ncompletion_code", "Completion Code") +CompressedDataStreamsCount = uint32("compressed_data_streams_count", "Compressed Data Streams Count") +CompressedLimboDataStreamsCount = uint32("compressed_limbo_data_streams_count", "Compressed Limbo Data Streams Count") +CompressedSectors = uint32("compressed_sectors", "Compressed Sectors") compressionStage = uint32("compression_stage", "Compression Stage") compressVolume = uint32("compress_volume", "Volume Compression") ConfigMajorVN = uint8("config_major_vn", "Configuration Major Version Number") ConfigMinorVN = uint8("config_minor_vn", "Configuration Minor Version Number") -ConfigurationDescription = fw_string("configuration_description", "Configuration Description", 80) -ConfigurationText = fw_string("configuration_text", "Configuration Text", 160) -ConfiguredMaxBinderyObjects = uint16("configured_max_bindery_objects", "Configured Max Bindery Objects") -ConfiguredMaxOpenFiles = uint16("configured_max_open_files", "Configured Max Open Files") -ConfiguredMaxRoutingBuffers = uint16("configured_max_routing_buffers", "Configured Max Routing Buffers") +ConfigurationDescription = fw_string("configuration_description", "Configuration Description", 80) +ConfigurationText = fw_string("configuration_text", "Configuration Text", 160) +ConfiguredMaxBinderyObjects = uint16("configured_max_bindery_objects", "Configured Max Bindery Objects") +ConfiguredMaxOpenFiles = uint16("configured_max_open_files", "Configured Max Open Files") +ConfiguredMaxRoutingBuffers = uint16("configured_max_routing_buffers", "Configured Max Routing Buffers") ConfiguredMaxSimultaneousTransactions = uint16("cfg_max_simultaneous_transactions", "Configured Max Simultaneous Transactions") ConnectedLAN = uint32("connected_lan", "LAN Adapter") -ConnectionControlBits = bitfield8("conn_ctrl_bits", "Connection Control", [ - bf_boolean8(0x01, "enable_brdcasts", "Enable Broadcasts"), - bf_boolean8(0x02, "enable_personal_brdcasts", "Enable Personal Broadcasts"), - bf_boolean8(0x04, "enable_wdog_messages", "Enable Watchdog Message"), - bf_boolean8(0x10, "disable_brdcasts", "Disable Broadcasts"), - bf_boolean8(0x20, "disable_personal_brdcasts", "Disable Personal Broadcasts"), - bf_boolean8(0x40, "disable_wdog_messages", "Disable Watchdog Message"), -]) -ConnectionListCount = uint32("conn_list_count", "Connection List Count") -ConnectionList = uint32("connection_list", "Connection List") -ConnectionNumber = uint32("connection_number", "Connection Number", BE) -ConnectionNumberList = nstring8("connection_number_list", "Connection Number List") -ConnectionNumberWord = uint16("conn_number_word", "Connection Number") -ConnectionNumberByte = uint8("conn_number_byte", "Connection Number") -ConnectionServiceType = val_string8("connection_service_type","Connection Service Type",[ - [ 0x01, "CLIB backward Compatibility" ], - [ 0x02, "NCP Connection" ], - [ 0x03, "NLM Connection" ], - [ 0x04, "AFP Connection" ], - [ 0x05, "FTAM Connection" ], - [ 0x06, "ANCP Connection" ], - [ 0x07, "ACP Connection" ], - [ 0x08, "SMB Connection" ], - [ 0x09, "Winsock Connection" ], -]) -ConnectionsInUse = uint16("connections_in_use", "Connections In Use") -ConnectionsMaxUsed = uint16("connections_max_used", "Connections Max Used") -ConnectionsSupportedMax = uint16("connections_supported_max", "Connections Supported Max") -ConnectionType = val_string8("connection_type", "Connection Type", [ - [ 0x00, "Not in use" ], - [ 0x02, "NCP" ], - [ 0x0b, "UDP (for IP)" ], +ConnectionControlBits = bitfield8("conn_ctrl_bits", "Connection Control", [ + bf_boolean8(0x01, "enable_brdcasts", "Enable Broadcasts"), + bf_boolean8(0x02, "enable_personal_brdcasts", "Enable Personal Broadcasts"), + bf_boolean8(0x04, "enable_wdog_messages", "Enable Watchdog Message"), + bf_boolean8(0x10, "disable_brdcasts", "Disable Broadcasts"), + bf_boolean8(0x20, "disable_personal_brdcasts", "Disable Personal Broadcasts"), + bf_boolean8(0x40, "disable_wdog_messages", "Disable Watchdog Message"), +]) +ConnectionListCount = uint32("conn_list_count", "Connection List Count") +ConnectionList = uint32("connection_list", "Connection List") +ConnectionNumber = uint32("connection_number", "Connection Number", BE) +ConnectionNumberList = nstring8("connection_number_list", "Connection Number List") +ConnectionNumberWord = uint16("conn_number_word", "Connection Number") +ConnectionNumberByte = uint8("conn_number_byte", "Connection Number") +ConnectionServiceType = val_string8("connection_service_type","Connection Service Type",[ + [ 0x01, "CLIB backward Compatibility" ], + [ 0x02, "NCP Connection" ], + [ 0x03, "NLM Connection" ], + [ 0x04, "AFP Connection" ], + [ 0x05, "FTAM Connection" ], + [ 0x06, "ANCP Connection" ], + [ 0x07, "ACP Connection" ], + [ 0x08, "SMB Connection" ], + [ 0x09, "Winsock Connection" ], +]) +ConnectionsInUse = uint16("connections_in_use", "Connections In Use") +ConnectionsMaxUsed = uint16("connections_max_used", "Connections Max Used") +ConnectionsSupportedMax = uint16("connections_supported_max", "Connections Supported Max") +ConnectionType = val_string8("connection_type", "Connection Type", [ + [ 0x00, "Not in use" ], + [ 0x02, "NCP" ], + [ 0x0b, "UDP (for IP)" ], ]) -ConnListLen = uint8("conn_list_len", "Connection List Length") +ConnListLen = uint8("conn_list_len", "Connection List Length") connList = uint32("conn_list", "Connection List") -ControlFlags = val_string8("control_flags", "Control Flags", [ - [ 0x00, "Forced Record Locking is Off" ], - [ 0x01, "Forced Record Locking is On" ], -]) -ControllerDriveNumber = uint8("controller_drive_number", "Controller Drive Number") -ControllerNumber = uint8("controller_number", "Controller Number") -ControllerType = uint8("controller_type", "Controller Type") -Cookie1 = uint32("cookie_1", "Cookie 1") -Cookie2 = uint32("cookie_2", "Cookie 2") -Copies = uint8( "copies", "Copies" ) -CoprocessorFlag = uint32("co_processor_flag", "CoProcessor Present Flag") -CoProcessorString = stringz("co_proc_string", "CoProcessor String") +ControlFlags = val_string8("control_flags", "Control Flags", [ + [ 0x00, "Forced Record Locking is Off" ], + [ 0x01, "Forced Record Locking is On" ], +]) +ControllerDriveNumber = uint8("controller_drive_number", "Controller Drive Number") +ControllerNumber = uint8("controller_number", "Controller Number") +ControllerType = uint8("controller_type", "Controller Type") +Cookie1 = uint32("cookie_1", "Cookie 1") +Cookie2 = uint32("cookie_2", "Cookie 2") +Copies = uint8( "copies", "Copies" ) +CoprocessorFlag = uint32("co_processor_flag", "CoProcessor Present Flag") +CoProcessorString = stringz("co_proc_string", "CoProcessor String") CounterMask = val_string8("counter_mask", "Counter Mask", [ [ 0x00, "Counter is Valid" ], [ 0x01, "Counter is not Valid" ], ]) -CPUNumber = uint32("cpu_number", "CPU Number") -CPUString = stringz("cpu_string", "CPU String") -CPUType = val_string8("cpu_type", "CPU Type", [ +CPUNumber = uint32("cpu_number", "CPU Number") +CPUString = stringz("cpu_string", "CPU String") +CPUType = val_string8("cpu_type", "CPU Type", [ [ 0x00, "80386" ], [ 0x01, "80486" ], [ 0x02, "Pentium" ], [ 0x03, "Pentium Pro" ], ]) -CreationDate = uint16("creation_date", "Creation Date") +CreationDate = uint16("creation_date", "Creation Date") CreationDate.NWDate() -CreationTime = uint16("creation_time", "Creation Time") +CreationTime = uint16("creation_time", "Creation Time") CreationTime.NWTime() -CreatorID = uint32("creator_id", "Creator ID", BE) +CreatorID = uint32("creator_id", "Creator ID", BE) CreatorID.Display("BASE_HEX") -CreatorNameSpaceNumber = val_string8("creator_name_space_number", "Creator Name Space Number", [ - [ 0x00, "DOS Name Space" ], - [ 0x01, "MAC Name Space" ], - [ 0x02, "NFS Name Space" ], - [ 0x04, "Long Name Space" ], -]) -CreditLimit = uint32("credit_limit", "Credit Limit") -CtrlFlags = val_string16("ctrl_flags", "Control Flags", [ - [ 0x0000, "Do Not Return File Name" ], - [ 0x0001, "Return File Name" ], +CreatorNameSpaceNumber = val_string8("creator_name_space_number", "Creator Name Space Number", [ + [ 0x00, "DOS Name Space" ], + [ 0x01, "MAC Name Space" ], + [ 0x02, "NFS Name Space" ], + [ 0x04, "Long Name Space" ], +]) +CreditLimit = uint32("credit_limit", "Credit Limit") +CtrlFlags = val_string16("ctrl_flags", "Control Flags", [ + [ 0x0000, "Do Not Return File Name" ], + [ 0x0001, "Return File Name" ], ]) curCompBlks = uint32("cur_comp_blks", "Current Compression Blocks") curInitialBlks = uint32("cur_initial_blks", "Current Initial Blocks") curIntermediateBlks = uint32("cur_inter_blks", "Current Intermediate Blocks") CurNumOfRTags = uint32("cur_num_of_r_tags", "Current Number of Resource Tags") CurrentBlockBeingDecompressed = uint32("cur_blk_being_dcompress", "Current Block Being Decompressed") -CurrentChangedFATs = uint16("current_changed_fats", "Current Changed FAT Entries") -CurrentEntries = uint32("current_entries", "Current Entries") -CurrentFormType = uint8( "current_form_type", "Current Form Type" ) -CurrentLFSCounters = uint32("current_lfs_counters", "Current LFS Counters") -CurrentlyUsedRoutingBuffers = uint16("currently_used_routing_buffers", "Currently Used Routing Buffers") -CurrentOpenFiles = uint16("current_open_files", "Current Open Files") +CurrentChangedFATs = uint16("current_changed_fats", "Current Changed FAT Entries") +CurrentEntries = uint32("current_entries", "Current Entries") +CurrentFormType = uint8( "current_form_type", "Current Form Type" ) +CurrentLFSCounters = uint32("current_lfs_counters", "Current LFS Counters") +CurrentlyUsedRoutingBuffers = uint16("currently_used_routing_buffers", "Currently Used Routing Buffers") +CurrentOpenFiles = uint16("current_open_files", "Current Open Files") CurrentReferenceID = uint16("curr_ref_id", "Current Reference ID") -CurrentServers = uint32("current_servers", "Current Servers") -CurrentServerTime = uint32("current_server_time", "Time Elapsed Since Server Was Brought Up") -CurrentSpace = uint32("current_space", "Current Space") -CurrentTransactionCount = uint32("current_trans_count", "Current Transaction Count") -CurrentUsedBinderyObjects = uint16("current_used_bindery_objects", "Current Used Bindery Objects") -CurrentUsedDynamicSpace = uint32("current_used_dynamic_space", "Current Used Dynamic Space") +CurrentServers = uint32("current_servers", "Current Servers") +CurrentServerTime = uint32("current_server_time", "Time Elapsed Since Server Was Brought Up") +CurrentSpace = uint32("current_space", "Current Space") +CurrentTransactionCount = uint32("current_trans_count", "Current Transaction Count") +CurrentUsedBinderyObjects = uint16("current_used_bindery_objects", "Current Used Bindery Objects") +CurrentUsedDynamicSpace = uint32("current_used_dynamic_space", "Current Used Dynamic Space") CustomCnts = uint32("custom_cnts", "Custom Counters") CustomCount = uint32("custom_count", "Custom Count") CustomCounters = uint32("custom_counters", "Custom Counters") CustomString = nstring8("custom_string", "Custom String") CustomVariableValue = uint32("custom_var_value", "Custom Variable Value") -Data = nstring8("data", "Data") -DataForkFirstFAT = uint32("data_fork_first_fat", "Data Fork First FAT Entry") -DataForkLen = uint32("data_fork_len", "Data Fork Len") -DataForkSize = uint32("data_fork_size", "Data Fork Size") -DataSize = uint32("data_size", "Data Size") -DataStream = val_string8("data_stream", "Data Stream", [ - [ 0x00, "Resource Fork or DOS" ], - [ 0x01, "Data Fork" ], +Data = nstring8("data", "Data") +DataForkFirstFAT = uint32("data_fork_first_fat", "Data Fork First FAT Entry") +DataForkLen = uint32("data_fork_len", "Data Fork Len") +DataForkSize = uint32("data_fork_size", "Data Fork Size") +DataSize = uint32("data_size", "Data Size") +DataStream = val_string8("data_stream", "Data Stream", [ + [ 0x00, "Resource Fork or DOS" ], + [ 0x01, "Data Fork" ], ]) DataStreamFATBlocks = uint32("data_stream_fat_blks", "Data Stream FAT Blocks") -DataStreamName = nstring8("data_stream_name", "Data Stream Name") -DataStreamNumber = uint8("data_stream_number", "Data Stream Number") +DataStreamName = nstring8("data_stream_name", "Data Stream Name") +DataStreamNumber = uint8("data_stream_number", "Data Stream Number") DataStreamNumberLong = uint32("data_stream_num_long", "Data Stream Number") -DataStreamsCount = uint32("data_streams_count", "Data Streams Count") -DataStreamSize = uint32("data_stream_size", "Size") -DataStreamSpaceAlloc = uint32( "data_stream_space_alloc", "Space Allocated for Data Stream" ) +DataStreamsCount = uint32("data_streams_count", "Data Streams Count") +DataStreamSize = uint32("data_stream_size", "Size") +DataStreamSpaceAlloc = uint32( "data_stream_space_alloc", "Space Allocated for Data Stream" ) DataTypeFlag = val_string8("data_type_flag", "Data Type Flag", [ [ 0x00, "ASCII Data" ], [ 0x01, "UTF8 Data" ], ]) -Day = uint8("s_day", "Day") -DayOfWeek = val_string8("s_day_of_week", "Day of Week", [ - [ 0x00, "Sunday" ], - [ 0x01, "Monday" ], - [ 0x02, "Tuesday" ], - [ 0x03, "Wednesday" ], - [ 0x04, "Thursday" ], - [ 0x05, "Friday" ], - [ 0x06, "Saturday" ], -]) -DeadMirrorTable = bytes("dead_mirror_table", "Dead Mirror Table", 32) -DefinedDataStreams = uint8("defined_data_streams", "Defined Data Streams") -DefinedNameSpaces = uint8("defined_name_spaces", "Defined Name Spaces") -DeletedDate = uint16("deleted_date", "Deleted Date") +Day = uint8("s_day", "Day") +DayOfWeek = val_string8("s_day_of_week", "Day of Week", [ + [ 0x00, "Sunday" ], + [ 0x01, "Monday" ], + [ 0x02, "Tuesday" ], + [ 0x03, "Wednesday" ], + [ 0x04, "Thursday" ], + [ 0x05, "Friday" ], + [ 0x06, "Saturday" ], +]) +DeadMirrorTable = bytes("dead_mirror_table", "Dead Mirror Table", 32) +DefinedDataStreams = uint8("defined_data_streams", "Defined Data Streams") +DefinedNameSpaces = uint8("defined_name_spaces", "Defined Name Spaces") +DeletedDate = uint16("deleted_date", "Deleted Date") DeletedDate.NWDate() -DeletedFileTime = uint32( "deleted_file_time", "Deleted File Time") +DeletedFileTime = uint32( "deleted_file_time", "Deleted File Time") DeletedFileTime.Display("BASE_HEX") -DeletedTime = uint16("deleted_time", "Deleted Time") +DeletedTime = uint16("deleted_time", "Deleted Time") DeletedTime.NWTime() -DeletedID = uint32( "delete_id", "Deleted ID", BE) +DeletedID = uint32( "delete_id", "Deleted ID", BE) DeletedID.Display("BASE_HEX") -DeleteExistingFileFlag = val_string8("delete_existing_file_flag", "Delete Existing File Flag", [ - [ 0x00, "Do Not Delete Existing File" ], - [ 0x01, "Delete Existing File" ], -]) -DenyReadCount = uint16("deny_read_count", "Deny Read Count") -DenyWriteCount = uint16("deny_write_count", "Deny Write Count") -DescriptionStrings = fw_string("description_string", "Description", 100) -DesiredAccessRights = bitfield16("desired_access_rights", "Desired Access Rights", [ +DeleteExistingFileFlag = val_string8("delete_existing_file_flag", "Delete Existing File Flag", [ + [ 0x00, "Do Not Delete Existing File" ], + [ 0x01, "Delete Existing File" ], +]) +DenyReadCount = uint16("deny_read_count", "Deny Read Count") +DenyWriteCount = uint16("deny_write_count", "Deny Write Count") +DescriptionStrings = fw_string("description_string", "Description", 100) +DesiredAccessRights = bitfield16("desired_access_rights", "Desired Access Rights", [ bf_boolean16(0x0001, "dsired_acc_rights_read_o", "Read Only"), - bf_boolean16(0x0002, "dsired_acc_rights_write_o", "Write Only"), - bf_boolean16(0x0004, "dsired_acc_rights_deny_r", "Deny Read"), - bf_boolean16(0x0008, "dsired_acc_rights_deny_w", "Deny Write"), - bf_boolean16(0x0010, "dsired_acc_rights_compat", "Compatibility"), - bf_boolean16(0x0040, "dsired_acc_rights_w_thru", "File Write Through"), - bf_boolean16(0x0400, "dsired_acc_rights_del_file_cls", "Delete File Close"), -]) -DesiredResponseCount = uint16("desired_response_count", "Desired Response Count") -DestDirHandle = uint8("dest_dir_handle", "Destination Directory Handle") -DestNameSpace = val_string8("dest_name_space", "Destination Name Space", [ - [ 0x00, "DOS Name Space" ], - [ 0x01, "MAC Name Space" ], - [ 0x02, "NFS Name Space" ], - [ 0x04, "Long Name Space" ], + bf_boolean16(0x0002, "dsired_acc_rights_write_o", "Write Only"), + bf_boolean16(0x0004, "dsired_acc_rights_deny_r", "Deny Read"), + bf_boolean16(0x0008, "dsired_acc_rights_deny_w", "Deny Write"), + bf_boolean16(0x0010, "dsired_acc_rights_compat", "Compatibility"), + bf_boolean16(0x0040, "dsired_acc_rights_w_thru", "File Write Through"), + bf_boolean16(0x0400, "dsired_acc_rights_del_file_cls", "Delete File Close"), +]) +DesiredResponseCount = uint16("desired_response_count", "Desired Response Count") +DestDirHandle = uint8("dest_dir_handle", "Destination Directory Handle") +DestNameSpace = val_string8("dest_name_space", "Destination Name Space", [ + [ 0x00, "DOS Name Space" ], + [ 0x01, "MAC Name Space" ], + [ 0x02, "NFS Name Space" ], + [ 0x04, "Long Name Space" ], ]) -DestPathComponentCount = uint8("dest_component_count", "Destination Path Component Count") -DestPath = nstring8("dest_path", "Destination Path") +DestPathComponentCount = uint8("dest_component_count", "Destination Path Component Count") +DestPath = nstring8("dest_path", "Destination Path") DestPath16 = nstring16("dest_path_16", "Destination Path") -DetachDuringProcessing = uint16("detach_during_processing", "Detach During Processing") -DetachForBadConnectionNumber = uint16("detach_for_bad_connection_number", "Detach For Bad Connection Number") -DirHandle = uint8("dir_handle", "Directory Handle") -DirHandleName = uint8("dir_handle_name", "Handle Name") -DirHandleLong = uint32("dir_handle_long", "Directory Handle") +DetachDuringProcessing = uint16("detach_during_processing", "Detach During Processing") +DetachForBadConnectionNumber = uint16("detach_for_bad_connection_number", "Detach For Bad Connection Number") +DirHandle = uint8("dir_handle", "Directory Handle") +DirHandleName = uint8("dir_handle_name", "Handle Name") +DirHandleLong = uint32("dir_handle_long", "Directory Handle") DirectoryAccessRights = uint8("directory_access_rights", "Directory Access Rights") # # XXX - what do the bits mean here? # DirectoryAttributes = uint8("directory_attributes", "Directory Attributes") -DirectoryBase = uint32("dir_base", "Directory Base") +DirectoryBase = uint32("dir_base", "Directory Base") DirectoryBase.Display("BASE_HEX") -DirectoryCount = uint16("dir_count", "Directory Count") -DirectoryEntryNumber = uint32("directory_entry_number", "Directory Entry Number") +DirectoryCount = uint16("dir_count", "Directory Count") +DirectoryEntryNumber = uint32("directory_entry_number", "Directory Entry Number") DirectoryEntryNumber.Display('BASE_HEX') -DirectoryEntryNumberWord = uint16("directory_entry_number_word", "Directory Entry Number") -DirectoryID = uint16("directory_id", "Directory ID", BE) +DirectoryEntryNumberWord = uint16("directory_entry_number_word", "Directory Entry Number") +DirectoryID = uint16("directory_id", "Directory ID", BE) DirectoryID.Display("BASE_HEX") DirectoryName = fw_string("directory_name", "Directory Name",12) DirectoryName14 = fw_string("directory_name_14", "Directory Name", 14) DirectoryNameLen = uint8("directory_name_len", "Directory Name Length") -DirectoryNumber = uint32("directory_number", "Directory Number") +DirectoryNumber = uint32("directory_number", "Directory Number") DirectoryNumber.Display("BASE_HEX") -DirectoryPath = fw_string("directory_path", "Directory Path", 16) -DirectoryServicesObjectID = uint32("directory_services_object_id", "Directory Services Object ID") +DirectoryPath = fw_string("directory_path", "Directory Path", 16) +DirectoryServicesObjectID = uint32("directory_services_object_id", "Directory Services Object ID") DirectoryServicesObjectID.Display("BASE_HEX") DirectoryStamp = uint16("directory_stamp", "Directory Stamp (0xD1D1)") -DirtyCacheBuffers = uint16("dirty_cache_buffers", "Dirty Cache Buffers") -DiskChannelNumber = uint8("disk_channel_number", "Disk Channel Number") -DiskChannelTable = val_string8("disk_channel_table", "Disk Channel Table", [ - [ 0x01, "XT" ], - [ 0x02, "AT" ], - [ 0x03, "SCSI" ], - [ 0x04, "Disk Coprocessor" ], -]) -DiskSpaceLimit = uint32("disk_space_limit", "Disk Space Limit") -DMAChannelsUsed = uint32("dma_channels_used", "DMA Channels Used") -DMInfoEntries = uint32("dm_info_entries", "DM Info Entries") -DMInfoLevel = val_string8("dm_info_level", "DM Info Level", [ - [ 0x00, "Return Detailed DM Support Module Information" ], - [ 0x01, "Return Number of DM Support Modules" ], - [ 0x02, "Return DM Support Modules Names" ], -]) -DMFlags = val_string8("dm_flags", "DM Flags", [ - [ 0x00, "OnLine Media" ], - [ 0x01, "OffLine Media" ], -]) -DMmajorVersion = uint32("dm_major_version", "DM Major Version") -DMminorVersion = uint32("dm_minor_version", "DM Minor Version") -DMPresentFlag = val_string8("dm_present_flag", "Data Migration Present Flag", [ - [ 0x00, "Data Migration NLM is not loaded" ], - [ 0x01, "Data Migration NLM has been loaded and is running" ], +DirtyCacheBuffers = uint16("dirty_cache_buffers", "Dirty Cache Buffers") +DiskChannelNumber = uint8("disk_channel_number", "Disk Channel Number") +DiskChannelTable = val_string8("disk_channel_table", "Disk Channel Table", [ + [ 0x01, "XT" ], + [ 0x02, "AT" ], + [ 0x03, "SCSI" ], + [ 0x04, "Disk Coprocessor" ], +]) +DiskSpaceLimit = uint32("disk_space_limit", "Disk Space Limit") +DMAChannelsUsed = uint32("dma_channels_used", "DMA Channels Used") +DMInfoEntries = uint32("dm_info_entries", "DM Info Entries") +DMInfoLevel = val_string8("dm_info_level", "DM Info Level", [ + [ 0x00, "Return Detailed DM Support Module Information" ], + [ 0x01, "Return Number of DM Support Modules" ], + [ 0x02, "Return DM Support Modules Names" ], +]) +DMFlags = val_string8("dm_flags", "DM Flags", [ + [ 0x00, "OnLine Media" ], + [ 0x01, "OffLine Media" ], +]) +DMmajorVersion = uint32("dm_major_version", "DM Major Version") +DMminorVersion = uint32("dm_minor_version", "DM Minor Version") +DMPresentFlag = val_string8("dm_present_flag", "Data Migration Present Flag", [ + [ 0x00, "Data Migration NLM is not loaded" ], + [ 0x01, "Data Migration NLM has been loaded and is running" ], ]) -DOSDirectoryBase = uint32("dos_directory_base", "DOS Directory Base") +DOSDirectoryBase = uint32("dos_directory_base", "DOS Directory Base") DOSDirectoryBase.Display("BASE_HEX") -DOSDirectoryEntry = uint32("dos_directory_entry", "DOS Directory Entry") +DOSDirectoryEntry = uint32("dos_directory_entry", "DOS Directory Entry") DOSDirectoryEntry.Display("BASE_HEX") -DOSDirectoryEntryNumber = uint32("dos_directory_entry_number", "DOS Directory Entry Number") +DOSDirectoryEntryNumber = uint32("dos_directory_entry_number", "DOS Directory Entry Number") DOSDirectoryEntryNumber.Display('BASE_HEX') -DOSFileAttributes = uint8("dos_file_attributes", "DOS File Attributes") -DOSParentDirectoryEntry = uint32("dos_parent_directory_entry", "DOS Parent Directory Entry") +DOSFileAttributes = uint8("dos_file_attributes", "DOS File Attributes") +DOSParentDirectoryEntry = uint32("dos_parent_directory_entry", "DOS Parent Directory Entry") DOSParentDirectoryEntry.Display('BASE_HEX') -DOSSequence = uint32("dos_sequence", "DOS Sequence") -DriveCylinders = uint16("drive_cylinders", "Drive Cylinders") -DriveDefinitionString = fw_string("drive_definition_string", "Drive Definition", 64) -DriveHeads = uint8("drive_heads", "Drive Heads") -DriveMappingTable = bytes("drive_mapping_table", "Drive Mapping Table", 32) -DriveMirrorTable = bytes("drive_mirror_table", "Drive Mirror Table", 32) +DOSSequence = uint32("dos_sequence", "DOS Sequence") +DriveCylinders = uint16("drive_cylinders", "Drive Cylinders") +DriveDefinitionString = fw_string("drive_definition_string", "Drive Definition", 64) +DriveHeads = uint8("drive_heads", "Drive Heads") +DriveMappingTable = bytes("drive_mapping_table", "Drive Mapping Table", 32) +DriveMirrorTable = bytes("drive_mirror_table", "Drive Mirror Table", 32) DriverBoardName = stringz("driver_board_name", "Driver Board Name") -DriveRemovableFlag = val_string8("drive_removable_flag", "Drive Removable Flag", [ - [ 0x00, "Nonremovable" ], - [ 0xff, "Removable" ], +DriveRemovableFlag = val_string8("drive_removable_flag", "Drive Removable Flag", [ + [ 0x00, "Nonremovable" ], + [ 0xff, "Removable" ], ]) DriverLogicalName = stringz("driver_log_name", "Driver Logical Name") DriverShortName = stringz("driver_short_name", "Driver Short Name") -DriveSize = uint32("drive_size", "Drive Size") -DstEAFlags = val_string16("dst_ea_flags", "Destination EA Flags", [ - [ 0x0000, "Return EAHandle,Information Level 0" ], - [ 0x0001, "Return NetWareHandle,Information Level 0" ], - [ 0x0002, "Return Volume/Directory Number,Information Level 0" ], - [ 0x0004, "Return EAHandle,Close Handle on Error,Information Level 0" ], - [ 0x0005, "Return NetWareHandle,Close Handle on Error,Information Level 0" ], - [ 0x0006, "Return Volume/Directory Number,Close Handle on Error,Information Level 0" ], - [ 0x0010, "Return EAHandle,Information Level 1" ], - [ 0x0011, "Return NetWareHandle,Information Level 1" ], - [ 0x0012, "Return Volume/Directory Number,Information Level 1" ], - [ 0x0014, "Return EAHandle,Close Handle on Error,Information Level 1" ], - [ 0x0015, "Return NetWareHandle,Close Handle on Error,Information Level 1" ], - [ 0x0016, "Return Volume/Directory Number,Close Handle on Error,Information Level 1" ], - [ 0x0020, "Return EAHandle,Information Level 2" ], - [ 0x0021, "Return NetWareHandle,Information Level 2" ], - [ 0x0022, "Return Volume/Directory Number,Information Level 2" ], - [ 0x0024, "Return EAHandle,Close Handle on Error,Information Level 2" ], - [ 0x0025, "Return NetWareHandle,Close Handle on Error,Information Level 2" ], - [ 0x0026, "Return Volume/Directory Number,Close Handle on Error,Information Level 2" ], - [ 0x0030, "Return EAHandle,Information Level 3" ], - [ 0x0031, "Return NetWareHandle,Information Level 3" ], - [ 0x0032, "Return Volume/Directory Number,Information Level 3" ], - [ 0x0034, "Return EAHandle,Close Handle on Error,Information Level 3" ], - [ 0x0035, "Return NetWareHandle,Close Handle on Error,Information Level 3" ], - [ 0x0036, "Return Volume/Directory Number,Close Handle on Error,Information Level 3" ], - [ 0x0040, "Return EAHandle,Information Level 4" ], - [ 0x0041, "Return NetWareHandle,Information Level 4" ], - [ 0x0042, "Return Volume/Directory Number,Information Level 4" ], - [ 0x0044, "Return EAHandle,Close Handle on Error,Information Level 4" ], - [ 0x0045, "Return NetWareHandle,Close Handle on Error,Information Level 4" ], - [ 0x0046, "Return Volume/Directory Number,Close Handle on Error,Information Level 4" ], - [ 0x0050, "Return EAHandle,Information Level 5" ], - [ 0x0051, "Return NetWareHandle,Information Level 5" ], - [ 0x0052, "Return Volume/Directory Number,Information Level 5" ], - [ 0x0054, "Return EAHandle,Close Handle on Error,Information Level 5" ], - [ 0x0055, "Return NetWareHandle,Close Handle on Error,Information Level 5" ], - [ 0x0056, "Return Volume/Directory Number,Close Handle on Error,Information Level 5" ], - [ 0x0060, "Return EAHandle,Information Level 6" ], - [ 0x0061, "Return NetWareHandle,Information Level 6" ], - [ 0x0062, "Return Volume/Directory Number,Information Level 6" ], - [ 0x0064, "Return EAHandle,Close Handle on Error,Information Level 6" ], - [ 0x0065, "Return NetWareHandle,Close Handle on Error,Information Level 6" ], - [ 0x0066, "Return Volume/Directory Number,Close Handle on Error,Information Level 6" ], - [ 0x0070, "Return EAHandle,Information Level 7" ], - [ 0x0071, "Return NetWareHandle,Information Level 7" ], - [ 0x0072, "Return Volume/Directory Number,Information Level 7" ], - [ 0x0074, "Return EAHandle,Close Handle on Error,Information Level 7" ], - [ 0x0075, "Return NetWareHandle,Close Handle on Error,Information Level 7" ], - [ 0x0076, "Return Volume/Directory Number,Close Handle on Error,Information Level 7" ], - [ 0x0080, "Return EAHandle,Information Level 0,Immediate Close Handle" ], - [ 0x0081, "Return NetWareHandle,Information Level 0,Immediate Close Handle" ], - [ 0x0082, "Return Volume/Directory Number,Information Level 0,Immediate Close Handle" ], - [ 0x0084, "Return EAHandle,Close Handle on Error,Information Level 0,Immediate Close Handle" ], - [ 0x0085, "Return NetWareHandle,Close Handle on Error,Information Level 0,Immediate Close Handle" ], - [ 0x0086, "Return Volume/Directory Number,Close Handle on Error,Information Level 0,Immediate Close Handle" ], - [ 0x0090, "Return EAHandle,Information Level 1,Immediate Close Handle" ], - [ 0x0091, "Return NetWareHandle,Information Level 1,Immediate Close Handle" ], - [ 0x0092, "Return Volume/Directory Number,Information Level 1,Immediate Close Handle" ], - [ 0x0094, "Return EAHandle,Close Handle on Error,Information Level 1,Immediate Close Handle" ], - [ 0x0095, "Return NetWareHandle,Close Handle on Error,Information Level 1,Immediate Close Handle" ], - [ 0x0096, "Return Volume/Directory Number,Close Handle on Error,Information Level 1,Immediate Close Handle" ], - [ 0x00a0, "Return EAHandle,Information Level 2,Immediate Close Handle" ], - [ 0x00a1, "Return NetWareHandle,Information Level 2,Immediate Close Handle" ], - [ 0x00a2, "Return Volume/Directory Number,Information Level 2,Immediate Close Handle" ], - [ 0x00a4, "Return EAHandle,Close Handle on Error,Information Level 2,Immediate Close Handle" ], - [ 0x00a5, "Return NetWareHandle,Close Handle on Error,Information Level 2,Immediate Close Handle" ], - [ 0x00a6, "Return Volume/Directory Number,Close Handle on Error,Information Level 2,Immediate Close Handle" ], - [ 0x00b0, "Return EAHandle,Information Level 3,Immediate Close Handle" ], - [ 0x00b1, "Return NetWareHandle,Information Level 3,Immediate Close Handle" ], - [ 0x00b2, "Return Volume/Directory Number,Information Level 3,Immediate Close Handle" ], - [ 0x00b4, "Return EAHandle,Close Handle on Error,Information Level 3,Immediate Close Handle" ], - [ 0x00b5, "Return NetWareHandle,Close Handle on Error,Information Level 3,Immediate Close Handle" ], - [ 0x00b6, "Return Volume/Directory Number,Close Handle on Error,Information Level 3,Immediate Close Handle" ], - [ 0x00c0, "Return EAHandle,Information Level 4,Immediate Close Handle" ], - [ 0x00c1, "Return NetWareHandle,Information Level 4,Immediate Close Handle" ], - [ 0x00c2, "Return Volume/Directory Number,Information Level 4,Immediate Close Handle" ], - [ 0x00c4, "Return EAHandle,Close Handle on Error,Information Level 4,Immediate Close Handle" ], - [ 0x00c5, "Return NetWareHandle,Close Handle on Error,Information Level 4,Immediate Close Handle" ], - [ 0x00c6, "Return Volume/Directory Number,Close Handle on Error,Information Level 4,Immediate Close Handle" ], - [ 0x00d0, "Return EAHandle,Information Level 5,Immediate Close Handle" ], - [ 0x00d1, "Return NetWareHandle,Information Level 5,Immediate Close Handle" ], - [ 0x00d2, "Return Volume/Directory Number,Information Level 5,Immediate Close Handle" ], - [ 0x00d4, "Return EAHandle,Close Handle on Error,Information Level 5,Immediate Close Handle" ], - [ 0x00d5, "Return NetWareHandle,Close Handle on Error,Information Level 5,Immediate Close Handle" ], - [ 0x00d6, "Return Volume/Directory Number,Close Handle on Error,Information Level 5,Immediate Close Handle" ], - [ 0x00e0, "Return EAHandle,Information Level 6,Immediate Close Handle" ], - [ 0x00e1, "Return NetWareHandle,Information Level 6,Immediate Close Handle" ], - [ 0x00e2, "Return Volume/Directory Number,Information Level 6,Immediate Close Handle" ], - [ 0x00e4, "Return EAHandle,Close Handle on Error,Information Level 6,Immediate Close Handle" ], - [ 0x00e5, "Return NetWareHandle,Close Handle on Error,Information Level 6,Immediate Close Handle" ], - [ 0x00e6, "Return Volume/Directory Number,Close Handle on Error,Information Level 6,Immediate Close Handle" ], - [ 0x00f0, "Return EAHandle,Information Level 7,Immediate Close Handle" ], - [ 0x00f1, "Return NetWareHandle,Information Level 7,Immediate Close Handle" ], - [ 0x00f2, "Return Volume/Directory Number,Information Level 7,Immediate Close Handle" ], - [ 0x00f4, "Return EAHandle,Close Handle on Error,Information Level 7,Immediate Close Handle" ], - [ 0x00f5, "Return NetWareHandle,Close Handle on Error,Information Level 7,Immediate Close Handle" ], - [ 0x00f6, "Return Volume/Directory Number,Close Handle on Error,Information Level 7,Immediate Close Handle" ], -]) -dstNSIndicator = val_string16("dst_ns_indicator", "Destination Name Space Indicator", [ - [ 0x0000, "Return Source Name Space Information" ], - [ 0x0001, "Return Destination Name Space Information" ], -]) -DstQueueID = uint32("dst_queue_id", "Destination Queue ID") -DuplicateRepliesSent = uint16("duplicate_replies_sent", "Duplicate Replies Sent") - -EAAccessFlag = bitfield16("ea_access_flag", "EA Access Flag", [ - bf_boolean16(0x0001, "ea_permanent_memory", "Permanent Memory"), - bf_boolean16(0x0002, "ea_deep_freeze", "Deep Freeze"), - bf_boolean16(0x0004, "ea_in_progress", "In Progress"), - bf_boolean16(0x0008, "ea_header_being_enlarged", "Header Being Enlarged"), - bf_boolean16(0x0010, "ea_new_tally_used", "New Tally Used"), - bf_boolean16(0x0020, "ea_tally_need_update", "Tally Need Update"), - bf_boolean16(0x0040, "ea_score_card_present", "Score Card Present"), - bf_boolean16(0x0080, "ea_need_bit_flag", "EA Need Bit Flag"), - bf_boolean16(0x0100, "ea_write_privileges", "Write Privileges"), - bf_boolean16(0x0200, "ea_read_privileges", "Read Privileges"), - bf_boolean16(0x0400, "ea_delete_privileges", "Delete Privileges"), - bf_boolean16(0x0800, "ea_system_ea_only", "System EA Only"), - bf_boolean16(0x1000, "ea_write_in_progress", "Write In Progress"), -]) -EABytesWritten = uint32("ea_bytes_written", "Bytes Written") -EACount = uint32("ea_count", "Count") -EADataSize = uint32("ea_data_size", "Data Size") -EADataSizeDuplicated = uint32("ea_data_size_duplicated", "Data Size Duplicated") -EADuplicateCount = uint32("ea_duplicate_count", "Duplicate Count") -EAErrorCodes = val_string16("ea_error_codes", "EA Error Codes", [ - [ 0x0000, "SUCCESSFUL" ], - [ 0x00c8, "ERR_MISSING_EA_KEY" ], - [ 0x00c9, "ERR_EA_NOT_FOUND" ], - [ 0x00ca, "ERR_INVALID_EA_HANDLE_TYPE" ], - [ 0x00cb, "ERR_EA_NO_KEY_NO_DATA" ], - [ 0x00cc, "ERR_EA_NUMBER_MISMATCH" ], - [ 0x00cd, "ERR_EXTENT_NUMBER_OUT_OF_RANGE" ], - [ 0x00ce, "ERR_EA_BAD_DIR_NUM" ], - [ 0x00cf, "ERR_INVALID_EA_HANDLE" ], - [ 0x00d0, "ERR_EA_POSITION_OUT_OF_RANGE" ], - [ 0x00d1, "ERR_EA_ACCESS_DENIED" ], - [ 0x00d2, "ERR_DATA_PAGE_ODD_SIZE" ], - [ 0x00d3, "ERR_EA_VOLUME_NOT_MOUNTED" ], - [ 0x00d4, "ERR_BAD_PAGE_BOUNDARY" ], - [ 0x00d5, "ERR_INSPECT_FAILURE" ], - [ 0x00d6, "ERR_EA_ALREADY_CLAIMED" ], - [ 0x00d7, "ERR_ODD_BUFFER_SIZE" ], - [ 0x00d8, "ERR_NO_SCORECARDS" ], - [ 0x00d9, "ERR_BAD_EDS_SIGNATURE" ], - [ 0x00da, "ERR_EA_SPACE_LIMIT" ], - [ 0x00db, "ERR_EA_KEY_CORRUPT" ], - [ 0x00dc, "ERR_EA_KEY_LIMIT" ], - [ 0x00dd, "ERR_TALLY_CORRUPT" ], -]) -EAFlags = val_string16("ea_flags", "EA Flags", [ - [ 0x0000, "Return EAHandle,Information Level 0" ], - [ 0x0001, "Return NetWareHandle,Information Level 0" ], - [ 0x0002, "Return Volume/Directory Number,Information Level 0" ], - [ 0x0004, "Return EAHandle,Close Handle on Error,Information Level 0" ], - [ 0x0005, "Return NetWareHandle,Close Handle on Error,Information Level 0" ], - [ 0x0006, "Return Volume/Directory Number,Close Handle on Error,Information Level 0" ], - [ 0x0010, "Return EAHandle,Information Level 1" ], - [ 0x0011, "Return NetWareHandle,Information Level 1" ], - [ 0x0012, "Return Volume/Directory Number,Information Level 1" ], - [ 0x0014, "Return EAHandle,Close Handle on Error,Information Level 1" ], - [ 0x0015, "Return NetWareHandle,Close Handle on Error,Information Level 1" ], - [ 0x0016, "Return Volume/Directory Number,Close Handle on Error,Information Level 1" ], - [ 0x0020, "Return EAHandle,Information Level 2" ], - [ 0x0021, "Return NetWareHandle,Information Level 2" ], - [ 0x0022, "Return Volume/Directory Number,Information Level 2" ], - [ 0x0024, "Return EAHandle,Close Handle on Error,Information Level 2" ], - [ 0x0025, "Return NetWareHandle,Close Handle on Error,Information Level 2" ], - [ 0x0026, "Return Volume/Directory Number,Close Handle on Error,Information Level 2" ], - [ 0x0030, "Return EAHandle,Information Level 3" ], - [ 0x0031, "Return NetWareHandle,Information Level 3" ], - [ 0x0032, "Return Volume/Directory Number,Information Level 3" ], - [ 0x0034, "Return EAHandle,Close Handle on Error,Information Level 3" ], - [ 0x0035, "Return NetWareHandle,Close Handle on Error,Information Level 3" ], - [ 0x0036, "Return Volume/Directory Number,Close Handle on Error,Information Level 3" ], - [ 0x0040, "Return EAHandle,Information Level 4" ], - [ 0x0041, "Return NetWareHandle,Information Level 4" ], - [ 0x0042, "Return Volume/Directory Number,Information Level 4" ], - [ 0x0044, "Return EAHandle,Close Handle on Error,Information Level 4" ], - [ 0x0045, "Return NetWareHandle,Close Handle on Error,Information Level 4" ], - [ 0x0046, "Return Volume/Directory Number,Close Handle on Error,Information Level 4" ], - [ 0x0050, "Return EAHandle,Information Level 5" ], - [ 0x0051, "Return NetWareHandle,Information Level 5" ], - [ 0x0052, "Return Volume/Directory Number,Information Level 5" ], - [ 0x0054, "Return EAHandle,Close Handle on Error,Information Level 5" ], - [ 0x0055, "Return NetWareHandle,Close Handle on Error,Information Level 5" ], - [ 0x0056, "Return Volume/Directory Number,Close Handle on Error,Information Level 5" ], - [ 0x0060, "Return EAHandle,Information Level 6" ], - [ 0x0061, "Return NetWareHandle,Information Level 6" ], - [ 0x0062, "Return Volume/Directory Number,Information Level 6" ], - [ 0x0064, "Return EAHandle,Close Handle on Error,Information Level 6" ], - [ 0x0065, "Return NetWareHandle,Close Handle on Error,Information Level 6" ], - [ 0x0066, "Return Volume/Directory Number,Close Handle on Error,Information Level 6" ], - [ 0x0070, "Return EAHandle,Information Level 7" ], - [ 0x0071, "Return NetWareHandle,Information Level 7" ], - [ 0x0072, "Return Volume/Directory Number,Information Level 7" ], - [ 0x0074, "Return EAHandle,Close Handle on Error,Information Level 7" ], - [ 0x0075, "Return NetWareHandle,Close Handle on Error,Information Level 7" ], - [ 0x0076, "Return Volume/Directory Number,Close Handle on Error,Information Level 7" ], - [ 0x0080, "Return EAHandle,Information Level 0,Immediate Close Handle" ], - [ 0x0081, "Return NetWareHandle,Information Level 0,Immediate Close Handle" ], - [ 0x0082, "Return Volume/Directory Number,Information Level 0,Immediate Close Handle" ], - [ 0x0084, "Return EAHandle,Close Handle on Error,Information Level 0,Immediate Close Handle" ], - [ 0x0085, "Return NetWareHandle,Close Handle on Error,Information Level 0,Immediate Close Handle" ], - [ 0x0086, "Return Volume/Directory Number,Close Handle on Error,Information Level 0,Immediate Close Handle" ], - [ 0x0090, "Return EAHandle,Information Level 1,Immediate Close Handle" ], - [ 0x0091, "Return NetWareHandle,Information Level 1,Immediate Close Handle" ], - [ 0x0092, "Return Volume/Directory Number,Information Level 1,Immediate Close Handle" ], - [ 0x0094, "Return EAHandle,Close Handle on Error,Information Level 1,Immediate Close Handle" ], - [ 0x0095, "Return NetWareHandle,Close Handle on Error,Information Level 1,Immediate Close Handle" ], - [ 0x0096, "Return Volume/Directory Number,Close Handle on Error,Information Level 1,Immediate Close Handle" ], - [ 0x00a0, "Return EAHandle,Information Level 2,Immediate Close Handle" ], - [ 0x00a1, "Return NetWareHandle,Information Level 2,Immediate Close Handle" ], - [ 0x00a2, "Return Volume/Directory Number,Information Level 2,Immediate Close Handle" ], - [ 0x00a4, "Return EAHandle,Close Handle on Error,Information Level 2,Immediate Close Handle" ], - [ 0x00a5, "Return NetWareHandle,Close Handle on Error,Information Level 2,Immediate Close Handle" ], - [ 0x00a6, "Return Volume/Directory Number,Close Handle on Error,Information Level 2,Immediate Close Handle" ], - [ 0x00b0, "Return EAHandle,Information Level 3,Immediate Close Handle" ], - [ 0x00b1, "Return NetWareHandle,Information Level 3,Immediate Close Handle" ], - [ 0x00b2, "Return Volume/Directory Number,Information Level 3,Immediate Close Handle" ], - [ 0x00b4, "Return EAHandle,Close Handle on Error,Information Level 3,Immediate Close Handle" ], - [ 0x00b5, "Return NetWareHandle,Close Handle on Error,Information Level 3,Immediate Close Handle" ], - [ 0x00b6, "Return Volume/Directory Number,Close Handle on Error,Information Level 3,Immediate Close Handle" ], - [ 0x00c0, "Return EAHandle,Information Level 4,Immediate Close Handle" ], - [ 0x00c1, "Return NetWareHandle,Information Level 4,Immediate Close Handle" ], - [ 0x00c2, "Return Volume/Directory Number,Information Level 4,Immediate Close Handle" ], - [ 0x00c4, "Return EAHandle,Close Handle on Error,Information Level 4,Immediate Close Handle" ], - [ 0x00c5, "Return NetWareHandle,Close Handle on Error,Information Level 4,Immediate Close Handle" ], - [ 0x00c6, "Return Volume/Directory Number,Close Handle on Error,Information Level 4,Immediate Close Handle" ], - [ 0x00d0, "Return EAHandle,Information Level 5,Immediate Close Handle" ], - [ 0x00d1, "Return NetWareHandle,Information Level 5,Immediate Close Handle" ], - [ 0x00d2, "Return Volume/Directory Number,Information Level 5,Immediate Close Handle" ], - [ 0x00d4, "Return EAHandle,Close Handle on Error,Information Level 5,Immediate Close Handle" ], - [ 0x00d5, "Return NetWareHandle,Close Handle on Error,Information Level 5,Immediate Close Handle" ], - [ 0x00d6, "Return Volume/Directory Number,Close Handle on Error,Information Level 5,Immediate Close Handle" ], - [ 0x00e0, "Return EAHandle,Information Level 6,Immediate Close Handle" ], - [ 0x00e1, "Return NetWareHandle,Information Level 6,Immediate Close Handle" ], - [ 0x00e2, "Return Volume/Directory Number,Information Level 6,Immediate Close Handle" ], - [ 0x00e4, "Return EAHandle,Close Handle on Error,Information Level 6,Immediate Close Handle" ], - [ 0x00e5, "Return NetWareHandle,Close Handle on Error,Information Level 6,Immediate Close Handle" ], - [ 0x00e6, "Return Volume/Directory Number,Close Handle on Error,Information Level 6,Immediate Close Handle" ], - [ 0x00f0, "Return EAHandle,Information Level 7,Immediate Close Handle" ], - [ 0x00f1, "Return NetWareHandle,Information Level 7,Immediate Close Handle" ], - [ 0x00f2, "Return Volume/Directory Number,Information Level 7,Immediate Close Handle" ], - [ 0x00f4, "Return EAHandle,Close Handle on Error,Information Level 7,Immediate Close Handle" ], - [ 0x00f5, "Return NetWareHandle,Close Handle on Error,Information Level 7,Immediate Close Handle" ], - [ 0x00f6, "Return Volume/Directory Number,Close Handle on Error,Information Level 7,Immediate Close Handle" ], +DriveSize = uint32("drive_size", "Drive Size") +DstEAFlags = val_string16("dst_ea_flags", "Destination EA Flags", [ + [ 0x0000, "Return EAHandle,Information Level 0" ], + [ 0x0001, "Return NetWareHandle,Information Level 0" ], + [ 0x0002, "Return Volume/Directory Number,Information Level 0" ], + [ 0x0004, "Return EAHandle,Close Handle on Error,Information Level 0" ], + [ 0x0005, "Return NetWareHandle,Close Handle on Error,Information Level 0" ], + [ 0x0006, "Return Volume/Directory Number,Close Handle on Error,Information Level 0" ], + [ 0x0010, "Return EAHandle,Information Level 1" ], + [ 0x0011, "Return NetWareHandle,Information Level 1" ], + [ 0x0012, "Return Volume/Directory Number,Information Level 1" ], + [ 0x0014, "Return EAHandle,Close Handle on Error,Information Level 1" ], + [ 0x0015, "Return NetWareHandle,Close Handle on Error,Information Level 1" ], + [ 0x0016, "Return Volume/Directory Number,Close Handle on Error,Information Level 1" ], + [ 0x0020, "Return EAHandle,Information Level 2" ], + [ 0x0021, "Return NetWareHandle,Information Level 2" ], + [ 0x0022, "Return Volume/Directory Number,Information Level 2" ], + [ 0x0024, "Return EAHandle,Close Handle on Error,Information Level 2" ], + [ 0x0025, "Return NetWareHandle,Close Handle on Error,Information Level 2" ], + [ 0x0026, "Return Volume/Directory Number,Close Handle on Error,Information Level 2" ], + [ 0x0030, "Return EAHandle,Information Level 3" ], + [ 0x0031, "Return NetWareHandle,Information Level 3" ], + [ 0x0032, "Return Volume/Directory Number,Information Level 3" ], + [ 0x0034, "Return EAHandle,Close Handle on Error,Information Level 3" ], + [ 0x0035, "Return NetWareHandle,Close Handle on Error,Information Level 3" ], + [ 0x0036, "Return Volume/Directory Number,Close Handle on Error,Information Level 3" ], + [ 0x0040, "Return EAHandle,Information Level 4" ], + [ 0x0041, "Return NetWareHandle,Information Level 4" ], + [ 0x0042, "Return Volume/Directory Number,Information Level 4" ], + [ 0x0044, "Return EAHandle,Close Handle on Error,Information Level 4" ], + [ 0x0045, "Return NetWareHandle,Close Handle on Error,Information Level 4" ], + [ 0x0046, "Return Volume/Directory Number,Close Handle on Error,Information Level 4" ], + [ 0x0050, "Return EAHandle,Information Level 5" ], + [ 0x0051, "Return NetWareHandle,Information Level 5" ], + [ 0x0052, "Return Volume/Directory Number,Information Level 5" ], + [ 0x0054, "Return EAHandle,Close Handle on Error,Information Level 5" ], + [ 0x0055, "Return NetWareHandle,Close Handle on Error,Information Level 5" ], + [ 0x0056, "Return Volume/Directory Number,Close Handle on Error,Information Level 5" ], + [ 0x0060, "Return EAHandle,Information Level 6" ], + [ 0x0061, "Return NetWareHandle,Information Level 6" ], + [ 0x0062, "Return Volume/Directory Number,Information Level 6" ], + [ 0x0064, "Return EAHandle,Close Handle on Error,Information Level 6" ], + [ 0x0065, "Return NetWareHandle,Close Handle on Error,Information Level 6" ], + [ 0x0066, "Return Volume/Directory Number,Close Handle on Error,Information Level 6" ], + [ 0x0070, "Return EAHandle,Information Level 7" ], + [ 0x0071, "Return NetWareHandle,Information Level 7" ], + [ 0x0072, "Return Volume/Directory Number,Information Level 7" ], + [ 0x0074, "Return EAHandle,Close Handle on Error,Information Level 7" ], + [ 0x0075, "Return NetWareHandle,Close Handle on Error,Information Level 7" ], + [ 0x0076, "Return Volume/Directory Number,Close Handle on Error,Information Level 7" ], + [ 0x0080, "Return EAHandle,Information Level 0,Immediate Close Handle" ], + [ 0x0081, "Return NetWareHandle,Information Level 0,Immediate Close Handle" ], + [ 0x0082, "Return Volume/Directory Number,Information Level 0,Immediate Close Handle" ], + [ 0x0084, "Return EAHandle,Close Handle on Error,Information Level 0,Immediate Close Handle" ], + [ 0x0085, "Return NetWareHandle,Close Handle on Error,Information Level 0,Immediate Close Handle" ], + [ 0x0086, "Return Volume/Directory Number,Close Handle on Error,Information Level 0,Immediate Close Handle" ], + [ 0x0090, "Return EAHandle,Information Level 1,Immediate Close Handle" ], + [ 0x0091, "Return NetWareHandle,Information Level 1,Immediate Close Handle" ], + [ 0x0092, "Return Volume/Directory Number,Information Level 1,Immediate Close Handle" ], + [ 0x0094, "Return EAHandle,Close Handle on Error,Information Level 1,Immediate Close Handle" ], + [ 0x0095, "Return NetWareHandle,Close Handle on Error,Information Level 1,Immediate Close Handle" ], + [ 0x0096, "Return Volume/Directory Number,Close Handle on Error,Information Level 1,Immediate Close Handle" ], + [ 0x00a0, "Return EAHandle,Information Level 2,Immediate Close Handle" ], + [ 0x00a1, "Return NetWareHandle,Information Level 2,Immediate Close Handle" ], + [ 0x00a2, "Return Volume/Directory Number,Information Level 2,Immediate Close Handle" ], + [ 0x00a4, "Return EAHandle,Close Handle on Error,Information Level 2,Immediate Close Handle" ], + [ 0x00a5, "Return NetWareHandle,Close Handle on Error,Information Level 2,Immediate Close Handle" ], + [ 0x00a6, "Return Volume/Directory Number,Close Handle on Error,Information Level 2,Immediate Close Handle" ], + [ 0x00b0, "Return EAHandle,Information Level 3,Immediate Close Handle" ], + [ 0x00b1, "Return NetWareHandle,Information Level 3,Immediate Close Handle" ], + [ 0x00b2, "Return Volume/Directory Number,Information Level 3,Immediate Close Handle" ], + [ 0x00b4, "Return EAHandle,Close Handle on Error,Information Level 3,Immediate Close Handle" ], + [ 0x00b5, "Return NetWareHandle,Close Handle on Error,Information Level 3,Immediate Close Handle" ], + [ 0x00b6, "Return Volume/Directory Number,Close Handle on Error,Information Level 3,Immediate Close Handle" ], + [ 0x00c0, "Return EAHandle,Information Level 4,Immediate Close Handle" ], + [ 0x00c1, "Return NetWareHandle,Information Level 4,Immediate Close Handle" ], + [ 0x00c2, "Return Volume/Directory Number,Information Level 4,Immediate Close Handle" ], + [ 0x00c4, "Return EAHandle,Close Handle on Error,Information Level 4,Immediate Close Handle" ], + [ 0x00c5, "Return NetWareHandle,Close Handle on Error,Information Level 4,Immediate Close Handle" ], + [ 0x00c6, "Return Volume/Directory Number,Close Handle on Error,Information Level 4,Immediate Close Handle" ], + [ 0x00d0, "Return EAHandle,Information Level 5,Immediate Close Handle" ], + [ 0x00d1, "Return NetWareHandle,Information Level 5,Immediate Close Handle" ], + [ 0x00d2, "Return Volume/Directory Number,Information Level 5,Immediate Close Handle" ], + [ 0x00d4, "Return EAHandle,Close Handle on Error,Information Level 5,Immediate Close Handle" ], + [ 0x00d5, "Return NetWareHandle,Close Handle on Error,Information Level 5,Immediate Close Handle" ], + [ 0x00d6, "Return Volume/Directory Number,Close Handle on Error,Information Level 5,Immediate Close Handle" ], + [ 0x00e0, "Return EAHandle,Information Level 6,Immediate Close Handle" ], + [ 0x00e1, "Return NetWareHandle,Information Level 6,Immediate Close Handle" ], + [ 0x00e2, "Return Volume/Directory Number,Information Level 6,Immediate Close Handle" ], + [ 0x00e4, "Return EAHandle,Close Handle on Error,Information Level 6,Immediate Close Handle" ], + [ 0x00e5, "Return NetWareHandle,Close Handle on Error,Information Level 6,Immediate Close Handle" ], + [ 0x00e6, "Return Volume/Directory Number,Close Handle on Error,Information Level 6,Immediate Close Handle" ], + [ 0x00f0, "Return EAHandle,Information Level 7,Immediate Close Handle" ], + [ 0x00f1, "Return NetWareHandle,Information Level 7,Immediate Close Handle" ], + [ 0x00f2, "Return Volume/Directory Number,Information Level 7,Immediate Close Handle" ], + [ 0x00f4, "Return EAHandle,Close Handle on Error,Information Level 7,Immediate Close Handle" ], + [ 0x00f5, "Return NetWareHandle,Close Handle on Error,Information Level 7,Immediate Close Handle" ], + [ 0x00f6, "Return Volume/Directory Number,Close Handle on Error,Information Level 7,Immediate Close Handle" ], +]) +dstNSIndicator = val_string16("dst_ns_indicator", "Destination Name Space Indicator", [ + [ 0x0000, "Return Source Name Space Information" ], + [ 0x0001, "Return Destination Name Space Information" ], +]) +DstQueueID = uint32("dst_queue_id", "Destination Queue ID") +DuplicateRepliesSent = uint16("duplicate_replies_sent", "Duplicate Replies Sent") + +EAAccessFlag = bitfield16("ea_access_flag", "EA Access Flag", [ + bf_boolean16(0x0001, "ea_permanent_memory", "Permanent Memory"), + bf_boolean16(0x0002, "ea_deep_freeze", "Deep Freeze"), + bf_boolean16(0x0004, "ea_in_progress", "In Progress"), + bf_boolean16(0x0008, "ea_header_being_enlarged", "Header Being Enlarged"), + bf_boolean16(0x0010, "ea_new_tally_used", "New Tally Used"), + bf_boolean16(0x0020, "ea_tally_need_update", "Tally Need Update"), + bf_boolean16(0x0040, "ea_score_card_present", "Score Card Present"), + bf_boolean16(0x0080, "ea_need_bit_flag", "EA Need Bit Flag"), + bf_boolean16(0x0100, "ea_write_privileges", "Write Privileges"), + bf_boolean16(0x0200, "ea_read_privileges", "Read Privileges"), + bf_boolean16(0x0400, "ea_delete_privileges", "Delete Privileges"), + bf_boolean16(0x0800, "ea_system_ea_only", "System EA Only"), + bf_boolean16(0x1000, "ea_write_in_progress", "Write In Progress"), +]) +EABytesWritten = uint32("ea_bytes_written", "Bytes Written") +EACount = uint32("ea_count", "Count") +EADataSize = uint32("ea_data_size", "Data Size") +EADataSizeDuplicated = uint32("ea_data_size_duplicated", "Data Size Duplicated") +EADuplicateCount = uint32("ea_duplicate_count", "Duplicate Count") +EAErrorCodes = val_string16("ea_error_codes", "EA Error Codes", [ + [ 0x0000, "SUCCESSFUL" ], + [ 0x00c8, "ERR_MISSING_EA_KEY" ], + [ 0x00c9, "ERR_EA_NOT_FOUND" ], + [ 0x00ca, "ERR_INVALID_EA_HANDLE_TYPE" ], + [ 0x00cb, "ERR_EA_NO_KEY_NO_DATA" ], + [ 0x00cc, "ERR_EA_NUMBER_MISMATCH" ], + [ 0x00cd, "ERR_EXTENT_NUMBER_OUT_OF_RANGE" ], + [ 0x00ce, "ERR_EA_BAD_DIR_NUM" ], + [ 0x00cf, "ERR_INVALID_EA_HANDLE" ], + [ 0x00d0, "ERR_EA_POSITION_OUT_OF_RANGE" ], + [ 0x00d1, "ERR_EA_ACCESS_DENIED" ], + [ 0x00d2, "ERR_DATA_PAGE_ODD_SIZE" ], + [ 0x00d3, "ERR_EA_VOLUME_NOT_MOUNTED" ], + [ 0x00d4, "ERR_BAD_PAGE_BOUNDARY" ], + [ 0x00d5, "ERR_INSPECT_FAILURE" ], + [ 0x00d6, "ERR_EA_ALREADY_CLAIMED" ], + [ 0x00d7, "ERR_ODD_BUFFER_SIZE" ], + [ 0x00d8, "ERR_NO_SCORECARDS" ], + [ 0x00d9, "ERR_BAD_EDS_SIGNATURE" ], + [ 0x00da, "ERR_EA_SPACE_LIMIT" ], + [ 0x00db, "ERR_EA_KEY_CORRUPT" ], + [ 0x00dc, "ERR_EA_KEY_LIMIT" ], + [ 0x00dd, "ERR_TALLY_CORRUPT" ], +]) +EAFlags = val_string16("ea_flags", "EA Flags", [ + [ 0x0000, "Return EAHandle,Information Level 0" ], + [ 0x0001, "Return NetWareHandle,Information Level 0" ], + [ 0x0002, "Return Volume/Directory Number,Information Level 0" ], + [ 0x0004, "Return EAHandle,Close Handle on Error,Information Level 0" ], + [ 0x0005, "Return NetWareHandle,Close Handle on Error,Information Level 0" ], + [ 0x0006, "Return Volume/Directory Number,Close Handle on Error,Information Level 0" ], + [ 0x0010, "Return EAHandle,Information Level 1" ], + [ 0x0011, "Return NetWareHandle,Information Level 1" ], + [ 0x0012, "Return Volume/Directory Number,Information Level 1" ], + [ 0x0014, "Return EAHandle,Close Handle on Error,Information Level 1" ], + [ 0x0015, "Return NetWareHandle,Close Handle on Error,Information Level 1" ], + [ 0x0016, "Return Volume/Directory Number,Close Handle on Error,Information Level 1" ], + [ 0x0020, "Return EAHandle,Information Level 2" ], + [ 0x0021, "Return NetWareHandle,Information Level 2" ], + [ 0x0022, "Return Volume/Directory Number,Information Level 2" ], + [ 0x0024, "Return EAHandle,Close Handle on Error,Information Level 2" ], + [ 0x0025, "Return NetWareHandle,Close Handle on Error,Information Level 2" ], + [ 0x0026, "Return Volume/Directory Number,Close Handle on Error,Information Level 2" ], + [ 0x0030, "Return EAHandle,Information Level 3" ], + [ 0x0031, "Return NetWareHandle,Information Level 3" ], + [ 0x0032, "Return Volume/Directory Number,Information Level 3" ], + [ 0x0034, "Return EAHandle,Close Handle on Error,Information Level 3" ], + [ 0x0035, "Return NetWareHandle,Close Handle on Error,Information Level 3" ], + [ 0x0036, "Return Volume/Directory Number,Close Handle on Error,Information Level 3" ], + [ 0x0040, "Return EAHandle,Information Level 4" ], + [ 0x0041, "Return NetWareHandle,Information Level 4" ], + [ 0x0042, "Return Volume/Directory Number,Information Level 4" ], + [ 0x0044, "Return EAHandle,Close Handle on Error,Information Level 4" ], + [ 0x0045, "Return NetWareHandle,Close Handle on Error,Information Level 4" ], + [ 0x0046, "Return Volume/Directory Number,Close Handle on Error,Information Level 4" ], + [ 0x0050, "Return EAHandle,Information Level 5" ], + [ 0x0051, "Return NetWareHandle,Information Level 5" ], + [ 0x0052, "Return Volume/Directory Number,Information Level 5" ], + [ 0x0054, "Return EAHandle,Close Handle on Error,Information Level 5" ], + [ 0x0055, "Return NetWareHandle,Close Handle on Error,Information Level 5" ], + [ 0x0056, "Return Volume/Directory Number,Close Handle on Error,Information Level 5" ], + [ 0x0060, "Return EAHandle,Information Level 6" ], + [ 0x0061, "Return NetWareHandle,Information Level 6" ], + [ 0x0062, "Return Volume/Directory Number,Information Level 6" ], + [ 0x0064, "Return EAHandle,Close Handle on Error,Information Level 6" ], + [ 0x0065, "Return NetWareHandle,Close Handle on Error,Information Level 6" ], + [ 0x0066, "Return Volume/Directory Number,Close Handle on Error,Information Level 6" ], + [ 0x0070, "Return EAHandle,Information Level 7" ], + [ 0x0071, "Return NetWareHandle,Information Level 7" ], + [ 0x0072, "Return Volume/Directory Number,Information Level 7" ], + [ 0x0074, "Return EAHandle,Close Handle on Error,Information Level 7" ], + [ 0x0075, "Return NetWareHandle,Close Handle on Error,Information Level 7" ], + [ 0x0076, "Return Volume/Directory Number,Close Handle on Error,Information Level 7" ], + [ 0x0080, "Return EAHandle,Information Level 0,Immediate Close Handle" ], + [ 0x0081, "Return NetWareHandle,Information Level 0,Immediate Close Handle" ], + [ 0x0082, "Return Volume/Directory Number,Information Level 0,Immediate Close Handle" ], + [ 0x0084, "Return EAHandle,Close Handle on Error,Information Level 0,Immediate Close Handle" ], + [ 0x0085, "Return NetWareHandle,Close Handle on Error,Information Level 0,Immediate Close Handle" ], + [ 0x0086, "Return Volume/Directory Number,Close Handle on Error,Information Level 0,Immediate Close Handle" ], + [ 0x0090, "Return EAHandle,Information Level 1,Immediate Close Handle" ], + [ 0x0091, "Return NetWareHandle,Information Level 1,Immediate Close Handle" ], + [ 0x0092, "Return Volume/Directory Number,Information Level 1,Immediate Close Handle" ], + [ 0x0094, "Return EAHandle,Close Handle on Error,Information Level 1,Immediate Close Handle" ], + [ 0x0095, "Return NetWareHandle,Close Handle on Error,Information Level 1,Immediate Close Handle" ], + [ 0x0096, "Return Volume/Directory Number,Close Handle on Error,Information Level 1,Immediate Close Handle" ], + [ 0x00a0, "Return EAHandle,Information Level 2,Immediate Close Handle" ], + [ 0x00a1, "Return NetWareHandle,Information Level 2,Immediate Close Handle" ], + [ 0x00a2, "Return Volume/Directory Number,Information Level 2,Immediate Close Handle" ], + [ 0x00a4, "Return EAHandle,Close Handle on Error,Information Level 2,Immediate Close Handle" ], + [ 0x00a5, "Return NetWareHandle,Close Handle on Error,Information Level 2,Immediate Close Handle" ], + [ 0x00a6, "Return Volume/Directory Number,Close Handle on Error,Information Level 2,Immediate Close Handle" ], + [ 0x00b0, "Return EAHandle,Information Level 3,Immediate Close Handle" ], + [ 0x00b1, "Return NetWareHandle,Information Level 3,Immediate Close Handle" ], + [ 0x00b2, "Return Volume/Directory Number,Information Level 3,Immediate Close Handle" ], + [ 0x00b4, "Return EAHandle,Close Handle on Error,Information Level 3,Immediate Close Handle" ], + [ 0x00b5, "Return NetWareHandle,Close Handle on Error,Information Level 3,Immediate Close Handle" ], + [ 0x00b6, "Return Volume/Directory Number,Close Handle on Error,Information Level 3,Immediate Close Handle" ], + [ 0x00c0, "Return EAHandle,Information Level 4,Immediate Close Handle" ], + [ 0x00c1, "Return NetWareHandle,Information Level 4,Immediate Close Handle" ], + [ 0x00c2, "Return Volume/Directory Number,Information Level 4,Immediate Close Handle" ], + [ 0x00c4, "Return EAHandle,Close Handle on Error,Information Level 4,Immediate Close Handle" ], + [ 0x00c5, "Return NetWareHandle,Close Handle on Error,Information Level 4,Immediate Close Handle" ], + [ 0x00c6, "Return Volume/Directory Number,Close Handle on Error,Information Level 4,Immediate Close Handle" ], + [ 0x00d0, "Return EAHandle,Information Level 5,Immediate Close Handle" ], + [ 0x00d1, "Return NetWareHandle,Information Level 5,Immediate Close Handle" ], + [ 0x00d2, "Return Volume/Directory Number,Information Level 5,Immediate Close Handle" ], + [ 0x00d4, "Return EAHandle,Close Handle on Error,Information Level 5,Immediate Close Handle" ], + [ 0x00d5, "Return NetWareHandle,Close Handle on Error,Information Level 5,Immediate Close Handle" ], + [ 0x00d6, "Return Volume/Directory Number,Close Handle on Error,Information Level 5,Immediate Close Handle" ], + [ 0x00e0, "Return EAHandle,Information Level 6,Immediate Close Handle" ], + [ 0x00e1, "Return NetWareHandle,Information Level 6,Immediate Close Handle" ], + [ 0x00e2, "Return Volume/Directory Number,Information Level 6,Immediate Close Handle" ], + [ 0x00e4, "Return EAHandle,Close Handle on Error,Information Level 6,Immediate Close Handle" ], + [ 0x00e5, "Return NetWareHandle,Close Handle on Error,Information Level 6,Immediate Close Handle" ], + [ 0x00e6, "Return Volume/Directory Number,Close Handle on Error,Information Level 6,Immediate Close Handle" ], + [ 0x00f0, "Return EAHandle,Information Level 7,Immediate Close Handle" ], + [ 0x00f1, "Return NetWareHandle,Information Level 7,Immediate Close Handle" ], + [ 0x00f2, "Return Volume/Directory Number,Information Level 7,Immediate Close Handle" ], + [ 0x00f4, "Return EAHandle,Close Handle on Error,Information Level 7,Immediate Close Handle" ], + [ 0x00f5, "Return NetWareHandle,Close Handle on Error,Information Level 7,Immediate Close Handle" ], + [ 0x00f6, "Return Volume/Directory Number,Close Handle on Error,Information Level 7,Immediate Close Handle" ], ]) -EAHandle = uint32("ea_handle", "EA Handle") +EAHandle = uint32("ea_handle", "EA Handle") EAHandle.Display("BASE_HEX") -EAHandleOrNetWareHandleOrVolume = uint32("ea_handle_or_netware_handle_or_volume", "EAHandle or NetWare Handle or Volume (see EAFlags)") +EAHandleOrNetWareHandleOrVolume = uint32("ea_handle_or_netware_handle_or_volume", "EAHandle or NetWare Handle or Volume (see EAFlags)") EAHandleOrNetWareHandleOrVolume.Display("BASE_HEX") -EAKey = nstring16("ea_key", "EA Key") -EAKeySize = uint32("ea_key_size", "Key Size") -EAKeySizeDuplicated = uint32("ea_key_size_duplicated", "Key Size Duplicated") +EAKey = nstring16("ea_key", "EA Key") +EAKeySize = uint32("ea_key_size", "Key Size") +EAKeySizeDuplicated = uint32("ea_key_size_duplicated", "Key Size Duplicated") EAValue = nstring16("ea_value", "EA Value") -EAValueRep = fw_string("ea_value_rep", "EA Value", 1) +EAValueRep = fw_string("ea_value_rep", "EA Value", 1) EAValueLength = uint16("ea_value_length", "Value Length") -EchoSocket = uint16("echo_socket", "Echo Socket") +EchoSocket = uint16("echo_socket", "Echo Socket") EchoSocket.Display('BASE_HEX') -EffectiveRights = bitfield8("effective_rights", "Effective Rights", [ - bf_boolean8(0x01, "effective_rights_read", "Read Rights"), - bf_boolean8(0x02, "effective_rights_write", "Write Rights"), - bf_boolean8(0x04, "effective_rights_open", "Open Rights"), - bf_boolean8(0x08, "effective_rights_create", "Create Rights"), - bf_boolean8(0x10, "effective_rights_delete", "Delete Rights"), - bf_boolean8(0x20, "effective_rights_parental", "Parental Rights"), - bf_boolean8(0x40, "effective_rights_search", "Search Rights"), - bf_boolean8(0x80, "effective_rights_modify", "Modify Rights"), -]) -EnumInfoMask = bitfield8("enum_info_mask", "Return Information Mask", [ - bf_boolean8(0x01, "enum_info_transport", "Transport Information"), - bf_boolean8(0x02, "enum_info_time", "Time Information"), - bf_boolean8(0x04, "enum_info_name", "Name Information"), - bf_boolean8(0x08, "enum_info_lock", "Lock Information"), - bf_boolean8(0x10, "enum_info_print", "Print Information"), - bf_boolean8(0x20, "enum_info_stats", "Statistical Information"), - bf_boolean8(0x40, "enum_info_account", "Accounting Information"), - bf_boolean8(0x80, "enum_info_auth", "Authentication Information"), +EffectiveRights = bitfield8("effective_rights", "Effective Rights", [ + bf_boolean8(0x01, "effective_rights_read", "Read Rights"), + bf_boolean8(0x02, "effective_rights_write", "Write Rights"), + bf_boolean8(0x04, "effective_rights_open", "Open Rights"), + bf_boolean8(0x08, "effective_rights_create", "Create Rights"), + bf_boolean8(0x10, "effective_rights_delete", "Delete Rights"), + bf_boolean8(0x20, "effective_rights_parental", "Parental Rights"), + bf_boolean8(0x40, "effective_rights_search", "Search Rights"), + bf_boolean8(0x80, "effective_rights_modify", "Modify Rights"), +]) +EnumInfoMask = bitfield8("enum_info_mask", "Return Information Mask", [ + bf_boolean8(0x01, "enum_info_transport", "Transport Information"), + bf_boolean8(0x02, "enum_info_time", "Time Information"), + bf_boolean8(0x04, "enum_info_name", "Name Information"), + bf_boolean8(0x08, "enum_info_lock", "Lock Information"), + bf_boolean8(0x10, "enum_info_print", "Print Information"), + bf_boolean8(0x20, "enum_info_stats", "Statistical Information"), + bf_boolean8(0x40, "enum_info_account", "Accounting Information"), + bf_boolean8(0x80, "enum_info_auth", "Authentication Information"), ]) -eventOffset = bytes("event_offset", "Event Offset", 8) -eventTime = uint32("event_time", "Event Time") +eventOffset = bytes("event_offset", "Event Offset", 8) +eventTime = uint32("event_time", "Event Time") eventTime.Display("BASE_HEX") -ExpirationTime = uint32("expiration_time", "Expiration Time") +ExpirationTime = uint32("expiration_time", "Expiration Time") ExpirationTime.Display('BASE_HEX') -ExtAttrDataSize = uint32("ext_attr_data_size", "Extended Attributes Data Size") -ExtAttrCount = uint32("ext_attr_count", "Extended Attributes Count") -ExtAttrKeySize = uint32("ext_attr_key_size", "Extended Attributes Key Size") -ExtendedAttributesDefined = uint32("extended_attributes_defined", "Extended Attributes Defined") -ExtendedAttributeExtentsUsed = uint32("extended_attribute_extents_used", "Extended Attribute Extents Used") -ExtendedInfo = bitfield16("ext_info", "Extended Return Information", [ - bf_boolean16(0x0001, "ext_info_update", "Last Update"), - bf_boolean16(0x0002, "ext_info_dos_name", "DOS Name"), - bf_boolean16(0x0004, "ext_info_flush", "Flush Time"), - bf_boolean16(0x0008, "ext_info_parental", "Parental"), - bf_boolean16(0x0010, "ext_info_mac_finder", "MAC Finder"), - bf_boolean16(0x0020, "ext_info_sibling", "Sibling"), - bf_boolean16(0x0040, "ext_info_effective", "Effective"), - bf_boolean16(0x0080, "ext_info_mac_date", "MAC Date"), - bf_boolean16(0x0100, "ext_info_access", "Last Access"), - bf_boolean16(0x0400, "ext_info_64_bit_fs", "64 Bit File Sizes"), - bf_boolean16(0x8000, "ext_info_newstyle", "New Style"), +ExtAttrDataSize = uint32("ext_attr_data_size", "Extended Attributes Data Size") +ExtAttrCount = uint32("ext_attr_count", "Extended Attributes Count") +ExtAttrKeySize = uint32("ext_attr_key_size", "Extended Attributes Key Size") +ExtendedAttributesDefined = uint32("extended_attributes_defined", "Extended Attributes Defined") +ExtendedAttributeExtentsUsed = uint32("extended_attribute_extents_used", "Extended Attribute Extents Used") +ExtendedInfo = bitfield16("ext_info", "Extended Return Information", [ + bf_boolean16(0x0001, "ext_info_update", "Last Update"), + bf_boolean16(0x0002, "ext_info_dos_name", "DOS Name"), + bf_boolean16(0x0004, "ext_info_flush", "Flush Time"), + bf_boolean16(0x0008, "ext_info_parental", "Parental"), + bf_boolean16(0x0010, "ext_info_mac_finder", "MAC Finder"), + bf_boolean16(0x0020, "ext_info_sibling", "Sibling"), + bf_boolean16(0x0040, "ext_info_effective", "Effective"), + bf_boolean16(0x0080, "ext_info_mac_date", "MAC Date"), + bf_boolean16(0x0100, "ext_info_access", "Last Access"), + bf_boolean16(0x0400, "ext_info_64_bit_fs", "64 Bit File Sizes"), + bf_boolean16(0x8000, "ext_info_newstyle", "New Style"), ]) ExtRouterActiveFlag = boolean8("ext_router_active_flag", "External Router Active Flag") -FailedAllocReqCnt = uint32("failed_alloc_req", "Failed Alloc Request Count") -FatalFATWriteErrors = uint16("fatal_fat_write_errors", "Fatal FAT Write Errors") -FATScanErrors = uint16("fat_scan_errors", "FAT Scan Errors") -FATWriteErrors = uint16("fat_write_errors", "FAT Write Errors") -FieldsLenTable = bytes("fields_len_table", "Fields Len Table", 32) -FileCount = uint16("file_count", "File Count") -FileDate = uint16("file_date", "File Date") +FailedAllocReqCnt = uint32("failed_alloc_req", "Failed Alloc Request Count") +FatalFATWriteErrors = uint16("fatal_fat_write_errors", "Fatal FAT Write Errors") +FATScanErrors = uint16("fat_scan_errors", "FAT Scan Errors") +FATWriteErrors = uint16("fat_write_errors", "FAT Write Errors") +FieldsLenTable = bytes("fields_len_table", "Fields Len Table", 32) +FileCount = uint16("file_count", "File Count") +FileDate = uint16("file_date", "File Date") FileDate.NWDate() -FileDirWindow = uint16("file_dir_win", "File/Dir Window") +FileDirWindow = uint16("file_dir_win", "File/Dir Window") FileDirWindow.Display("BASE_HEX") -FileExecuteType = uint8("file_execute_type", "File Execute Type") -FileExtendedAttributes = val_string8("file_ext_attr", "File Extended Attributes", [ - [ 0x00, "Search On All Read Only Opens" ], - [ 0x01, "Search On Read Only Opens With No Path" ], - [ 0x02, "Shell Default Search Mode" ], - [ 0x03, "Search On All Opens With No Path" ], - [ 0x04, "Do Not Search" ], - [ 0x05, "Reserved" ], - [ 0x06, "Search On All Opens" ], - [ 0x07, "Reserved" ], - [ 0x08, "Search On All Read Only Opens/Indexed" ], - [ 0x09, "Search On Read Only Opens With No Path/Indexed" ], - [ 0x0a, "Shell Default Search Mode/Indexed" ], - [ 0x0b, "Search On All Opens With No Path/Indexed" ], - [ 0x0c, "Do Not Search/Indexed" ], - [ 0x0d, "Indexed" ], - [ 0x0e, "Search On All Opens/Indexed" ], - [ 0x0f, "Indexed" ], - [ 0x10, "Search On All Read Only Opens/Transactional" ], - [ 0x11, "Search On Read Only Opens With No Path/Transactional" ], - [ 0x12, "Shell Default Search Mode/Transactional" ], - [ 0x13, "Search On All Opens With No Path/Transactional" ], - [ 0x14, "Do Not Search/Transactional" ], - [ 0x15, "Transactional" ], - [ 0x16, "Search On All Opens/Transactional" ], - [ 0x17, "Transactional" ], - [ 0x18, "Search On All Read Only Opens/Indexed/Transactional" ], - [ 0x19, "Search On Read Only Opens With No Path/Indexed/Transactional" ], - [ 0x1a, "Shell Default Search Mode/Indexed/Transactional" ], - [ 0x1b, "Search On All Opens With No Path/Indexed/Transactional" ], - [ 0x1c, "Do Not Search/Indexed/Transactional" ], - [ 0x1d, "Indexed/Transactional" ], - [ 0x1e, "Search On All Opens/Indexed/Transactional" ], - [ 0x1f, "Indexed/Transactional" ], - [ 0x40, "Search On All Read Only Opens/Read Audit" ], - [ 0x41, "Search On Read Only Opens With No Path/Read Audit" ], - [ 0x42, "Shell Default Search Mode/Read Audit" ], - [ 0x43, "Search On All Opens With No Path/Read Audit" ], - [ 0x44, "Do Not Search/Read Audit" ], - [ 0x45, "Read Audit" ], - [ 0x46, "Search On All Opens/Read Audit" ], - [ 0x47, "Read Audit" ], - [ 0x48, "Search On All Read Only Opens/Indexed/Read Audit" ], - [ 0x49, "Search On Read Only Opens With No Path/Indexed/Read Audit" ], - [ 0x4a, "Shell Default Search Mode/Indexed/Read Audit" ], - [ 0x4b, "Search On All Opens With No Path/Indexed/Read Audit" ], - [ 0x4c, "Do Not Search/Indexed/Read Audit" ], - [ 0x4d, "Indexed/Read Audit" ], - [ 0x4e, "Search On All Opens/Indexed/Read Audit" ], - [ 0x4f, "Indexed/Read Audit" ], - [ 0x50, "Search On All Read Only Opens/Transactional/Read Audit" ], - [ 0x51, "Search On Read Only Opens With No Path/Transactional/Read Audit" ], - [ 0x52, "Shell Default Search Mode/Transactional/Read Audit" ], - [ 0x53, "Search On All Opens With No Path/Transactional/Read Audit" ], - [ 0x54, "Do Not Search/Transactional/Read Audit" ], - [ 0x55, "Transactional/Read Audit" ], - [ 0x56, "Search On All Opens/Transactional/Read Audit" ], - [ 0x57, "Transactional/Read Audit" ], - [ 0x58, "Search On All Read Only Opens/Indexed/Transactional/Read Audit" ], - [ 0x59, "Search On Read Only Opens With No Path/Indexed/Transactional/Read Audit" ], - [ 0x5a, "Shell Default Search Mode/Indexed/Transactional/Read Audit" ], - [ 0x5b, "Search On All Opens With No Path/Indexed/Transactional/Read Audit" ], - [ 0x5c, "Do Not Search/Indexed/Transactional/Read Audit" ], - [ 0x5d, "Indexed/Transactional/Read Audit" ], - [ 0x5e, "Search On All Opens/Indexed/Transactional/Read Audit" ], - [ 0x5f, "Indexed/Transactional/Read Audit" ], - [ 0x80, "Search On All Read Only Opens/Write Audit" ], - [ 0x81, "Search On Read Only Opens With No Path/Write Audit" ], - [ 0x82, "Shell Default Search Mode/Write Audit" ], - [ 0x83, "Search On All Opens With No Path/Write Audit" ], - [ 0x84, "Do Not Search/Write Audit" ], - [ 0x85, "Write Audit" ], - [ 0x86, "Search On All Opens/Write Audit" ], - [ 0x87, "Write Audit" ], - [ 0x88, "Search On All Read Only Opens/Indexed/Write Audit" ], - [ 0x89, "Search On Read Only Opens With No Path/Indexed/Write Audit" ], - [ 0x8a, "Shell Default Search Mode/Indexed/Write Audit" ], - [ 0x8b, "Search On All Opens With No Path/Indexed/Write Audit" ], - [ 0x8c, "Do Not Search/Indexed/Write Audit" ], - [ 0x8d, "Indexed/Write Audit" ], - [ 0x8e, "Search On All Opens/Indexed/Write Audit" ], - [ 0x8f, "Indexed/Write Audit" ], - [ 0x90, "Search On All Read Only Opens/Transactional/Write Audit" ], - [ 0x91, "Search On Read Only Opens With No Path/Transactional/Write Audit" ], - [ 0x92, "Shell Default Search Mode/Transactional/Write Audit" ], - [ 0x93, "Search On All Opens With No Path/Transactional/Write Audit" ], - [ 0x94, "Do Not Search/Transactional/Write Audit" ], - [ 0x95, "Transactional/Write Audit" ], - [ 0x96, "Search On All Opens/Transactional/Write Audit" ], - [ 0x97, "Transactional/Write Audit" ], - [ 0x98, "Search On All Read Only Opens/Indexed/Transactional/Write Audit" ], - [ 0x99, "Search On Read Only Opens With No Path/Indexed/Transactional/Write Audit" ], - [ 0x9a, "Shell Default Search Mode/Indexed/Transactional/Write Audit" ], - [ 0x9b, "Search On All Opens With No Path/Indexed/Transactional/Write Audit" ], - [ 0x9c, "Do Not Search/Indexed/Transactional/Write Audit" ], - [ 0x9d, "Indexed/Transactional/Write Audit" ], - [ 0x9e, "Search On All Opens/Indexed/Transactional/Write Audit" ], - [ 0x9f, "Indexed/Transactional/Write Audit" ], - [ 0xa0, "Search On All Read Only Opens/Read Audit/Write Audit" ], - [ 0xa1, "Search On Read Only Opens With No Path/Read Audit/Write Audit" ], - [ 0xa2, "Shell Default Search Mode/Read Audit/Write Audit" ], - [ 0xa3, "Search On All Opens With No Path/Read Audit/Write Audit" ], - [ 0xa4, "Do Not Search/Read Audit/Write Audit" ], - [ 0xa5, "Read Audit/Write Audit" ], - [ 0xa6, "Search On All Opens/Read Audit/Write Audit" ], - [ 0xa7, "Read Audit/Write Audit" ], - [ 0xa8, "Search On All Read Only Opens/Indexed/Read Audit/Write Audit" ], - [ 0xa9, "Search On Read Only Opens With No Path/Indexed/Read Audit/Write Audit" ], - [ 0xaa, "Shell Default Search Mode/Indexed/Read Audit/Write Audit" ], - [ 0xab, "Search On All Opens With No Path/Indexed/Read Audit/Write Audit" ], - [ 0xac, "Do Not Search/Indexed/Read Audit/Write Audit" ], - [ 0xad, "Indexed/Read Audit/Write Audit" ], - [ 0xae, "Search On All Opens/Indexed/Read Audit/Write Audit" ], - [ 0xaf, "Indexed/Read Audit/Write Audit" ], - [ 0xb0, "Search On All Read Only Opens/Transactional/Read Audit/Write Audit" ], - [ 0xb1, "Search On Read Only Opens With No Path/Transactional/Read Audit/Write Audit" ], - [ 0xb2, "Shell Default Search Mode/Transactional/Read Audit/Write Audit" ], - [ 0xb3, "Search On All Opens With No Path/Transactional/Read Audit/Write Audit" ], - [ 0xb4, "Do Not Search/Transactional/Read Audit/Write Audit" ], - [ 0xb5, "Transactional/Read Audit/Write Audit" ], - [ 0xb6, "Search On All Opens/Transactional/Read Audit/Write Audit" ], - [ 0xb7, "Transactional/Read Audit/Write Audit" ], - [ 0xb8, "Search On All Read Only Opens/Indexed/Transactional/Read Audit/Write Audit" ], - [ 0xb9, "Search On Read Only Opens With No Path/Indexed/Transactional/Read Audit/Write Audit" ], - [ 0xba, "Shell Default Search Mode/Indexed/Transactional/Read Audit/Write Audit" ], - [ 0xbb, "Search On All Opens With No Path/Indexed/Transactional/Read Audit/Write Audit" ], - [ 0xbc, "Do Not Search/Indexed/Transactional/Read Audit/Write Audit" ], - [ 0xbd, "Indexed/Transactional/Read Audit/Write Audit" ], - [ 0xbe, "Search On All Opens/Indexed/Transactional/Read Audit/Write Audit" ], - [ 0xbf, "Indexed/Transactional/Read Audit/Write Audit" ], +FileExecuteType = uint8("file_execute_type", "File Execute Type") +FileExtendedAttributes = val_string8("file_ext_attr", "File Extended Attributes", [ + [ 0x00, "Search On All Read Only Opens" ], + [ 0x01, "Search On Read Only Opens With No Path" ], + [ 0x02, "Shell Default Search Mode" ], + [ 0x03, "Search On All Opens With No Path" ], + [ 0x04, "Do Not Search" ], + [ 0x05, "Reserved" ], + [ 0x06, "Search On All Opens" ], + [ 0x07, "Reserved" ], + [ 0x08, "Search On All Read Only Opens/Indexed" ], + [ 0x09, "Search On Read Only Opens With No Path/Indexed" ], + [ 0x0a, "Shell Default Search Mode/Indexed" ], + [ 0x0b, "Search On All Opens With No Path/Indexed" ], + [ 0x0c, "Do Not Search/Indexed" ], + [ 0x0d, "Indexed" ], + [ 0x0e, "Search On All Opens/Indexed" ], + [ 0x0f, "Indexed" ], + [ 0x10, "Search On All Read Only Opens/Transactional" ], + [ 0x11, "Search On Read Only Opens With No Path/Transactional" ], + [ 0x12, "Shell Default Search Mode/Transactional" ], + [ 0x13, "Search On All Opens With No Path/Transactional" ], + [ 0x14, "Do Not Search/Transactional" ], + [ 0x15, "Transactional" ], + [ 0x16, "Search On All Opens/Transactional" ], + [ 0x17, "Transactional" ], + [ 0x18, "Search On All Read Only Opens/Indexed/Transactional" ], + [ 0x19, "Search On Read Only Opens With No Path/Indexed/Transactional" ], + [ 0x1a, "Shell Default Search Mode/Indexed/Transactional" ], + [ 0x1b, "Search On All Opens With No Path/Indexed/Transactional" ], + [ 0x1c, "Do Not Search/Indexed/Transactional" ], + [ 0x1d, "Indexed/Transactional" ], + [ 0x1e, "Search On All Opens/Indexed/Transactional" ], + [ 0x1f, "Indexed/Transactional" ], + [ 0x40, "Search On All Read Only Opens/Read Audit" ], + [ 0x41, "Search On Read Only Opens With No Path/Read Audit" ], + [ 0x42, "Shell Default Search Mode/Read Audit" ], + [ 0x43, "Search On All Opens With No Path/Read Audit" ], + [ 0x44, "Do Not Search/Read Audit" ], + [ 0x45, "Read Audit" ], + [ 0x46, "Search On All Opens/Read Audit" ], + [ 0x47, "Read Audit" ], + [ 0x48, "Search On All Read Only Opens/Indexed/Read Audit" ], + [ 0x49, "Search On Read Only Opens With No Path/Indexed/Read Audit" ], + [ 0x4a, "Shell Default Search Mode/Indexed/Read Audit" ], + [ 0x4b, "Search On All Opens With No Path/Indexed/Read Audit" ], + [ 0x4c, "Do Not Search/Indexed/Read Audit" ], + [ 0x4d, "Indexed/Read Audit" ], + [ 0x4e, "Search On All Opens/Indexed/Read Audit" ], + [ 0x4f, "Indexed/Read Audit" ], + [ 0x50, "Search On All Read Only Opens/Transactional/Read Audit" ], + [ 0x51, "Search On Read Only Opens With No Path/Transactional/Read Audit" ], + [ 0x52, "Shell Default Search Mode/Transactional/Read Audit" ], + [ 0x53, "Search On All Opens With No Path/Transactional/Read Audit" ], + [ 0x54, "Do Not Search/Transactional/Read Audit" ], + [ 0x55, "Transactional/Read Audit" ], + [ 0x56, "Search On All Opens/Transactional/Read Audit" ], + [ 0x57, "Transactional/Read Audit" ], + [ 0x58, "Search On All Read Only Opens/Indexed/Transactional/Read Audit" ], + [ 0x59, "Search On Read Only Opens With No Path/Indexed/Transactional/Read Audit" ], + [ 0x5a, "Shell Default Search Mode/Indexed/Transactional/Read Audit" ], + [ 0x5b, "Search On All Opens With No Path/Indexed/Transactional/Read Audit" ], + [ 0x5c, "Do Not Search/Indexed/Transactional/Read Audit" ], + [ 0x5d, "Indexed/Transactional/Read Audit" ], + [ 0x5e, "Search On All Opens/Indexed/Transactional/Read Audit" ], + [ 0x5f, "Indexed/Transactional/Read Audit" ], + [ 0x80, "Search On All Read Only Opens/Write Audit" ], + [ 0x81, "Search On Read Only Opens With No Path/Write Audit" ], + [ 0x82, "Shell Default Search Mode/Write Audit" ], + [ 0x83, "Search On All Opens With No Path/Write Audit" ], + [ 0x84, "Do Not Search/Write Audit" ], + [ 0x85, "Write Audit" ], + [ 0x86, "Search On All Opens/Write Audit" ], + [ 0x87, "Write Audit" ], + [ 0x88, "Search On All Read Only Opens/Indexed/Write Audit" ], + [ 0x89, "Search On Read Only Opens With No Path/Indexed/Write Audit" ], + [ 0x8a, "Shell Default Search Mode/Indexed/Write Audit" ], + [ 0x8b, "Search On All Opens With No Path/Indexed/Write Audit" ], + [ 0x8c, "Do Not Search/Indexed/Write Audit" ], + [ 0x8d, "Indexed/Write Audit" ], + [ 0x8e, "Search On All Opens/Indexed/Write Audit" ], + [ 0x8f, "Indexed/Write Audit" ], + [ 0x90, "Search On All Read Only Opens/Transactional/Write Audit" ], + [ 0x91, "Search On Read Only Opens With No Path/Transactional/Write Audit" ], + [ 0x92, "Shell Default Search Mode/Transactional/Write Audit" ], + [ 0x93, "Search On All Opens With No Path/Transactional/Write Audit" ], + [ 0x94, "Do Not Search/Transactional/Write Audit" ], + [ 0x95, "Transactional/Write Audit" ], + [ 0x96, "Search On All Opens/Transactional/Write Audit" ], + [ 0x97, "Transactional/Write Audit" ], + [ 0x98, "Search On All Read Only Opens/Indexed/Transactional/Write Audit" ], + [ 0x99, "Search On Read Only Opens With No Path/Indexed/Transactional/Write Audit" ], + [ 0x9a, "Shell Default Search Mode/Indexed/Transactional/Write Audit" ], + [ 0x9b, "Search On All Opens With No Path/Indexed/Transactional/Write Audit" ], + [ 0x9c, "Do Not Search/Indexed/Transactional/Write Audit" ], + [ 0x9d, "Indexed/Transactional/Write Audit" ], + [ 0x9e, "Search On All Opens/Indexed/Transactional/Write Audit" ], + [ 0x9f, "Indexed/Transactional/Write Audit" ], + [ 0xa0, "Search On All Read Only Opens/Read Audit/Write Audit" ], + [ 0xa1, "Search On Read Only Opens With No Path/Read Audit/Write Audit" ], + [ 0xa2, "Shell Default Search Mode/Read Audit/Write Audit" ], + [ 0xa3, "Search On All Opens With No Path/Read Audit/Write Audit" ], + [ 0xa4, "Do Not Search/Read Audit/Write Audit" ], + [ 0xa5, "Read Audit/Write Audit" ], + [ 0xa6, "Search On All Opens/Read Audit/Write Audit" ], + [ 0xa7, "Read Audit/Write Audit" ], + [ 0xa8, "Search On All Read Only Opens/Indexed/Read Audit/Write Audit" ], + [ 0xa9, "Search On Read Only Opens With No Path/Indexed/Read Audit/Write Audit" ], + [ 0xaa, "Shell Default Search Mode/Indexed/Read Audit/Write Audit" ], + [ 0xab, "Search On All Opens With No Path/Indexed/Read Audit/Write Audit" ], + [ 0xac, "Do Not Search/Indexed/Read Audit/Write Audit" ], + [ 0xad, "Indexed/Read Audit/Write Audit" ], + [ 0xae, "Search On All Opens/Indexed/Read Audit/Write Audit" ], + [ 0xaf, "Indexed/Read Audit/Write Audit" ], + [ 0xb0, "Search On All Read Only Opens/Transactional/Read Audit/Write Audit" ], + [ 0xb1, "Search On Read Only Opens With No Path/Transactional/Read Audit/Write Audit" ], + [ 0xb2, "Shell Default Search Mode/Transactional/Read Audit/Write Audit" ], + [ 0xb3, "Search On All Opens With No Path/Transactional/Read Audit/Write Audit" ], + [ 0xb4, "Do Not Search/Transactional/Read Audit/Write Audit" ], + [ 0xb5, "Transactional/Read Audit/Write Audit" ], + [ 0xb6, "Search On All Opens/Transactional/Read Audit/Write Audit" ], + [ 0xb7, "Transactional/Read Audit/Write Audit" ], + [ 0xb8, "Search On All Read Only Opens/Indexed/Transactional/Read Audit/Write Audit" ], + [ 0xb9, "Search On Read Only Opens With No Path/Indexed/Transactional/Read Audit/Write Audit" ], + [ 0xba, "Shell Default Search Mode/Indexed/Transactional/Read Audit/Write Audit" ], + [ 0xbb, "Search On All Opens With No Path/Indexed/Transactional/Read Audit/Write Audit" ], + [ 0xbc, "Do Not Search/Indexed/Transactional/Read Audit/Write Audit" ], + [ 0xbd, "Indexed/Transactional/Read Audit/Write Audit" ], + [ 0xbe, "Search On All Opens/Indexed/Transactional/Read Audit/Write Audit" ], + [ 0xbf, "Indexed/Transactional/Read Audit/Write Audit" ], ]) fileFlags = uint32("file_flags", "File Flags") -FileHandle = bytes("file_handle", "File Handle", 6) -FileLimbo = uint32("file_limbo", "File Limbo") +FileHandle = bytes("file_handle", "File Handle", 6) +FileLimbo = uint32("file_limbo", "File Limbo") FileListCount = uint32("file_list_count", "File List Count") -FileLock = val_string8("file_lock", "File Lock", [ - [ 0x00, "Not Locked" ], - [ 0xfe, "Locked by file lock" ], - [ 0xff, "Unknown" ], +FileLock = val_string8("file_lock", "File Lock", [ + [ 0x00, "Not Locked" ], + [ 0xfe, "Locked by file lock" ], + [ 0xff, "Unknown" ], ]) -FileLockCount = uint16("file_lock_count", "File Lock Count") +FileLockCount = uint16("file_lock_count", "File Lock Count") FileMigrationState = val_string8("file_mig_state", "File Migration State", [ [ 0x00, "Mark file ineligible for file migration" ], [ 0x01, "Mark file eligible for file migration" ], @@ -2211,215 +2214,215 @@ [ 0x03, "Reset file status back to normal" ], [ 0x04, "Get file data back and reset file status back to normal" ], ]) -FileMode = uint8("file_mode", "File Mode") -FileName = nstring8("file_name", "Filename") -FileName12 = fw_string("file_name_12", "Filename", 12) -FileName14 = fw_string("file_name_14", "Filename", 14) +FileMode = uint8("file_mode", "File Mode") +FileName = nstring8("file_name", "Filename") +FileName12 = fw_string("file_name_12", "Filename", 12) +FileName14 = fw_string("file_name_14", "Filename", 14) FileName16 = nstring16("file_name_16", "Filename") -FileNameLen = uint8("file_name_len", "Filename Length") -FileOffset = uint32("file_offset", "File Offset") -FilePath = nstring8("file_path", "File Path") -FileSize = uint32("file_size", "File Size", BE) +FileNameLen = uint8("file_name_len", "Filename Length") +FileOffset = uint32("file_offset", "File Offset") +FilePath = nstring8("file_path", "File Path") +FileSize = uint32("file_size", "File Size", BE) FileSize64bit = uint64("f_size_64bit", "64bit File Size") -FileSystemID = uint8("file_system_id", "File System ID") -FileTime = uint16("file_time", "File Time") +FileSystemID = uint8("file_system_id", "File System ID") +FileTime = uint16("file_time", "File Time") FileTime.NWTime() FileUseCount = uint16("file_use_count", "File Use Count") -FileWriteFlags = val_string8("file_write_flags", "File Write Flags", [ - [ 0x01, "Writing" ], - [ 0x02, "Write aborted" ], -]) -FileWriteState = val_string8("file_write_state", "File Write State", [ - [ 0x00, "Not Writing" ], - [ 0x01, "Write in Progress" ], - [ 0x02, "Write Being Stopped" ], -]) -Filler = uint8("filler", "Filler") -FinderAttr = bitfield16("finder_attr", "Finder Info Attributes", [ - bf_boolean16(0x0001, "finder_attr_desktop", "Object on Desktop"), - bf_boolean16(0x2000, "finder_attr_invisible", "Object is Invisible"), - bf_boolean16(0x4000, "finder_attr_bundle", "Object Has Bundle"), -]) -FixedBitMask = uint32("fixed_bit_mask", "Fixed Bit Mask") -FixedBitsDefined = uint16("fixed_bits_defined", "Fixed Bits Defined") -FlagBits = uint8("flag_bits", "Flag Bits") +FileWriteFlags = val_string8("file_write_flags", "File Write Flags", [ + [ 0x01, "Writing" ], + [ 0x02, "Write aborted" ], +]) +FileWriteState = val_string8("file_write_state", "File Write State", [ + [ 0x00, "Not Writing" ], + [ 0x01, "Write in Progress" ], + [ 0x02, "Write Being Stopped" ], +]) +Filler = uint8("filler", "Filler") +FinderAttr = bitfield16("finder_attr", "Finder Info Attributes", [ + bf_boolean16(0x0001, "finder_attr_desktop", "Object on Desktop"), + bf_boolean16(0x2000, "finder_attr_invisible", "Object is Invisible"), + bf_boolean16(0x4000, "finder_attr_bundle", "Object Has Bundle"), +]) +FixedBitMask = uint32("fixed_bit_mask", "Fixed Bit Mask") +FixedBitsDefined = uint16("fixed_bits_defined", "Fixed Bits Defined") +FlagBits = uint8("flag_bits", "Flag Bits") Flags = uint8("flags", "Flags") -FlagsDef = uint16("flags_def", "Flags") +FlagsDef = uint16("flags_def", "Flags") FlushTime = uint32("flush_time", "Flush Time") -FolderFlag = val_string8("folder_flag", "Folder Flag", [ - [ 0x00, "Not a Folder" ], - [ 0x01, "Folder" ], -]) -ForkCount = uint8("fork_count", "Fork Count") -ForkIndicator = val_string8("fork_indicator", "Fork Indicator", [ - [ 0x00, "Data Fork" ], - [ 0x01, "Resource Fork" ], -]) -ForceFlag = val_string8("force_flag", "Force Server Down Flag", [ - [ 0x00, "Down Server if No Files Are Open" ], - [ 0xff, "Down Server Immediately, Auto-Close Open Files" ], -]) -ForgedDetachedRequests = uint16("forged_detached_requests", "Forged Detached Requests") -FormType = uint16( "form_type", "Form Type" ) -FormTypeCnt = uint32("form_type_count", "Form Types Count") -FoundSomeMem = uint32("found_some_mem", "Found Some Memory") +FolderFlag = val_string8("folder_flag", "Folder Flag", [ + [ 0x00, "Not a Folder" ], + [ 0x01, "Folder" ], +]) +ForkCount = uint8("fork_count", "Fork Count") +ForkIndicator = val_string8("fork_indicator", "Fork Indicator", [ + [ 0x00, "Data Fork" ], + [ 0x01, "Resource Fork" ], +]) +ForceFlag = val_string8("force_flag", "Force Server Down Flag", [ + [ 0x00, "Down Server if No Files Are Open" ], + [ 0xff, "Down Server Immediately, Auto-Close Open Files" ], +]) +ForgedDetachedRequests = uint16("forged_detached_requests", "Forged Detached Requests") +FormType = uint16( "form_type", "Form Type" ) +FormTypeCnt = uint32("form_type_count", "Form Types Count") +FoundSomeMem = uint32("found_some_mem", "Found Some Memory") FractionalSeconds = uint32("fractional_time", "Fractional Time in Seconds") -FraggerHandle = uint32("fragger_handle", "Fragment Handle") +FraggerHandle = uint32("fragger_handle", "Fragment Handle") FraggerHandle.Display('BASE_HEX') -FragmentWriteOccurred = uint16("fragment_write_occurred", "Fragment Write Occurred") -FragSize = uint32("frag_size", "Fragment Size") -FreeableLimboSectors = uint32("freeable_limbo_sectors", "Freeable Limbo Sectors") -FreeBlocks = uint32("free_blocks", "Free Blocks") -FreedClusters = uint32("freed_clusters", "Freed Clusters") -FreeDirectoryEntries = uint16("free_directory_entries", "Free Directory Entries") -FSEngineFlag = boolean8("fs_engine_flag", "FS Engine Flag") -FullName = fw_string("full_name", "Full Name", 39) - -GetSetFlag = val_string8("get_set_flag", "Get Set Flag", [ - [ 0x00, "Get the default support module ID" ], - [ 0x01, "Set the default support module ID" ], -]) -GUID = bytes("guid", "GUID", 16) - -HandleFlag = val_string8("handle_flag", "Handle Flag", [ - [ 0x00, "Short Directory Handle" ], - [ 0x01, "Directory Base" ], - [ 0xFF, "No Handle Present" ], -]) -HandleInfoLevel = val_string8("handle_info_level", "Handle Info Level", [ - [ 0x00, "Get Limited Information from a File Handle" ], - [ 0x01, "Get Limited Information from a File Handle Using a Name Space" ], - [ 0x02, "Get Information from a File Handle" ], - [ 0x03, "Get Information from a Directory Handle" ], - [ 0x04, "Get Complete Information from a Directory Handle" ], - [ 0x05, "Get Complete Information from a File Handle" ], +FragmentWriteOccurred = uint16("fragment_write_occurred", "Fragment Write Occurred") +FragSize = uint32("frag_size", "Fragment Size") +FreeableLimboSectors = uint32("freeable_limbo_sectors", "Freeable Limbo Sectors") +FreeBlocks = uint32("free_blocks", "Free Blocks") +FreedClusters = uint32("freed_clusters", "Freed Clusters") +FreeDirectoryEntries = uint16("free_directory_entries", "Free Directory Entries") +FSEngineFlag = boolean8("fs_engine_flag", "FS Engine Flag") +FullName = fw_string("full_name", "Full Name", 39) + +GetSetFlag = val_string8("get_set_flag", "Get Set Flag", [ + [ 0x00, "Get the default support module ID" ], + [ 0x01, "Set the default support module ID" ], +]) +GUID = bytes("guid", "GUID", 16) + +HandleFlag = val_string8("handle_flag", "Handle Flag", [ + [ 0x00, "Short Directory Handle" ], + [ 0x01, "Directory Base" ], + [ 0xFF, "No Handle Present" ], +]) +HandleInfoLevel = val_string8("handle_info_level", "Handle Info Level", [ + [ 0x00, "Get Limited Information from a File Handle" ], + [ 0x01, "Get Limited Information from a File Handle Using a Name Space" ], + [ 0x02, "Get Information from a File Handle" ], + [ 0x03, "Get Information from a Directory Handle" ], + [ 0x04, "Get Complete Information from a Directory Handle" ], + [ 0x05, "Get Complete Information from a File Handle" ], ]) -HeldBytesRead = bytes("held_bytes_read", "Held Bytes Read", 6) -HeldBytesWritten = bytes("held_bytes_write", "Held Bytes Written", 6) +HeldBytesRead = bytes("held_bytes_read", "Held Bytes Read", 6) +HeldBytesWritten = bytes("held_bytes_write", "Held Bytes Written", 6) HeldConnectTimeInMinutes = uint32("held_conn_time", "Held Connect Time in Minutes") -HeldRequests = uint32("user_info_held_req", "Held Requests") -HoldAmount = uint32("hold_amount", "Hold Amount") -HoldCancelAmount = uint32("hold_cancel_amount", "Hold Cancel Amount") -HolderID = uint32("holder_id", "Holder ID") +HeldRequests = uint32("user_info_held_req", "Held Requests") +HoldAmount = uint32("hold_amount", "Hold Amount") +HoldCancelAmount = uint32("hold_cancel_amount", "Hold Cancel Amount") +HolderID = uint32("holder_id", "Holder ID") HolderID.Display("BASE_HEX") HoldTime = uint32("hold_time", "Hold Time") HopsToNet = uint16("hops_to_net", "Hop Count") -HorizLocation = uint16("horiz_location", "Horizontal Location") -HostAddress = bytes("host_address", "Host Address", 6) -HotFixBlocksAvailable = uint16("hot_fix_blocks_available", "Hot Fix Blocks Available") -HotFixDisabled = val_string8("hot_fix_disabled", "Hot Fix Disabled", [ - [ 0x00, "Enabled" ], - [ 0x01, "Disabled" ], -]) -HotFixTableSize = uint16("hot_fix_table_size", "Hot Fix Table Size") -HotFixTableStart = uint32("hot_fix_table_start", "Hot Fix Table Start") -Hour = uint8("s_hour", "Hour") -HugeBitMask = uint32("huge_bit_mask", "Huge Bit Mask") -HugeBitsDefined = uint16("huge_bits_defined", "Huge Bits Defined") -HugeData = nstring8("huge_data", "Huge Data") -HugeDataUsed = uint32("huge_data_used", "Huge Data Used") -HugeStateInfo = bytes("huge_state_info", "Huge State Info", 16) +HorizLocation = uint16("horiz_location", "Horizontal Location") +HostAddress = bytes("host_address", "Host Address", 6) +HotFixBlocksAvailable = uint16("hot_fix_blocks_available", "Hot Fix Blocks Available") +HotFixDisabled = val_string8("hot_fix_disabled", "Hot Fix Disabled", [ + [ 0x00, "Enabled" ], + [ 0x01, "Disabled" ], +]) +HotFixTableSize = uint16("hot_fix_table_size", "Hot Fix Table Size") +HotFixTableStart = uint32("hot_fix_table_start", "Hot Fix Table Start") +Hour = uint8("s_hour", "Hour") +HugeBitMask = uint32("huge_bit_mask", "Huge Bit Mask") +HugeBitsDefined = uint16("huge_bits_defined", "Huge Bits Defined") +HugeData = nstring8("huge_data", "Huge Data") +HugeDataUsed = uint32("huge_data_used", "Huge Data Used") +HugeStateInfo = bytes("huge_state_info", "Huge State Info", 16) -IdentificationNumber = uint32("identification_number", "Identification Number") +IdentificationNumber = uint32("identification_number", "Identification Number") IgnoredRxPkts = uint32("ignored_rx_pkts", "Ignored Receive Packets") IncomingPacketDiscardedNoDGroup = uint16("incoming_packet_discarded_no_dgroup", "Incoming Packet Discarded No DGroup") -IndexNumber = uint8("index_number", "Index Number") -InfoCount = uint16("info_count", "Info Count") -InfoFlags = bitfield32("info_flags", "Info Flags", [ - bf_boolean32(0x10000000, "info_flags_security", "Return Object Security"), - bf_boolean32(0x20000000, "info_flags_flags", "Return Object Flags"), - bf_boolean32(0x40000000, "info_flags_type", "Return Object Type"), - bf_boolean32(0x80000000, "info_flags_name", "Return Object Name"), +IndexNumber = uint8("index_number", "Index Number") +InfoCount = uint16("info_count", "Info Count") +InfoFlags = bitfield32("info_flags", "Info Flags", [ + bf_boolean32(0x10000000, "info_flags_security", "Return Object Security"), + bf_boolean32(0x20000000, "info_flags_flags", "Return Object Flags"), + bf_boolean32(0x40000000, "info_flags_type", "Return Object Type"), + bf_boolean32(0x80000000, "info_flags_name", "Return Object Name"), ]) InfoLevelNumber = val_string8("info_level_num", "Information Level Number", [ [ 0x01, "Volume Information Definition" ], [ 0x02, "Volume Information 2 Definition" ], ]) -InfoMask = bitfield32("info_mask", "Information Mask", [ - bf_boolean32(0x00000001, "info_flags_dos_time", "DOS Time"), - bf_boolean32(0x00000002, "info_flags_ref_count", "Reference Count"), - bf_boolean32(0x00000004, "info_flags_dos_attr", "DOS Attributes"), - bf_boolean32(0x00000008, "info_flags_ids", "ID's"), - bf_boolean32(0x00000010, "info_flags_ds_sizes", "Data Stream Sizes"), - bf_boolean32(0x00000020, "info_flags_ns_attr", "Name Space Attributes"), - bf_boolean32(0x00000040, "info_flags_ea_present", "EA Present Flag"), - bf_boolean32(0x00000080, "info_flags_all_attr", "All Attributes"), - bf_boolean32(0x00000100, "info_flags_all_dirbase_num", "All Directory Base Numbers"), - bf_boolean32(0x00000200, "info_flags_max_access_mask", "Maximum Access Mask"), - bf_boolean32(0x00000400, "info_flags_flush_time", "Flush Time"), - bf_boolean32(0x00000800, "info_flags_prnt_base_id", "Parent Base ID"), - bf_boolean32(0x00001000, "info_flags_mac_finder", "Mac Finder Information"), - bf_boolean32(0x00002000, "info_flags_sibling_cnt", "Sibling Count"), - bf_boolean32(0x00004000, "info_flags_effect_rights", "Effective Rights"), - bf_boolean32(0x00008000, "info_flags_mac_time", "Mac Time"), - bf_boolean32(0x20000000, "info_mask_dosname", "DOS Name"), - bf_boolean32(0x40000000, "info_mask_c_name_space", "Creator Name Space & Name"), - bf_boolean32(0x80000000, "info_mask_name", "Name"), +InfoMask = bitfield32("info_mask", "Information Mask", [ + bf_boolean32(0x00000001, "info_flags_dos_time", "DOS Time"), + bf_boolean32(0x00000002, "info_flags_ref_count", "Reference Count"), + bf_boolean32(0x00000004, "info_flags_dos_attr", "DOS Attributes"), + bf_boolean32(0x00000008, "info_flags_ids", "ID's"), + bf_boolean32(0x00000010, "info_flags_ds_sizes", "Data Stream Sizes"), + bf_boolean32(0x00000020, "info_flags_ns_attr", "Name Space Attributes"), + bf_boolean32(0x00000040, "info_flags_ea_present", "EA Present Flag"), + bf_boolean32(0x00000080, "info_flags_all_attr", "All Attributes"), + bf_boolean32(0x00000100, "info_flags_all_dirbase_num", "All Directory Base Numbers"), + bf_boolean32(0x00000200, "info_flags_max_access_mask", "Maximum Access Mask"), + bf_boolean32(0x00000400, "info_flags_flush_time", "Flush Time"), + bf_boolean32(0x00000800, "info_flags_prnt_base_id", "Parent Base ID"), + bf_boolean32(0x00001000, "info_flags_mac_finder", "Mac Finder Information"), + bf_boolean32(0x00002000, "info_flags_sibling_cnt", "Sibling Count"), + bf_boolean32(0x00004000, "info_flags_effect_rights", "Effective Rights"), + bf_boolean32(0x00008000, "info_flags_mac_time", "Mac Time"), + bf_boolean32(0x20000000, "info_mask_dosname", "DOS Name"), + bf_boolean32(0x40000000, "info_mask_c_name_space", "Creator Name Space & Name"), + bf_boolean32(0x80000000, "info_mask_name", "Name"), ]) -InheritedRightsMask = bitfield16("inherited_rights_mask", "Inherited Rights Mask", [ +InheritedRightsMask = bitfield16("inherited_rights_mask", "Inherited Rights Mask", [ bf_boolean16(0x0001, "inh_rights_read", "Read Rights"), - bf_boolean16(0x0002, "inh_rights_write", "Write Rights"), - bf_boolean16(0x0004, "inh_rights_open", "Open Rights"), - bf_boolean16(0x0008, "inh_rights_create", "Create Rights"), - bf_boolean16(0x0010, "inh_rights_delete", "Delete Rights"), - bf_boolean16(0x0020, "inh_rights_parent", "Change Access"), - bf_boolean16(0x0040, "inh_rights_search", "See Files Flag"), - bf_boolean16(0x0080, "inh_rights_modify", "Modify Rights"), - bf_boolean16(0x0100, "inh_rights_supervisor", "Supervisor"), -]) -InheritanceRevokeMask = bitfield16("inheritance_revoke_mask", "Revoke Rights Mask", [ - bf_boolean16(0x0001, "inh_revoke_read", "Read Rights"), - bf_boolean16(0x0002, "inh_revoke_write", "Write Rights"), - bf_boolean16(0x0004, "inh_revoke_open", "Open Rights"), - bf_boolean16(0x0008, "inh_revoke_create", "Create Rights"), - bf_boolean16(0x0010, "inh_revoke_delete", "Delete Rights"), - bf_boolean16(0x0020, "inh_revoke_parent", "Change Access"), - bf_boolean16(0x0040, "inh_revoke_search", "See Files Flag"), - bf_boolean16(0x0080, "inh_revoke_modify", "Modify Rights"), - bf_boolean16(0x0100, "inh_revoke_supervisor", "Supervisor"), -]) -InitialSemaphoreValue = uint8("initial_semaphore_value", "Initial Semaphore Value") -InspectSize = uint32("inspect_size", "Inspect Size") -InternetBridgeVersion = uint8("internet_bridge_version", "Internet Bridge Version") -InterruptNumbersUsed = uint32("interrupt_numbers_used", "Interrupt Numbers Used") -InUse = uint32("in_use", "Bytes in Use") -IOAddressesUsed = bytes("io_addresses_used", "IO Addresses Used", 8) -IOErrorCount = uint16("io_error_count", "IO Error Count") -IOEngineFlag = boolean8("io_engine_flag", "IO Engine Flag") -IPXNotMyNetwork = uint16("ipx_not_my_network", "IPX Not My Network") -ItemsChanged = uint32("items_changed", "Items Changed") -ItemsChecked = uint32("items_checked", "Items Checked") -ItemsCount = uint32("items_count", "Items Count") + bf_boolean16(0x0002, "inh_rights_write", "Write Rights"), + bf_boolean16(0x0004, "inh_rights_open", "Open Rights"), + bf_boolean16(0x0008, "inh_rights_create", "Create Rights"), + bf_boolean16(0x0010, "inh_rights_delete", "Delete Rights"), + bf_boolean16(0x0020, "inh_rights_parent", "Change Access"), + bf_boolean16(0x0040, "inh_rights_search", "See Files Flag"), + bf_boolean16(0x0080, "inh_rights_modify", "Modify Rights"), + bf_boolean16(0x0100, "inh_rights_supervisor", "Supervisor"), +]) +InheritanceRevokeMask = bitfield16("inheritance_revoke_mask", "Revoke Rights Mask", [ + bf_boolean16(0x0001, "inh_revoke_read", "Read Rights"), + bf_boolean16(0x0002, "inh_revoke_write", "Write Rights"), + bf_boolean16(0x0004, "inh_revoke_open", "Open Rights"), + bf_boolean16(0x0008, "inh_revoke_create", "Create Rights"), + bf_boolean16(0x0010, "inh_revoke_delete", "Delete Rights"), + bf_boolean16(0x0020, "inh_revoke_parent", "Change Access"), + bf_boolean16(0x0040, "inh_revoke_search", "See Files Flag"), + bf_boolean16(0x0080, "inh_revoke_modify", "Modify Rights"), + bf_boolean16(0x0100, "inh_revoke_supervisor", "Supervisor"), +]) +InitialSemaphoreValue = uint8("initial_semaphore_value", "Initial Semaphore Value") +InspectSize = uint32("inspect_size", "Inspect Size") +InternetBridgeVersion = uint8("internet_bridge_version", "Internet Bridge Version") +InterruptNumbersUsed = uint32("interrupt_numbers_used", "Interrupt Numbers Used") +InUse = uint32("in_use", "Bytes in Use") +IOAddressesUsed = bytes("io_addresses_used", "IO Addresses Used", 8) +IOErrorCount = uint16("io_error_count", "IO Error Count") +IOEngineFlag = boolean8("io_engine_flag", "IO Engine Flag") +IPXNotMyNetwork = uint16("ipx_not_my_network", "IPX Not My Network") +ItemsChanged = uint32("items_changed", "Items Changed") +ItemsChecked = uint32("items_checked", "Items Checked") +ItemsCount = uint32("items_count", "Items Count") itemsInList = uint32("items_in_list", "Items in List") -ItemsInPacket = uint32("items_in_packet", "Items in Packet") +ItemsInPacket = uint32("items_in_packet", "Items in Packet") -JobControlFlags = bitfield8("job_control_flags", "Job Control Flags", [ - bf_boolean8(0x08, "job_control_job_recovery", "Job Recovery"), - bf_boolean8(0x10, "job_control_reservice", "ReService Job"), - bf_boolean8(0x20, "job_control_file_open", "File Open"), - bf_boolean8(0x40, "job_control_user_hold", "User Hold"), - bf_boolean8(0x80, "job_control_operator_hold", "Operator Hold"), - -]) -JobControlFlagsWord = bitfield16("job_control_flags_word", "Job Control Flags", [ - bf_boolean16(0x0008, "job_control1_job_recovery", "Job Recovery"), - bf_boolean16(0x0010, "job_control1_reservice", "ReService Job"), - bf_boolean16(0x0020, "job_control1_file_open", "File Open"), - bf_boolean16(0x0040, "job_control1_user_hold", "User Hold"), - bf_boolean16(0x0080, "job_control1_operator_hold", "Operator Hold"), - -]) -JobCount = uint32("job_count", "Job Count") -JobFileHandle = bytes("job_file_handle", "Job File Handle", 6) -JobFileHandleLong = uint32("job_file_handle_long", "Job File Handle", BE) +JobControlFlags = bitfield8("job_control_flags", "Job Control Flags", [ + bf_boolean8(0x08, "job_control_job_recovery", "Job Recovery"), + bf_boolean8(0x10, "job_control_reservice", "ReService Job"), + bf_boolean8(0x20, "job_control_file_open", "File Open"), + bf_boolean8(0x40, "job_control_user_hold", "User Hold"), + bf_boolean8(0x80, "job_control_operator_hold", "Operator Hold"), + +]) +JobControlFlagsWord = bitfield16("job_control_flags_word", "Job Control Flags", [ + bf_boolean16(0x0008, "job_control1_job_recovery", "Job Recovery"), + bf_boolean16(0x0010, "job_control1_reservice", "ReService Job"), + bf_boolean16(0x0020, "job_control1_file_open", "File Open"), + bf_boolean16(0x0040, "job_control1_user_hold", "User Hold"), + bf_boolean16(0x0080, "job_control1_operator_hold", "Operator Hold"), + +]) +JobCount = uint32("job_count", "Job Count") +JobFileHandle = bytes("job_file_handle", "Job File Handle", 6) +JobFileHandleLong = uint32("job_file_handle_long", "Job File Handle", BE) JobFileHandleLong.Display("BASE_HEX") -JobFileName = fw_string("job_file_name", "Job File Name", 14) -JobPosition = uint8("job_position", "Job Position") -JobPositionWord = uint16("job_position_word", "Job Position") -JobNumber = uint16("job_number", "Job Number", BE ) -JobNumberLong = uint32("job_number_long", "Job Number", BE ) +JobFileName = fw_string("job_file_name", "Job File Name", 14) +JobPosition = uint8("job_position", "Job Position") +JobPositionWord = uint16("job_position_word", "Job Position") +JobNumber = uint16("job_number", "Job Number", BE ) +JobNumberLong = uint32("job_number_long", "Job Number", BE ) JobNumberLong.Display("BASE_HEX") -JobType = uint16("job_type", "Job Type", BE ) +JobType = uint16("job_type", "Job Type", BE ) LANCustomVariablesCount = uint32("lan_cust_var_count", "LAN Custom Variables Count") LANdriverBoardInstance = uint16("lan_drv_bd_inst", "LAN Driver Board Instance") @@ -2452,7 +2455,7 @@ LANdriverMemoryLength0 = uint16("lan_drv_mem_length_0", "LAN Driver Memory Length 0") LANdriverMemoryLength1 = uint16("lan_drv_mem_length_1", "LAN Driver Memory Length 1") LANdriverMinorVersion = uint8("lan_drv_minor_ver", "LAN Driver Minor Version") -LANdriverModeFlags = val_string8("lan_dvr_mode_flags", "LAN Driver Mode Flags", [ +LANdriverModeFlags = val_string8("lan_dvr_mode_flags", "LAN Driver Mode Flags", [ [0x80, "Canonical Address" ], [0x81, "Canonical Address" ], [0x82, "Canonical Address" ], @@ -2582,7 +2585,7 @@ [0xfe, "Non-Canonical Address" ], [0xff, "Non-Canonical Address" ], ]) -LANDriverNumber = uint8("lan_driver_number", "LAN Driver Number") +LANDriverNumber = uint8("lan_driver_number", "LAN Driver Number") LANdriverNodeAddress = bytes("lan_dvr_node_addr", "LAN Driver Node Address", 6) LANdriverRecvSize = uint32("lan_drv_rcv_size", "LAN Driver Receive Size") LANdriverReserved = uint16("lan_drv_reserved", "LAN Driver Reserved") @@ -2592,147 +2595,147 @@ LANdriverSlot = uint16("lan_drv_slot", "LAN Driver Slot") LANdriverSrcRouting = uint32("lan_drv_src_route", "LAN Driver Source Routing") LANdriverTransportTime = uint16("lan_drv_trans_time", "LAN Driver Transport Time") -LastAccessedDate = uint16("last_access_date", "Last Accessed Date") +LastAccessedDate = uint16("last_access_date", "Last Accessed Date") LastAccessedDate.NWDate() -LastAccessedTime = uint16("last_access_time", "Last Accessed Time") +LastAccessedTime = uint16("last_access_time", "Last Accessed Time") LastAccessedTime.NWTime() -LastGarbCollect = uint32("last_garbage_collect", "Last Garbage Collection") -LastInstance = uint32("last_instance", "Last Instance") -LastRecordSeen = uint16("last_record_seen", "Last Record Seen") -LastSearchIndex = uint16("last_search_index", "Search Index") -LastSeen = uint32("last_seen", "Last Seen") -LastSequenceNumber = uint16("last_sequence_number", "Sequence Number") +LastGarbCollect = uint32("last_garbage_collect", "Last Garbage Collection") +LastInstance = uint32("last_instance", "Last Instance") +LastRecordSeen = uint16("last_record_seen", "Last Record Seen") +LastSearchIndex = uint16("last_search_index", "Search Index") +LastSeen = uint32("last_seen", "Last Seen") +LastSequenceNumber = uint16("last_sequence_number", "Sequence Number") Length64bit = bytes("length_64bit", "64bit Length", 64) -Level = uint8("level", "Level") -LFSCounters = uint32("lfs_counters", "LFS Counters") -LimboDataStreamsCount = uint32("limbo_data_streams_count", "Limbo Data Streams Count") -limbCount = uint32("limb_count", "Limb Count") +Level = uint8("level", "Level") +LFSCounters = uint32("lfs_counters", "LFS Counters") +LimboDataStreamsCount = uint32("limbo_data_streams_count", "Limbo Data Streams Count") +limbCount = uint32("limb_count", "Limb Count") limbFlags = bitfield32("limb_flags", "Limb Flags", [ - bf_boolean32(0x00000002, "scan_entire_folder", "Wild Search"), - bf_boolean32(0x00000004, "scan_files_only", "Scan Files Only"), - bf_boolean32(0x00000008, "scan_folders_only", "Scan Folders Only"), - bf_boolean32(0x00000010, "allow_system", "Allow System Files and Folders"), - bf_boolean32(0x00000020, "allow_hidden", "Allow Hidden Files and Folders"), + bf_boolean32(0x00000002, "scan_entire_folder", "Wild Search"), + bf_boolean32(0x00000004, "scan_files_only", "Scan Files Only"), + bf_boolean32(0x00000008, "scan_folders_only", "Scan Folders Only"), + bf_boolean32(0x00000010, "allow_system", "Allow System Files and Folders"), + bf_boolean32(0x00000020, "allow_hidden", "Allow Hidden Files and Folders"), ]) -limbScanNum = uint32("limb_scan_num", "Limb Scan Number") -LimboUsed = uint32("limbo_used", "Limbo Used") -LoadedNameSpaces = uint8("loaded_name_spaces", "Loaded Name Spaces") -LocalConnectionID = uint32("local_connection_id", "Local Connection ID") +limbScanNum = uint32("limb_scan_num", "Limb Scan Number") +LimboUsed = uint32("limbo_used", "Limbo Used") +LoadedNameSpaces = uint8("loaded_name_spaces", "Loaded Name Spaces") +LocalConnectionID = uint32("local_connection_id", "Local Connection ID") LocalConnectionID.Display("BASE_HEX") -LocalMaxPacketSize = uint32("local_max_packet_size", "Local Max Packet Size") -LocalMaxSendSize = uint32("local_max_send_size", "Local Max Send Size") -LocalMaxRecvSize = uint32("local_max_recv_size", "Local Max Recv Size") -LocalLoginInfoCcode = uint8("local_login_info_ccode", "Local Login Info C Code") -LocalTargetSocket = uint32("local_target_socket", "Local Target Socket") +LocalMaxPacketSize = uint32("local_max_packet_size", "Local Max Packet Size") +LocalMaxSendSize = uint32("local_max_send_size", "Local Max Send Size") +LocalMaxRecvSize = uint32("local_max_recv_size", "Local Max Recv Size") +LocalLoginInfoCcode = uint8("local_login_info_ccode", "Local Login Info C Code") +LocalTargetSocket = uint32("local_target_socket", "Local Target Socket") LocalTargetSocket.Display("BASE_HEX") -LockAreaLen = uint32("lock_area_len", "Lock Area Length") -LockAreasStartOffset = uint32("lock_areas_start_offset", "Lock Areas Start Offset") -LockTimeout = uint16("lock_timeout", "Lock Timeout") -Locked = val_string8("locked", "Locked Flag", [ - [ 0x00, "Not Locked Exclusively" ], - [ 0x01, "Locked Exclusively" ], -]) -LockFlag = val_string8("lock_flag", "Lock Flag", [ - [ 0x00, "Not Locked, Log for Future Exclusive Lock" ], - [ 0x01, "Exclusive Lock (Read/Write)" ], - [ 0x02, "Log for Future Shared Lock"], - [ 0x03, "Shareable Lock (Read-Only)" ], - [ 0xfe, "Locked by a File Lock" ], - [ 0xff, "Locked by Begin Share File Set" ], -]) -LockName = nstring8("lock_name", "Lock Name") -LockStatus = val_string8("lock_status", "Lock Status", [ - [ 0x00, "Locked Exclusive" ], - [ 0x01, "Locked Shareable" ], - [ 0x02, "Logged" ], - [ 0x06, "Lock is Held by TTS"], -]) -ConnLockStatus = val_string8("conn_lock_status", "Lock Status", [ - [ 0x00, "Normal (connection free to run)" ], - [ 0x01, "Waiting on physical record lock" ], - [ 0x02, "Waiting on a file lock" ], - [ 0x03, "Waiting on a logical record lock"], - [ 0x04, "Waiting on a semaphore"], -]) -LockType = val_string8("lock_type", "Lock Type", [ - [ 0x00, "Locked" ], - [ 0x01, "Open Shareable" ], - [ 0x02, "Logged" ], - [ 0x03, "Open Normal" ], - [ 0x06, "TTS Holding Lock" ], - [ 0x07, "Transaction Flag Set on This File" ], +LockAreaLen = uint32("lock_area_len", "Lock Area Length") +LockAreasStartOffset = uint32("lock_areas_start_offset", "Lock Areas Start Offset") +LockTimeout = uint16("lock_timeout", "Lock Timeout") +Locked = val_string8("locked", "Locked Flag", [ + [ 0x00, "Not Locked Exclusively" ], + [ 0x01, "Locked Exclusively" ], +]) +LockFlag = val_string8("lock_flag", "Lock Flag", [ + [ 0x00, "Not Locked, Log for Future Exclusive Lock" ], + [ 0x01, "Exclusive Lock (Read/Write)" ], + [ 0x02, "Log for Future Shared Lock"], + [ 0x03, "Shareable Lock (Read-Only)" ], + [ 0xfe, "Locked by a File Lock" ], + [ 0xff, "Locked by Begin Share File Set" ], +]) +LockName = nstring8("lock_name", "Lock Name") +LockStatus = val_string8("lock_status", "Lock Status", [ + [ 0x00, "Locked Exclusive" ], + [ 0x01, "Locked Shareable" ], + [ 0x02, "Logged" ], + [ 0x06, "Lock is Held by TTS"], +]) +ConnLockStatus = val_string8("conn_lock_status", "Lock Status", [ + [ 0x00, "Normal (connection free to run)" ], + [ 0x01, "Waiting on physical record lock" ], + [ 0x02, "Waiting on a file lock" ], + [ 0x03, "Waiting on a logical record lock"], + [ 0x04, "Waiting on a semaphore"], +]) +LockType = val_string8("lock_type", "Lock Type", [ + [ 0x00, "Locked" ], + [ 0x01, "Open Shareable" ], + [ 0x02, "Logged" ], + [ 0x03, "Open Normal" ], + [ 0x06, "TTS Holding Lock" ], + [ 0x07, "Transaction Flag Set on This File" ], ]) -LogFileFlagHigh = bitfield8("log_file_flag_high", "Log File Flag (byte 2)", [ - bf_boolean8(0x80, "log_flag_call_back", "Call Back Requested" ), +LogFileFlagHigh = bitfield8("log_file_flag_high", "Log File Flag (byte 2)", [ + bf_boolean8(0x80, "log_flag_call_back", "Call Back Requested" ), ]) -LogFileFlagLow = bitfield8("log_file_flag_low", "Log File Flag", [ - bf_boolean8(0x01, "log_flag_lock_file", "Lock File Immediately" ), +LogFileFlagLow = bitfield8("log_file_flag_low", "Log File Flag", [ + bf_boolean8(0x01, "log_flag_lock_file", "Lock File Immediately" ), ]) -LoggedObjectID = uint32("logged_object_id", "Logged in Object ID") +LoggedObjectID = uint32("logged_object_id", "Logged in Object ID") LoggedObjectID.Display("BASE_HEX") -LoggedCount = uint16("logged_count", "Logged Count") -LogicalConnectionNumber = uint16("logical_connection_number", "Logical Connection Number", BE) -LogicalDriveCount = uint8("logical_drive_count", "Logical Drive Count") -LogicalDriveNumber = uint8("logical_drive_number", "Logical Drive Number") -LogicalLockThreshold = uint8("logical_lock_threshold", "LogicalLockThreshold") -LogicalRecordName = nstring8("logical_record_name", "Logical Record Name") -LoginKey = bytes("login_key", "Login Key", 8) -LogLockType = uint8("log_lock_type", "Log Lock Type") +LoggedCount = uint16("logged_count", "Logged Count") +LogicalConnectionNumber = uint16("logical_connection_number", "Logical Connection Number", BE) +LogicalDriveCount = uint8("logical_drive_count", "Logical Drive Count") +LogicalDriveNumber = uint8("logical_drive_number", "Logical Drive Number") +LogicalLockThreshold = uint8("logical_lock_threshold", "LogicalLockThreshold") +LogicalRecordName = nstring8("logical_record_name", "Logical Record Name") +LoginKey = bytes("login_key", "Login Key", 8) +LogLockType = uint8("log_lock_type", "Log Lock Type") LogTtlRxPkts = uint32("log_ttl_rx_pkts", "Total Received Packets") LogTtlTxPkts = uint32("log_ttl_tx_pkts", "Total Transmitted Packets") -LongName = fw_string("long_name", "Long Name", 32) -LRUBlockWasDirty = uint16("lru_block_was_dirty", "LRU Block Was Dirty") +LongName = fw_string("long_name", "Long Name", 32) +LRUBlockWasDirty = uint16("lru_block_was_dirty", "LRU Block Was Dirty") -MacAttr = bitfield16("mac_attr", "Attributes", [ - bf_boolean16(0x0001, "mac_attr_smode1", "Search Mode"), - bf_boolean16(0x0002, "mac_attr_smode2", "Search Mode"), - bf_boolean16(0x0004, "mac_attr_smode3", "Search Mode"), - bf_boolean16(0x0010, "mac_attr_transaction", "Transaction"), - bf_boolean16(0x0020, "mac_attr_index", "Index"), - bf_boolean16(0x0040, "mac_attr_r_audit", "Read Audit"), - bf_boolean16(0x0080, "mac_attr_w_audit", "Write Audit"), - bf_boolean16(0x0100, "mac_attr_r_only", "Read Only"), - bf_boolean16(0x0200, "mac_attr_hidden", "Hidden"), - bf_boolean16(0x0400, "mac_attr_system", "System"), - bf_boolean16(0x0800, "mac_attr_execute_only", "Execute Only"), - bf_boolean16(0x1000, "mac_attr_subdirectory", "Subdirectory"), - bf_boolean16(0x2000, "mac_attr_archive", "Archive"), - bf_boolean16(0x8000, "mac_attr_share", "Shareable File"), +MacAttr = bitfield16("mac_attr", "Attributes", [ + bf_boolean16(0x0001, "mac_attr_smode1", "Search Mode"), + bf_boolean16(0x0002, "mac_attr_smode2", "Search Mode"), + bf_boolean16(0x0004, "mac_attr_smode3", "Search Mode"), + bf_boolean16(0x0010, "mac_attr_transaction", "Transaction"), + bf_boolean16(0x0020, "mac_attr_index", "Index"), + bf_boolean16(0x0040, "mac_attr_r_audit", "Read Audit"), + bf_boolean16(0x0080, "mac_attr_w_audit", "Write Audit"), + bf_boolean16(0x0100, "mac_attr_r_only", "Read Only"), + bf_boolean16(0x0200, "mac_attr_hidden", "Hidden"), + bf_boolean16(0x0400, "mac_attr_system", "System"), + bf_boolean16(0x0800, "mac_attr_execute_only", "Execute Only"), + bf_boolean16(0x1000, "mac_attr_subdirectory", "Subdirectory"), + bf_boolean16(0x2000, "mac_attr_archive", "Archive"), + bf_boolean16(0x8000, "mac_attr_share", "Shareable File"), ]) MACBackupDate = uint16("mac_backup_date", "Mac Backup Date") MACBackupDate.NWDate() MACBackupTime = uint16("mac_backup_time", "Mac Backup Time") MACBackupTime.NWTime() -MacBaseDirectoryID = uint32("mac_base_directory_id", "Mac Base Directory ID", BE) +MacBaseDirectoryID = uint32("mac_base_directory_id", "Mac Base Directory ID", BE) MacBaseDirectoryID.Display("BASE_HEX") MACCreateDate = uint16("mac_create_date", "Mac Create Date") MACCreateDate.NWDate() MACCreateTime = uint16("mac_create_time", "Mac Create Time") MACCreateTime.NWTime() -MacDestinationBaseID = uint32("mac_destination_base_id", "Mac Destination Base ID") +MacDestinationBaseID = uint32("mac_destination_base_id", "Mac Destination Base ID") MacDestinationBaseID.Display("BASE_HEX") MacFinderInfo = bytes("mac_finder_info", "Mac Finder Information", 32) -MacLastSeenID = uint32("mac_last_seen_id", "Mac Last Seen ID") +MacLastSeenID = uint32("mac_last_seen_id", "Mac Last Seen ID") MacLastSeenID.Display("BASE_HEX") -MacSourceBaseID = uint32("mac_source_base_id", "Mac Source Base ID") +MacSourceBaseID = uint32("mac_source_base_id", "Mac Source Base ID") MacSourceBaseID.Display("BASE_HEX") -MajorVersion = uint32("major_version", "Major Version") -MaxBytes = uint16("max_bytes", "Maximum Number of Bytes") -MaxDataStreams = uint32("max_data_streams", "Maximum Data Streams") -MaxDirDepth = uint32("max_dir_depth", "Maximum Directory Depth") -MaximumSpace = uint16("max_space", "Maximum Space") -MaxNumOfConn = uint32("max_num_of_conn", "Maximum Number of Connections") -MaxNumOfLANS = uint32("max_num_of_lans", "Maximum Number Of LAN's") -MaxNumOfMedias = uint32("max_num_of_medias", "Maximum Number Of Media's") -MaxNumOfNmeSps = uint32("max_num_of_nme_sps", "Maximum Number Of Name Spaces") -MaxNumOfSpoolPr = uint32("max_num_of_spool_pr", "Maximum Number Of Spool Printers") -MaxNumOfStacks = uint32("max_num_of_stacks", "Maximum Number Of Stacks") -MaxNumOfUsers = uint32("max_num_of_users", "Maximum Number Of Users") -MaxNumOfVol = uint32("max_num_of_vol", "Maximum Number of Volumes") +MajorVersion = uint32("major_version", "Major Version") +MaxBytes = uint16("max_bytes", "Maximum Number of Bytes") +MaxDataStreams = uint32("max_data_streams", "Maximum Data Streams") +MaxDirDepth = uint32("max_dir_depth", "Maximum Directory Depth") +MaximumSpace = uint16("max_space", "Maximum Space") +MaxNumOfConn = uint32("max_num_of_conn", "Maximum Number of Connections") +MaxNumOfLANS = uint32("max_num_of_lans", "Maximum Number Of LAN's") +MaxNumOfMedias = uint32("max_num_of_medias", "Maximum Number Of Media's") +MaxNumOfNmeSps = uint32("max_num_of_nme_sps", "Maximum Number Of Name Spaces") +MaxNumOfSpoolPr = uint32("max_num_of_spool_pr", "Maximum Number Of Spool Printers") +MaxNumOfStacks = uint32("max_num_of_stacks", "Maximum Number Of Stacks") +MaxNumOfUsers = uint32("max_num_of_users", "Maximum Number Of Users") +MaxNumOfVol = uint32("max_num_of_vol", "Maximum Number of Volumes") MaxReadDataReplySize = uint16("max_read_data_reply_size", "Max Read Data Reply Size") -MaxSpace = uint32("maxspace", "Maximum Space") -MaxUsedDynamicSpace = uint32("max_used_dynamic_space", "Max Used Dynamic Space") +MaxSpace = uint32("maxspace", "Maximum Space") +MaxUsedDynamicSpace = uint32("max_used_dynamic_space", "Max Used Dynamic Space") MediaList = uint32("media_list", "Media List") MediaListCount = uint32("media_list_count", "Media List Count") MediaName = nstring8("media_name", "Media Name") @@ -2755,85 +2758,85 @@ [ 0x0d, "Fixed Media" ], [ 0x0e, "Unknown" ], ]) -MemberName = nstring8("member_name", "Member Name") -MemberType = val_string16("member_type", "Member Type", [ - [ 0x0000, "Unknown" ], - [ 0x0001, "User" ], - [ 0x0002, "User group" ], - [ 0x0003, "Print queue" ], - [ 0x0004, "NetWare file server" ], - [ 0x0005, "Job server" ], - [ 0x0006, "Gateway" ], - [ 0x0007, "Print server" ], - [ 0x0008, "Archive queue" ], - [ 0x0009, "Archive server" ], - [ 0x000a, "Job queue" ], - [ 0x000b, "Administration" ], - [ 0x0021, "NAS SNA gateway" ], - [ 0x0026, "Remote bridge server" ], - [ 0x0027, "TCP/IP gateway" ], -]) -MessageLanguage = uint32("message_language", "NLM Language") -MigratedFiles = uint32("migrated_files", "Migrated Files") -MigratedSectors = uint32("migrated_sectors", "Migrated Sectors") -MinorVersion = uint32("minor_version", "Minor Version") -Minute = uint8("s_minute", "Minutes") -MixedModePathFlag = val_string8("mixed_mode_path_flag", "Mixed Mode Path Flag", [ +MemberName = nstring8("member_name", "Member Name") +MemberType = val_string16("member_type", "Member Type", [ + [ 0x0000, "Unknown" ], + [ 0x0001, "User" ], + [ 0x0002, "User group" ], + [ 0x0003, "Print queue" ], + [ 0x0004, "NetWare file server" ], + [ 0x0005, "Job server" ], + [ 0x0006, "Gateway" ], + [ 0x0007, "Print server" ], + [ 0x0008, "Archive queue" ], + [ 0x0009, "Archive server" ], + [ 0x000a, "Job queue" ], + [ 0x000b, "Administration" ], + [ 0x0021, "NAS SNA gateway" ], + [ 0x0026, "Remote bridge server" ], + [ 0x0027, "TCP/IP gateway" ], +]) +MessageLanguage = uint32("message_language", "NLM Language") +MigratedFiles = uint32("migrated_files", "Migrated Files") +MigratedSectors = uint32("migrated_sectors", "Migrated Sectors") +MinorVersion = uint32("minor_version", "Minor Version") +Minute = uint8("s_minute", "Minutes") +MixedModePathFlag = val_string8("mixed_mode_path_flag", "Mixed Mode Path Flag", [ [ 0x00, "Mixed mode path handling is not available"], [ 0x01, "Mixed mode path handling is available"], ]) -ModifiedDate = uint16("modified_date", "Modified Date") +ModifiedDate = uint16("modified_date", "Modified Date") ModifiedDate.NWDate() -ModifiedTime = uint16("modified_time", "Modified Time") +ModifiedTime = uint16("modified_time", "Modified Time") ModifiedTime.NWTime() -ModifierID = uint32("modifier_id", "Modifier ID", BE) +ModifierID = uint32("modifier_id", "Modifier ID", BE) ModifierID.Display("BASE_HEX") -ModifyDOSInfoMask = bitfield16("modify_dos_info_mask", "Modify DOS Info Mask", [ - bf_boolean16(0x0002, "modify_dos_read", "Attributes"), - bf_boolean16(0x0004, "modify_dos_write", "Creation Date"), - bf_boolean16(0x0008, "modify_dos_open", "Creation Time"), - bf_boolean16(0x0010, "modify_dos_create", "Creator ID"), - bf_boolean16(0x0020, "modify_dos_delete", "Archive Date"), - bf_boolean16(0x0040, "modify_dos_parent", "Archive Time"), - bf_boolean16(0x0080, "modify_dos_search", "Archiver ID"), - bf_boolean16(0x0100, "modify_dos_mdate", "Modify Date"), - bf_boolean16(0x0200, "modify_dos_mtime", "Modify Time"), - bf_boolean16(0x0400, "modify_dos_mid", "Modifier ID"), - bf_boolean16(0x0800, "modify_dos_laccess", "Last Access"), - bf_boolean16(0x1000, "modify_dos_inheritance", "Inheritance"), - bf_boolean16(0x2000, "modify_dos_max_space", "Maximum Space"), -]) -Month = val_string8("s_month", "Month", [ - [ 0x01, "January"], - [ 0x02, "February"], - [ 0x03, "March"], - [ 0x04, "April"], - [ 0x05, "May"], - [ 0x06, "June"], - [ 0x07, "July"], - [ 0x08, "August"], - [ 0x09, "September"], - [ 0x0a, "October"], - [ 0x0b, "November"], - [ 0x0c, "December"], -]) - -MoreFlag = val_string8("more_flag", "More Flag", [ - [ 0x00, "No More Segments/Entries Available" ], - [ 0x01, "More Segments/Entries Available" ], - [ 0xff, "More Segments/Entries Available" ], -]) -MoreProperties = val_string8("more_properties", "More Properties", [ - [ 0x00, "No More Properties Available" ], - [ 0x01, "No More Properties Available" ], - [ 0xff, "More Properties Available" ], -]) - -Name = nstring8("name", "Name") -Name12 = fw_string("name12", "Name", 12) -NameLen = uint8("name_len", "Name Space Length") +ModifyDOSInfoMask = bitfield16("modify_dos_info_mask", "Modify DOS Info Mask", [ + bf_boolean16(0x0002, "modify_dos_read", "Attributes"), + bf_boolean16(0x0004, "modify_dos_write", "Creation Date"), + bf_boolean16(0x0008, "modify_dos_open", "Creation Time"), + bf_boolean16(0x0010, "modify_dos_create", "Creator ID"), + bf_boolean16(0x0020, "modify_dos_delete", "Archive Date"), + bf_boolean16(0x0040, "modify_dos_parent", "Archive Time"), + bf_boolean16(0x0080, "modify_dos_search", "Archiver ID"), + bf_boolean16(0x0100, "modify_dos_mdate", "Modify Date"), + bf_boolean16(0x0200, "modify_dos_mtime", "Modify Time"), + bf_boolean16(0x0400, "modify_dos_mid", "Modifier ID"), + bf_boolean16(0x0800, "modify_dos_laccess", "Last Access"), + bf_boolean16(0x1000, "modify_dos_inheritance", "Inheritance"), + bf_boolean16(0x2000, "modify_dos_max_space", "Maximum Space"), +]) +Month = val_string8("s_month", "Month", [ + [ 0x01, "January"], + [ 0x02, "February"], + [ 0x03, "March"], + [ 0x04, "April"], + [ 0x05, "May"], + [ 0x06, "June"], + [ 0x07, "July"], + [ 0x08, "August"], + [ 0x09, "September"], + [ 0x0a, "October"], + [ 0x0b, "November"], + [ 0x0c, "December"], +]) + +MoreFlag = val_string8("more_flag", "More Flag", [ + [ 0x00, "No More Segments/Entries Available" ], + [ 0x01, "More Segments/Entries Available" ], + [ 0xff, "More Segments/Entries Available" ], +]) +MoreProperties = val_string8("more_properties", "More Properties", [ + [ 0x00, "No More Properties Available" ], + [ 0x01, "No More Properties Available" ], + [ 0xff, "More Properties Available" ], +]) + +Name = nstring8("name", "Name") +Name12 = fw_string("name12", "Name", 12) +NameLen = uint8("name_len", "Name Space Length") NameLength = uint8("name_length", "Name Length") -NameList = uint32("name_list", "Name List") +NameList = uint32("name_list", "Name List") # # XXX - should this value be used to interpret the characters in names, # search patterns, and the like? @@ -2844,137 +2847,137 @@ # Mac character sets, etc.) into UCS-4 or UTF-8 and storing them as such # in the protocol tree, and displaying them as best we can. # -NameSpace = val_string8("name_space", "Name Space", [ - [ 0x00, "DOS" ], - [ 0x01, "MAC" ], - [ 0x02, "NFS" ], - [ 0x03, "FTAM" ], - [ 0x04, "OS/2, Long" ], -]) -NamesSpaceInfoMask = bitfield16("ns_info_mask", "Names Space Info Mask", [ - bf_boolean16(0x0001, "ns_info_mask_modify", "Modify Name"), - bf_boolean16(0x0002, "ns_info_mask_fatt", "File Attributes"), - bf_boolean16(0x0004, "ns_info_mask_cdate", "Creation Date"), - bf_boolean16(0x0008, "ns_info_mask_ctime", "Creation Time"), - bf_boolean16(0x0010, "ns_info_mask_owner", "Owner ID"), - bf_boolean16(0x0020, "ns_info_mask_adate", "Archive Date"), - bf_boolean16(0x0040, "ns_info_mask_atime", "Archive Time"), - bf_boolean16(0x0080, "ns_info_mask_aid", "Archiver ID"), - bf_boolean16(0x0100, "ns_info_mask_udate", "Update Date"), - bf_boolean16(0x0200, "ns_info_mask_utime", "Update Time"), - bf_boolean16(0x0400, "ns_info_mask_uid", "Update ID"), - bf_boolean16(0x0800, "ns_info_mask_acc_date", "Access Date"), - bf_boolean16(0x1000, "ns_info_mask_max_acc_mask", "Inheritance"), - bf_boolean16(0x2000, "ns_info_mask_max_space", "Maximum Space"), -]) -NameSpaceName = nstring8("name_space_name", "Name Space Name") -nameType = uint32("name_type", "nameType") -NCPdataSize = uint32("ncp_data_size", "NCP Data Size") +NameSpace = val_string8("name_space", "Name Space", [ + [ 0x00, "DOS" ], + [ 0x01, "MAC" ], + [ 0x02, "NFS" ], + [ 0x03, "FTAM" ], + [ 0x04, "OS/2, Long" ], +]) +NamesSpaceInfoMask = bitfield16("ns_info_mask", "Names Space Info Mask", [ + bf_boolean16(0x0001, "ns_info_mask_modify", "Modify Name"), + bf_boolean16(0x0002, "ns_info_mask_fatt", "File Attributes"), + bf_boolean16(0x0004, "ns_info_mask_cdate", "Creation Date"), + bf_boolean16(0x0008, "ns_info_mask_ctime", "Creation Time"), + bf_boolean16(0x0010, "ns_info_mask_owner", "Owner ID"), + bf_boolean16(0x0020, "ns_info_mask_adate", "Archive Date"), + bf_boolean16(0x0040, "ns_info_mask_atime", "Archive Time"), + bf_boolean16(0x0080, "ns_info_mask_aid", "Archiver ID"), + bf_boolean16(0x0100, "ns_info_mask_udate", "Update Date"), + bf_boolean16(0x0200, "ns_info_mask_utime", "Update Time"), + bf_boolean16(0x0400, "ns_info_mask_uid", "Update ID"), + bf_boolean16(0x0800, "ns_info_mask_acc_date", "Access Date"), + bf_boolean16(0x1000, "ns_info_mask_max_acc_mask", "Inheritance"), + bf_boolean16(0x2000, "ns_info_mask_max_space", "Maximum Space"), +]) +NameSpaceName = nstring8("name_space_name", "Name Space Name") +nameType = uint32("name_type", "nameType") +NCPdataSize = uint32("ncp_data_size", "NCP Data Size") NCPEncodedStringsBits = uint32("ncp_encoded_strings_bits", "NCP Encoded Strings Bits") -NCPextensionMajorVersion = uint8("ncp_extension_major_version", "NCP Extension Major Version") -NCPextensionMinorVersion = uint8("ncp_extension_minor_version", "NCP Extension Minor Version") -NCPextensionName = nstring8("ncp_extension_name", "NCP Extension Name") -NCPextensionNumber = uint32("ncp_extension_number", "NCP Extension Number") +NCPextensionMajorVersion = uint8("ncp_extension_major_version", "NCP Extension Major Version") +NCPextensionMinorVersion = uint8("ncp_extension_minor_version", "NCP Extension Minor Version") +NCPextensionName = nstring8("ncp_extension_name", "NCP Extension Name") +NCPextensionNumber = uint32("ncp_extension_number", "NCP Extension Number") NCPextensionNumber.Display("BASE_HEX") -NCPExtensionNumbers = uint32("ncp_extension_numbers", "NCP Extension Numbers") -NCPextensionRevisionNumber = uint8("ncp_extension_revision_number", "NCP Extension Revision Number") -NCPPeakStaInUse = uint32("ncp_peak_sta_in_use", "Peak Number of Connections since Server was brought up") -NCPStaInUseCnt = uint32("ncp_sta_in_use", "Number of Workstations Connected to Server") -NDSRequestFlags = bitfield16("nds_request_flags", "NDS Request Flags", [ - bf_boolean16(0x0001, "nds_request_flags_output", "Output Fields"), - bf_boolean16(0x0002, "nds_request_flags_no_such_entry", "No Such Entry"), - bf_boolean16(0x0004, "nds_request_flags_local_entry", "Local Entry"), - bf_boolean16(0x0008, "nds_request_flags_type_ref", "Type Referral"), - bf_boolean16(0x0010, "nds_request_flags_alias_ref", "Alias Referral"), - bf_boolean16(0x0020, "nds_request_flags_req_cnt", "Request Count"), - bf_boolean16(0x0040, "nds_request_flags_req_data_size", "Request Data Size"), - bf_boolean16(0x0080, "nds_request_flags_reply_data_size", "Reply Data Size"), - bf_boolean16(0x0100, "nds_request_flags_trans_ref", "Transport Referral"), - bf_boolean16(0x0200, "nds_request_flags_trans_ref2", "Transport Referral"), - bf_boolean16(0x0400, "nds_request_flags_up_ref", "Up Referral"), - bf_boolean16(0x0800, "nds_request_flags_dn_ref", "Down Referral"), +NCPExtensionNumbers = uint32("ncp_extension_numbers", "NCP Extension Numbers") +NCPextensionRevisionNumber = uint8("ncp_extension_revision_number", "NCP Extension Revision Number") +NCPPeakStaInUse = uint32("ncp_peak_sta_in_use", "Peak Number of Connections since Server was brought up") +NCPStaInUseCnt = uint32("ncp_sta_in_use", "Number of Workstations Connected to Server") +NDSRequestFlags = bitfield16("nds_request_flags", "NDS Request Flags", [ + bf_boolean16(0x0001, "nds_request_flags_output", "Output Fields"), + bf_boolean16(0x0002, "nds_request_flags_no_such_entry", "No Such Entry"), + bf_boolean16(0x0004, "nds_request_flags_local_entry", "Local Entry"), + bf_boolean16(0x0008, "nds_request_flags_type_ref", "Type Referral"), + bf_boolean16(0x0010, "nds_request_flags_alias_ref", "Alias Referral"), + bf_boolean16(0x0020, "nds_request_flags_req_cnt", "Request Count"), + bf_boolean16(0x0040, "nds_request_flags_req_data_size", "Request Data Size"), + bf_boolean16(0x0080, "nds_request_flags_reply_data_size", "Reply Data Size"), + bf_boolean16(0x0100, "nds_request_flags_trans_ref", "Transport Referral"), + bf_boolean16(0x0200, "nds_request_flags_trans_ref2", "Transport Referral"), + bf_boolean16(0x0400, "nds_request_flags_up_ref", "Up Referral"), + bf_boolean16(0x0800, "nds_request_flags_dn_ref", "Down Referral"), ]) -NDSStatus = uint32("nds_status", "NDS Status") -NetBIOSBroadcastWasPropogated = uint32("netbios_broadcast_was_propogated", "NetBIOS Broadcast Was Propogated") +NDSStatus = uint32("nds_status", "NDS Status") +NetBIOSBroadcastWasPropogated = uint32("netbios_broadcast_was_propogated", "NetBIOS Broadcast Was Propogated") NetIDNumber = uint32("net_id_number", "Net ID Number") NetIDNumber.Display("BASE_HEX") NetAddress = nbytes32("address", "Address") NetStatus = uint16("net_status", "Network Status") -NetWareAccessHandle = bytes("netware_access_handle", "NetWare Access Handle", 6) -NetworkAddress = uint32("network_address", "Network Address") +NetWareAccessHandle = bytes("netware_access_handle", "NetWare Access Handle", 6) +NetworkAddress = uint32("network_address", "Network Address") NetworkAddress.Display("BASE_HEX") -NetworkNodeAddress = bytes("network_node_address", "Network Node Address", 6) +NetworkNodeAddress = bytes("network_node_address", "Network Node Address", 6) NetworkNumber = uint32("network_number", "Network Number") NetworkNumber.Display("BASE_HEX") # # XXX - this should have the "ipx_socket_vals" value_string table # from "packet-ipx.c". # -NetworkSocket = uint16("network_socket", "Network Socket") +NetworkSocket = uint16("network_socket", "Network Socket") NetworkSocket.Display("BASE_HEX") -NewAccessRights = bitfield16("new_access_rights_mask", "New Access Rights", [ - bf_boolean16(0x0001, "new_access_rights_read", "Read"), - bf_boolean16(0x0002, "new_access_rights_write", "Write"), - bf_boolean16(0x0004, "new_access_rights_open", "Open"), - bf_boolean16(0x0008, "new_access_rights_create", "Create"), - bf_boolean16(0x0010, "new_access_rights_delete", "Delete"), - bf_boolean16(0x0020, "new_access_rights_parental", "Parental"), - bf_boolean16(0x0040, "new_access_rights_search", "Search"), - bf_boolean16(0x0080, "new_access_rights_modify", "Modify"), - bf_boolean16(0x0100, "new_access_rights_supervisor", "Supervisor"), +NewAccessRights = bitfield16("new_access_rights_mask", "New Access Rights", [ + bf_boolean16(0x0001, "new_access_rights_read", "Read"), + bf_boolean16(0x0002, "new_access_rights_write", "Write"), + bf_boolean16(0x0004, "new_access_rights_open", "Open"), + bf_boolean16(0x0008, "new_access_rights_create", "Create"), + bf_boolean16(0x0010, "new_access_rights_delete", "Delete"), + bf_boolean16(0x0020, "new_access_rights_parental", "Parental"), + bf_boolean16(0x0040, "new_access_rights_search", "Search"), + bf_boolean16(0x0080, "new_access_rights_modify", "Modify"), + bf_boolean16(0x0100, "new_access_rights_supervisor", "Supervisor"), ]) -NewDirectoryID = uint32("new_directory_id", "New Directory ID", BE) +NewDirectoryID = uint32("new_directory_id", "New Directory ID", BE) NewDirectoryID.Display("BASE_HEX") -NewEAHandle = uint32("new_ea_handle", "New EA Handle") +NewEAHandle = uint32("new_ea_handle", "New EA Handle") NewEAHandle.Display("BASE_HEX") -NewFileName = fw_string("new_file_name", "New File Name", 14) -NewFileNameLen = nstring8("new_file_name_len", "New File Name") -NewFileSize = uint32("new_file_size", "New File Size") -NewPassword = nstring8("new_password", "New Password") -NewPath = nstring8("new_path", "New Path") -NewPosition = uint8("new_position", "New Position") -NewObjectName = nstring8("new_object_name", "New Object Name") +NewFileName = fw_string("new_file_name", "New File Name", 14) +NewFileNameLen = nstring8("new_file_name_len", "New File Name") +NewFileSize = uint32("new_file_size", "New File Size") +NewPassword = nstring8("new_password", "New Password") +NewPath = nstring8("new_path", "New Path") +NewPosition = uint8("new_position", "New Position") +NewObjectName = nstring8("new_object_name", "New Object Name") NextCntBlock = uint32("next_cnt_block", "Next Count Block") -NextHugeStateInfo = bytes("next_huge_state_info", "Next Huge State Info", 16) -nextLimbScanNum = uint32("next_limb_scan_num", "Next Limb Scan Number") -NextObjectID = uint32("next_object_id", "Next Object ID", BE) +NextHugeStateInfo = bytes("next_huge_state_info", "Next Huge State Info", 16) +nextLimbScanNum = uint32("next_limb_scan_num", "Next Limb Scan Number") +NextObjectID = uint32("next_object_id", "Next Object ID", BE) NextObjectID.Display("BASE_HEX") -NextRecord = uint32("next_record", "Next Record") -NextRequestRecord = uint16("next_request_record", "Next Request Record") -NextSearchIndex = uint16("next_search_index", "Next Search Index") -NextSearchNumber = uint16("next_search_number", "Next Search Number") +NextRecord = uint32("next_record", "Next Record") +NextRequestRecord = uint16("next_request_record", "Next Request Record") +NextSearchIndex = uint16("next_search_index", "Next Search Index") +NextSearchNumber = uint16("next_search_number", "Next Search Number") NextSearchNum = uint32("nxt_search_num", "Next Search Number") -nextStartingNumber = uint32("next_starting_number", "Next Starting Number") -NextTrusteeEntry = uint32("next_trustee_entry", "Next Trustee Entry") -NextVolumeNumber = uint32("next_volume_number", "Next Volume Number") +nextStartingNumber = uint32("next_starting_number", "Next Starting Number") +NextTrusteeEntry = uint32("next_trustee_entry", "Next Trustee Entry") +NextVolumeNumber = uint32("next_volume_number", "Next Volume Number") NLMBuffer = nstring8("nlm_buffer", "Buffer") -NLMcount = uint32("nlm_count", "NLM Count") -NLMFlags = bitfield8("nlm_flags", "Flags", [ - bf_boolean8(0x01, "nlm_flags_reentrant", "ReEntrant"), - bf_boolean8(0x02, "nlm_flags_multiple", "Can Load Multiple Times"), - bf_boolean8(0x04, "nlm_flags_synchronize", "Synchronize Start"), - bf_boolean8(0x08, "nlm_flags_pseudo", "PseudoPreemption"), +NLMcount = uint32("nlm_count", "NLM Count") +NLMFlags = bitfield8("nlm_flags", "Flags", [ + bf_boolean8(0x01, "nlm_flags_reentrant", "ReEntrant"), + bf_boolean8(0x02, "nlm_flags_multiple", "Can Load Multiple Times"), + bf_boolean8(0x04, "nlm_flags_synchronize", "Synchronize Start"), + bf_boolean8(0x08, "nlm_flags_pseudo", "PseudoPreemption"), ]) NLMLoadOptions = uint32("nlm_load_options", "NLM Load Options") NLMName = stringz("nlm_name_stringz", "NLM Name") -NLMNumber = uint32("nlm_number", "NLM Number") -NLMNumbers = uint32("nlm_numbers", "NLM Numbers") -NLMsInList = uint32("nlms_in_list", "NLM's in List") +NLMNumber = uint32("nlm_number", "NLM Number") +NLMNumbers = uint32("nlm_numbers", "NLM Numbers") +NLMsInList = uint32("nlms_in_list", "NLM's in List") NLMStartNumber = uint32("nlm_start_num", "NLM Start Number") -NLMType = val_string8("nlm_type", "NLM Type", [ +NLMType = val_string8("nlm_type", "NLM Type", [ [ 0x00, "Generic NLM (.NLM)" ], - [ 0x01, "LAN Driver (.LAN)" ], - [ 0x02, "Disk Driver (.DSK)" ], - [ 0x03, "Name Space Support Module (.NAM)" ], - [ 0x04, "Utility or Support Program (.NLM)" ], - [ 0x05, "Mirrored Server Link (.MSL)" ], - [ 0x06, "OS NLM (.NLM)" ], - [ 0x07, "Paged High OS NLM (.NLM)" ], - [ 0x08, "Host Adapter Module (.HAM)" ], - [ 0x09, "Custom Device Module (.CDM)" ], - [ 0x0a, "File System Engine (.NLM)" ], - [ 0x0b, "Real Mode NLM (.NLM)" ], - [ 0x0c, "Hidden NLM (.NLM)" ], + [ 0x01, "LAN Driver (.LAN)" ], + [ 0x02, "Disk Driver (.DSK)" ], + [ 0x03, "Name Space Support Module (.NAM)" ], + [ 0x04, "Utility or Support Program (.NLM)" ], + [ 0x05, "Mirrored Server Link (.MSL)" ], + [ 0x06, "OS NLM (.NLM)" ], + [ 0x07, "Paged High OS NLM (.NLM)" ], + [ 0x08, "Host Adapter Module (.HAM)" ], + [ 0x09, "Custom Device Module (.CDM)" ], + [ 0x0a, "File System Engine (.NLM)" ], + [ 0x0b, "Real Mode NLM (.NLM)" ], + [ 0x0c, "Hidden NLM (.NLM)" ], [ 0x15, "NICI Support (.NLM)" ], [ 0x16, "NICI Support (.NLM)" ], [ 0x17, "Cryptography (.NLM)" ], @@ -2982,19 +2985,19 @@ [ 0x19, "NICI Support (.NLM)" ], [ 0x1c, "NICI Support (.NLM)" ], ]) -nodeFlags = uint32("node_flags", "Node Flags") +nodeFlags = uint32("node_flags", "Node Flags") nodeFlags.Display("BASE_HEX") -NoMoreMemAvlCnt = uint32("no_more_mem_avail", "No More Memory Available Count") -NonDedFlag = boolean8("non_ded_flag", "Non Dedicated Flag") +NoMoreMemAvlCnt = uint32("no_more_mem_avail", "No More Memory Available Count") +NonDedFlag = boolean8("non_ded_flag", "Non Dedicated Flag") NonFreeableAvailableSubAllocSectors = uint32("non_freeable_avail_sub_alloc_sectors", "Non Freeable Available Sub Alloc Sectors") -NonFreeableLimboSectors = uint32("non_freeable_limbo_sectors", "Non Freeable Limbo Sectors") -NotUsableSubAllocSectors = uint32("not_usable_sub_alloc_sectors", "Not Usable Sub Alloc Sectors") -NotYetPurgeableBlocks = uint32("not_yet_purgeable_blocks", "Not Yet Purgeable Blocks") -NSInfoBitMask = uint32("ns_info_bit_mask", "Name Space Info Bit Mask") +NonFreeableLimboSectors = uint32("non_freeable_limbo_sectors", "Non Freeable Limbo Sectors") +NotUsableSubAllocSectors = uint32("not_usable_sub_alloc_sectors", "Not Usable Sub Alloc Sectors") +NotYetPurgeableBlocks = uint32("not_yet_purgeable_blocks", "Not Yet Purgeable Blocks") +NSInfoBitMask = uint32("ns_info_bit_mask", "Name Space Info Bit Mask") NSSOAllInFlags = bitfield32("nsso_all_in_flags", "SecretStore All Input Flags",[ bf_boolean32(0x00000010, "nsso_all_unicode", "Unicode Data"), - bf_boolean32(0x00000080, "nsso_set_tree", "Set Tree"), - bf_boolean32(0x00000200, "nsso_destroy_ctx", "Destroy Context"), + bf_boolean32(0x00000080, "nsso_set_tree", "Set Tree"), + bf_boolean32(0x00000200, "nsso_destroy_ctx", "Destroy Context"), ]) NSSOGetServiceInFlags = bitfield32("nsso_get_svc_in_flags", "SecretStore Get Service Flags",[ bf_boolean32(0x00000100, "nsso_get_ctx", "Get Context"), @@ -3011,13 +3014,13 @@ ]) NSSOWriteInFlags = bitfield32("nsso_write_in_flags", "SecretStore Write Flags",[ bf_boolean32(0x00000001, "nsso_enh_prot", "Enhanced Protection"), - bf_boolean32(0x00000002, "nsso_create_id", "Create ID"), - bf_boolean32(0x00000040, "nsso_ep_pwd_used", "Enhanced Protection Password Used"), + bf_boolean32(0x00000002, "nsso_create_id", "Create ID"), + bf_boolean32(0x00000040, "nsso_ep_pwd_used", "Enhanced Protection Password Used"), ]) NSSOContextOutFlags = bitfield32("nsso_cts_out_flags", "Type of Context",[ bf_boolean32(0x00000001, "nsso_ds_ctx", "DSAPI Context"), - bf_boolean32(0x00000080, "nsso_ldap_ctx", "LDAP Context"), - bf_boolean32(0x00000200, "nsso_dc_ctx", "Reserved"), + bf_boolean32(0x00000080, "nsso_ldap_ctx", "LDAP Context"), + bf_boolean32(0x00000200, "nsso_dc_ctx", "Reserved"), ]) NSSOGetServiceOutFlags = bitfield32("nsso_get_svc_out_flags", "SecretStore Status Flags",[ bf_boolean32(0x00400000, "nsso_mstr_pwd", "Master Password Present"), @@ -3047,79 +3050,79 @@ [ 0x08, "Set Master Password" ], [ 0x09, "Get Service Information" ], ]) -NSSpecificInfo = fw_string("ns_specific_info", "Name Space Specific Info", 512) -NumberOfActiveTasks = uint8("num_of_active_tasks", "Number of Active Tasks") -NumberOfAllocs = uint32("num_of_allocs", "Number of Allocations") -NumberOfCPUs = uint32("number_of_cpus", "Number of CPU's") -NumberOfDataStreams = uint16("number_of_data_streams", "Number of Data Streams") +NSSpecificInfo = fw_string("ns_specific_info", "Name Space Specific Info", 512) +NumberOfActiveTasks = uint8("num_of_active_tasks", "Number of Active Tasks") +NumberOfAllocs = uint32("num_of_allocs", "Number of Allocations") +NumberOfCPUs = uint32("number_of_cpus", "Number of CPU's") +NumberOfDataStreams = uint16("number_of_data_streams", "Number of Data Streams") NumberOfDataStreamsLong = uint32("number_of_data_streams_long", "Number of Data Streams") -NumberOfDynamicMemoryAreas = uint16("number_of_dynamic_memory_areas", "Number Of Dynamic Memory Areas") -NumberOfEntries = uint8("number_of_entries", "Number of Entries") -NumberOfLocks = uint8("number_of_locks", "Number of Locks") -NumberOfMinutesToDelay = uint32("number_of_minutes_to_delay", "Number of Minutes to Delay") -NumberOfNCPExtensions = uint32("number_of_ncp_extensions", "Number Of NCP Extensions") -NumberOfNSLoaded = uint16("number_of_ns_loaded", "Number Of Name Spaces Loaded") +NumberOfDynamicMemoryAreas = uint16("number_of_dynamic_memory_areas", "Number Of Dynamic Memory Areas") +NumberOfEntries = uint8("number_of_entries", "Number of Entries") +NumberOfLocks = uint8("number_of_locks", "Number of Locks") +NumberOfMinutesToDelay = uint32("number_of_minutes_to_delay", "Number of Minutes to Delay") +NumberOfNCPExtensions = uint32("number_of_ncp_extensions", "Number Of NCP Extensions") +NumberOfNSLoaded = uint16("number_of_ns_loaded", "Number Of Name Spaces Loaded") NumberOfProtocols = uint8("number_of_protocols", "Number of Protocols") -NumberOfRecords = uint16("number_of_records", "Number of Records") -NumberOfReferencedPublics = uint32("num_of_ref_publics", "Number of Referenced Public Symbols") -NumberOfSemaphores = uint16("number_of_semaphores", "Number Of Semaphores") -NumberOfServiceProcesses = uint8("number_of_service_processes", "Number Of Service Processes") +NumberOfRecords = uint16("number_of_records", "Number of Records") +NumberOfReferencedPublics = uint32("num_of_ref_publics", "Number of Referenced Public Symbols") +NumberOfSemaphores = uint16("number_of_semaphores", "Number Of Semaphores") +NumberOfServiceProcesses = uint8("number_of_service_processes", "Number Of Service Processes") NumberOfSetCategories = uint32("number_of_set_categories", "Number Of Set Categories") NumberOfSMs = uint32("number_of_sms", "Number Of Storage Medias") -NumberOfStations = uint8("number_of_stations", "Number of Stations") -NumBytes = uint16("num_bytes", "Number of Bytes") +NumberOfStations = uint8("number_of_stations", "Number of Stations") +NumBytes = uint16("num_bytes", "Number of Bytes") NumOfCCinPkt = uint32("num_of_cc_in_pkt", "Number of Custom Counters in Packet") -NumOfChecks = uint32("num_of_checks", "Number of Checks") -NumOfEntries = uint32("num_of_entries", "Number of Entries") -NumOfFilesMigrated = uint32("num_of_files_migrated", "Number Of Files Migrated") -NumOfGarbageColl = uint32("num_of_garb_coll", "Number of Garbage Collections") -NumOfNCPReqs = uint32("num_of_ncp_reqs", "Number of NCP Requests since Server was brought up") +NumOfChecks = uint32("num_of_checks", "Number of Checks") +NumOfEntries = uint32("num_of_entries", "Number of Entries") +NumOfFilesMigrated = uint32("num_of_files_migrated", "Number Of Files Migrated") +NumOfGarbageColl = uint32("num_of_garb_coll", "Number of Garbage Collections") +NumOfNCPReqs = uint32("num_of_ncp_reqs", "Number of NCP Requests since Server was brought up") NumOfSegments = uint32("num_of_segments", "Number of Segments") ObjectCount = uint32("object_count", "Object Count") -ObjectFlags = val_string8("object_flags", "Object Flags", [ - [ 0x00, "Dynamic object" ], - [ 0x01, "Static object" ], -]) -ObjectHasProperties = val_string8("object_has_properites", "Object Has Properties", [ - [ 0x00, "No properties" ], - [ 0xff, "One or more properties" ], +ObjectFlags = val_string8("object_flags", "Object Flags", [ + [ 0x00, "Dynamic object" ], + [ 0x01, "Static object" ], +]) +ObjectHasProperties = val_string8("object_has_properites", "Object Has Properties", [ + [ 0x00, "No properties" ], + [ 0xff, "One or more properties" ], ]) -ObjectID = uint32("object_id", "Object ID", BE) +ObjectID = uint32("object_id", "Object ID", BE) ObjectID.Display('BASE_HEX') -ObjectIDCount = uint16("object_id_count", "Object ID Count") -ObjectIDInfo = uint32("object_id_info", "Object Information") -ObjectInfoReturnCount = uint32("object_info_rtn_count", "Object Information Count") -ObjectName = nstring8("object_name", "Object Name") -ObjectNameLen = fw_string("object_name_len", "Object Name", 48) +ObjectIDCount = uint16("object_id_count", "Object ID Count") +ObjectIDInfo = uint32("object_id_info", "Object Information") +ObjectInfoReturnCount = uint32("object_info_rtn_count", "Object Information Count") +ObjectName = nstring8("object_name", "Object Name") +ObjectNameLen = fw_string("object_name_len", "Object Name", 48) ObjectNameStringz = stringz("object_name_stringz", "Object Name") ObjectNumber = uint32("object_number", "Object Number") -ObjectSecurity = val_string8("object_security", "Object Security", [ - [ 0x00, "Object Read (Anyone) / Object Write (Anyone)" ], - [ 0x01, "Object Read (Logged in) / Object Write (Anyone)" ], - [ 0x02, "Object Read (Logged in as Object) / Object Write (Anyone)" ], - [ 0x03, "Object Read (Supervisor) / Object Write (Anyone)" ], - [ 0x04, "Object Read (Operating System Only) / Object Write (Anyone)" ], - [ 0x10, "Object Read (Anyone) / Object Write (Logged in)" ], - [ 0x11, "Object Read (Logged in) / Object Write (Logged in)" ], - [ 0x12, "Object Read (Logged in as Object) / Object Write (Logged in)" ], - [ 0x13, "Object Read (Supervisor) / Object Write (Logged in)" ], - [ 0x14, "Object Read (Operating System Only) / Object Write (Logged in)" ], - [ 0x20, "Object Read (Anyone) / Object Write (Logged in as Object)" ], - [ 0x21, "Object Read (Logged in) / Object Write (Logged in as Object)" ], - [ 0x22, "Object Read (Logged in as Object) / Object Write (Logged in as Object)" ], - [ 0x23, "Object Read (Supervisor) / Object Write (Logged in as Object)" ], - [ 0x24, "Object Read (Operating System Only) / Object Write (Logged in as Object)" ], - [ 0x30, "Object Read (Anyone) / Object Write (Supervisor)" ], - [ 0x31, "Object Read (Logged in) / Object Write (Supervisor)" ], - [ 0x32, "Object Read (Logged in as Object) / Object Write (Supervisor)" ], - [ 0x33, "Object Read (Supervisor) / Object Write (Supervisor)" ], - [ 0x34, "Object Read (Operating System Only) / Object Write (Supervisor)" ], - [ 0x40, "Object Read (Anyone) / Object Write (Operating System Only)" ], - [ 0x41, "Object Read (Logged in) / Object Write (Operating System Only)" ], - [ 0x42, "Object Read (Logged in as Object) / Object Write (Operating System Only)" ], - [ 0x43, "Object Read (Supervisor) / Object Write (Operating System Only)" ], - [ 0x44, "Object Read (Operating System Only) / Object Write (Operating System Only)" ], +ObjectSecurity = val_string8("object_security", "Object Security", [ + [ 0x00, "Object Read (Anyone) / Object Write (Anyone)" ], + [ 0x01, "Object Read (Logged in) / Object Write (Anyone)" ], + [ 0x02, "Object Read (Logged in as Object) / Object Write (Anyone)" ], + [ 0x03, "Object Read (Supervisor) / Object Write (Anyone)" ], + [ 0x04, "Object Read (Operating System Only) / Object Write (Anyone)" ], + [ 0x10, "Object Read (Anyone) / Object Write (Logged in)" ], + [ 0x11, "Object Read (Logged in) / Object Write (Logged in)" ], + [ 0x12, "Object Read (Logged in as Object) / Object Write (Logged in)" ], + [ 0x13, "Object Read (Supervisor) / Object Write (Logged in)" ], + [ 0x14, "Object Read (Operating System Only) / Object Write (Logged in)" ], + [ 0x20, "Object Read (Anyone) / Object Write (Logged in as Object)" ], + [ 0x21, "Object Read (Logged in) / Object Write (Logged in as Object)" ], + [ 0x22, "Object Read (Logged in as Object) / Object Write (Logged in as Object)" ], + [ 0x23, "Object Read (Supervisor) / Object Write (Logged in as Object)" ], + [ 0x24, "Object Read (Operating System Only) / Object Write (Logged in as Object)" ], + [ 0x30, "Object Read (Anyone) / Object Write (Supervisor)" ], + [ 0x31, "Object Read (Logged in) / Object Write (Supervisor)" ], + [ 0x32, "Object Read (Logged in as Object) / Object Write (Supervisor)" ], + [ 0x33, "Object Read (Supervisor) / Object Write (Supervisor)" ], + [ 0x34, "Object Read (Operating System Only) / Object Write (Supervisor)" ], + [ 0x40, "Object Read (Anyone) / Object Write (Operating System Only)" ], + [ 0x41, "Object Read (Logged in) / Object Write (Operating System Only)" ], + [ 0x42, "Object Read (Logged in as Object) / Object Write (Operating System Only)" ], + [ 0x43, "Object Read (Supervisor) / Object Write (Operating System Only)" ], + [ 0x44, "Object Read (Operating System Only) / Object Write (Operating System Only)" ], ]) # # XXX - should this use the "server_vals[]" value_string array from @@ -3130,22 +3133,22 @@ # the list from "packet-ipx.c" has 0xf503 for that - is that just # byte-order confusion? # -ObjectType = val_string16("object_type", "Object Type", [ - [ 0x0000, "Unknown" ], - [ 0x0001, "User" ], - [ 0x0002, "User group" ], - [ 0x0003, "Print queue" ], - [ 0x0004, "NetWare file server" ], - [ 0x0005, "Job server" ], - [ 0x0006, "Gateway" ], - [ 0x0007, "Print server" ], - [ 0x0008, "Archive queue" ], - [ 0x0009, "Archive server" ], - [ 0x000a, "Job queue" ], - [ 0x000b, "Administration" ], - [ 0x0021, "NAS SNA gateway" ], - [ 0x0026, "Remote bridge server" ], - [ 0x0027, "TCP/IP gateway" ], +ObjectType = val_string16("object_type", "Object Type", [ + [ 0x0000, "Unknown" ], + [ 0x0001, "User" ], + [ 0x0002, "User group" ], + [ 0x0003, "Print queue" ], + [ 0x0004, "NetWare file server" ], + [ 0x0005, "Job server" ], + [ 0x0006, "Gateway" ], + [ 0x0007, "Print server" ], + [ 0x0008, "Archive queue" ], + [ 0x0009, "Archive server" ], + [ 0x000a, "Job queue" ], + [ 0x000b, "Administration" ], + [ 0x0021, "NAS SNA gateway" ], + [ 0x0026, "Remote bridge server" ], + [ 0x0027, "TCP/IP gateway" ], [ 0x0047, "Novell Print Server" ], [ 0x004b, "Btrieve Server" ], [ 0x004c, "NetWare SQL Server" ], @@ -3194,67 +3197,67 @@ [ 0x5555, "Site Lock" ], [ 0x8202, "NDPS Broker" ], ]) -OCRetFlags = val_string8("o_c_ret_flags", "Open Create Return Flags", [ - [ 0x00, "No CallBack has been registered (No Op-Lock)" ], - [ 0x01, "Request has been registered for CallBack (Op-Lock)" ], -]) -OESServer = val_string8("oes_server", "Type of Novell Server", [ - [ 0x00, "NetWare" ], - [ 0x01, "OES" ], -]) - -OESLinuxOrNetWare = val_string8("oeslinux_or_netware", "Kernel Type", [ - [ 0x00, "NetWare" ], - [ 0x01, "Linux" ], -]) - -OldestDeletedFileAgeInTicks = uint32("oldest_deleted_file_age_in_ticks", "Oldest Deleted File Age in Ticks") -OldFileName = bytes("old_file_name", "Old File Name", 15) -OldFileSize = uint32("old_file_size", "Old File Size") -OpenCount = uint16("open_count", "Open Count") -OpenCreateAction = bitfield8("open_create_action", "Open Create Action", [ - bf_boolean8(0x01, "open_create_action_opened", "Opened"), - bf_boolean8(0x02, "open_create_action_created", "Created"), - bf_boolean8(0x04, "open_create_action_replaced", "Replaced"), - bf_boolean8(0x08, "open_create_action_compressed", "Compressed"), - bf_boolean8(0x80, "open_create_action_read_only", "Read Only"), -]) -OpenCreateMode = bitfield8("open_create_mode", "Open Create Mode", [ - bf_boolean8(0x01, "open_create_mode_open", "Open existing file (file must exist)"), - bf_boolean8(0x02, "open_create_mode_replace", "Replace existing file"), - bf_boolean8(0x08, "open_create_mode_create", "Create new file or subdirectory (file or subdirectory cannot exist)"), +OCRetFlags = val_string8("o_c_ret_flags", "Open Create Return Flags", [ + [ 0x00, "No CallBack has been registered (No Op-Lock)" ], + [ 0x01, "Request has been registered for CallBack (Op-Lock)" ], +]) +OESServer = val_string8("oes_server", "Type of Novell Server", [ + [ 0x00, "NetWare" ], + [ 0x01, "OES" ], +]) + +OESLinuxOrNetWare = val_string8("oeslinux_or_netware", "Kernel Type", [ + [ 0x00, "NetWare" ], + [ 0x01, "Linux" ], +]) + +OldestDeletedFileAgeInTicks = uint32("oldest_deleted_file_age_in_ticks", "Oldest Deleted File Age in Ticks") +OldFileName = bytes("old_file_name", "Old File Name", 15) +OldFileSize = uint32("old_file_size", "Old File Size") +OpenCount = uint16("open_count", "Open Count") +OpenCreateAction = bitfield8("open_create_action", "Open Create Action", [ + bf_boolean8(0x01, "open_create_action_opened", "Opened"), + bf_boolean8(0x02, "open_create_action_created", "Created"), + bf_boolean8(0x04, "open_create_action_replaced", "Replaced"), + bf_boolean8(0x08, "open_create_action_compressed", "Compressed"), + bf_boolean8(0x80, "open_create_action_read_only", "Read Only"), +]) +OpenCreateMode = bitfield8("open_create_mode", "Open Create Mode", [ + bf_boolean8(0x01, "open_create_mode_open", "Open existing file (file must exist)"), + bf_boolean8(0x02, "open_create_mode_replace", "Replace existing file"), + bf_boolean8(0x08, "open_create_mode_create", "Create new file or subdirectory (file or subdirectory cannot exist)"), bf_boolean8(0x20, "open_create_mode_64bit", "Open 64-bit Access"), bf_boolean8(0x40, "open_create_mode_ro", "Open with Read Only Access"), - bf_boolean8(0x80, "open_create_mode_oplock", "Open Callback (Op-Lock)"), + bf_boolean8(0x80, "open_create_mode_oplock", "Open Callback (Op-Lock)"), ]) -OpenForReadCount = uint16("open_for_read_count", "Open For Read Count") -OpenForWriteCount = uint16("open_for_write_count", "Open For Write Count") -OpenRights = bitfield8("open_rights", "Open Rights", [ - bf_boolean8(0x01, "open_rights_read_only", "Read Only"), - bf_boolean8(0x02, "open_rights_write_only", "Write Only"), - bf_boolean8(0x04, "open_rights_deny_read", "Deny Read"), - bf_boolean8(0x08, "open_rights_deny_write", "Deny Write"), - bf_boolean8(0x10, "open_rights_compat", "Compatibility"), - bf_boolean8(0x40, "open_rights_write_thru", "File Write Through"), +OpenForReadCount = uint16("open_for_read_count", "Open For Read Count") +OpenForWriteCount = uint16("open_for_write_count", "Open For Write Count") +OpenRights = bitfield8("open_rights", "Open Rights", [ + bf_boolean8(0x01, "open_rights_read_only", "Read Only"), + bf_boolean8(0x02, "open_rights_write_only", "Write Only"), + bf_boolean8(0x04, "open_rights_deny_read", "Deny Read"), + bf_boolean8(0x08, "open_rights_deny_write", "Deny Write"), + bf_boolean8(0x10, "open_rights_compat", "Compatibility"), + bf_boolean8(0x40, "open_rights_write_thru", "File Write Through"), ]) -OptionNumber = uint8("option_number", "Option Number") +OptionNumber = uint8("option_number", "Option Number") originalSize = uint32("original_size", "Original Size") -OSLanguageID = uint8("os_language_id", "OS Language ID") -OSMajorVersion = uint8("os_major_version", "OS Major Version") -OSMinorVersion = uint8("os_minor_version", "OS Minor Version") -OSRevision = uint32("os_revision", "OS Revision") -OtherFileForkSize = uint32("other_file_fork_size", "Other File Fork Size") -OtherFileForkFAT = uint32("other_file_fork_fat", "Other File Fork FAT Entry") +OSLanguageID = uint8("os_language_id", "OS Language ID") +OSMajorVersion = uint8("os_major_version", "OS Major Version") +OSMinorVersion = uint8("os_minor_version", "OS Minor Version") +OSRevision = uint32("os_revision", "OS Revision") +OtherFileForkSize = uint32("other_file_fork_size", "Other File Fork Size") +OtherFileForkFAT = uint32("other_file_fork_fat", "Other File Fork FAT Entry") OutgoingPacketDiscardedNoTurboBuffer = uint16("outgoing_packet_discarded_no_turbo_buffer", "Outgoing Packet Discarded No Turbo Buffer") -PacketsDiscardedByHopCount = uint16("packets_discarded_by_hop_count", "Packets Discarded By Hop Count") -PacketsDiscardedUnknownNet = uint16("packets_discarded_unknown_net", "Packets Discarded Unknown Net") -PacketsFromInvalidConnection = uint16("packets_from_invalid_connection", "Packets From Invalid Connection") +PacketsDiscardedByHopCount = uint16("packets_discarded_by_hop_count", "Packets Discarded By Hop Count") +PacketsDiscardedUnknownNet = uint16("packets_discarded_unknown_net", "Packets Discarded Unknown Net") +PacketsFromInvalidConnection = uint16("packets_from_invalid_connection", "Packets From Invalid Connection") PacketsReceivedDuringProcessing = uint16("packets_received_during_processing", "Packets Received During Processing") -PacketsWithBadRequestType = uint16("packets_with_bad_request_type", "Packets With Bad Request Type") -PacketsWithBadSequenceNumber = uint16("packets_with_bad_sequence_number", "Packets With Bad Sequence Number") -PageTableOwnerFlag = uint32("page_table_owner_flag", "Page Table Owner") -ParentID = uint32("parent_id", "Parent ID") +PacketsWithBadRequestType = uint16("packets_with_bad_request_type", "Packets With Bad Request Type") +PacketsWithBadSequenceNumber = uint16("packets_with_bad_sequence_number", "Packets With Bad Sequence Number") +PageTableOwnerFlag = uint32("page_table_owner_flag", "Page Table Owner") +ParentID = uint32("parent_id", "Parent ID") ParentID.Display("BASE_HEX") ParentBaseID = uint32("parent_base_id", "Parent Base ID") ParentBaseID.Display("BASE_HEX") @@ -3262,246 +3265,246 @@ ParentDOSDirectoryBase = uint32("parent_dos_directory_base", "Parent DOS Directory Base") ParentObjectNumber = uint32("parent_object_number", "Parent Object Number") ParentObjectNumber.Display("BASE_HEX") -Password = nstring8("password", "Password") -PathBase = uint8("path_base", "Path Base") -PathComponentCount = uint16("path_component_count", "Path Component Count") -PathComponentSize = uint16("path_component_size", "Path Component Size") -PathCookieFlags = val_string16("path_cookie_flags", "Path Cookie Flags", [ - [ 0x0000, "Last component is Not a File Name" ], - [ 0x0001, "Last component is a File Name" ], +Password = nstring8("password", "Password") +PathBase = uint8("path_base", "Path Base") +PathComponentCount = uint16("path_component_count", "Path Component Count") +PathComponentSize = uint16("path_component_size", "Path Component Size") +PathCookieFlags = val_string16("path_cookie_flags", "Path Cookie Flags", [ + [ 0x0000, "Last component is Not a File Name" ], + [ 0x0001, "Last component is a File Name" ], ]) -PathCount = uint8("path_count", "Path Count") -Path = nstring8("path", "Path") +PathCount = uint8("path_count", "Path Count") +Path = nstring8("path", "Path") Path16 = nstring16("path16", "Path") PathAndName = stringz("path_and_name", "Path and Name") -PendingIOCommands = uint16("pending_io_commands", "Pending IO Commands") -PhysicalDiskNumber = uint8("physical_disk_number", "Physical Disk Number") -PhysicalDriveCount = uint8("physical_drive_count", "Physical Drive Count") -PhysicalLockThreshold = uint8("physical_lock_threshold", "Physical Lock Threshold") -PingVersion = uint16("ping_version", "Ping Version") +PendingIOCommands = uint16("pending_io_commands", "Pending IO Commands") +PhysicalDiskNumber = uint8("physical_disk_number", "Physical Disk Number") +PhysicalDriveCount = uint8("physical_drive_count", "Physical Drive Count") +PhysicalLockThreshold = uint8("physical_lock_threshold", "Physical Lock Threshold") +PingVersion = uint16("ping_version", "Ping Version") PoolName = stringz("pool_name", "Pool Name") -PositiveAcknowledgesSent = uint16("positive_acknowledges_sent", "Positive Acknowledges Sent") -PreCompressedSectors = uint32("pre_compressed_sectors", "Precompressed Sectors") -PreviousRecord = uint32("previous_record", "Previous Record") -PrimaryEntry = uint32("primary_entry", "Primary Entry") -PrintFlags = bitfield8("print_flags", "Print Flags", [ - bf_boolean8(0x08, "print_flags_ff", "Suppress Form Feeds"), +PositiveAcknowledgesSent = uint16("positive_acknowledges_sent", "Positive Acknowledges Sent") +PreCompressedSectors = uint32("pre_compressed_sectors", "Precompressed Sectors") +PreviousRecord = uint32("previous_record", "Previous Record") +PrimaryEntry = uint32("primary_entry", "Primary Entry") +PrintFlags = bitfield8("print_flags", "Print Flags", [ + bf_boolean8(0x08, "print_flags_ff", "Suppress Form Feeds"), bf_boolean8(0x10, "print_flags_cr", "Create"), - bf_boolean8(0x20, "print_flags_del_spool", "Delete Spool File after Printing"), - bf_boolean8(0x40, "print_flags_exp_tabs", "Expand Tabs in the File"), - bf_boolean8(0x80, "print_flags_banner", "Print Banner Page"), -]) -PrinterHalted = val_string8("printer_halted", "Printer Halted", [ - [ 0x00, "Printer is not Halted" ], - [ 0xff, "Printer is Halted" ], -]) -PrinterOffLine = val_string8( "printer_offline", "Printer Off-Line", [ - [ 0x00, "Printer is On-Line" ], - [ 0xff, "Printer is Off-Line" ], + bf_boolean8(0x20, "print_flags_del_spool", "Delete Spool File after Printing"), + bf_boolean8(0x40, "print_flags_exp_tabs", "Expand Tabs in the File"), + bf_boolean8(0x80, "print_flags_banner", "Print Banner Page"), +]) +PrinterHalted = val_string8("printer_halted", "Printer Halted", [ + [ 0x00, "Printer is not Halted" ], + [ 0xff, "Printer is Halted" ], +]) +PrinterOffLine = val_string8( "printer_offline", "Printer Off-Line", [ + [ 0x00, "Printer is On-Line" ], + [ 0xff, "Printer is Off-Line" ], ]) -PrintServerVersion = uint8("print_server_version", "Print Server Version") -Priority = uint32("priority", "Priority") +PrintServerVersion = uint8("print_server_version", "Print Server Version") +Priority = uint32("priority", "Priority") Privileges = uint32("privileges", "Login Privileges") -ProcessorType = val_string8("processor_type", "Processor Type", [ - [ 0x00, "Motorola 68000" ], - [ 0x01, "Intel 8088 or 8086" ], - [ 0x02, "Intel 80286" ], -]) -ProDOSInfo = bytes("pro_dos_info", "Pro DOS Info", 6) -ProductMajorVersion = uint16("product_major_version", "Product Major Version") -ProductMinorVersion = uint16("product_minor_version", "Product Minor Version") -ProductRevisionVersion = uint8("product_revision_version", "Product Revision Version") +ProcessorType = val_string8("processor_type", "Processor Type", [ + [ 0x00, "Motorola 68000" ], + [ 0x01, "Intel 8088 or 8086" ], + [ 0x02, "Intel 80286" ], +]) +ProDOSInfo = bytes("pro_dos_info", "Pro DOS Info", 6) +ProductMajorVersion = uint16("product_major_version", "Product Major Version") +ProductMinorVersion = uint16("product_minor_version", "Product Minor Version") +ProductRevisionVersion = uint8("product_revision_version", "Product Revision Version") projectedCompSize = uint32("projected_comp_size", "Projected Compression Size") -PropertyHasMoreSegments = val_string8("property_has_more_segments", - "Property Has More Segments", [ - [ 0x00, "Is last segment" ], - [ 0xff, "More segments are available" ], -]) -PropertyName = nstring8("property_name", "Property Name") -PropertyName16 = fw_string("property_name_16", "Property Name", 16) -PropertyData = bytes("property_data", "Property Data", 128) -PropertySegment = uint8("property_segment", "Property Segment") -PropertyType = val_string8("property_type", "Property Type", [ - [ 0x00, "Display Static property" ], - [ 0x01, "Display Dynamic property" ], - [ 0x02, "Set Static property" ], - [ 0x03, "Set Dynamic property" ], -]) -PropertyValue = fw_string("property_value", "Property Value", 128) -ProposedMaxSize = uint16("proposed_max_size", "Proposed Max Size") -protocolFlags = uint32("protocol_flags", "Protocol Flags") +PropertyHasMoreSegments = val_string8("property_has_more_segments", + "Property Has More Segments", [ + [ 0x00, "Is last segment" ], + [ 0xff, "More segments are available" ], +]) +PropertyName = nstring8("property_name", "Property Name") +PropertyName16 = fw_string("property_name_16", "Property Name", 16) +PropertyData = bytes("property_data", "Property Data", 128) +PropertySegment = uint8("property_segment", "Property Segment") +PropertyType = val_string8("property_type", "Property Type", [ + [ 0x00, "Display Static property" ], + [ 0x01, "Display Dynamic property" ], + [ 0x02, "Set Static property" ], + [ 0x03, "Set Dynamic property" ], +]) +PropertyValue = fw_string("property_value", "Property Value", 128) +ProposedMaxSize = uint16("proposed_max_size", "Proposed Max Size") +protocolFlags = uint32("protocol_flags", "Protocol Flags") protocolFlags.Display("BASE_HEX") -PurgeableBlocks = uint32("purgeable_blocks", "Purgeable Blocks") +PurgeableBlocks = uint32("purgeable_blocks", "Purgeable Blocks") PurgeCcode = uint32("purge_c_code", "Purge Completion Code") -PurgeCount = uint32("purge_count", "Purge Count") -PurgeFlags = val_string16("purge_flags", "Purge Flags", [ - [ 0x0000, "Do not Purge All" ], - [ 0x0001, "Purge All" ], +PurgeCount = uint32("purge_count", "Purge Count") +PurgeFlags = val_string16("purge_flags", "Purge Flags", [ + [ 0x0000, "Do not Purge All" ], + [ 0x0001, "Purge All" ], [ 0xffff, "Do not Purge All" ], ]) PurgeList = uint32("purge_list", "Purge List") -PhysicalDiskChannel = uint8("physical_disk_channel", "Physical Disk Channel") -PhysicalDriveType = val_string8("physical_drive_type", "Physical Drive Type", [ - [ 0x01, "XT" ], - [ 0x02, "AT" ], - [ 0x03, "SCSI" ], - [ 0x04, "Disk Coprocessor" ], - [ 0x05, "PS/2 with MFM Controller" ], - [ 0x06, "PS/2 with ESDI Controller" ], - [ 0x07, "Convergent Technology SBIC" ], -]) -PhysicalReadErrors = uint16("physical_read_errors", "Physical Read Errors") -PhysicalReadRequests = uint32("physical_read_requests", "Physical Read Requests") -PhysicalWriteErrors = uint16("physical_write_errors", "Physical Write Errors") -PhysicalWriteRequests = uint32("physical_write_requests", "Physical Write Requests") +PhysicalDiskChannel = uint8("physical_disk_channel", "Physical Disk Channel") +PhysicalDriveType = val_string8("physical_drive_type", "Physical Drive Type", [ + [ 0x01, "XT" ], + [ 0x02, "AT" ], + [ 0x03, "SCSI" ], + [ 0x04, "Disk Coprocessor" ], + [ 0x05, "PS/2 with MFM Controller" ], + [ 0x06, "PS/2 with ESDI Controller" ], + [ 0x07, "Convergent Technology SBIC" ], +]) +PhysicalReadErrors = uint16("physical_read_errors", "Physical Read Errors") +PhysicalReadRequests = uint32("physical_read_requests", "Physical Read Requests") +PhysicalWriteErrors = uint16("physical_write_errors", "Physical Write Errors") +PhysicalWriteRequests = uint32("physical_write_requests", "Physical Write Requests") PrintToFileFlag = boolean8("print_to_file_flag", "Print to File Flag") -QueueID = uint32("queue_id", "Queue ID") +QueueID = uint32("queue_id", "Queue ID") QueueID.Display("BASE_HEX") -QueueName = nstring8("queue_name", "Queue Name") -QueueStartPosition = uint32("queue_start_position", "Queue Start Position") -QueueStatus = bitfield8("queue_status", "Queue Status", [ - bf_boolean8(0x01, "queue_status_new_jobs", "Operator does not want to add jobs to the queue"), - bf_boolean8(0x02, "queue_status_pserver", "Operator does not want additional servers attaching"), - bf_boolean8(0x04, "queue_status_svc_jobs", "Operator does not want servers to service jobs"), -]) -QueueType = uint16("queue_type", "Queue Type") -QueueingVersion = uint8("qms_version", "QMS Version") - -ReadBeyondWrite = uint16("read_beyond_write", "Read Beyond Write") -RecordLockCount = uint16("rec_lock_count", "Record Lock Count") -RecordStart = uint32("record_start", "Record Start") -RecordEnd = uint32("record_end", "Record End") -RecordInUseFlag = val_string16("record_in_use", "Record in Use", [ - [ 0x0000, "Record In Use" ], - [ 0xffff, "Record Not In Use" ], -]) -RedirectedPrinter = uint8( "redirected_printer", "Redirected Printer" ) -ReferenceCount = uint32("reference_count", "Reference Count") -RelationsCount = uint16("relations_count", "Relations Count") -ReMirrorCurrentOffset = uint32("re_mirror_current_offset", "ReMirror Current Offset") -ReMirrorDriveNumber = uint8("re_mirror_drive_number", "ReMirror Drive Number") -RemoteMaxPacketSize = uint32("remote_max_packet_size", "Remote Max Packet Size") -RemoteTargetID = uint32("remote_target_id", "Remote Target ID") +QueueName = nstring8("queue_name", "Queue Name") +QueueStartPosition = uint32("queue_start_position", "Queue Start Position") +QueueStatus = bitfield8("queue_status", "Queue Status", [ + bf_boolean8(0x01, "queue_status_new_jobs", "Operator does not want to add jobs to the queue"), + bf_boolean8(0x02, "queue_status_pserver", "Operator does not want additional servers attaching"), + bf_boolean8(0x04, "queue_status_svc_jobs", "Operator does not want servers to service jobs"), +]) +QueueType = uint16("queue_type", "Queue Type") +QueueingVersion = uint8("qms_version", "QMS Version") + +ReadBeyondWrite = uint16("read_beyond_write", "Read Beyond Write") +RecordLockCount = uint16("rec_lock_count", "Record Lock Count") +RecordStart = uint32("record_start", "Record Start") +RecordEnd = uint32("record_end", "Record End") +RecordInUseFlag = val_string16("record_in_use", "Record in Use", [ + [ 0x0000, "Record In Use" ], + [ 0xffff, "Record Not In Use" ], +]) +RedirectedPrinter = uint8( "redirected_printer", "Redirected Printer" ) +ReferenceCount = uint32("reference_count", "Reference Count") +RelationsCount = uint16("relations_count", "Relations Count") +ReMirrorCurrentOffset = uint32("re_mirror_current_offset", "ReMirror Current Offset") +ReMirrorDriveNumber = uint8("re_mirror_drive_number", "ReMirror Drive Number") +RemoteMaxPacketSize = uint32("remote_max_packet_size", "Remote Max Packet Size") +RemoteTargetID = uint32("remote_target_id", "Remote Target ID") RemoteTargetID.Display("BASE_HEX") -RemovableFlag = uint16("removable_flag", "Removable Flag") -RemoveOpenRights = bitfield8("remove_open_rights", "Remove Open Rights", [ - bf_boolean8(0x01, "remove_open_rights_ro", "Read Only"), - bf_boolean8(0x02, "remove_open_rights_wo", "Write Only"), - bf_boolean8(0x04, "remove_open_rights_dr", "Deny Read"), - bf_boolean8(0x08, "remove_open_rights_dw", "Deny Write"), - bf_boolean8(0x10, "remove_open_rights_comp", "Compatibility"), - bf_boolean8(0x40, "remove_open_rights_write_thru", "Write Through"), -]) -RenameFlag = bitfield8("rename_flag", "Rename Flag", [ - bf_boolean8(0x01, "rename_flag_ren", "Rename to Myself allows file to be renamed to its original name"), - bf_boolean8(0x02, "rename_flag_comp", "Compatibility allows files that are marked read only to be opened with read/write access"), - bf_boolean8(0x04, "rename_flag_no", "Name Only renames only the specified name space entry name"), -]) -RepliesCancelled = uint16("replies_cancelled", "Replies Cancelled") -ReplyBuffer = nstring8("reply_buffer", "Reply Buffer") -ReplyBufferSize = uint32("reply_buffer_size", "Reply Buffer Size") -ReplyQueueJobNumbers = uint32("reply_queue_job_numbers", "Reply Queue Job Numbers") -RequestBitMap = bitfield16("request_bit_map", "Request Bit Map", [ - bf_boolean16(0x0001, "request_bit_map_ret_afp_ent", "AFP Entry ID"), - bf_boolean16(0x0002, "request_bit_map_ret_data_fork", "Data Fork Length"), - bf_boolean16(0x0004, "request_bit_map_ret_res_fork", "Resource Fork Length"), - bf_boolean16(0x0008, "request_bit_map_ret_num_off", "Number of Offspring"), - bf_boolean16(0x0010, "request_bit_map_ret_owner", "Owner ID"), - bf_boolean16(0x0020, "request_bit_map_ret_short", "Short Name"), - bf_boolean16(0x0040, "request_bit_map_ret_acc_priv", "Access Privileges"), - bf_boolean16(0x0100, "request_bit_map_ratt", "Return Attributes"), - bf_boolean16(0x0200, "request_bit_map_ret_afp_parent", "AFP Parent Entry ID"), - bf_boolean16(0x0400, "request_bit_map_ret_cr_date", "Creation Date"), - bf_boolean16(0x0800, "request_bit_map_ret_acc_date", "Access Date"), - bf_boolean16(0x1000, "request_bit_map_ret_mod_date", "Modify Date&Time"), - bf_boolean16(0x2000, "request_bit_map_ret_bak_date", "Backup Date&Time"), - bf_boolean16(0x4000, "request_bit_map_ret_finder", "Finder Info"), - bf_boolean16(0x8000, "request_bit_map_ret_long_nm", "Long Name"), -]) -ResourceForkLen = uint32("resource_fork_len", "Resource Fork Len") -RequestCode = val_string8("request_code", "Request Code", [ - [ 0x00, "Change Logged in to Temporary Authenticated" ], - [ 0x01, "Change Temporary Authenticated to Logged in" ], +RemovableFlag = uint16("removable_flag", "Removable Flag") +RemoveOpenRights = bitfield8("remove_open_rights", "Remove Open Rights", [ + bf_boolean8(0x01, "remove_open_rights_ro", "Read Only"), + bf_boolean8(0x02, "remove_open_rights_wo", "Write Only"), + bf_boolean8(0x04, "remove_open_rights_dr", "Deny Read"), + bf_boolean8(0x08, "remove_open_rights_dw", "Deny Write"), + bf_boolean8(0x10, "remove_open_rights_comp", "Compatibility"), + bf_boolean8(0x40, "remove_open_rights_write_thru", "Write Through"), +]) +RenameFlag = bitfield8("rename_flag", "Rename Flag", [ + bf_boolean8(0x01, "rename_flag_ren", "Rename to Myself allows file to be renamed to its original name"), + bf_boolean8(0x02, "rename_flag_comp", "Compatibility allows files that are marked read only to be opened with read/write access"), + bf_boolean8(0x04, "rename_flag_no", "Name Only renames only the specified name space entry name"), +]) +RepliesCancelled = uint16("replies_cancelled", "Replies Cancelled") +ReplyBuffer = nstring8("reply_buffer", "Reply Buffer") +ReplyBufferSize = uint32("reply_buffer_size", "Reply Buffer Size") +ReplyQueueJobNumbers = uint32("reply_queue_job_numbers", "Reply Queue Job Numbers") +RequestBitMap = bitfield16("request_bit_map", "Request Bit Map", [ + bf_boolean16(0x0001, "request_bit_map_ret_afp_ent", "AFP Entry ID"), + bf_boolean16(0x0002, "request_bit_map_ret_data_fork", "Data Fork Length"), + bf_boolean16(0x0004, "request_bit_map_ret_res_fork", "Resource Fork Length"), + bf_boolean16(0x0008, "request_bit_map_ret_num_off", "Number of Offspring"), + bf_boolean16(0x0010, "request_bit_map_ret_owner", "Owner ID"), + bf_boolean16(0x0020, "request_bit_map_ret_short", "Short Name"), + bf_boolean16(0x0040, "request_bit_map_ret_acc_priv", "Access Privileges"), + bf_boolean16(0x0100, "request_bit_map_ratt", "Return Attributes"), + bf_boolean16(0x0200, "request_bit_map_ret_afp_parent", "AFP Parent Entry ID"), + bf_boolean16(0x0400, "request_bit_map_ret_cr_date", "Creation Date"), + bf_boolean16(0x0800, "request_bit_map_ret_acc_date", "Access Date"), + bf_boolean16(0x1000, "request_bit_map_ret_mod_date", "Modify Date&Time"), + bf_boolean16(0x2000, "request_bit_map_ret_bak_date", "Backup Date&Time"), + bf_boolean16(0x4000, "request_bit_map_ret_finder", "Finder Info"), + bf_boolean16(0x8000, "request_bit_map_ret_long_nm", "Long Name"), +]) +ResourceForkLen = uint32("resource_fork_len", "Resource Fork Len") +RequestCode = val_string8("request_code", "Request Code", [ + [ 0x00, "Change Logged in to Temporary Authenticated" ], + [ 0x01, "Change Temporary Authenticated to Logged in" ], ]) -RequestData = nstring8("request_data", "Request Data") +RequestData = nstring8("request_data", "Request Data") RequestsReprocessed = uint16("requests_reprocessed", "Requests Reprocessed") -Reserved = uint8( "reserved", "Reserved" ) -Reserved2 = bytes("reserved2", "Reserved", 2) -Reserved3 = bytes("reserved3", "Reserved", 3) -Reserved4 = bytes("reserved4", "Reserved", 4) -Reserved5 = bytes("reserved5", "Reserved", 5) +Reserved = uint8( "reserved", "Reserved" ) +Reserved2 = bytes("reserved2", "Reserved", 2) +Reserved3 = bytes("reserved3", "Reserved", 3) +Reserved4 = bytes("reserved4", "Reserved", 4) +Reserved5 = bytes("reserved5", "Reserved", 5) Reserved6 = bytes("reserved6", "Reserved", 6) -Reserved8 = bytes("reserved8", "Reserved", 8) +Reserved8 = bytes("reserved8", "Reserved", 8) Reserved10 = bytes("reserved10", "Reserved", 10) -Reserved12 = bytes("reserved12", "Reserved", 12) -Reserved16 = bytes("reserved16", "Reserved", 16) -Reserved20 = bytes("reserved20", "Reserved", 20) -Reserved28 = bytes("reserved28", "Reserved", 28) -Reserved36 = bytes("reserved36", "Reserved", 36) -Reserved44 = bytes("reserved44", "Reserved", 44) -Reserved48 = bytes("reserved48", "Reserved", 48) -Reserved50 = bytes("reserved50", "Reserved", 50) -Reserved56 = bytes("reserved56", "Reserved", 56) -Reserved64 = bytes("reserved64", "Reserved", 64) -Reserved120 = bytes("reserved120", "Reserved", 120) -ReservedOrDirectoryNumber = uint32("reserved_or_directory_number", "Reserved or Directory Number (see EAFlags)") +Reserved12 = bytes("reserved12", "Reserved", 12) +Reserved16 = bytes("reserved16", "Reserved", 16) +Reserved20 = bytes("reserved20", "Reserved", 20) +Reserved28 = bytes("reserved28", "Reserved", 28) +Reserved36 = bytes("reserved36", "Reserved", 36) +Reserved44 = bytes("reserved44", "Reserved", 44) +Reserved48 = bytes("reserved48", "Reserved", 48) +Reserved50 = bytes("reserved50", "Reserved", 50) +Reserved56 = bytes("reserved56", "Reserved", 56) +Reserved64 = bytes("reserved64", "Reserved", 64) +Reserved120 = bytes("reserved120", "Reserved", 120) +ReservedOrDirectoryNumber = uint32("reserved_or_directory_number", "Reserved or Directory Number (see EAFlags)") ReservedOrDirectoryNumber.Display("BASE_HEX") ResourceCount = uint32("resource_count", "Resource Count") -ResourceForkSize = uint32("resource_fork_size", "Resource Fork Size") +ResourceForkSize = uint32("resource_fork_size", "Resource Fork Size") ResourceName = stringz("resource_name", "Resource Name") ResourceSignature = fw_string("resource_sig", "Resource Signature", 4) -RestoreTime = uint32("restore_time", "Restore Time") -Restriction = uint32("restriction", "Disk Space Restriction") -RestrictionsEnforced = val_string8("restrictions_enforced", "Disk Restrictions Enforce Flag", [ - [ 0x00, "Enforced" ], - [ 0xff, "Not Enforced" ], +RestoreTime = uint32("restore_time", "Restore Time") +Restriction = uint32("restriction", "Disk Space Restriction") +RestrictionsEnforced = val_string8("restrictions_enforced", "Disk Restrictions Enforce Flag", [ + [ 0x00, "Enforced" ], + [ 0xff, "Not Enforced" ], ]) -ReturnInfoCount = uint32("return_info_count", "Return Information Count") -ReturnInfoMask = bitfield16("ret_info_mask", "Return Information", [ +ReturnInfoCount = uint32("return_info_count", "Return Information Count") +ReturnInfoMask = bitfield16("ret_info_mask", "Return Information", [ bf_boolean16(0x0001, "ret_info_mask_fname", "Return File Name Information"), - bf_boolean16(0x0002, "ret_info_mask_alloc", "Return Allocation Space Information"), - bf_boolean16(0x0004, "ret_info_mask_attr", "Return Attribute Information"), - bf_boolean16(0x0008, "ret_info_mask_size", "Return Size Information"), - bf_boolean16(0x0010, "ret_info_mask_tspace", "Return Total Space Information"), - bf_boolean16(0x0020, "ret_info_mask_eattr", "Return Extended Attributes Information"), - bf_boolean16(0x0040, "ret_info_mask_arch", "Return Archive Information"), - bf_boolean16(0x0080, "ret_info_mask_mod", "Return Modify Information"), + bf_boolean16(0x0002, "ret_info_mask_alloc", "Return Allocation Space Information"), + bf_boolean16(0x0004, "ret_info_mask_attr", "Return Attribute Information"), + bf_boolean16(0x0008, "ret_info_mask_size", "Return Size Information"), + bf_boolean16(0x0010, "ret_info_mask_tspace", "Return Total Space Information"), + bf_boolean16(0x0020, "ret_info_mask_eattr", "Return Extended Attributes Information"), + bf_boolean16(0x0040, "ret_info_mask_arch", "Return Archive Information"), + bf_boolean16(0x0080, "ret_info_mask_mod", "Return Modify Information"), bf_boolean16(0x0100, "ret_info_mask_create", "Return Creation Information"), - bf_boolean16(0x0200, "ret_info_mask_ns", "Return Name Space Information"), - bf_boolean16(0x0400, "ret_info_mask_dir", "Return Directory Information"), - bf_boolean16(0x0800, "ret_info_mask_rights", "Return Rights Information"), - bf_boolean16(0x1000, "ret_info_mask_id", "Return ID Information"), - bf_boolean16(0x2000, "ret_info_mask_ns_attr", "Return Name Space Attributes Information"), - bf_boolean16(0x4000, "ret_info_mask_actual", "Return Actual Information"), - bf_boolean16(0x8000, "ret_info_mask_logical", "Return Logical Information"), -]) -ReturnedListCount = uint32("returned_list_count", "Returned List Count") -Revision = uint32("revision", "Revision") -RevisionNumber = uint8("revision_number", "Revision") -RevQueryFlag = val_string8("rev_query_flag", "Revoke Rights Query Flag", [ - [ 0x00, "Do not query the locks engine for access rights" ], - [ 0x01, "Query the locks engine and return the access rights" ], -]) -RightsGrantMask = bitfield8("rights_grant_mask", "Grant Rights", [ - bf_boolean8(0x01, "rights_grant_mask_read", "Read"), - bf_boolean8(0x02, "rights_grant_mask_write", "Write"), - bf_boolean8(0x04, "rights_grant_mask_open", "Open"), - bf_boolean8(0x08, "rights_grant_mask_create", "Create"), - bf_boolean8(0x10, "rights_grant_mask_del", "Delete"), - bf_boolean8(0x20, "rights_grant_mask_parent", "Parental"), - bf_boolean8(0x40, "rights_grant_mask_search", "Search"), - bf_boolean8(0x80, "rights_grant_mask_mod", "Modify"), -]) -RightsRevokeMask = bitfield8("rights_revoke_mask", "Revoke Rights", [ - bf_boolean8(0x01, "rights_revoke_mask_read", "Read"), - bf_boolean8(0x02, "rights_revoke_mask_write", "Write"), - bf_boolean8(0x04, "rights_revoke_mask_open", "Open"), - bf_boolean8(0x08, "rights_revoke_mask_create", "Create"), - bf_boolean8(0x10, "rights_revoke_mask_del", "Delete"), - bf_boolean8(0x20, "rights_revoke_mask_parent", "Parental"), - bf_boolean8(0x40, "rights_revoke_mask_search", "Search"), - bf_boolean8(0x80, "rights_revoke_mask_mod", "Modify"), + bf_boolean16(0x0200, "ret_info_mask_ns", "Return Name Space Information"), + bf_boolean16(0x0400, "ret_info_mask_dir", "Return Directory Information"), + bf_boolean16(0x0800, "ret_info_mask_rights", "Return Rights Information"), + bf_boolean16(0x1000, "ret_info_mask_id", "Return ID Information"), + bf_boolean16(0x2000, "ret_info_mask_ns_attr", "Return Name Space Attributes Information"), + bf_boolean16(0x4000, "ret_info_mask_actual", "Return Actual Information"), + bf_boolean16(0x8000, "ret_info_mask_logical", "Return Logical Information"), +]) +ReturnedListCount = uint32("returned_list_count", "Returned List Count") +Revision = uint32("revision", "Revision") +RevisionNumber = uint8("revision_number", "Revision") +RevQueryFlag = val_string8("rev_query_flag", "Revoke Rights Query Flag", [ + [ 0x00, "Do not query the locks engine for access rights" ], + [ 0x01, "Query the locks engine and return the access rights" ], +]) +RightsGrantMask = bitfield8("rights_grant_mask", "Grant Rights", [ + bf_boolean8(0x01, "rights_grant_mask_read", "Read"), + bf_boolean8(0x02, "rights_grant_mask_write", "Write"), + bf_boolean8(0x04, "rights_grant_mask_open", "Open"), + bf_boolean8(0x08, "rights_grant_mask_create", "Create"), + bf_boolean8(0x10, "rights_grant_mask_del", "Delete"), + bf_boolean8(0x20, "rights_grant_mask_parent", "Parental"), + bf_boolean8(0x40, "rights_grant_mask_search", "Search"), + bf_boolean8(0x80, "rights_grant_mask_mod", "Modify"), +]) +RightsRevokeMask = bitfield8("rights_revoke_mask", "Revoke Rights", [ + bf_boolean8(0x01, "rights_revoke_mask_read", "Read"), + bf_boolean8(0x02, "rights_revoke_mask_write", "Write"), + bf_boolean8(0x04, "rights_revoke_mask_open", "Open"), + bf_boolean8(0x08, "rights_revoke_mask_create", "Create"), + bf_boolean8(0x10, "rights_revoke_mask_del", "Delete"), + bf_boolean8(0x20, "rights_revoke_mask_parent", "Parental"), + bf_boolean8(0x40, "rights_revoke_mask_search", "Search"), + bf_boolean8(0x80, "rights_revoke_mask_mod", "Modify"), ]) RIPSocketNumber = uint16("rip_socket_num", "RIP Socket Number") RIPSocketNumber.Display("BASE_HEX") @@ -3513,46 +3516,46 @@ RTagNumber.Display("BASE_HEX") RpyNearestSrvFlag = boolean8("rpy_nearest_srv_flag", "Reply to Nearest Server Flag") -SalvageableFileEntryNumber = uint32("salvageable_file_entry_number", "Salvageable File Entry Number") +SalvageableFileEntryNumber = uint32("salvageable_file_entry_number", "Salvageable File Entry Number") SalvageableFileEntryNumber.Display("BASE_HEX") SAPSocketNumber = uint16("sap_socket_number", "SAP Socket Number") SAPSocketNumber.Display("BASE_HEX") -ScanItems = uint32("scan_items", "Number of Items returned from Scan") -SearchAttributes = bitfield8("sattr", "Search Attributes", [ - bf_boolean8(0x01, "sattr_ronly", "Read-Only Files Allowed"), - bf_boolean8(0x02, "sattr_hid", "Hidden Files Allowed"), - bf_boolean8(0x04, "sattr_sys", "System Files Allowed"), - bf_boolean8(0x08, "sattr_exonly", "Execute-Only Files Allowed"), - bf_boolean8(0x10, "sattr_sub", "Subdirectories Only"), - bf_boolean8(0x20, "sattr_archive", "Archive"), - bf_boolean8(0x40, "sattr_execute_confirm", "Execute Confirm"), - bf_boolean8(0x80, "sattr_shareable", "Shareable"), -]) -SearchAttributesLow = bitfield16("search_att_low", "Search Attributes", [ - bf_boolean16(0x0001, "search_att_read_only", "Read-Only"), - bf_boolean16(0x0002, "search_att_hidden", "Hidden Files Allowed"), - bf_boolean16(0x0004, "search_att_system", "System"), - bf_boolean16(0x0008, "search_att_execute_only", "Execute-Only"), - bf_boolean16(0x0010, "search_att_sub", "Subdirectories Only"), - bf_boolean16(0x0020, "search_att_archive", "Archive"), - bf_boolean16(0x0040, "search_att_execute_confirm", "Execute Confirm"), - bf_boolean16(0x0080, "search_att_shareable", "Shareable"), - bf_boolean16(0x8000, "search_attr_all_files", "All Files and Directories"), -]) -SearchBitMap = bitfield8("search_bit_map", "Search Bit Map", [ - bf_boolean8(0x01, "search_bit_map_hidden", "Hidden"), - bf_boolean8(0x02, "search_bit_map_sys", "System"), - bf_boolean8(0x04, "search_bit_map_sub", "Subdirectory"), - bf_boolean8(0x08, "search_bit_map_files", "Files"), +ScanItems = uint32("scan_items", "Number of Items returned from Scan") +SearchAttributes = bitfield8("sattr", "Search Attributes", [ + bf_boolean8(0x01, "sattr_ronly", "Read-Only Files Allowed"), + bf_boolean8(0x02, "sattr_hid", "Hidden Files Allowed"), + bf_boolean8(0x04, "sattr_sys", "System Files Allowed"), + bf_boolean8(0x08, "sattr_exonly", "Execute-Only Files Allowed"), + bf_boolean8(0x10, "sattr_sub", "Subdirectories Only"), + bf_boolean8(0x20, "sattr_archive", "Archive"), + bf_boolean8(0x40, "sattr_execute_confirm", "Execute Confirm"), + bf_boolean8(0x80, "sattr_shareable", "Shareable"), +]) +SearchAttributesLow = bitfield16("search_att_low", "Search Attributes", [ + bf_boolean16(0x0001, "search_att_read_only", "Read-Only"), + bf_boolean16(0x0002, "search_att_hidden", "Hidden Files Allowed"), + bf_boolean16(0x0004, "search_att_system", "System"), + bf_boolean16(0x0008, "search_att_execute_only", "Execute-Only"), + bf_boolean16(0x0010, "search_att_sub", "Subdirectories Only"), + bf_boolean16(0x0020, "search_att_archive", "Archive"), + bf_boolean16(0x0040, "search_att_execute_confirm", "Execute Confirm"), + bf_boolean16(0x0080, "search_att_shareable", "Shareable"), + bf_boolean16(0x8000, "search_attr_all_files", "All Files and Directories"), +]) +SearchBitMap = bitfield8("search_bit_map", "Search Bit Map", [ + bf_boolean8(0x01, "search_bit_map_hidden", "Hidden"), + bf_boolean8(0x02, "search_bit_map_sys", "System"), + bf_boolean8(0x04, "search_bit_map_sub", "Subdirectory"), + bf_boolean8(0x08, "search_bit_map_files", "Files"), ]) -SearchConnNumber = uint32("search_conn_number", "Search Connection Number") -SearchInstance = uint32("search_instance", "Search Instance") +SearchConnNumber = uint32("search_conn_number", "Search Connection Number") +SearchInstance = uint32("search_instance", "Search Instance") SearchNumber = uint32("search_number", "Search Number") -SearchPattern = nstring8("search_pattern", "Search Pattern") -SearchPattern16 = nstring16("search_pattern_16", "Search Pattern") -SearchSequence = bytes("search_sequence", "Search Sequence", 9) +SearchPattern = nstring8("search_pattern", "Search Pattern") +SearchPattern16 = nstring16("search_pattern_16", "Search Pattern") +SearchSequence = bytes("search_sequence", "Search Sequence", 9) SearchSequenceWord = uint16("search_sequence_word", "Search Sequence", BE) -Second = uint8("s_second", "Seconds") +Second = uint8("s_second", "Seconds") SecondsRelativeToTheYear2000 = uint32("sec_rel_to_y2k", "Seconds Relative to the Year 2000") SecretStoreVerb = val_string8("ss_verb", "Secret Store Verb",[ [ 0x00, "Query Server" ], @@ -3566,81 +3569,81 @@ [ 0x08, "Set Master Password" ], [ 0x09, "Get Service Information" ], ]) -SecurityEquivalentList = fw_string("security_equiv_list", "Security Equivalent List", 128) -SecurityFlag = bitfield8("security_flag", "Security Flag", [ - bf_boolean8(0x01, "checksumming", "Checksumming"), - bf_boolean8(0x02, "signature", "Signature"), - bf_boolean8(0x04, "complete_signatures", "Complete Signatures"), - bf_boolean8(0x08, "encryption", "Encryption"), - bf_boolean8(0x80, "large_internet_packets", "Large Internet Packets (LIP) Disabled"), -]) -SecurityRestrictionVersion = uint8("security_restriction_version", "Security Restriction Version") -SectorsPerBlock = uint8("sectors_per_block", "Sectors Per Block") -SectorsPerCluster = uint16("sectors_per_cluster", "Sectors Per Cluster" ) -SectorsPerClusterLong = uint32("sectors_per_cluster_long", "Sectors Per Cluster" ) -SectorsPerTrack = uint8("sectors_per_track", "Sectors Per Track") -SectorSize = uint32("sector_size", "Sector Size") -SemaphoreHandle = uint32("semaphore_handle", "Semaphore Handle") -SemaphoreName = nstring8("semaphore_name", "Semaphore Name") -SemaphoreOpenCount = uint8("semaphore_open_count", "Semaphore Open Count") -SemaphoreShareCount = uint8("semaphore_share_count", "Semaphore Share Count") -SemaphoreTimeOut = uint16("semaphore_time_out", "Semaphore Time Out") -SemaphoreValue = uint16("semaphore_value", "Semaphore Value") -SendStatus = val_string8("send_status", "Send Status", [ - [ 0x00, "Successful" ], - [ 0x01, "Illegal Station Number" ], - [ 0x02, "Client Not Logged In" ], - [ 0x03, "Client Not Accepting Messages" ], - [ 0x04, "Client Already has a Message" ], - [ 0x96, "No Alloc Space for the Message" ], - [ 0xfd, "Bad Station Number" ], - [ 0xff, "Failure" ], +SecurityEquivalentList = fw_string("security_equiv_list", "Security Equivalent List", 128) +SecurityFlag = bitfield8("security_flag", "Security Flag", [ + bf_boolean8(0x01, "checksumming", "Checksumming"), + bf_boolean8(0x02, "signature", "Signature"), + bf_boolean8(0x04, "complete_signatures", "Complete Signatures"), + bf_boolean8(0x08, "encryption", "Encryption"), + bf_boolean8(0x80, "large_internet_packets", "Large Internet Packets (LIP) Disabled"), +]) +SecurityRestrictionVersion = uint8("security_restriction_version", "Security Restriction Version") +SectorsPerBlock = uint8("sectors_per_block", "Sectors Per Block") +SectorsPerCluster = uint16("sectors_per_cluster", "Sectors Per Cluster" ) +SectorsPerClusterLong = uint32("sectors_per_cluster_long", "Sectors Per Cluster" ) +SectorsPerTrack = uint8("sectors_per_track", "Sectors Per Track") +SectorSize = uint32("sector_size", "Sector Size") +SemaphoreHandle = uint32("semaphore_handle", "Semaphore Handle") +SemaphoreName = nstring8("semaphore_name", "Semaphore Name") +SemaphoreOpenCount = uint8("semaphore_open_count", "Semaphore Open Count") +SemaphoreShareCount = uint8("semaphore_share_count", "Semaphore Share Count") +SemaphoreTimeOut = uint16("semaphore_time_out", "Semaphore Time Out") +SemaphoreValue = uint16("semaphore_value", "Semaphore Value") +SendStatus = val_string8("send_status", "Send Status", [ + [ 0x00, "Successful" ], + [ 0x01, "Illegal Station Number" ], + [ 0x02, "Client Not Logged In" ], + [ 0x03, "Client Not Accepting Messages" ], + [ 0x04, "Client Already has a Message" ], + [ 0x96, "No Alloc Space for the Message" ], + [ 0xfd, "Bad Station Number" ], + [ 0xff, "Failure" ], ]) -SequenceByte = uint8("sequence_byte", "Sequence") -SequenceNumber = uint32("sequence_number", "Sequence Number") +SequenceByte = uint8("sequence_byte", "Sequence") +SequenceNumber = uint32("sequence_number", "Sequence Number") SequenceNumber.Display("BASE_HEX") ServerAddress = bytes("server_address", "Server Address", 12) -ServerAppNumber = uint16("server_app_num", "Server App Number") -ServerID = uint32("server_id_number", "Server ID", BE ) +ServerAppNumber = uint16("server_app_num", "Server App Number") +ServerID = uint32("server_id_number", "Server ID", BE ) ServerID.Display("BASE_HEX") ServerInfoFlags = val_string16("server_info_flags", "Server Information Flags", [ [ 0x0000, "This server is not a member of a Cluster" ], [ 0x0001, "This server is a member of a Cluster" ], ]) -serverListFlags = uint32("server_list_flags", "Server List Flags") -ServerName = fw_string("server_name", "Server Name", 48) -serverName50 = fw_string("server_name50", "Server Name", 50) -ServerNameLen = nstring8("server_name_len", "Server Name") +serverListFlags = uint32("server_list_flags", "Server List Flags") +ServerName = fw_string("server_name", "Server Name", 48) +serverName50 = fw_string("server_name50", "Server Name", 50) +ServerNameLen = nstring8("server_name_len", "Server Name") ServerNameStringz = stringz("server_name_stringz", "Server Name") -ServerNetworkAddress = bytes("server_network_address", "Server Network Address", 10) +ServerNetworkAddress = bytes("server_network_address", "Server Network Address", 10) ServerNode = bytes("server_node", "Server Node", 6) -ServerSerialNumber = uint32("server_serial_number", "Server Serial Number") -ServerStation = uint8("server_station", "Server Station") -ServerStationLong = uint32("server_station_long", "Server Station") -ServerStationList = uint8("server_station_list", "Server Station List") -ServerStatusRecord = fw_string("server_status_record", "Server Status Record", 64) -ServerTaskNumber = uint8("server_task_number", "Server Task Number") -ServerTaskNumberLong = uint32("server_task_number_long", "Server Task Number") +ServerSerialNumber = uint32("server_serial_number", "Server Serial Number") +ServerStation = uint8("server_station", "Server Station") +ServerStationLong = uint32("server_station_long", "Server Station") +ServerStationList = uint8("server_station_list", "Server Station List") +ServerStatusRecord = fw_string("server_status_record", "Server Status Record", 64) +ServerTaskNumber = uint8("server_task_number", "Server Task Number") +ServerTaskNumberLong = uint32("server_task_number_long", "Server Task Number") ServerType = uint16("server_type", "Server Type") ServerType.Display("BASE_HEX") -ServerUtilization = uint32("server_utilization", "Server Utilization") -ServerUtilizationPercentage = uint8("server_utilization_percentage", "Server Utilization Percentage") -ServiceType = val_string16("Service_type", "Service Type", [ - [ 0x0000, "Unknown" ], - [ 0x0001, "User" ], - [ 0x0002, "User group" ], - [ 0x0003, "Print queue" ], - [ 0x0004, "NetWare file server" ], - [ 0x0005, "Job server" ], - [ 0x0006, "Gateway" ], - [ 0x0007, "Print server" ], - [ 0x0008, "Archive queue" ], - [ 0x0009, "Archive server" ], - [ 0x000a, "Job queue" ], - [ 0x000b, "Administration" ], - [ 0x0021, "NAS SNA gateway" ], - [ 0x0026, "Remote bridge server" ], - [ 0x0027, "TCP/IP gateway" ], +ServerUtilization = uint32("server_utilization", "Server Utilization") +ServerUtilizationPercentage = uint8("server_utilization_percentage", "Server Utilization Percentage") +ServiceType = val_string16("Service_type", "Service Type", [ + [ 0x0000, "Unknown" ], + [ 0x0001, "User" ], + [ 0x0002, "User group" ], + [ 0x0003, "Print queue" ], + [ 0x0004, "NetWare file server" ], + [ 0x0005, "Job server" ], + [ 0x0006, "Gateway" ], + [ 0x0007, "Print server" ], + [ 0x0008, "Archive queue" ], + [ 0x0009, "Archive server" ], + [ 0x000a, "Job queue" ], + [ 0x000b, "Administration" ], + [ 0x0021, "NAS SNA gateway" ], + [ 0x0026, "Remote bridge server" ], + [ 0x0027, "TCP/IP gateway" ], [ 0xffff, "All Types" ], ]) SetCmdCategory = val_string8("set_cmd_category", "Set Command Category", [ @@ -3661,12 +3664,12 @@ [ 0x0e, "Service Location Protocol" ], [ 0x0f, "Licensing Services" ], ]) -SetCmdFlags = bitfield8("set_cmd_flags", "Set Command Flags", [ - bf_boolean8(0x01, "cmd_flags_startup_only", "Startup.ncf Only"), - bf_boolean8(0x02, "cmd_flags_hidden", "Hidden"), - bf_boolean8(0x04, "cmd_flags_advanced", "Advanced"), - bf_boolean8(0x08, "cmd_flags_later", "Restart Server Required to Take Effect"), - bf_boolean8(0x80, "cmd_flags_secure", "Console Secured"), +SetCmdFlags = bitfield8("set_cmd_flags", "Set Command Flags", [ + bf_boolean8(0x01, "cmd_flags_startup_only", "Startup.ncf Only"), + bf_boolean8(0x02, "cmd_flags_hidden", "Hidden"), + bf_boolean8(0x04, "cmd_flags_advanced", "Advanced"), + bf_boolean8(0x08, "cmd_flags_later", "Restart Server Required to Take Effect"), + bf_boolean8(0x80, "cmd_flags_secure", "Console Secured"), ]) SetCmdName = stringz("set_cmd_name", "Set Command Name") SetCmdType = val_string8("set_cmd_type", "Set Command Type", [ @@ -3681,19 +3684,19 @@ SetCmdValueNum = uint32("set_cmd_value_num", "Set Command Value") SetCmdValueString = stringz("set_cmd_value_string", "Set Command Value") SetMask = bitfield32("set_mask", "Set Mask", [ - bf_boolean32(0x00000001, "ncp_encoded_strings", "NCP Encoded Strings"), - bf_boolean32(0x00000002, "connection_code_page", "Connection Code Page"), + bf_boolean32(0x00000001, "ncp_encoded_strings", "NCP Encoded Strings"), + bf_boolean32(0x00000002, "connection_code_page", "Connection Code Page"), ]) SetParmName = stringz("set_parm_name", "Set Parameter Name") -SFTErrorTable = bytes("sft_error_table", "SFT Error Table", 60) -SFTSupportLevel = val_string8("sft_support_level", "SFT Support Level", [ - [ 0x01, "Server Offers Hot Disk Error Fixing" ], - [ 0x02, "Server Offers Disk Mirroring and Transaction Tracking" ], - [ 0x03, "Server Offers Physical Server Mirroring" ], -]) -ShareableLockCount = uint16("shareable_lock_count", "Shareable Lock Count") -SharedMemoryAddresses = bytes("shared_memory_addresses", "Shared Memory Addresses", 10) -ShortName = fw_string("short_name", "Short Name", 12) +SFTErrorTable = bytes("sft_error_table", "SFT Error Table", 60) +SFTSupportLevel = val_string8("sft_support_level", "SFT Support Level", [ + [ 0x01, "Server Offers Hot Disk Error Fixing" ], + [ 0x02, "Server Offers Disk Mirroring and Transaction Tracking" ], + [ 0x03, "Server Offers Physical Server Mirroring" ], +]) +ShareableLockCount = uint16("shareable_lock_count", "Shareable Lock Count") +SharedMemoryAddresses = bytes("shared_memory_addresses", "Shared Memory Addresses", 10) +ShortName = fw_string("short_name", "Short Name", 12) ShortStkName = fw_string("short_stack_name", "Short Stack Name", 16) SiblingCount = uint32("sibling_count", "Sibling Count") SixtyFourBitOffsetsSupportedFlag = val_string8("64_bit_flag", "64 Bit Support", [ @@ -3701,357 +3704,357 @@ [ 0x01, "64 bit offsets supported" ], ]) SMIDs = uint32("smids", "Storage Media ID's") -SoftwareDescription = fw_string("software_description", "Software Description", 65) -SoftwareDriverType = uint8("software_driver_type", "Software Driver Type") -SoftwareMajorVersionNumber = uint8("software_major_version_number", "Software Major Version Number") -SoftwareMinorVersionNumber = uint8("software_minor_version_number", "Software Minor Version Number") -SourceDirHandle = uint8("source_dir_handle", "Source Directory Handle") -sourceOriginateTime = bytes("source_originate_time", "Source Originate Time", 8) -SourcePath = nstring8("source_path", "Source Path") -SourcePathComponentCount = uint8("source_component_count", "Source Path Component Count") -sourceReturnTime = bytes("source_return_time", "Source Return Time", 8) -SpaceUsed = uint32("space_used", "Space Used") -SpaceMigrated = uint32("space_migrated", "Space Migrated") -SrcNameSpace = val_string8("src_name_space", "Source Name Space", [ - [ 0x00, "DOS Name Space" ], - [ 0x01, "MAC Name Space" ], - [ 0x02, "NFS Name Space" ], - [ 0x04, "Long Name Space" ], +SoftwareDescription = fw_string("software_description", "Software Description", 65) +SoftwareDriverType = uint8("software_driver_type", "Software Driver Type") +SoftwareMajorVersionNumber = uint8("software_major_version_number", "Software Major Version Number") +SoftwareMinorVersionNumber = uint8("software_minor_version_number", "Software Minor Version Number") +SourceDirHandle = uint8("source_dir_handle", "Source Directory Handle") +sourceOriginateTime = bytes("source_originate_time", "Source Originate Time", 8) +SourcePath = nstring8("source_path", "Source Path") +SourcePathComponentCount = uint8("source_component_count", "Source Path Component Count") +sourceReturnTime = bytes("source_return_time", "Source Return Time", 8) +SpaceUsed = uint32("space_used", "Space Used") +SpaceMigrated = uint32("space_migrated", "Space Migrated") +SrcNameSpace = val_string8("src_name_space", "Source Name Space", [ + [ 0x00, "DOS Name Space" ], + [ 0x01, "MAC Name Space" ], + [ 0x02, "NFS Name Space" ], + [ 0x04, "Long Name Space" ], ]) -SupModID = uint32("sup_mod_id", "Sup Mod ID") +SupModID = uint32("sup_mod_id", "Sup Mod ID") StackCount = uint32("stack_count", "Stack Count") StackFullNameStr = nstring8("stack_full_name_str", "Stack Full Name") StackMajorVN = uint8("stack_major_vn", "Stack Major Version Number") StackMinorVN = uint8("stack_minor_vn", "Stack Minor Version Number") StackNumber = uint32("stack_number", "Stack Number") -StartConnNumber = uint32("start_conn_num", "Starting Connection Number") -StartingBlock = uint16("starting_block", "Starting Block") -StartingNumber = uint32("starting_number", "Starting Number") -StartingSearchNumber = uint16("start_search_number", "Start Search Number") -StartNumber = uint32("start_number", "Start Number") -startNumberFlag = uint16("start_number_flag", "Start Number Flag") +StartConnNumber = uint32("start_conn_num", "Starting Connection Number") +StartingBlock = uint16("starting_block", "Starting Block") +StartingNumber = uint32("starting_number", "Starting Number") +StartingSearchNumber = uint16("start_search_number", "Start Search Number") +StartNumber = uint32("start_number", "Start Number") +startNumberFlag = uint16("start_number_flag", "Start Number Flag") StartOffset64bit = bytes("s_offset_64bit", "64bit Starting Offset", 64) -StartVolumeNumber = uint32("start_volume_number", "Starting Volume Number") -StationList = uint32("station_list", "Station List") -StationNumber = bytes("station_number", "Station Number", 3) +StartVolumeNumber = uint32("start_volume_number", "Starting Volume Number") +StationList = uint32("station_list", "Station List") +StationNumber = bytes("station_number", "Station Number", 3) StatMajorVersion = uint8("stat_major_version", "Statistics Table Major Version") StatMinorVersion = uint8("stat_minor_version", "Statistics Table Minor Version") -Status = bitfield16("status", "Status", [ - bf_boolean16(0x0001, "user_info_logged_in", "Logged In"), - bf_boolean16(0x0002, "user_info_being_abort", "Being Aborted"), - bf_boolean16(0x0004, "user_info_audited", "Audited"), - bf_boolean16(0x0008, "user_info_need_sec", "Needs Security Change"), - bf_boolean16(0x0010, "user_info_mac_station", "MAC Station"), - bf_boolean16(0x0020, "user_info_temp_authen", "Temporary Authenticated"), - bf_boolean16(0x0040, "user_info_audit_conn", "Audit Connection Recorded"), - bf_boolean16(0x0080, "user_info_dsaudit_conn", "DS Audit Connection Recorded"), - bf_boolean16(0x0100, "user_info_logout", "Logout in Progress"), - bf_boolean16(0x0200, "user_info_int_login", "Internal Login"), - bf_boolean16(0x0400, "user_info_bindery", "Bindery Connection"), -]) -StatusFlagBits = bitfield32("status_flag_bits", "Status Flag", [ - bf_boolean32(0x00000001, "status_flag_bits_suballoc", "Sub Allocation"), - bf_boolean32(0x00000002, "status_flag_bits_comp", "Compression"), - bf_boolean32(0x00000004, "status_flag_bits_migrate", "Migration"), - bf_boolean32(0x00000008, "status_flag_bits_audit", "Audit"), - bf_boolean32(0x00000010, "status_flag_bits_ro", "Read Only"), - bf_boolean32(0x00000020, "status_flag_bits_im_purge", "Immediate Purge"), +Status = bitfield16("status", "Status", [ + bf_boolean16(0x0001, "user_info_logged_in", "Logged In"), + bf_boolean16(0x0002, "user_info_being_abort", "Being Aborted"), + bf_boolean16(0x0004, "user_info_audited", "Audited"), + bf_boolean16(0x0008, "user_info_need_sec", "Needs Security Change"), + bf_boolean16(0x0010, "user_info_mac_station", "MAC Station"), + bf_boolean16(0x0020, "user_info_temp_authen", "Temporary Authenticated"), + bf_boolean16(0x0040, "user_info_audit_conn", "Audit Connection Recorded"), + bf_boolean16(0x0080, "user_info_dsaudit_conn", "DS Audit Connection Recorded"), + bf_boolean16(0x0100, "user_info_logout", "Logout in Progress"), + bf_boolean16(0x0200, "user_info_int_login", "Internal Login"), + bf_boolean16(0x0400, "user_info_bindery", "Bindery Connection"), +]) +StatusFlagBits = bitfield32("status_flag_bits", "Status Flag", [ + bf_boolean32(0x00000001, "status_flag_bits_suballoc", "Sub Allocation"), + bf_boolean32(0x00000002, "status_flag_bits_comp", "Compression"), + bf_boolean32(0x00000004, "status_flag_bits_migrate", "Migration"), + bf_boolean32(0x00000008, "status_flag_bits_audit", "Audit"), + bf_boolean32(0x00000010, "status_flag_bits_ro", "Read Only"), + bf_boolean32(0x00000020, "status_flag_bits_im_purge", "Immediate Purge"), bf_boolean32(0x00000040, "status_flag_bits_64bit", "64Bit File Offsets"), bf_boolean32(0x00000080, "status_flag_bits_utf8", "UTF8 NCP Strings"), bf_boolean32(0x80000000, "status_flag_bits_nss", "NSS Volume"), ]) -SubAllocClusters = uint32("sub_alloc_clusters", "Sub Alloc Clusters") -SubAllocFreeableClusters = uint32("sub_alloc_freeable_clusters", "Sub Alloc Freeable Clusters") -Subdirectory = uint32("sub_directory", "Subdirectory") +SubAllocClusters = uint32("sub_alloc_clusters", "Sub Alloc Clusters") +SubAllocFreeableClusters = uint32("sub_alloc_freeable_clusters", "Sub Alloc Freeable Clusters") +Subdirectory = uint32("sub_directory", "Subdirectory") Subdirectory.Display("BASE_HEX") -SuggestedFileSize = uint32("suggested_file_size", "Suggested File Size") -SupportModuleID = uint32("support_module_id", "Support Module ID") -SynchName = nstring8("synch_name", "Synch Name") -SystemIntervalMarker = uint32("system_interval_marker", "System Interval Marker") - -TabSize = uint8( "tab_size", "Tab Size" ) -TargetClientList = uint8("target_client_list", "Target Client List") -TargetConnectionNumber = uint16("target_connection_number", "Target Connection Number") -TargetDirectoryBase = uint32("target_directory_base", "Target Directory Base") -TargetDirHandle = uint8("target_dir_handle", "Target Directory Handle") -TargetEntryID = uint32("target_entry_id", "Target Entry ID") +SuggestedFileSize = uint32("suggested_file_size", "Suggested File Size") +SupportModuleID = uint32("support_module_id", "Support Module ID") +SynchName = nstring8("synch_name", "Synch Name") +SystemIntervalMarker = uint32("system_interval_marker", "System Interval Marker") + +TabSize = uint8( "tab_size", "Tab Size" ) +TargetClientList = uint8("target_client_list", "Target Client List") +TargetConnectionNumber = uint16("target_connection_number", "Target Connection Number") +TargetDirectoryBase = uint32("target_directory_base", "Target Directory Base") +TargetDirHandle = uint8("target_dir_handle", "Target Directory Handle") +TargetEntryID = uint32("target_entry_id", "Target Entry ID") TargetEntryID.Display("BASE_HEX") -TargetExecutionTime = bytes("target_execution_time", "Target Execution Time", 6) -TargetFileHandle = bytes("target_file_handle", "Target File Handle", 6) -TargetFileOffset = uint32("target_file_offset", "Target File Offset") -TargetMessage = nstring8("target_message", "Message") -TargetPrinter = uint8( "target_ptr", "Target Printer" ) -targetReceiveTime = bytes("target_receive_time", "Target Receive Time", 8) -TargetServerIDNumber = uint32("target_server_id_number", "Target Server ID Number", BE ) +TargetExecutionTime = bytes("target_execution_time", "Target Execution Time", 6) +TargetFileHandle = bytes("target_file_handle", "Target File Handle", 6) +TargetFileOffset = uint32("target_file_offset", "Target File Offset") +TargetMessage = nstring8("target_message", "Message") +TargetPrinter = uint8( "target_ptr", "Target Printer" ) +targetReceiveTime = bytes("target_receive_time", "Target Receive Time", 8) +TargetServerIDNumber = uint32("target_server_id_number", "Target Server ID Number", BE ) TargetServerIDNumber.Display("BASE_HEX") -targetTransmitTime = bytes("target_transmit_time", "Target Transmit Time", 8) -TaskNumByte = uint8("task_num_byte", "Task Number") -TaskNumber = uint32("task_number", "Task Number") -TaskNumberWord = uint16("task_number_word", "Task Number") +targetTransmitTime = bytes("target_transmit_time", "Target Transmit Time", 8) +TaskNumByte = uint8("task_num_byte", "Task Number") +TaskNumber = uint32("task_number", "Task Number") +TaskNumberWord = uint16("task_number_word", "Task Number") TaskState = val_string8("task_state", "Task State", [ [ 0x00, "Normal" ], [ 0x01, "TTS explicit transaction in progress" ], [ 0x02, "TTS implicit transaction in progress" ], [ 0x04, "Shared file set lock in progress" ], ]) -TextJobDescription = fw_string("text_job_description", "Text Job Description", 50) -ThrashingCount = uint16("thrashing_count", "Thrashing Count") -TimeoutLimit = uint16("timeout_limit", "Timeout Limit") +TextJobDescription = fw_string("text_job_description", "Text Job Description", 50) +ThrashingCount = uint16("thrashing_count", "Thrashing Count") +TimeoutLimit = uint16("timeout_limit", "Timeout Limit") TimesyncStatus = bitfield32("timesync_status_flags", "Timesync Status", [ - bf_boolean32(0x00000001, "timesync_status_sync", "Time is Synchronized"), - bf_boolean32(0x00000002, "timesync_status_net_sync", "Time is Synchronized to the Network"), + bf_boolean32(0x00000001, "timesync_status_sync", "Time is Synchronized"), + bf_boolean32(0x00000002, "timesync_status_net_sync", "Time is Synchronized to the Network"), bf_boolean32(0x00000004, "timesync_status_active", "Time Synchronization is Active"), - bf_boolean32(0x00000008, "timesync_status_external", "External Time Synchronization Active"), - bf_val_str32(0x00000700, "timesync_status_server_type", "Time Server Type", [ - [ 0x01, "Client Time Server" ], - [ 0x02, "Secondary Time Server" ], - [ 0x03, "Primary Time Server" ], - [ 0x04, "Reference Time Server" ], - [ 0x05, "Single Reference Time Server" ], - ]), - bf_boolean32(0x000f0000, "timesync_status_ext_sync", "External Clock Status"), + bf_boolean32(0x00000008, "timesync_status_external", "External Time Synchronization Active"), + bf_val_str32(0x00000700, "timesync_status_server_type", "Time Server Type", [ + [ 0x01, "Client Time Server" ], + [ 0x02, "Secondary Time Server" ], + [ 0x03, "Primary Time Server" ], + [ 0x04, "Reference Time Server" ], + [ 0x05, "Single Reference Time Server" ], + ]), + bf_boolean32(0x000f0000, "timesync_status_ext_sync", "External Clock Status"), ]) TimeToNet = uint16("time_to_net", "Time To Net") -TotalBlocks = uint32("total_blocks", "Total Blocks") +TotalBlocks = uint32("total_blocks", "Total Blocks") TotalBlocksToDecompress = uint32("total_blks_to_dcompress", "Total Blocks To Decompress") -TotalBytesRead = bytes("user_info_ttl_bytes_rd", "Total Bytes Read", 6) -TotalBytesWritten = bytes("user_info_ttl_bytes_wrt", "Total Bytes Written", 6) -TotalCacheWrites = uint32("total_cache_writes", "Total Cache Writes") -TotalChangedFATs = uint32("total_changed_fats", "Total Changed FAT Entries") +TotalBytesRead = bytes("user_info_ttl_bytes_rd", "Total Bytes Read", 6) +TotalBytesWritten = bytes("user_info_ttl_bytes_wrt", "Total Bytes Written", 6) +TotalCacheWrites = uint32("total_cache_writes", "Total Cache Writes") +TotalChangedFATs = uint32("total_changed_fats", "Total Changed FAT Entries") TotalCommonCnts = uint32("total_common_cnts", "Total Common Counts") TotalCntBlocks = uint32("total_cnt_blocks", "Total Count Blocks") -TotalDataStreamDiskSpaceAlloc = uint32("ttl_data_str_size_space_alloc", "Total Data Stream Disk Space Alloc") -TotalDirectorySlots = uint16("total_directory_slots", "Total Directory Slots") -TotalDirectoryEntries = uint32("total_dir_entries", "Total Directory Entries") -TotalDynamicSpace = uint32("total_dynamic_space", "Total Dynamic Space") -TotalExtendedDirectoryExtents = uint32("total_extended_directory_extents", "Total Extended Directory Extents") -TotalFileServicePackets = uint32("total_file_service_packets", "Total File Service Packets") -TotalFilesOpened = uint32("total_files_opened", "Total Files Opened") -TotalLFSCounters = uint32("total_lfs_counters", "Total LFS Counters") -TotalOffspring = uint16("total_offspring", "Total Offspring") -TotalOtherPackets = uint32("total_other_packets", "Total Other Packets") -TotalQueueJobs = uint32("total_queue_jobs", "Total Queue Jobs") -TotalReadRequests = uint32("total_read_requests", "Total Read Requests") -TotalRequest = uint32("total_request", "Total Requests") -TotalRequestPackets = uint32("total_request_packets", "Total Request Packets") -TotalRoutedPackets = uint32("total_routed_packets", "Total Routed Packets") +TotalDataStreamDiskSpaceAlloc = uint32("ttl_data_str_size_space_alloc", "Total Data Stream Disk Space Alloc") +TotalDirectorySlots = uint16("total_directory_slots", "Total Directory Slots") +TotalDirectoryEntries = uint32("total_dir_entries", "Total Directory Entries") +TotalDynamicSpace = uint32("total_dynamic_space", "Total Dynamic Space") +TotalExtendedDirectoryExtents = uint32("total_extended_directory_extents", "Total Extended Directory Extents") +TotalFileServicePackets = uint32("total_file_service_packets", "Total File Service Packets") +TotalFilesOpened = uint32("total_files_opened", "Total Files Opened") +TotalLFSCounters = uint32("total_lfs_counters", "Total LFS Counters") +TotalOffspring = uint16("total_offspring", "Total Offspring") +TotalOtherPackets = uint32("total_other_packets", "Total Other Packets") +TotalQueueJobs = uint32("total_queue_jobs", "Total Queue Jobs") +TotalReadRequests = uint32("total_read_requests", "Total Read Requests") +TotalRequest = uint32("total_request", "Total Requests") +TotalRequestPackets = uint32("total_request_packets", "Total Request Packets") +TotalRoutedPackets = uint32("total_routed_packets", "Total Routed Packets") TotalRxPkts = uint32("total_rx_pkts", "Total Receive Packets") -TotalServerMemory = uint16("total_server_memory", "Total Server Memory", BE) -TotalTransactionsBackedOut = uint32("total_trans_backed_out", "Total Transactions Backed Out") -TotalTransactionsPerformed = uint32("total_trans_performed", "Total Transactions Performed") +TotalServerMemory = uint16("total_server_memory", "Total Server Memory", BE) +TotalTransactionsBackedOut = uint32("total_trans_backed_out", "Total Transactions Backed Out") +TotalTransactionsPerformed = uint32("total_trans_performed", "Total Transactions Performed") TotalTxPkts = uint32("total_tx_pkts", "Total Transmit Packets") TotalUnfilledBackoutRequests = uint16("total_unfilled_backout_requests", "Total Unfilled Backout Requests") -TotalVolumeClusters = uint16("total_volume_clusters", "Total Volume Clusters") -TotalWriteRequests = uint32("total_write_requests", "Total Write Requests") +TotalVolumeClusters = uint16("total_volume_clusters", "Total Volume Clusters") +TotalWriteRequests = uint32("total_write_requests", "Total Write Requests") TotalWriteTransactionsPerformed = uint32("total_write_trans_performed", "Total Write Transactions Performed") TrackOnFlag = boolean8("track_on_flag", "Track On Flag") -TransactionDiskSpace = uint16("transaction_disk_space", "Transaction Disk Space") -TransactionFATAllocations = uint32("transaction_fat_allocations", "Transaction FAT Allocations") -TransactionFileSizeChanges = uint32("transaction_file_size_changes", "Transaction File Size Changes") -TransactionFilesTruncated = uint32("transaction_files_truncated", "Transaction Files Truncated") -TransactionNumber = uint32("transaction_number", "Transaction Number") -TransactionTrackingEnabled = uint8("transaction_tracking_enabled", "Transaction Tracking Enabled") -TransactionTrackingFlag = uint16("tts_flag", "Transaction Tracking Flag") -TransactionTrackingSupported = uint8("transaction_tracking_supported", "Transaction Tracking Supported") -TransactionVolumeNumber = uint16("transaction_volume_number", "Transaction Volume Number") +TransactionDiskSpace = uint16("transaction_disk_space", "Transaction Disk Space") +TransactionFATAllocations = uint32("transaction_fat_allocations", "Transaction FAT Allocations") +TransactionFileSizeChanges = uint32("transaction_file_size_changes", "Transaction File Size Changes") +TransactionFilesTruncated = uint32("transaction_files_truncated", "Transaction Files Truncated") +TransactionNumber = uint32("transaction_number", "Transaction Number") +TransactionTrackingEnabled = uint8("transaction_tracking_enabled", "Transaction Tracking Enabled") +TransactionTrackingFlag = uint16("tts_flag", "Transaction Tracking Flag") +TransactionTrackingSupported = uint8("transaction_tracking_supported", "Transaction Tracking Supported") +TransactionVolumeNumber = uint16("transaction_volume_number", "Transaction Volume Number") TransportType = val_string8("transport_type", "Communications Type", [ [ 0x01, "Internet Packet Exchange (IPX)" ], [ 0x05, "User Datagram Protocol (UDP)" ], [ 0x06, "Transmission Control Protocol (TCP)" ], ]) -TreeLength = uint32("tree_length", "Tree Length") -TreeName = nstring32("tree_name", "Tree Name") +TreeLength = uint32("tree_length", "Tree Length") +TreeName = nstring32("tree_name", "Tree Name") TreeName.NWUnicode() TrusteeAccessMask = uint8("trustee_acc_mask", "Trustee Access Mask") -TrusteeRights = bitfield16("trustee_rights_low", "Trustee Rights", [ - bf_boolean16(0x0001, "trustee_rights_read", "Read"), - bf_boolean16(0x0002, "trustee_rights_write", "Write"), - bf_boolean16(0x0004, "trustee_rights_open", "Open"), - bf_boolean16(0x0008, "trustee_rights_create", "Create"), - bf_boolean16(0x0010, "trustee_rights_del", "Delete"), - bf_boolean16(0x0020, "trustee_rights_parent", "Parental"), - bf_boolean16(0x0040, "trustee_rights_search", "Search"), - bf_boolean16(0x0080, "trustee_rights_modify", "Modify"), - bf_boolean16(0x0100, "trustee_rights_super", "Supervisor"), -]) -TTSLevel = uint8("tts_level", "TTS Level") -TrusteeSetNumber = uint8("trustee_set_number", "Trustee Set Number") -TrusteeID = uint32("trustee_id_set", "Trustee ID") +TrusteeRights = bitfield16("trustee_rights_low", "Trustee Rights", [ + bf_boolean16(0x0001, "trustee_rights_read", "Read"), + bf_boolean16(0x0002, "trustee_rights_write", "Write"), + bf_boolean16(0x0004, "trustee_rights_open", "Open"), + bf_boolean16(0x0008, "trustee_rights_create", "Create"), + bf_boolean16(0x0010, "trustee_rights_del", "Delete"), + bf_boolean16(0x0020, "trustee_rights_parent", "Parental"), + bf_boolean16(0x0040, "trustee_rights_search", "Search"), + bf_boolean16(0x0080, "trustee_rights_modify", "Modify"), + bf_boolean16(0x0100, "trustee_rights_super", "Supervisor"), +]) +TTSLevel = uint8("tts_level", "TTS Level") +TrusteeSetNumber = uint8("trustee_set_number", "Trustee Set Number") +TrusteeID = uint32("trustee_id_set", "Trustee ID") TrusteeID.Display("BASE_HEX") ttlCompBlks = uint32("ttl_comp_blks", "Total Compression Blocks") -TtlDSDskSpaceAlloc = uint32("ttl_ds_disk_space_alloc", "Total Streams Space Allocated") -TtlEAs = uint32("ttl_eas", "Total EA's") -TtlEAsDataSize = uint32("ttl_eas_data_size", "Total EA's Data Size") -TtlEAsKeySize = uint32("ttl_eas_key_size", "Total EA's Key Size") +TtlDSDskSpaceAlloc = uint32("ttl_ds_disk_space_alloc", "Total Streams Space Allocated") +TtlEAs = uint32("ttl_eas", "Total EA's") +TtlEAsDataSize = uint32("ttl_eas_data_size", "Total EA's Data Size") +TtlEAsKeySize = uint32("ttl_eas_key_size", "Total EA's Key Size") ttlIntermediateBlks = uint32("ttl_inter_blks", "Total Intermediate Blocks") -TtlMigratedSize = uint32("ttl_migrated_size", "Total Migrated Size") +TtlMigratedSize = uint32("ttl_migrated_size", "Total Migrated Size") TtlNumOfRTags = uint32("ttl_num_of_r_tags", "Total Number of Resource Tags") TtlNumOfSetCmds = uint32("ttl_num_of_set_cmds", "Total Number of Set Commands") -TtlValuesLength = uint32("ttl_values_length", "Total Values Length") -TtlWriteDataSize = uint32("ttl_write_data_size", "Total Write Data Size") -TurboUsedForFileService = uint16("turbo_used_for_file_service", "Turbo Used For File Service") +TtlValuesLength = uint32("ttl_values_length", "Total Values Length") +TtlWriteDataSize = uint32("ttl_write_data_size", "Total Write Data Size") +TurboUsedForFileService = uint16("turbo_used_for_file_service", "Turbo Used For File Service") UnclaimedPkts = uint32("un_claimed_packets", "Unclaimed Packets") -UnCompressableDataStreamsCount = uint32("un_compressable_data_streams_count", "Uncompressable Data Streams Count") -Undefined8 = bytes("undefined_8", "Undefined", 8) -Undefined28 = bytes("undefined_28", "Undefined", 28) -UndefinedWord = uint16("undefined_word", "Undefined") -UniqueID = uint8("unique_id", "Unique ID") -UnknownByte = uint8("unknown_byte", "Unknown Byte") -Unused = uint8("un_used", "Unused") -UnusedBlocks = uint32("unused_blocks", "Unused Blocks") -UnUsedDirectoryEntries = uint32("un_used_directory_entries", "Unused Directory Entries") -UnusedDiskBlocks = uint32("unused_disk_blocks", "Unused Disk Blocks") -UnUsedExtendedDirectoryExtents = uint32("un_used_extended_directory_extents", "Unused Extended Directory Extents") +UnCompressableDataStreamsCount = uint32("un_compressable_data_streams_count", "Uncompressable Data Streams Count") +Undefined8 = bytes("undefined_8", "Undefined", 8) +Undefined28 = bytes("undefined_28", "Undefined", 28) +UndefinedWord = uint16("undefined_word", "Undefined") +UniqueID = uint8("unique_id", "Unique ID") +UnknownByte = uint8("unknown_byte", "Unknown Byte") +Unused = uint8("un_used", "Unused") +UnusedBlocks = uint32("unused_blocks", "Unused Blocks") +UnUsedDirectoryEntries = uint32("un_used_directory_entries", "Unused Directory Entries") +UnusedDiskBlocks = uint32("unused_disk_blocks", "Unused Disk Blocks") +UnUsedExtendedDirectoryExtents = uint32("un_used_extended_directory_extents", "Unused Extended Directory Extents") UpdateDate = uint16("update_date", "Update Date") UpdateDate.NWDate() -UpdateID = uint32("update_id", "Update ID", BE) +UpdateID = uint32("update_id", "Update ID", BE) UpdateID.Display("BASE_HEX") UpdateTime = uint16("update_time", "Update Time") UpdateTime.NWTime() -UseCount = val_string16("user_info_use_count", "Use Count", [ - [ 0x0000, "Connection is not in use" ], - [ 0x0001, "Connection is in use" ], +UseCount = val_string16("user_info_use_count", "Use Count", [ + [ 0x0000, "Connection is not in use" ], + [ 0x0001, "Connection is in use" ], ]) -UsedBlocks = uint32("used_blocks", "Used Blocks") -UserID = uint32("user_id", "User ID", BE) +UsedBlocks = uint32("used_blocks", "Used Blocks") +UserID = uint32("user_id", "User ID", BE) UserID.Display("BASE_HEX") -UserLoginAllowed = val_string8("user_login_allowed", "Login Status", [ - [ 0x00, "Client Login Disabled" ], - [ 0x01, "Client Login Enabled" ], +UserLoginAllowed = val_string8("user_login_allowed", "Login Status", [ + [ 0x00, "Client Login Disabled" ], + [ 0x01, "Client Login Enabled" ], ]) -UserName = nstring8("user_name", "User Name") -UserName16 = fw_string("user_name_16", "User Name", 16) -UserName48 = fw_string("user_name_48", "User Name", 48) -UserType = uint16("user_type", "User Type") +UserName = nstring8("user_name", "User Name") +UserName16 = fw_string("user_name_16", "User Name", 16) +UserName48 = fw_string("user_name_48", "User Name", 48) +UserType = uint16("user_type", "User Type") UTCTimeInSeconds = uint32("uts_time_in_seconds", "UTC Time in Seconds") -ValueAvailable = val_string8("value_available", "Value Available", [ - [ 0x00, "Has No Value" ], - [ 0xff, "Has Value" ], -]) -VAPVersion = uint8("vap_version", "VAP Version") -VariableBitMask = uint32("variable_bit_mask", "Variable Bit Mask") -VariableBitsDefined = uint16("variable_bits_defined", "Variable Bits Defined") -VConsoleRevision = uint8("vconsole_rev", "Console Revision") -VConsoleVersion = uint8("vconsole_ver", "Console Version") -Verb = uint32("verb", "Verb") -VerbData = uint8("verb_data", "Verb Data") -version = uint32("version", "Version") -VersionNumber = uint8("version_number", "Version") +ValueAvailable = val_string8("value_available", "Value Available", [ + [ 0x00, "Has No Value" ], + [ 0xff, "Has Value" ], +]) +VAPVersion = uint8("vap_version", "VAP Version") +VariableBitMask = uint32("variable_bit_mask", "Variable Bit Mask") +VariableBitsDefined = uint16("variable_bits_defined", "Variable Bits Defined") +VConsoleRevision = uint8("vconsole_rev", "Console Revision") +VConsoleVersion = uint8("vconsole_ver", "Console Version") +Verb = uint32("verb", "Verb") +VerbData = uint8("verb_data", "Verb Data") +version = uint32("version", "Version") +VersionNumber = uint8("version_number", "Version") VersionNumberLong = uint32("version_num_long", "Version") -VertLocation = uint16("vert_location", "Vertical Location") -VirtualConsoleVersion = uint8("virtual_console_version", "Virtual Console Version") -VolumeID = uint32("volume_id", "Volume ID") +VertLocation = uint16("vert_location", "Vertical Location") +VirtualConsoleVersion = uint8("virtual_console_version", "Virtual Console Version") +VolumeID = uint32("volume_id", "Volume ID") VolumeID.Display("BASE_HEX") -VolInfoReplyLen = uint16("vol_info_reply_len", "Volume Information Reply Length") -VolumeCapabilities = bitfield32("volume_capabilities", "Volume Capabilities", [ - bf_boolean32(0x00000001, "vol_cap_user_space", "NetWare User Space Restrictions Supported"), - bf_boolean32(0x00000002, "vol_cap_dir_quota", "NetWare Directory Quotas Supported"), - bf_boolean32(0x00000004, "vol_cap_dfs", "DFS is Active on Volume"), - bf_boolean32(0x00000008, "vol_cap_sal_purge", "NetWare Salvage and Purge Operations Supported"), - bf_boolean32(0x00000010, "vol_cap_comp", "NetWare Compression Supported"), - bf_boolean32(0x00000020, "vol_cap_cluster", "Volume is a Cluster Resource"), +VolInfoReplyLen = uint16("vol_info_reply_len", "Volume Information Reply Length") +VolumeCapabilities = bitfield32("volume_capabilities", "Volume Capabilities", [ + bf_boolean32(0x00000001, "vol_cap_user_space", "NetWare User Space Restrictions Supported"), + bf_boolean32(0x00000002, "vol_cap_dir_quota", "NetWare Directory Quotas Supported"), + bf_boolean32(0x00000004, "vol_cap_dfs", "DFS is Active on Volume"), + bf_boolean32(0x00000008, "vol_cap_sal_purge", "NetWare Salvage and Purge Operations Supported"), + bf_boolean32(0x00000010, "vol_cap_comp", "NetWare Compression Supported"), + bf_boolean32(0x00000020, "vol_cap_cluster", "Volume is a Cluster Resource"), bf_boolean32(0x00000040, "vol_cap_nss_admin", "Volume is the NSS Admin Volume"), bf_boolean32(0x00000080, "vol_cap_nss", "Volume is Mounted by NSS"), - bf_boolean32(0x00000100, "vol_cap_ea", "OS2 style EA's Supported"), - bf_boolean32(0x00000200, "vol_cap_archive", "NetWare Archive bit Supported"), + bf_boolean32(0x00000100, "vol_cap_ea", "OS2 style EA's Supported"), + bf_boolean32(0x00000200, "vol_cap_archive", "NetWare Archive bit Supported"), bf_boolean32(0x00000400, "vol_cap_file_attr", "Full NetWare file Attributes Supported"), ]) -VolumeCachedFlag = val_string8("volume_cached_flag", "Volume Cached Flag", [ - [ 0x00, "Volume is Not Cached" ], - [ 0xff, "Volume is Cached" ], +VolumeCachedFlag = val_string8("volume_cached_flag", "Volume Cached Flag", [ + [ 0x00, "Volume is Not Cached" ], + [ 0xff, "Volume is Cached" ], ]) -VolumeDataStreams = uint8("volume_data_streams", "Volume Data Streams") +VolumeDataStreams = uint8("volume_data_streams", "Volume Data Streams") VolumeGUID = stringz("volume_guid", "Volume GUID") -VolumeHashedFlag = val_string8("volume_hashed_flag", "Volume Hashed Flag", [ - [ 0x00, "Volume is Not Hashed" ], - [ 0xff, "Volume is Hashed" ], +VolumeHashedFlag = val_string8("volume_hashed_flag", "Volume Hashed Flag", [ + [ 0x00, "Volume is Not Hashed" ], + [ 0xff, "Volume is Hashed" ], ]) -VolumeLastModifiedDate = uint16("volume_last_modified_date", "Volume Last Modified Date") +VolumeLastModifiedDate = uint16("volume_last_modified_date", "Volume Last Modified Date") VolumeLastModifiedDate.NWDate() -VolumeLastModifiedTime = uint16("volume_last_modified_time", "Volume Last Modified Time") +VolumeLastModifiedTime = uint16("volume_last_modified_time", "Volume Last Modified Time") VolumeLastModifiedTime.NWTime() -VolumeMountedFlag = val_string8("volume_mounted_flag", "Volume Mounted Flag", [ - [ 0x00, "Volume is Not Mounted" ], - [ 0xff, "Volume is Mounted" ], +VolumeMountedFlag = val_string8("volume_mounted_flag", "Volume Mounted Flag", [ + [ 0x00, "Volume is Not Mounted" ], + [ 0xff, "Volume is Mounted" ], ]) VolumeMountPoint = stringz("volume_mnt_point", "Volume Mount Point") -VolumeName = fw_string("volume_name", "Volume Name", 16) -VolumeNameLen = nstring8("volume_name_len", "Volume Name") -VolumeNameSpaces = uint8("volume_name_spaces", "Volume Name Spaces") +VolumeName = fw_string("volume_name", "Volume Name", 16) +VolumeNameLen = nstring8("volume_name_len", "Volume Name") +VolumeNameSpaces = uint8("volume_name_spaces", "Volume Name Spaces") VolumeNameStringz = stringz("vol_name_stringz", "Volume Name") -VolumeNumber = uint8("volume_number", "Volume Number") -VolumeNumberLong = uint32("volume_number_long", "Volume Number") -VolumeRemovableFlag = val_string8("volume_removable_flag", "Volume Removable Flag", [ - [ 0x00, "Disk Cannot be Removed from Server" ], - [ 0xff, "Disk Can be Removed from Server" ], -]) -VolumeRequestFlags = val_string16("volume_request_flags", "Volume Request Flags", [ - [ 0x0000, "Do not return name with volume number" ], - [ 0x0001, "Return name with volume number" ], -]) -VolumeSizeInClusters = uint32("volume_size_in_clusters", "Volume Size in Clusters") -VolumesSupportedMax = uint16("volumes_supported_max", "Volumes Supported Max") -VolumeType = val_string16("volume_type", "Volume Type", [ - [ 0x0000, "NetWare 386" ], - [ 0x0001, "NetWare 286" ], - [ 0x0002, "NetWare 386 Version 30" ], - [ 0x0003, "NetWare 386 Version 31" ], -]) -WastedServerMemory = uint16("wasted_server_memory", "Wasted Server Memory", BE) -WaitTime = uint32("wait_time", "Wait Time") - -Year = val_string8("year", "Year",[ - [ 0x50, "1980" ], - [ 0x51, "1981" ], - [ 0x52, "1982" ], - [ 0x53, "1983" ], - [ 0x54, "1984" ], - [ 0x55, "1985" ], - [ 0x56, "1986" ], - [ 0x57, "1987" ], - [ 0x58, "1988" ], - [ 0x59, "1989" ], - [ 0x5a, "1990" ], - [ 0x5b, "1991" ], - [ 0x5c, "1992" ], - [ 0x5d, "1993" ], - [ 0x5e, "1994" ], - [ 0x5f, "1995" ], - [ 0x60, "1996" ], - [ 0x61, "1997" ], - [ 0x62, "1998" ], - [ 0x63, "1999" ], - [ 0x64, "2000" ], - [ 0x65, "2001" ], - [ 0x66, "2002" ], - [ 0x67, "2003" ], - [ 0x68, "2004" ], - [ 0x69, "2005" ], - [ 0x6a, "2006" ], - [ 0x6b, "2007" ], - [ 0x6c, "2008" ], - [ 0x6d, "2009" ], - [ 0x6e, "2010" ], - [ 0x6f, "2011" ], - [ 0x70, "2012" ], - [ 0x71, "2013" ], - [ 0x72, "2014" ], - [ 0x73, "2015" ], - [ 0x74, "2016" ], - [ 0x75, "2017" ], - [ 0x76, "2018" ], - [ 0x77, "2019" ], - [ 0x78, "2020" ], - [ 0x79, "2021" ], - [ 0x7a, "2022" ], - [ 0x7b, "2023" ], - [ 0x7c, "2024" ], - [ 0x7d, "2025" ], - [ 0x7e, "2026" ], - [ 0x7f, "2027" ], +VolumeNumber = uint8("volume_number", "Volume Number") +VolumeNumberLong = uint32("volume_number_long", "Volume Number") +VolumeRemovableFlag = val_string8("volume_removable_flag", "Volume Removable Flag", [ + [ 0x00, "Disk Cannot be Removed from Server" ], + [ 0xff, "Disk Can be Removed from Server" ], +]) +VolumeRequestFlags = val_string16("volume_request_flags", "Volume Request Flags", [ + [ 0x0000, "Do not return name with volume number" ], + [ 0x0001, "Return name with volume number" ], +]) +VolumeSizeInClusters = uint32("volume_size_in_clusters", "Volume Size in Clusters") +VolumesSupportedMax = uint16("volumes_supported_max", "Volumes Supported Max") +VolumeType = val_string16("volume_type", "Volume Type", [ + [ 0x0000, "NetWare 386" ], + [ 0x0001, "NetWare 286" ], + [ 0x0002, "NetWare 386 Version 30" ], + [ 0x0003, "NetWare 386 Version 31" ], +]) +WastedServerMemory = uint16("wasted_server_memory", "Wasted Server Memory", BE) +WaitTime = uint32("wait_time", "Wait Time") + +Year = val_string8("year", "Year",[ + [ 0x50, "1980" ], + [ 0x51, "1981" ], + [ 0x52, "1982" ], + [ 0x53, "1983" ], + [ 0x54, "1984" ], + [ 0x55, "1985" ], + [ 0x56, "1986" ], + [ 0x57, "1987" ], + [ 0x58, "1988" ], + [ 0x59, "1989" ], + [ 0x5a, "1990" ], + [ 0x5b, "1991" ], + [ 0x5c, "1992" ], + [ 0x5d, "1993" ], + [ 0x5e, "1994" ], + [ 0x5f, "1995" ], + [ 0x60, "1996" ], + [ 0x61, "1997" ], + [ 0x62, "1998" ], + [ 0x63, "1999" ], + [ 0x64, "2000" ], + [ 0x65, "2001" ], + [ 0x66, "2002" ], + [ 0x67, "2003" ], + [ 0x68, "2004" ], + [ 0x69, "2005" ], + [ 0x6a, "2006" ], + [ 0x6b, "2007" ], + [ 0x6c, "2008" ], + [ 0x6d, "2009" ], + [ 0x6e, "2010" ], + [ 0x6f, "2011" ], + [ 0x70, "2012" ], + [ 0x71, "2013" ], + [ 0x72, "2014" ], + [ 0x73, "2015" ], + [ 0x74, "2016" ], + [ 0x75, "2017" ], + [ 0x76, "2018" ], + [ 0x77, "2019" ], + [ 0x78, "2020" ], + [ 0x79, "2021" ], + [ 0x7a, "2022" ], + [ 0x7b, "2023" ], + [ 0x7c, "2024" ], + [ 0x7d, "2025" ], + [ 0x7e, "2026" ], + [ 0x7f, "2027" ], [ 0xc0, "1984" ], [ 0xc1, "1985" ], [ 0xc2, "1986" ], @@ -4100,56 +4103,56 @@ HeldBytesWritten, ],"Accounting Information") AFP10Struct = struct("afp_10_struct", [ - AFPEntryID, - ParentID, - AttributesDef16, - DataForkLen, - ResourceForkLen, - TotalOffspring, - CreationDate, - LastAccessedDate, - ModifiedDate, - ModifiedTime, - ArchivedDate, - ArchivedTime, - CreatorID, - Reserved4, - FinderAttr, - HorizLocation, - VertLocation, - FileDirWindow, - Reserved16, - LongName, - CreatorID, - ShortName, - AccessPrivileges, + AFPEntryID, + ParentID, + AttributesDef16, + DataForkLen, + ResourceForkLen, + TotalOffspring, + CreationDate, + LastAccessedDate, + ModifiedDate, + ModifiedTime, + ArchivedDate, + ArchivedTime, + CreatorID, + Reserved4, + FinderAttr, + HorizLocation, + VertLocation, + FileDirWindow, + Reserved16, + LongName, + CreatorID, + ShortName, + AccessPrivileges, ], "AFP Information" ) AFP20Struct = struct("afp_20_struct", [ - AFPEntryID, - ParentID, - AttributesDef16, - DataForkLen, - ResourceForkLen, - TotalOffspring, - CreationDate, - LastAccessedDate, - ModifiedDate, - ModifiedTime, - ArchivedDate, - ArchivedTime, - CreatorID, - Reserved4, - FinderAttr, - HorizLocation, - VertLocation, - FileDirWindow, - Reserved16, - LongName, - CreatorID, - ShortName, - AccessPrivileges, + AFPEntryID, + ParentID, + AttributesDef16, + DataForkLen, + ResourceForkLen, + TotalOffspring, + CreationDate, + LastAccessedDate, + ModifiedDate, + ModifiedTime, + ArchivedDate, + ArchivedTime, + CreatorID, + Reserved4, + FinderAttr, + HorizLocation, + VertLocation, + FileDirWindow, + Reserved16, + LongName, + CreatorID, + ShortName, + AccessPrivileges, Reserved, - ProDOSInfo, + ProDOSInfo, ], "AFP Information" ) ArchiveDateStruct = struct("archive_date_struct", [ ArchivedDate, @@ -4157,17 +4160,17 @@ ArchiveIdStruct = struct("archive_id_struct", [ ArchiverID, ]) -ArchiveInfoStruct = struct("archive_info_struct", [ - ArchivedTime, - ArchivedDate, - ArchiverID, +ArchiveInfoStruct = struct("archive_info_struct", [ + ArchivedTime, + ArchivedDate, + ArchiverID, ], "Archive Information") ArchiveTimeStruct = struct("archive_time_struct", [ ArchivedTime, ]) -AttributesStruct = struct("attributes_struct", [ - AttributesDef32, - FlagsDef, +AttributesStruct = struct("attributes_struct", [ + AttributesDef32, + FlagsDef, ], "Attributes") authInfo = struct("auth_info_struct", [ Status, @@ -4179,17 +4182,17 @@ DriverShortName, DriverLogicalName, ], "Board Name") -CacheInfo = struct("cache_info", [ +CacheInfo = struct("cache_info", [ uint32("max_byte_cnt", "Maximum Byte Count"), - uint32("min_num_of_cache_buff", "Minimum Number Of Cache Buffers"), - uint32("min_cache_report_thresh", "Minimum Cache Report Threshold"), - uint32("alloc_waiting", "Allocate Waiting Count"), - uint32("ndirty_blocks", "Number of Dirty Blocks"), - uint32("cache_dirty_wait_time", "Cache Dirty Wait Time"), - uint32("cache_max_concur_writes", "Cache Maximum Concurrent Writes"), - uint32("max_dirty_time", "Maximum Dirty Time"), - uint32("num_dir_cache_buff", "Number Of Directory Cache Buffers"), - uint32("cache_byte_to_block", "Cache Byte To Block Shift Factor"), + uint32("min_num_of_cache_buff", "Minimum Number Of Cache Buffers"), + uint32("min_cache_report_thresh", "Minimum Cache Report Threshold"), + uint32("alloc_waiting", "Allocate Waiting Count"), + uint32("ndirty_blocks", "Number of Dirty Blocks"), + uint32("cache_dirty_wait_time", "Cache Dirty Wait Time"), + uint32("cache_max_concur_writes", "Cache Maximum Concurrent Writes"), + uint32("max_dirty_time", "Maximum Dirty Time"), + uint32("num_dir_cache_buff", "Number Of Directory Cache Buffers"), + uint32("cache_byte_to_block", "Cache Byte To Block Shift Factor"), ], "Cache Information") CommonLanStruc = struct("common_lan_struct", [ boolean8("not_supported_mask", "Bit Counter Supported"), @@ -4222,78 +4225,78 @@ uint32("decphibyteincnt", "DeCompress High Byte In Count"), uint32("decphibyteoutcnt", "DeCompress High Byte Out Count"), ], "Compression/Decompression Information") -ConnFileStruct = struct("conn_file_struct", [ - ConnectionNumberWord, - TaskNumberWord, - LockType, - AccessControl, - LockFlag, +ConnFileStruct = struct("conn_file_struct", [ + ConnectionNumberWord, + TaskNumberWord, + LockType, + AccessControl, + LockFlag, ], "File Connection Information") -ConnStruct = struct("conn_struct", [ - TaskNumByte, - LockType, - AccessControl, - LockFlag, - VolumeNumber, - DirectoryEntryNumberWord, - FileName14, +ConnStruct = struct("conn_struct", [ + TaskNumByte, + LockType, + AccessControl, + LockFlag, + VolumeNumber, + DirectoryEntryNumberWord, + FileName14, ], "Connection Information") -ConnTaskStruct = struct("conn_task_struct", [ - ConnectionNumberByte, - TaskNumByte, +ConnTaskStruct = struct("conn_task_struct", [ + ConnectionNumberByte, + TaskNumByte, ], "Task Information") -Counters = struct("counters_struct", [ - uint32("read_exist_blck", "Read Existing Block Count"), - uint32("read_exist_write_wait", "Read Existing Write Wait Count"), - uint32("read_exist_part_read", "Read Existing Partial Read Count"), - uint32("read_exist_read_err", "Read Existing Read Error Count"), - uint32("wrt_blck_cnt", "Write Block Count"), - uint32("wrt_entire_blck", "Write Entire Block Count"), - uint32("internl_dsk_get", "Internal Disk Get Count"), - uint32("internl_dsk_get_need_to_alloc", "Internal Disk Get Need To Allocate Count"), - uint32("internl_dsk_get_someone_beat", "Internal Disk Get Someone Beat My Count"), - uint32("internl_dsk_get_part_read", "Internal Disk Get Partial Read Count"), - uint32("internl_dsk_get_read_err", "Internal Disk Get Read Error Count"), - uint32("async_internl_dsk_get", "Async Internal Disk Get Count"), - uint32("async_internl_dsk_get_need_to_alloc", "Async Internal Disk Get Need To Alloc"), - uint32("async_internl_dsk_get_someone_beat", "Async Internal Disk Get Someone Beat Me"), - uint32("err_doing_async_read", "Error Doing Async Read Count"), - uint32("internl_dsk_get_no_read", "Internal Disk Get No Read Count"), - uint32("internl_dsk_get_no_read_alloc", "Internal Disk Get No Read Allocate Count"), - uint32("internl_dsk_get_no_read_someone_beat", "Internal Disk Get No Read Someone Beat Me Count"), - uint32("internl_dsk_write", "Internal Disk Write Count"), - uint32("internl_dsk_write_alloc", "Internal Disk Write Allocate Count"), - uint32("internl_dsk_write_someone_beat", "Internal Disk Write Someone Beat Me Count"), - uint32("write_err", "Write Error Count"), - uint32("wait_on_sema", "Wait On Semaphore Count"), - uint32("alloc_blck_i_had_to_wait_for", "Allocate Block I Had To Wait For Someone Count"), - uint32("alloc_blck", "Allocate Block Count"), - uint32("alloc_blck_i_had_to_wait", "Allocate Block I Had To Wait Count"), +Counters = struct("counters_struct", [ + uint32("read_exist_blck", "Read Existing Block Count"), + uint32("read_exist_write_wait", "Read Existing Write Wait Count"), + uint32("read_exist_part_read", "Read Existing Partial Read Count"), + uint32("read_exist_read_err", "Read Existing Read Error Count"), + uint32("wrt_blck_cnt", "Write Block Count"), + uint32("wrt_entire_blck", "Write Entire Block Count"), + uint32("internl_dsk_get", "Internal Disk Get Count"), + uint32("internl_dsk_get_need_to_alloc", "Internal Disk Get Need To Allocate Count"), + uint32("internl_dsk_get_someone_beat", "Internal Disk Get Someone Beat My Count"), + uint32("internl_dsk_get_part_read", "Internal Disk Get Partial Read Count"), + uint32("internl_dsk_get_read_err", "Internal Disk Get Read Error Count"), + uint32("async_internl_dsk_get", "Async Internal Disk Get Count"), + uint32("async_internl_dsk_get_need_to_alloc", "Async Internal Disk Get Need To Alloc"), + uint32("async_internl_dsk_get_someone_beat", "Async Internal Disk Get Someone Beat Me"), + uint32("err_doing_async_read", "Error Doing Async Read Count"), + uint32("internl_dsk_get_no_read", "Internal Disk Get No Read Count"), + uint32("internl_dsk_get_no_read_alloc", "Internal Disk Get No Read Allocate Count"), + uint32("internl_dsk_get_no_read_someone_beat", "Internal Disk Get No Read Someone Beat Me Count"), + uint32("internl_dsk_write", "Internal Disk Write Count"), + uint32("internl_dsk_write_alloc", "Internal Disk Write Allocate Count"), + uint32("internl_dsk_write_someone_beat", "Internal Disk Write Someone Beat Me Count"), + uint32("write_err", "Write Error Count"), + uint32("wait_on_sema", "Wait On Semaphore Count"), + uint32("alloc_blck_i_had_to_wait_for", "Allocate Block I Had To Wait For Someone Count"), + uint32("alloc_blck", "Allocate Block Count"), + uint32("alloc_blck_i_had_to_wait", "Allocate Block I Had To Wait Count"), ], "Disk Counter Information") -CPUInformation = struct("cpu_information", [ - PageTableOwnerFlag, - CPUType, +CPUInformation = struct("cpu_information", [ + PageTableOwnerFlag, + CPUType, + Reserved3, + CoprocessorFlag, + BusType, Reserved3, - CoprocessorFlag, - BusType, - Reserved3, - IOEngineFlag, - Reserved3, - FSEngineFlag, - Reserved3, - NonDedFlag, - Reserved3, - CPUString, + IOEngineFlag, + Reserved3, + FSEngineFlag, + Reserved3, + NonDedFlag, + Reserved3, + CPUString, CoProcessorString, BusString, ], "CPU Information") CreationDateStruct = struct("creation_date_struct", [ CreationDate, ]) -CreationInfoStruct = struct("creation_info_struct", [ - CreationTime, - CreationDate, - endian(CreatorID, LE), +CreationInfoStruct = struct("creation_info_struct", [ + CreationTime, + CreationDate, + endian(CreatorID, LE), ], "Creation Information") CreationTimeStruct = struct("creation_time_struct", [ CreationTime, @@ -4302,33 +4305,33 @@ CustomVariableValue, CustomString, ], "Custom Counters" ) -DataStreamInfo = struct("data_stream_info", [ - AssociatedNameSpace, - DataStreamName -]) -DataStreamSizeStruct = struct("data_stream_size_struct", [ - DataStreamSize, -]) -DirCacheInfo = struct("dir_cache_info", [ - uint32("min_time_since_file_delete", "Minimum Time Since File Delete"), - uint32("abs_min_time_since_file_delete", "Absolute Minimum Time Since File Delete"), - uint32("min_num_of_dir_cache_buff", "Minimum Number Of Directory Cache Buffers"), - uint32("max_num_of_dir_cache_buff", "Maximum Number Of Directory Cache Buffers"), - uint32("num_of_dir_cache_buff", "Number Of Directory Cache Buffers"), - uint32("dc_min_non_ref_time", "DC Minimum Non-Referenced Time"), - uint32("dc_wait_time_before_new_buff", "DC Wait Time Before New Buffer"), - uint32("dc_max_concurrent_writes", "DC Maximum Concurrent Writes"), - uint32("dc_dirty_wait_time", "DC Dirty Wait Time"), - uint32("dc_double_read_flag", "DC Double Read Flag"), - uint32("map_hash_node_count", "Map Hash Node Count"), - uint32("space_restriction_node_count", "Space Restriction Node Count"), - uint32("trustee_list_node_count", "Trustee List Node Count"), - uint32("percent_of_vol_used_by_dirs", "Percent Of Volume Used By Directories"), +DataStreamInfo = struct("data_stream_info", [ + AssociatedNameSpace, + DataStreamName +]) +DataStreamSizeStruct = struct("data_stream_size_struct", [ + DataStreamSize, +]) +DirCacheInfo = struct("dir_cache_info", [ + uint32("min_time_since_file_delete", "Minimum Time Since File Delete"), + uint32("abs_min_time_since_file_delete", "Absolute Minimum Time Since File Delete"), + uint32("min_num_of_dir_cache_buff", "Minimum Number Of Directory Cache Buffers"), + uint32("max_num_of_dir_cache_buff", "Maximum Number Of Directory Cache Buffers"), + uint32("num_of_dir_cache_buff", "Number Of Directory Cache Buffers"), + uint32("dc_min_non_ref_time", "DC Minimum Non-Referenced Time"), + uint32("dc_wait_time_before_new_buff", "DC Wait Time Before New Buffer"), + uint32("dc_max_concurrent_writes", "DC Maximum Concurrent Writes"), + uint32("dc_dirty_wait_time", "DC Dirty Wait Time"), + uint32("dc_double_read_flag", "DC Double Read Flag"), + uint32("map_hash_node_count", "Map Hash Node Count"), + uint32("space_restriction_node_count", "Space Restriction Node Count"), + uint32("trustee_list_node_count", "Trustee List Node Count"), + uint32("percent_of_vol_used_by_dirs", "Percent Of Volume Used By Directories"), ], "Directory Cache Information") -DirEntryStruct = struct("dir_entry_struct", [ - DirectoryEntryNumber, - DOSDirectoryEntryNumber, - VolumeNumberLong, +DirEntryStruct = struct("dir_entry_struct", [ + DirectoryEntryNumber, + DOSDirectoryEntryNumber, + VolumeNumberLong, ], "Directory Entry Information") DirectoryInstance = struct("directory_instance", [ SearchSequenceWord, @@ -4336,9 +4339,9 @@ DirectoryName14, DirectoryAttributes, DirectoryAccessRights, - endian(CreationDate, BE), + endian(CreationDate, BE), endian(AccessDate, BE), - CreatorID, + CreatorID, Reserved2, DirectoryStamp, ], "Directory Information") @@ -4359,38 +4362,38 @@ ]) DOSDirectoryEntryStruct = struct("dos_directory_entry_struct", [ AttributesDef32, - UniqueID, - PurgeFlags, - DestNameSpace, - DirectoryNameLen, - DirectoryName, + UniqueID, + PurgeFlags, + DestNameSpace, + DirectoryNameLen, + DirectoryName, CreationTime, - CreationDate, - CreatorID, + CreationDate, + CreatorID, ArchivedTime, - ArchivedDate, - ArchiverID, + ArchivedDate, + ArchiverID, UpdateTime, - UpdateDate, + UpdateDate, NextTrusteeEntry, Reserved48, InheritedRightsMask, ], "DOS Directory Information") DOSFileEntryStruct = struct("dos_file_entry_struct", [ AttributesDef32, - UniqueID, - PurgeFlags, - DestNameSpace, - NameLen, - Name12, + UniqueID, + PurgeFlags, + DestNameSpace, + NameLen, + Name12, CreationTime, - CreationDate, - CreatorID, + CreationDate, + CreatorID, ArchivedTime, - ArchivedDate, - ArchiverID, + ArchivedDate, + ArchiverID, UpdateTime, - UpdateDate, + UpdateDate, UpdateID, FileSize, DataForkFirstFAT, @@ -4402,30 +4405,30 @@ PrimaryEntry, NameList, ], "DOS File Information") -DSSpaceAllocateStruct = struct("ds_space_alloc_struct", [ - DataStreamSpaceAlloc, +DSSpaceAllocateStruct = struct("ds_space_alloc_struct", [ + DataStreamSpaceAlloc, ]) -DynMemStruct = struct("dyn_mem_struct", [ - uint32("dyn_mem_struct_total", "Total Dynamic Space" ), - uint32("dyn_mem_struct_max", "Max Used Dynamic Space" ), - uint32("dyn_mem_struct_cur", "Current Used Dynamic Space" ), +DynMemStruct = struct("dyn_mem_struct", [ + uint32("dyn_mem_struct_total", "Total Dynamic Space" ), + uint32("dyn_mem_struct_max", "Max Used Dynamic Space" ), + uint32("dyn_mem_struct_cur", "Current Used Dynamic Space" ), ], "Dynamic Memory Information") -EAInfoStruct = struct("ea_info_struct", [ - EADataSize, - EACount, - EAKeySize, +EAInfoStruct = struct("ea_info_struct", [ + EADataSize, + EACount, + EAKeySize, ], "Extended Attribute Information") -ExtraCacheCntrs = struct("extra_cache_cntrs", [ - uint32("internl_dsk_get_no_wait", "Internal Disk Get No Wait Count"), - uint32("internl_dsk_get_no_wait_need", "Internal Disk Get No Wait Need To Allocate Count"), - uint32("internl_dsk_get_no_wait_no_blk", "Internal Disk Get No Wait No Block Count"), - uint32("id_get_no_read_no_wait", "ID Get No Read No Wait Count"), - uint32("id_get_no_read_no_wait_sema", "ID Get No Read No Wait Semaphored Count"), - uint32("id_get_no_read_no_wait_buffer", "ID Get No Read No Wait No Buffer Count"), - uint32("id_get_no_read_no_wait_alloc", "ID Get No Read No Wait Allocate Count"), - uint32("id_get_no_read_no_wait_no_alloc", "ID Get No Read No Wait No Alloc Count"), - uint32("id_get_no_read_no_wait_no_alloc_sema", "ID Get No Read No Wait No Alloc Semaphored Count"), - uint32("id_get_no_read_no_wait_no_alloc_alloc", "ID Get No Read No Wait No Alloc Allocate Count"), +ExtraCacheCntrs = struct("extra_cache_cntrs", [ + uint32("internl_dsk_get_no_wait", "Internal Disk Get No Wait Count"), + uint32("internl_dsk_get_no_wait_need", "Internal Disk Get No Wait Need To Allocate Count"), + uint32("internl_dsk_get_no_wait_no_blk", "Internal Disk Get No Wait No Block Count"), + uint32("id_get_no_read_no_wait", "ID Get No Read No Wait Count"), + uint32("id_get_no_read_no_wait_sema", "ID Get No Read No Wait Semaphored Count"), + uint32("id_get_no_read_no_wait_buffer", "ID Get No Read No Wait No Buffer Count"), + uint32("id_get_no_read_no_wait_alloc", "ID Get No Read No Wait Allocate Count"), + uint32("id_get_no_read_no_wait_no_alloc", "ID Get No Read No Wait No Alloc Count"), + uint32("id_get_no_read_no_wait_no_alloc_sema", "ID Get No Read No Wait No Alloc Semaphored Count"), + uint32("id_get_no_read_no_wait_no_alloc_alloc", "ID Get No Read No Wait No Alloc Allocate Count"), ], "Extra Cache Counters Information") FileSize64bitStruct = struct("file_sz_64bit_struct", [ @@ -4480,8 +4483,8 @@ LastAccessedTimeStruct = struct("last_access_time_struct", [ LastAccessedTime, ]) -FileAttributesStruct = struct("file_attributes_struct", [ - AttributesDef32, +FileAttributesStruct = struct("file_attributes_struct", [ + AttributesDef32, ]) FileInfoStruct = struct("file_info_struct", [ ParentID, @@ -4496,9 +4499,9 @@ AttributesDef, FileMode, FileSize, - endian(CreationDate, BE), + endian(CreationDate, BE), endian(AccessDate, BE), - endian(UpdateDate, BE), + endian(UpdateDate, BE), endian(UpdateTime, BE), ], "File Instance") FileNameStruct = struct("file_name_struct", [ @@ -4507,30 +4510,30 @@ FileName16Struct = struct("file_name16_struct", [ FileName16, ], "File Name") -FileServerCounters = struct("file_server_counters", [ - uint16("too_many_hops", "Too Many Hops"), - uint16("unknown_network", "Unknown Network"), - uint16("no_space_for_service", "No Space For Service"), - uint16("no_receive_buff", "No Receive Buffers"), - uint16("not_my_network", "Not My Network"), - uint32("netbios_progated", "NetBIOS Propagated Count"), - uint32("ttl_pckts_srvcd", "Total Packets Serviced"), - uint32("ttl_pckts_routed", "Total Packets Routed"), +FileServerCounters = struct("file_server_counters", [ + uint16("too_many_hops", "Too Many Hops"), + uint16("unknown_network", "Unknown Network"), + uint16("no_space_for_service", "No Space For Service"), + uint16("no_receive_buff", "No Receive Buffers"), + uint16("not_my_network", "Not My Network"), + uint32("netbios_progated", "NetBIOS Propagated Count"), + uint32("ttl_pckts_srvcd", "Total Packets Serviced"), + uint32("ttl_pckts_routed", "Total Packets Routed"), ], "File Server Counters") -FileSystemInfo = struct("file_system_info", [ - uint32("fat_moved", "Number of times the OS has move the location of FAT"), - uint32("fat_write_err", "Number of write errors in both original and mirrored copies of FAT"), - uint32("someone_else_did_it_0", "Someone Else Did It Count 0"), - uint32("someone_else_did_it_1", "Someone Else Did It Count 1"), - uint32("someone_else_did_it_2", "Someone Else Did It Count 2"), - uint32("i_ran_out_someone_else_did_it_0", "I Ran Out Someone Else Did It Count 0"), - uint32("i_ran_out_someone_else_did_it_1", "I Ran Out Someone Else Did It Count 1"), - uint32("i_ran_out_someone_else_did_it_2", "I Ran Out Someone Else Did It Count 2"), - uint32("turbo_fat_build_failed", "Turbo FAT Build Failed Count"), - uint32("extra_use_count_node_count", "Errors allocating a use count node for TTS"), - uint32("extra_extra_use_count_node_count", "Errors allocating an additional use count node for TTS"), - uint32("error_read_last_fat", "Error Reading Last FAT Count"), - uint32("someone_else_using_this_file", "Someone Else Using This File Count"), +FileSystemInfo = struct("file_system_info", [ + uint32("fat_moved", "Number of times the OS has move the location of FAT"), + uint32("fat_write_err", "Number of write errors in both original and mirrored copies of FAT"), + uint32("someone_else_did_it_0", "Someone Else Did It Count 0"), + uint32("someone_else_did_it_1", "Someone Else Did It Count 1"), + uint32("someone_else_did_it_2", "Someone Else Did It Count 2"), + uint32("i_ran_out_someone_else_did_it_0", "I Ran Out Someone Else Did It Count 0"), + uint32("i_ran_out_someone_else_did_it_1", "I Ran Out Someone Else Did It Count 1"), + uint32("i_ran_out_someone_else_did_it_2", "I Ran Out Someone Else Did It Count 2"), + uint32("turbo_fat_build_failed", "Turbo FAT Build Failed Count"), + uint32("extra_use_count_node_count", "Errors allocating a use count node for TTS"), + uint32("extra_extra_use_count_node_count", "Errors allocating an additional use count node for TTS"), + uint32("error_read_last_fat", "Error Reading Last FAT Count"), + uint32("someone_else_using_this_file", "Someone Else Using This File Count"), ], "File System Information") GenericInfoDef = struct("generic_info_def", [ fw_string("generic_label", "Label", 64), @@ -4582,88 +4585,88 @@ ParentDirectoryBase, ParentDOSDirectoryBase, ]) -IPXInformation = struct("ipx_information", [ - uint32("ipx_send_pkt", "IPX Send Packet Count"), - uint16("ipx_malform_pkt", "IPX Malformed Packet Count"), - uint32("ipx_get_ecb_req", "IPX Get ECB Request Count"), - uint32("ipx_get_ecb_fail", "IPX Get ECB Fail Count"), - uint32("ipx_aes_event", "IPX AES Event Count"), - uint16("ipx_postponed_aes", "IPX Postponed AES Count"), - uint16("ipx_max_conf_sock", "IPX Max Configured Socket Count"), - uint16("ipx_max_open_sock", "IPX Max Open Socket Count"), - uint16("ipx_open_sock_fail", "IPX Open Socket Fail Count"), - uint32("ipx_listen_ecb", "IPX Listen ECB Count"), - uint16("ipx_ecb_cancel_fail", "IPX ECB Cancel Fail Count"), - uint16("ipx_get_lcl_targ_fail", "IPX Get Local Target Fail Count"), +IPXInformation = struct("ipx_information", [ + uint32("ipx_send_pkt", "IPX Send Packet Count"), + uint16("ipx_malform_pkt", "IPX Malformed Packet Count"), + uint32("ipx_get_ecb_req", "IPX Get ECB Request Count"), + uint32("ipx_get_ecb_fail", "IPX Get ECB Fail Count"), + uint32("ipx_aes_event", "IPX AES Event Count"), + uint16("ipx_postponed_aes", "IPX Postponed AES Count"), + uint16("ipx_max_conf_sock", "IPX Max Configured Socket Count"), + uint16("ipx_max_open_sock", "IPX Max Open Socket Count"), + uint16("ipx_open_sock_fail", "IPX Open Socket Fail Count"), + uint32("ipx_listen_ecb", "IPX Listen ECB Count"), + uint16("ipx_ecb_cancel_fail", "IPX ECB Cancel Fail Count"), + uint16("ipx_get_lcl_targ_fail", "IPX Get Local Target Fail Count"), ], "IPX Information") -JobEntryTime = struct("job_entry_time", [ - Year, - Month, - Day, - Hour, - Minute, - Second, +JobEntryTime = struct("job_entry_time", [ + Year, + Month, + Day, + Hour, + Minute, + Second, ], "Job Entry Time") JobStruct3x = struct("job_struct_3x", [ RecordInUseFlag, PreviousRecord, NextRecord, - ClientStationLong, + ClientStationLong, ClientTaskNumberLong, ClientIDNumber, - TargetServerIDNumber, - TargetExecutionTime, + TargetServerIDNumber, + TargetExecutionTime, JobEntryTime, - JobNumberLong, - JobType, - JobPositionWord, - JobControlFlagsWord, - JobFileName, - JobFileHandleLong, - ServerStationLong, - ServerTaskNumberLong, - ServerID, + JobNumberLong, + JobType, + JobPositionWord, + JobControlFlagsWord, + JobFileName, + JobFileHandleLong, + ServerStationLong, + ServerTaskNumberLong, + ServerID, TextJobDescription, ClientRecordArea, ], "Job Information") JobStruct = struct("job_struct", [ - ClientStation, + ClientStation, ClientTaskNumber, ClientIDNumber, - TargetServerIDNumber, - TargetExecutionTime, + TargetServerIDNumber, + TargetExecutionTime, JobEntryTime, - JobNumber, - JobType, - JobPosition, - JobControlFlags, - JobFileName, - JobFileHandle, - ServerStation, - ServerTaskNumber, - ServerID, + JobNumber, + JobType, + JobPosition, + JobControlFlags, + JobFileName, + JobFileHandle, + ServerStation, + ServerTaskNumber, + ServerID, TextJobDescription, ClientRecordArea, ], "Job Information") JobStructNew = struct("job_struct_new", [ - RecordInUseFlag, - PreviousRecord, - NextRecord, - ClientStationLong, - ClientTaskNumberLong, - ClientIDNumber, + RecordInUseFlag, + PreviousRecord, + NextRecord, + ClientStationLong, + ClientTaskNumberLong, + ClientIDNumber, TargetServerIDNumber, - TargetExecutionTime, - JobEntryTime, - JobNumberLong, - JobType, - JobPositionWord, - JobControlFlagsWord, - JobFileName, - JobFileHandleLong, - ServerStationLong, - ServerTaskNumberLong, - ServerID, + TargetExecutionTime, + JobEntryTime, + JobNumberLong, + JobType, + JobPositionWord, + JobControlFlagsWord, + JobFileName, + JobFileHandleLong, + ServerStationLong, + ServerTaskNumberLong, + ServerID, ], "Job Information") KnownRoutes = struct("known_routes", [ NetIDNumber, @@ -4672,16 +4675,16 @@ TimeToNet, ], "Known Routes") SrcEnhNWHandlePathS1 = struct("source_nwhandle", [ - DirectoryBase, - VolumeNumber, - HandleFlag, + DirectoryBase, + VolumeNumber, + HandleFlag, DataTypeFlag, Reserved5, ], "Source Information") DstEnhNWHandlePathS1 = struct("destination_nwhandle", [ - DirectoryBase, - VolumeNumber, - HandleFlag, + DirectoryBase, + VolumeNumber, + HandleFlag, DataTypeFlag, Reserved5, ], "Destination Information") @@ -4739,30 +4742,30 @@ FileLockCount, RecordLockCount, ], "Lock Information") -LockStruct = struct("lock_struct", [ - TaskNumByte, - LockType, - RecordStart, - RecordEnd, +LockStruct = struct("lock_struct", [ + TaskNumByte, + LockType, + RecordStart, + RecordEnd, ], "Locks") LoginTime = struct("login_time", [ - Year, - Month, - Day, - Hour, - Minute, - Second, - DayOfWeek, + Year, + Month, + Day, + Hour, + Minute, + Second, + DayOfWeek, ], "Login Time") -LogLockStruct = struct("log_lock_struct", [ - TaskNumberWord, - LockStatus, - LockName, +LogLockStruct = struct("log_lock_struct", [ + TaskNumberWord, + LockStatus, + LockName, ], "Logical Locks") -LogRecStruct = struct("log_rec_struct", [ - ConnectionNumberWord, - TaskNumByte, - LockStatus, +LogRecStruct = struct("log_rec_struct", [ + ConnectionNumberWord, + TaskNumByte, + LockStatus, ], "Logical Record Locks") LSLInformation = struct("lsl_information", [ uint32("rx_buffers", "Receive Buffers"), @@ -4789,17 +4792,17 @@ MaximumSpaceStruct = struct("max_space_struct", [ MaxSpace, ]) -MemoryCounters = struct("memory_counters", [ - uint32("orig_num_cache_buff", "Original Number Of Cache Buffers"), - uint32("curr_num_cache_buff", "Current Number Of Cache Buffers"), - uint32("cache_dirty_block_thresh", "Cache Dirty Block Threshold"), - uint32("wait_node", "Wait Node Count"), - uint32("wait_node_alloc_fail", "Wait Node Alloc Failure Count"), - uint32("move_cache_node", "Move Cache Node Count"), - uint32("move_cache_node_from_avai", "Move Cache Node From Avail Count"), - uint32("accel_cache_node_write", "Accelerate Cache Node Write Count"), - uint32("rem_cache_node", "Remove Cache Node Count"), - uint32("rem_cache_node_from_avail", "Remove Cache Node From Avail Count"), +MemoryCounters = struct("memory_counters", [ + uint32("orig_num_cache_buff", "Original Number Of Cache Buffers"), + uint32("curr_num_cache_buff", "Current Number Of Cache Buffers"), + uint32("cache_dirty_block_thresh", "Cache Dirty Block Threshold"), + uint32("wait_node", "Wait Node Count"), + uint32("wait_node_alloc_fail", "Wait Node Alloc Failure Count"), + uint32("move_cache_node", "Move Cache Node Count"), + uint32("move_cache_node_from_avai", "Move Cache Node From Avail Count"), + uint32("accel_cache_node_write", "Accelerate Cache Node Write Count"), + uint32("rem_cache_node", "Remove Cache Node Count"), + uint32("rem_cache_node_from_avail", "Remove Cache Node From Avail Count"), ], "Memory Counters") MLIDBoardInfo = struct("mlid_board_info", [ uint32("protocol_board_num", "Protocol Board Number"), @@ -4807,11 +4810,11 @@ bytes("protocol_id", "Protocol ID", 6), nstring8("protocol_name", "Protocol Name"), ], "MLID Board Information") -ModifyInfoStruct = struct("modify_info_struct", [ - ModifiedTime, - ModifiedDate, - endian(ModifierID, LE), - LastAccessedDate, +ModifyInfoStruct = struct("modify_info_struct", [ + ModifiedTime, + ModifiedDate, + endian(ModifierID, LE), + LastAccessedDate, ], "Modification Information") nameInfo = struct("name_info_struct", [ ObjectType, @@ -4828,73 +4831,73 @@ nbytes32("transport_addr", "Transport Address"), ], "Network Address") -NetWareInformationStruct = struct("netware_information_struct", [ - DataStreamSpaceAlloc, # (Data Stream Alloc Bit) - AttributesDef32, # (Attributes Bit) - FlagsDef, - DataStreamSize, # (Data Stream Size Bit) - TotalDataStreamDiskSpaceAlloc, # (Total Stream Size Bit) - NumberOfDataStreams, - CreationTime, # (Creation Bit) - CreationDate, - CreatorID, - ModifiedTime, # (Modify Bit) - ModifiedDate, - ModifierID, - LastAccessedDate, - ArchivedTime, # (Archive Bit) - ArchivedDate, - ArchiverID, - InheritedRightsMask, # (Rights Bit) - DirectoryEntryNumber, # (Directory Entry Bit) - DOSDirectoryEntryNumber, - VolumeNumberLong, - EADataSize, # (Extended Attribute Bit) - EACount, - EAKeySize, - CreatorNameSpaceNumber, # (Name Space Bit) - Reserved3, +NetWareInformationStruct = struct("netware_information_struct", [ + DataStreamSpaceAlloc, # (Data Stream Alloc Bit) + AttributesDef32, # (Attributes Bit) + FlagsDef, + DataStreamSize, # (Data Stream Size Bit) + TotalDataStreamDiskSpaceAlloc, # (Total Stream Size Bit) + NumberOfDataStreams, + CreationTime, # (Creation Bit) + CreationDate, + CreatorID, + ModifiedTime, # (Modify Bit) + ModifiedDate, + ModifierID, + LastAccessedDate, + ArchivedTime, # (Archive Bit) + ArchivedDate, + ArchiverID, + InheritedRightsMask, # (Rights Bit) + DirectoryEntryNumber, # (Directory Entry Bit) + DOSDirectoryEntryNumber, + VolumeNumberLong, + EADataSize, # (Extended Attribute Bit) + EACount, + EAKeySize, + CreatorNameSpaceNumber, # (Name Space Bit) + Reserved3, ], "NetWare Information") -NLMInformation = struct("nlm_information", [ - IdentificationNumber, - NLMFlags, - Reserved3, - NLMType, - Reserved3, - ParentID, - MajorVersion, - MinorVersion, - Revision, - Year, - Reserved3, - Month, - Reserved3, - Day, - Reserved3, - AllocAvailByte, - AllocFreeCount, - LastGarbCollect, - MessageLanguage, - NumberOfReferencedPublics, +NLMInformation = struct("nlm_information", [ + IdentificationNumber, + NLMFlags, + Reserved3, + NLMType, + Reserved3, + ParentID, + MajorVersion, + MinorVersion, + Revision, + Year, + Reserved3, + Month, + Reserved3, + Day, + Reserved3, + AllocAvailByte, + AllocFreeCount, + LastGarbCollect, + MessageLanguage, + NumberOfReferencedPublics, ], "NLM Information") -NSInfoStruct = struct("ns_info_struct", [ - CreatorNameSpaceNumber, +NSInfoStruct = struct("ns_info_struct", [ + CreatorNameSpaceNumber, Reserved3, ]) -NWAuditStatus = struct("nw_audit_status", [ - AuditVersionDate, +NWAuditStatus = struct("nw_audit_status", [ + AuditVersionDate, AuditFileVersionDate, - val_string16("audit_enable_flag", "Auditing Enabled Flag", [ - [ 0x0000, "Auditing Disabled" ], - [ 0x0001, "Auditing Enabled" ], - ]), - Reserved2, - uint32("audit_file_size", "Audit File Size"), - uint32("modified_counter", "Modified Counter"), - uint32("audit_file_max_size", "Audit File Maximum Size"), - uint32("audit_file_size_threshold", "Audit File Size Threshold"), - uint32("audit_record_count", "Audit Record Count"), - uint32("auditing_flags", "Auditing Flags"), + val_string16("audit_enable_flag", "Auditing Enabled Flag", [ + [ 0x0000, "Auditing Disabled" ], + [ 0x0001, "Auditing Enabled" ], + ]), + Reserved2, + uint32("audit_file_size", "Audit File Size"), + uint32("modified_counter", "Modified Counter"), + uint32("audit_file_max_size", "Audit File Maximum Size"), + uint32("audit_file_size_threshold", "Audit File Size Threshold"), + uint32("audit_record_count", "Audit Record Count"), + uint32("auditing_flags", "Auditing Flags"), ], "NetWare Audit Status") ObjectSecurityStruct = struct("object_security_struct", [ ObjectSecurity, @@ -4909,119 +4912,119 @@ ObjectNameStruct = struct("object_name_struct", [ ObjectNameStringz, ]) -ObjectIDStruct = struct("object_id_struct", [ - ObjectID, - Restriction, -]) -OpnFilesStruct = struct("opn_files_struct", [ - TaskNumberWord, - LockType, - AccessControl, - LockFlag, - VolumeNumber, - DOSParentDirectoryEntry, - DOSDirectoryEntry, - ForkCount, - NameSpace, - FileName, +ObjectIDStruct = struct("object_id_struct", [ + ObjectID, + Restriction, +]) +OpnFilesStruct = struct("opn_files_struct", [ + TaskNumberWord, + LockType, + AccessControl, + LockFlag, + VolumeNumber, + DOSParentDirectoryEntry, + DOSDirectoryEntry, + ForkCount, + NameSpace, + FileName, ], "Open Files Information") OwnerIDStruct = struct("owner_id_struct", [ CreatorID, ]) -PacketBurstInformation = struct("packet_burst_information", [ - uint32("big_invalid_slot", "Big Invalid Slot Count"), - uint32("big_forged_packet", "Big Forged Packet Count"), - uint32("big_invalid_packet", "Big Invalid Packet Count"), - uint32("big_still_transmitting", "Big Still Transmitting Count"), - uint32("still_doing_the_last_req", "Still Doing The Last Request Count"), - uint32("invalid_control_req", "Invalid Control Request Count"), - uint32("control_invalid_message_number", "Control Invalid Message Number Count"), - uint32("control_being_torn_down", "Control Being Torn Down Count"), - uint32("big_repeat_the_file_read", "Big Repeat the File Read Count"), - uint32("big_send_extra_cc_count", "Big Send Extra CC Count"), - uint32("big_return_abort_mess", "Big Return Abort Message Count"), - uint32("big_read_invalid_mess", "Big Read Invalid Message Number Count"), - uint32("big_read_do_it_over", "Big Read Do It Over Count"), - uint32("big_read_being_torn_down", "Big Read Being Torn Down Count"), - uint32("previous_control_packet", "Previous Control Packet Count"), - uint32("send_hold_off_message", "Send Hold Off Message Count"), - uint32("big_read_no_data_avail", "Big Read No Data Available Count"), - uint32("big_read_trying_to_read", "Big Read Trying To Read Too Much Count"), - uint32("async_read_error", "Async Read Error Count"), - uint32("big_read_phy_read_err", "Big Read Physical Read Error Count"), - uint32("ctl_bad_ack_frag_list", "Control Bad ACK Fragment List Count"), - uint32("ctl_no_data_read", "Control No Data Read Count"), - uint32("write_dup_req", "Write Duplicate Request Count"), - uint32("shouldnt_be_ack_here", "Shouldn't Be ACKing Here Count"), - uint32("write_incon_packet_len", "Write Inconsistent Packet Lengths Count"), - uint32("first_packet_isnt_a_write", "First Packet Isn't A Write Count"), - uint32("write_trash_dup_req", "Write Trashed Duplicate Request Count"), - uint32("big_write_inv_message_num", "Big Write Invalid Message Number Count"), - uint32("big_write_being_torn_down", "Big Write Being Torn Down Count"), - uint32("big_write_being_abort", "Big Write Being Aborted Count"), - uint32("zero_ack_frag", "Zero ACK Fragment Count"), - uint32("write_curr_trans", "Write Currently Transmitting Count"), - uint32("try_to_write_too_much", "Trying To Write Too Much Count"), - uint32("write_out_of_mem_for_ctl_nodes", "Write Out Of Memory For Control Nodes Count"), - uint32("write_didnt_need_this_frag", "Write Didn't Need This Fragment Count"), - uint32("write_too_many_buf_check", "Write Too Many Buffers Checked Out Count"), - uint32("write_timeout", "Write Time Out Count"), - uint32("write_got_an_ack0", "Write Got An ACK Count 0"), - uint32("write_got_an_ack1", "Write Got An ACK Count 1"), - uint32("poll_abort_conn", "Poller Aborted The Connection Count"), - uint32("may_had_out_of_order", "Maybe Had Out Of Order Writes Count"), - uint32("had_an_out_of_order", "Had An Out Of Order Write Count"), - uint32("moved_the_ack_bit_dn", "Moved The ACK Bit Down Count"), - uint32("bumped_out_of_order", "Bumped Out Of Order Write Count"), - uint32("poll_rem_old_out_of_order", "Poller Removed Old Out Of Order Count"), - uint32("write_didnt_need_but_req_ack", "Write Didn't Need But Requested ACK Count"), - uint32("write_trash_packet", "Write Trashed Packet Count"), - uint32("too_many_ack_frag", "Too Many ACK Fragments Count"), - uint32("saved_an_out_of_order_packet", "Saved An Out Of Order Packet Count"), - uint32("conn_being_aborted", "Connection Being Aborted Count"), +PacketBurstInformation = struct("packet_burst_information", [ + uint32("big_invalid_slot", "Big Invalid Slot Count"), + uint32("big_forged_packet", "Big Forged Packet Count"), + uint32("big_invalid_packet", "Big Invalid Packet Count"), + uint32("big_still_transmitting", "Big Still Transmitting Count"), + uint32("still_doing_the_last_req", "Still Doing The Last Request Count"), + uint32("invalid_control_req", "Invalid Control Request Count"), + uint32("control_invalid_message_number", "Control Invalid Message Number Count"), + uint32("control_being_torn_down", "Control Being Torn Down Count"), + uint32("big_repeat_the_file_read", "Big Repeat the File Read Count"), + uint32("big_send_extra_cc_count", "Big Send Extra CC Count"), + uint32("big_return_abort_mess", "Big Return Abort Message Count"), + uint32("big_read_invalid_mess", "Big Read Invalid Message Number Count"), + uint32("big_read_do_it_over", "Big Read Do It Over Count"), + uint32("big_read_being_torn_down", "Big Read Being Torn Down Count"), + uint32("previous_control_packet", "Previous Control Packet Count"), + uint32("send_hold_off_message", "Send Hold Off Message Count"), + uint32("big_read_no_data_avail", "Big Read No Data Available Count"), + uint32("big_read_trying_to_read", "Big Read Trying To Read Too Much Count"), + uint32("async_read_error", "Async Read Error Count"), + uint32("big_read_phy_read_err", "Big Read Physical Read Error Count"), + uint32("ctl_bad_ack_frag_list", "Control Bad ACK Fragment List Count"), + uint32("ctl_no_data_read", "Control No Data Read Count"), + uint32("write_dup_req", "Write Duplicate Request Count"), + uint32("shouldnt_be_ack_here", "Shouldn't Be ACKing Here Count"), + uint32("write_incon_packet_len", "Write Inconsistent Packet Lengths Count"), + uint32("first_packet_isnt_a_write", "First Packet Isn't A Write Count"), + uint32("write_trash_dup_req", "Write Trashed Duplicate Request Count"), + uint32("big_write_inv_message_num", "Big Write Invalid Message Number Count"), + uint32("big_write_being_torn_down", "Big Write Being Torn Down Count"), + uint32("big_write_being_abort", "Big Write Being Aborted Count"), + uint32("zero_ack_frag", "Zero ACK Fragment Count"), + uint32("write_curr_trans", "Write Currently Transmitting Count"), + uint32("try_to_write_too_much", "Trying To Write Too Much Count"), + uint32("write_out_of_mem_for_ctl_nodes", "Write Out Of Memory For Control Nodes Count"), + uint32("write_didnt_need_this_frag", "Write Didn't Need This Fragment Count"), + uint32("write_too_many_buf_check", "Write Too Many Buffers Checked Out Count"), + uint32("write_timeout", "Write Time Out Count"), + uint32("write_got_an_ack0", "Write Got An ACK Count 0"), + uint32("write_got_an_ack1", "Write Got An ACK Count 1"), + uint32("poll_abort_conn", "Poller Aborted The Connection Count"), + uint32("may_had_out_of_order", "Maybe Had Out Of Order Writes Count"), + uint32("had_an_out_of_order", "Had An Out Of Order Write Count"), + uint32("moved_the_ack_bit_dn", "Moved The ACK Bit Down Count"), + uint32("bumped_out_of_order", "Bumped Out Of Order Write Count"), + uint32("poll_rem_old_out_of_order", "Poller Removed Old Out Of Order Count"), + uint32("write_didnt_need_but_req_ack", "Write Didn't Need But Requested ACK Count"), + uint32("write_trash_packet", "Write Trashed Packet Count"), + uint32("too_many_ack_frag", "Too Many ACK Fragments Count"), + uint32("saved_an_out_of_order_packet", "Saved An Out Of Order Packet Count"), + uint32("conn_being_aborted", "Connection Being Aborted Count"), ], "Packet Burst Information") -PadDSSpaceAllocate = struct("pad_ds_space_alloc", [ +PadDSSpaceAllocate = struct("pad_ds_space_alloc", [ Reserved4, ]) -PadAttributes = struct("pad_attributes", [ +PadAttributes = struct("pad_attributes", [ Reserved6, ]) PadDataStreamSize = struct("pad_data_stream_size", [ Reserved4, ]) -PadTotalStreamSize = struct("pad_total_stream_size", [ +PadTotalStreamSize = struct("pad_total_stream_size", [ Reserved6, ]) -PadCreationInfo = struct("pad_creation_info", [ +PadCreationInfo = struct("pad_creation_info", [ Reserved8, ]) -PadModifyInfo = struct("pad_modify_info", [ +PadModifyInfo = struct("pad_modify_info", [ Reserved10, ]) -PadArchiveInfo = struct("pad_archive_info", [ +PadArchiveInfo = struct("pad_archive_info", [ Reserved8, ]) -PadRightsInfo = struct("pad_rights_info", [ +PadRightsInfo = struct("pad_rights_info", [ Reserved2, ]) -PadDirEntry = struct("pad_dir_entry", [ +PadDirEntry = struct("pad_dir_entry", [ Reserved12, ]) -PadEAInfo = struct("pad_ea_info", [ +PadEAInfo = struct("pad_ea_info", [ Reserved12, ]) -PadNSInfo = struct("pad_ns_info", [ +PadNSInfo = struct("pad_ns_info", [ Reserved4, ]) -PhyLockStruct = struct("phy_lock_struct", [ - LoggedCount, - ShareableLockCount, - RecordStart, - RecordEnd, - LogicalConnectionNumber, - TaskNumByte, - LockType, +PhyLockStruct = struct("phy_lock_struct", [ + LoggedCount, + ShareableLockCount, + RecordStart, + RecordEnd, + LogicalConnectionNumber, + TaskNumByte, + LockType, ], "Physical Locks") printInfo = struct("print_info_struct", [ PrintFlags, @@ -5044,8 +5047,8 @@ NameSpace, DirHandle, ], "Reply Level 2") -RightsInfoStruct = struct("rights_info_struct", [ - InheritedRightsMask, +RightsInfoStruct = struct("rights_info_struct", [ + InheritedRightsMask, ]) RoutersInfo = struct("routers_info", [ bytes("node", "Node", 6), @@ -5076,41 +5079,41 @@ uint32("volume_segment_offset", "Volume Segment Offset"), uint32("volume_segment_size", "Volume Segment Size"), ], "Volume Segment Information") -SemaInfoStruct = struct("sema_info_struct", [ - LogicalConnectionNumber, - TaskNumByte, -]) -SemaStruct = struct("sema_struct", [ - OpenCount, - SemaphoreValue, - TaskNumberWord, - SemaphoreName, +SemaInfoStruct = struct("sema_info_struct", [ + LogicalConnectionNumber, + TaskNumByte, +]) +SemaStruct = struct("sema_struct", [ + OpenCount, + SemaphoreValue, + TaskNumberWord, + SemaphoreName, ], "Semaphore Information") -ServerInfo = struct("server_info", [ - uint32("reply_canceled", "Reply Canceled Count"), - uint32("write_held_off", "Write Held Off Count"), - uint32("write_held_off_with_dup", "Write Held Off With Duplicate Request"), - uint32("invalid_req_type", "Invalid Request Type Count"), - uint32("being_aborted", "Being Aborted Count"), - uint32("already_doing_realloc", "Already Doing Re-Allocate Count"), - uint32("dealloc_invalid_slot", "De-Allocate Invalid Slot Count"), - uint32("dealloc_being_proc", "De-Allocate Being Processed Count"), - uint32("dealloc_forged_packet", "De-Allocate Forged Packet Count"), - uint32("dealloc_still_transmit", "De-Allocate Still Transmitting Count"), - uint32("start_station_error", "Start Station Error Count"), - uint32("invalid_slot", "Invalid Slot Count"), - uint32("being_processed", "Being Processed Count"), - uint32("forged_packet", "Forged Packet Count"), - uint32("still_transmitting", "Still Transmitting Count"), - uint32("reexecute_request", "Re-Execute Request Count"), - uint32("invalid_sequence_number", "Invalid Sequence Number Count"), - uint32("dup_is_being_sent", "Duplicate Is Being Sent Already Count"), - uint32("sent_pos_ack", "Sent Positive Acknowledge Count"), - uint32("sent_a_dup_reply", "Sent A Duplicate Reply Count"), - uint32("no_mem_for_station", "No Memory For Station Control Count"), - uint32("no_avail_conns", "No Available Connections Count"), - uint32("realloc_slot", "Re-Allocate Slot Count"), - uint32("realloc_slot_came_too_soon", "Re-Allocate Slot Came Too Soon Count"), +ServerInfo = struct("server_info", [ + uint32("reply_canceled", "Reply Canceled Count"), + uint32("write_held_off", "Write Held Off Count"), + uint32("write_held_off_with_dup", "Write Held Off With Duplicate Request"), + uint32("invalid_req_type", "Invalid Request Type Count"), + uint32("being_aborted", "Being Aborted Count"), + uint32("already_doing_realloc", "Already Doing Re-Allocate Count"), + uint32("dealloc_invalid_slot", "De-Allocate Invalid Slot Count"), + uint32("dealloc_being_proc", "De-Allocate Being Processed Count"), + uint32("dealloc_forged_packet", "De-Allocate Forged Packet Count"), + uint32("dealloc_still_transmit", "De-Allocate Still Transmitting Count"), + uint32("start_station_error", "Start Station Error Count"), + uint32("invalid_slot", "Invalid Slot Count"), + uint32("being_processed", "Being Processed Count"), + uint32("forged_packet", "Forged Packet Count"), + uint32("still_transmitting", "Still Transmitting Count"), + uint32("reexecute_request", "Re-Execute Request Count"), + uint32("invalid_sequence_number", "Invalid Sequence Number Count"), + uint32("dup_is_being_sent", "Duplicate Is Being Sent Already Count"), + uint32("sent_pos_ack", "Sent Positive Acknowledge Count"), + uint32("sent_a_dup_reply", "Sent A Duplicate Reply Count"), + uint32("no_mem_for_station", "No Memory For Station Control Count"), + uint32("no_avail_conns", "No Available Connections Count"), + uint32("realloc_slot", "Re-Allocate Slot Count"), + uint32("realloc_slot_came_too_soon", "Re-Allocate Slot Came Too Soon Count"), ], "Server Information") ServersSrcInfo = struct("servers_src_info", [ ServerNode, @@ -5118,29 +5121,29 @@ HopsToNet, ], "Source Server Information") SpaceStruct = struct("space_struct", [ - Level, - MaxSpace, - CurrentSpace, + Level, + MaxSpace, + CurrentSpace, ], "Space Information") -SPXInformation = struct("spx_information", [ - uint16("spx_max_conn", "SPX Max Connections Count"), - uint16("spx_max_used_conn", "SPX Max Used Connections"), - uint16("spx_est_conn_req", "SPX Establish Connection Requests"), - uint16("spx_est_conn_fail", "SPX Establish Connection Fail"), - uint16("spx_listen_con_req", "SPX Listen Connect Request"), - uint16("spx_listen_con_fail", "SPX Listen Connect Fail"), - uint32("spx_send", "SPX Send Count"), - uint32("spx_window_choke", "SPX Window Choke Count"), - uint16("spx_bad_send", "SPX Bad Send Count"), - uint16("spx_send_fail", "SPX Send Fail Count"), - uint16("spx_abort_conn", "SPX Aborted Connection"), - uint32("spx_listen_pkt", "SPX Listen Packet Count"), - uint16("spx_bad_listen", "SPX Bad Listen Count"), - uint32("spx_incoming_pkt", "SPX Incoming Packet Count"), - uint16("spx_bad_in_pkt", "SPX Bad In Packet Count"), - uint16("spx_supp_pkt", "SPX Suppressed Packet Count"), - uint16("spx_no_ses_listen", "SPX No Session Listen ECB Count"), - uint16("spx_watch_dog", "SPX Watch Dog Destination Session Count"), +SPXInformation = struct("spx_information", [ + uint16("spx_max_conn", "SPX Max Connections Count"), + uint16("spx_max_used_conn", "SPX Max Used Connections"), + uint16("spx_est_conn_req", "SPX Establish Connection Requests"), + uint16("spx_est_conn_fail", "SPX Establish Connection Fail"), + uint16("spx_listen_con_req", "SPX Listen Connect Request"), + uint16("spx_listen_con_fail", "SPX Listen Connect Fail"), + uint32("spx_send", "SPX Send Count"), + uint32("spx_window_choke", "SPX Window Choke Count"), + uint16("spx_bad_send", "SPX Bad Send Count"), + uint16("spx_send_fail", "SPX Send Fail Count"), + uint16("spx_abort_conn", "SPX Aborted Connection"), + uint32("spx_listen_pkt", "SPX Listen Packet Count"), + uint16("spx_bad_listen", "SPX Bad Listen Count"), + uint32("spx_incoming_pkt", "SPX Incoming Packet Count"), + uint16("spx_bad_in_pkt", "SPX Bad In Packet Count"), + uint16("spx_supp_pkt", "SPX Suppressed Packet Count"), + uint16("spx_no_ses_listen", "SPX No Session Listen ECB Count"), + uint16("spx_watch_dog", "SPX Watch Dog Destination Session Count"), ], "SPX Information") StackInfo = struct("stack_info", [ StackNumber, @@ -5161,36 +5164,36 @@ TimesyncStatus, ]) timeInfo = struct("time_info", [ - Year, - Month, - Day, - Hour, - Minute, - Second, - DayOfWeek, + Year, + Month, + Day, + Hour, + Minute, + Second, + DayOfWeek, uint32("login_expiration_time", "Login Expiration Time"), ]) -TotalStreamSizeStruct = struct("total_stream_size_struct", [ +TotalStreamSizeStruct = struct("total_stream_size_struct", [ TtlDSDskSpaceAlloc, - NumberOfDataStreams, + NumberOfDataStreams, ]) -TrendCounters = struct("trend_counters", [ - uint32("num_of_cache_checks", "Number Of Cache Checks"), - uint32("num_of_cache_hits", "Number Of Cache Hits"), - uint32("num_of_dirty_cache_checks", "Number Of Dirty Cache Checks"), - uint32("num_of_cache_dirty_checks", "Number Of Cache Dirty Checks"), - uint32("cache_used_while_check", "Cache Used While Checking"), - uint32("wait_till_dirty_blcks_dec", "Wait Till Dirty Blocks Decrease Count"), - uint32("alloc_blck_frm_avail", "Allocate Block From Available Count"), - uint32("alloc_blck_frm_lru", "Allocate Block From LRU Count"), - uint32("alloc_blck_already_wait", "Allocate Block Already Waiting"), - uint32("lru_sit_time", "LRU Sitting Time"), - uint32("num_of_cache_check_no_wait", "Number Of Cache Check No Wait"), - uint32("num_of_cache_hits_no_wait", "Number Of Cache Hits No Wait"), +TrendCounters = struct("trend_counters", [ + uint32("num_of_cache_checks", "Number Of Cache Checks"), + uint32("num_of_cache_hits", "Number Of Cache Hits"), + uint32("num_of_dirty_cache_checks", "Number Of Dirty Cache Checks"), + uint32("num_of_cache_dirty_checks", "Number Of Cache Dirty Checks"), + uint32("cache_used_while_check", "Cache Used While Checking"), + uint32("wait_till_dirty_blcks_dec", "Wait Till Dirty Blocks Decrease Count"), + uint32("alloc_blck_frm_avail", "Allocate Block From Available Count"), + uint32("alloc_blck_frm_lru", "Allocate Block From LRU Count"), + uint32("alloc_blck_already_wait", "Allocate Block Already Waiting"), + uint32("lru_sit_time", "LRU Sitting Time"), + uint32("num_of_cache_check_no_wait", "Number Of Cache Check No Wait"), + uint32("num_of_cache_hits_no_wait", "Number Of Cache Hits No Wait"), ], "Trend Counters") -TrusteeStruct = struct("trustee_struct", [ - endian(ObjectID, LE), - AccessRightsMaskWord, +TrusteeStruct = struct("trustee_struct", [ + endian(ObjectID, LE), + AccessRightsMaskWord, ]) UpdateDateStruct = struct("update_date_struct", [ UpdateDate, @@ -5201,41 +5204,41 @@ UpdateTimeStruct = struct("update_time_struct", [ UpdateTime, ]) -UserInformation = struct("user_info", [ - endian(ConnectionNumber, LE), - UseCount, - Reserved2, - ConnectionServiceType, - Year, - Month, - Day, - Hour, - Minute, - Second, - DayOfWeek, - Status, - Reserved2, - ExpirationTime, - ObjectType, - Reserved2, - TransactionTrackingFlag, - LogicalLockThreshold, - FileWriteFlags, - FileWriteState, - Reserved, - FileLockCount, - RecordLockCount, - TotalBytesRead, - TotalBytesWritten, - TotalRequest, - HeldRequests, - HeldBytesRead, - HeldBytesWritten, +UserInformation = struct("user_info", [ + endian(ConnectionNumber, LE), + UseCount, + Reserved2, + ConnectionServiceType, + Year, + Month, + Day, + Hour, + Minute, + Second, + DayOfWeek, + Status, + Reserved2, + ExpirationTime, + ObjectType, + Reserved2, + TransactionTrackingFlag, + LogicalLockThreshold, + FileWriteFlags, + FileWriteState, + Reserved, + FileLockCount, + RecordLockCount, + TotalBytesRead, + TotalBytesWritten, + TotalRequest, + HeldRequests, + HeldBytesRead, + HeldBytesWritten, ], "User Information") VolInfoStructure = struct("vol_info_struct", [ VolumeType, Reserved2, - StatusFlagBits, + StatusFlagBits, SectorSize, SectorsPerClusterLong, VolumeSizeInClusters, @@ -5296,420 +5299,420 @@ # NCP Groups ############################################################################## def define_groups(): - groups['accounting'] = "Accounting" - groups['afp'] = "AFP" - groups['auditing'] = "Auditing" - groups['bindery'] = "Bindery" - groups['connection'] = "Connection" - groups['enhanced'] = "Enhanced File System" - groups['extended'] = "Extended Attribute" - groups['extension'] = "NCP Extension" - groups['file'] = "File System" - groups['fileserver'] = "File Server Environment" - groups['message'] = "Message" - groups['migration'] = "Data Migration" - groups['nds'] = "Novell Directory Services" - groups['pburst'] = "Packet Burst" - groups['print'] = "Print" - groups['remote'] = "Remote" - groups['sync'] = "Synchronization" - groups['tsync'] = "Time Synchronization" - groups['tts'] = "Transaction Tracking" - groups['qms'] = "Queue Management System (QMS)" - groups['stats'] = "Server Statistics" - groups['nmas'] = "Novell Modular Authentication Service" - groups['sss'] = "SecretStore Services" + groups['accounting'] = "Accounting" + groups['afp'] = "AFP" + groups['auditing'] = "Auditing" + groups['bindery'] = "Bindery" + groups['connection'] = "Connection" + groups['enhanced'] = "Enhanced File System" + groups['extended'] = "Extended Attribute" + groups['extension'] = "NCP Extension" + groups['file'] = "File System" + groups['fileserver'] = "File Server Environment" + groups['message'] = "Message" + groups['migration'] = "Data Migration" + groups['nds'] = "Novell Directory Services" + groups['pburst'] = "Packet Burst" + groups['print'] = "Print" + groups['remote'] = "Remote" + groups['sync'] = "Synchronization" + groups['tsync'] = "Time Synchronization" + groups['tts'] = "Transaction Tracking" + groups['qms'] = "Queue Management System (QMS)" + groups['stats'] = "Server Statistics" + groups['nmas'] = "Novell Modular Authentication Service" + groups['sss'] = "SecretStore Services" ############################################################################## # NCP Errors ############################################################################## def define_errors(): - errors[0x0000] = "Ok" - errors[0x0001] = "Transaction tracking is available" - errors[0x0002] = "Ok. The data has been written" - errors[0x0003] = "Calling Station is a Manager" - - errors[0x0100] = "One or more of the Connection Numbers in the send list are invalid" - errors[0x0101] = "Invalid space limit" - errors[0x0102] = "Insufficient disk space" - errors[0x0103] = "Queue server cannot add jobs" - errors[0x0104] = "Out of disk space" - errors[0x0105] = "Semaphore overflow" - errors[0x0106] = "Invalid Parameter" - errors[0x0107] = "Invalid Number of Minutes to Delay" - errors[0x0108] = "Invalid Start or Network Number" - errors[0x0109] = "Cannot Obtain License" - errors[0x010a] = "No Purgeable Files Available" - - errors[0x0200] = "One or more clients in the send list are not logged in" - errors[0x0201] = "Queue server cannot attach" - - errors[0x0300] = "One or more clients in the send list are not accepting messages" - - errors[0x0400] = "Client already has message" - errors[0x0401] = "Queue server cannot service job" - - errors[0x7300] = "Revoke Handle Rights Not Found" - errors[0x7700] = "Buffer Too Small" - errors[0x7900] = "Invalid Parameter in Request Packet" - errors[0x7901] = "Nothing being Compressed" - errors[0x7a00] = "Connection Already Temporary" - errors[0x7b00] = "Connection Already Logged in" - errors[0x7c00] = "Connection Not Authenticated" - errors[0x7d00] = "Connection Not Logged In" - - errors[0x7e00] = "NCP failed boundary check" - errors[0x7e01] = "Invalid Length" - - errors[0x7f00] = "Lock Waiting" - errors[0x8000] = "Lock fail" - errors[0x8001] = "File in Use" - - errors[0x8100] = "A file handle could not be allocated by the file server" - errors[0x8101] = "Out of File Handles" - - errors[0x8200] = "Unauthorized to open the file" - errors[0x8300] = "Unable to read/write the volume. Possible bad sector on the file server" - errors[0x8301] = "Hard I/O Error" - - errors[0x8400] = "Unauthorized to create the directory" - errors[0x8401] = "Unauthorized to create the file" - - errors[0x8500] = "Unauthorized to delete the specified file" - errors[0x8501] = "Unauthorized to overwrite an existing file in this directory" - - errors[0x8700] = "An unexpected character was encountered in the filename" - errors[0x8701] = "Create Filename Error" - - errors[0x8800] = "Invalid file handle" - errors[0x8900] = "Unauthorized to search this file/directory" - errors[0x8a00] = "Unauthorized to delete this file/directory" - errors[0x8b00] = "Unauthorized to rename a file in this directory" - - errors[0x8c00] = "No set privileges" - errors[0x8c01] = "Unauthorized to modify a file in this directory" - errors[0x8c02] = "Unauthorized to change the restriction on this volume" - - errors[0x8d00] = "Some of the affected files are in use by another client" - errors[0x8d01] = "The affected file is in use" - - errors[0x8e00] = "All of the affected files are in use by another client" - errors[0x8f00] = "Some of the affected files are read-only" - - errors[0x9000] = "An attempt to modify a read-only volume occurred" - errors[0x9001] = "All of the affected files are read-only" - errors[0x9002] = "Read Only Access to Volume" - - errors[0x9100] = "Some of the affected files already exist" - errors[0x9101] = "Some Names Exist" - - errors[0x9200] = "Directory with the new name already exists" - errors[0x9201] = "All of the affected files already exist" - - errors[0x9300] = "Unauthorized to read from this file" - errors[0x9400] = "Unauthorized to write to this file" - errors[0x9500] = "The affected file is detached" - - errors[0x9600] = "The file server has run out of memory to service this request" - errors[0x9601] = "No alloc space for message" - errors[0x9602] = "Server Out of Space" - - errors[0x9800] = "The affected volume is not mounted" - errors[0x9801] = "The volume associated with Volume Number is not mounted" - errors[0x9802] = "The resulting volume does not exist" - errors[0x9803] = "The destination volume is not mounted" - errors[0x9804] = "Disk Map Error" - - errors[0x9900] = "The file server has run out of directory space on the affected volume" - errors[0x9a00] = "Invalid request to rename the affected file to another volume" - - errors[0x9b00] = "DirHandle is not associated with a valid directory path" - errors[0x9b01] = "A resulting directory handle is not associated with a valid directory path" - errors[0x9b02] = "The directory associated with DirHandle does not exist" - errors[0x9b03] = "Bad directory handle" - - errors[0x9c00] = "The resulting path is not valid" - errors[0x9c01] = "The resulting file path is not valid" - errors[0x9c02] = "The resulting directory path is not valid" - errors[0x9c03] = "Invalid path" - errors[0x9c04] = "No more trustees found, based on requested search sequence number" - - errors[0x9d00] = "A directory handle was not available for allocation" - - errors[0x9e00] = "The name of the directory does not conform to a legal name for this name space" - errors[0x9e01] = "The new directory name does not conform to a legal name for this name space" - errors[0x9e02] = "Bad File Name" - - errors[0x9f00] = "The request attempted to delete a directory that is in use by another client" - - errors[0xa000] = "The request attempted to delete a directory that is not empty" - errors[0xa100] = "An unrecoverable error occurred on the affected directory" - - errors[0xa200] = "The request attempted to read from a file region that is physically locked" - errors[0xa201] = "I/O Lock Error" - - errors[0xa400] = "Invalid directory rename attempted" - errors[0xa500] = "Invalid open create mode" - errors[0xa600] = "Auditor Access has been Removed" - errors[0xa700] = "Error Auditing Version" - - errors[0xa800] = "Invalid Support Module ID" - errors[0xa801] = "No Auditing Access Rights" - errors[0xa802] = "No Access Rights" - - errors[0xa900] = "Error Link in Path" - errors[0xa901] = "Invalid Path With Junction Present" - - errors[0xaa00] = "Invalid Data Type Flag" - - errors[0xac00] = "Packet Signature Required" - - errors[0xbe00] = "Invalid Data Stream" - errors[0xbf00] = "Requests for this name space are not valid on this volume" - - errors[0xc000] = "Unauthorized to retrieve accounting data" - - errors[0xc100] = "The ACCOUNT_BALANCE property does not exist" - errors[0xc101] = "No Account Balance" - - errors[0xc200] = "The object has exceeded its credit limit" - errors[0xc300] = "Too many holds have been placed against this account" - errors[0xc400] = "The client account has been disabled" - - errors[0xc500] = "Access to the account has been denied because of intruder detection" - errors[0xc501] = "Login lockout" - errors[0xc502] = "Server Login Locked" - - errors[0xc600] = "The caller does not have operator privileges" - errors[0xc601] = "The client does not have operator privileges" - - errors[0xc800] = "Missing EA Key" - errors[0xc900] = "EA Not Found" - errors[0xca00] = "Invalid EA Handle Type" - errors[0xcb00] = "EA No Key No Data" - errors[0xcc00] = "EA Number Mismatch" - errors[0xcd00] = "Extent Number Out of Range" - errors[0xce00] = "EA Bad Directory Number" - errors[0xcf00] = "Invalid EA Handle" - - errors[0xd000] = "Queue error" - errors[0xd001] = "EA Position Out of Range" - - errors[0xd100] = "The queue does not exist" - errors[0xd101] = "EA Access Denied" - - errors[0xd200] = "A queue server is not associated with this queue" - errors[0xd201] = "A queue server is not associated with the selected queue" - errors[0xd202] = "No queue server" - errors[0xd203] = "Data Page Odd Size" - - errors[0xd300] = "No queue rights" - errors[0xd301] = "EA Volume Not Mounted" - - errors[0xd400] = "The queue is full and cannot accept another request" - errors[0xd401] = "The queue associated with ObjectId is full and cannot accept another request" - errors[0xd402] = "Bad Page Boundary" - - errors[0xd500] = "A job does not exist in this queue" - errors[0xd501] = "No queue job" - errors[0xd502] = "The job associated with JobNumber does not exist in this queue" - errors[0xd503] = "Inspect Failure" - errors[0xd504] = "Unknown NCP Extension Number" - - errors[0xd600] = "The file server does not allow unencrypted passwords" - errors[0xd601] = "No job right" - errors[0xd602] = "EA Already Claimed" - - errors[0xd700] = "Bad account" - errors[0xd701] = "The old and new password strings are identical" - errors[0xd702] = "The job is currently being serviced" - errors[0xd703] = "The queue is currently servicing a job" - errors[0xd704] = "Queue servicing" - errors[0xd705] = "Odd Buffer Size" - - errors[0xd800] = "Queue not active" - errors[0xd801] = "No Scorecards" - - errors[0xd900] = "The file server cannot accept another connection as it has reached its limit" - errors[0xd901] = "The client is not security equivalent to one of the objects in the Q_SERVERS group property of the target queue" - errors[0xd902] = "Queue Station is not a server" - errors[0xd903] = "Bad EDS Signature" - errors[0xd904] = "Attempt to log in using an account which has limits on the number of concurrent connections and that number has been reached." - - errors[0xda00] = "Attempted to login to the file server during a restricted time period" - errors[0xda01] = "Queue halted" - errors[0xda02] = "EA Space Limit" - - errors[0xdb00] = "Attempted to login to the file server from an unauthorized workstation or network" - errors[0xdb01] = "The queue cannot attach another queue server" - errors[0xdb02] = "Maximum queue servers" - errors[0xdb03] = "EA Key Corrupt" - - errors[0xdc00] = "Account Expired" - errors[0xdc01] = "EA Key Limit" - - errors[0xdd00] = "Tally Corrupt" - errors[0xde00] = "Attempted to login to the file server with an incorrect password" - errors[0xdf00] = "Attempted to login to the file server with a password that has expired" - - errors[0xe000] = "No Login Connections Available" - errors[0xe700] = "No disk track" - errors[0xe800] = "Write to group" - errors[0xe900] = "The object is already a member of the group property" - - errors[0xea00] = "No such member" - errors[0xea01] = "The bindery object is not a member of the set" - errors[0xea02] = "Non-existent member" - - errors[0xeb00] = "The property is not a set property" - - errors[0xec00] = "No such set" - errors[0xec01] = "The set property does not exist" - - errors[0xed00] = "Property exists" - errors[0xed01] = "The property already exists" - errors[0xed02] = "An attempt was made to create a bindery object property that already exists" - - errors[0xee00] = "The object already exists" - errors[0xee01] = "The bindery object already exists" - - errors[0xef00] = "Illegal name" - errors[0xef01] = "Illegal characters in ObjectName field" - errors[0xef02] = "Invalid name" - - errors[0xf000] = "A wildcard was detected in a field that does not support wildcards" - errors[0xf001] = "An illegal wildcard was detected in ObjectName" - - errors[0xf100] = "The client does not have the rights to access this bindery object" - errors[0xf101] = "Bindery security" - errors[0xf102] = "Invalid bindery security" - - errors[0xf200] = "Unauthorized to read from this object" - errors[0xf300] = "Unauthorized to rename this object" - - errors[0xf400] = "Unauthorized to delete this object" - errors[0xf401] = "No object delete privileges" - errors[0xf402] = "Unauthorized to delete this queue" - - errors[0xf500] = "Unauthorized to create this object" - errors[0xf501] = "No object create" - - errors[0xf600] = "No property delete" - errors[0xf601] = "Unauthorized to delete the property of this object" - errors[0xf602] = "Unauthorized to delete this property" - - errors[0xf700] = "Unauthorized to create this property" - errors[0xf701] = "No property create privilege" - - errors[0xf800] = "Unauthorized to write to this property" - errors[0xf900] = "Unauthorized to read this property" - errors[0xfa00] = "Temporary remap error" - - errors[0xfb00] = "No such property" - errors[0xfb01] = "The file server does not support this request" - errors[0xfb02] = "The specified property does not exist" - errors[0xfb03] = "The PASSWORD property does not exist for this bindery object" - errors[0xfb04] = "NDS NCP not available" - errors[0xfb05] = "Bad Directory Handle" - errors[0xfb06] = "Unknown Request" - errors[0xfb07] = "Invalid Subfunction Request" - errors[0xfb08] = "Attempt to use an invalid parameter (drive number, path, or flag value) during a set drive path call" - errors[0xfb09] = "NMAS not running on this server, NCP NOT Supported" - errors[0xfb0a] = "Station Not Logged In" - errors[0xfb0b] = "Secret Store not running on this server, NCP Not supported" - - errors[0xfc00] = "The message queue cannot accept another message" - errors[0xfc01] = "The trustee associated with ObjectId does not exist" - errors[0xfc02] = "The specified bindery object does not exist" - errors[0xfc03] = "The bindery object associated with ObjectID does not exist" - errors[0xfc04] = "A bindery object does not exist that matches" - errors[0xfc05] = "The specified queue does not exist" - errors[0xfc06] = "No such object" - errors[0xfc07] = "The queue associated with ObjectID does not exist" - - errors[0xfd00] = "Bad station number" - errors[0xfd01] = "The connection associated with ConnectionNumber is not active" - errors[0xfd02] = "Lock collision" - errors[0xfd03] = "Transaction tracking is disabled" - - errors[0xfe00] = "I/O failure" - errors[0xfe01] = "The files containing the bindery on the file server are locked" - errors[0xfe02] = "A file with the specified name already exists in this directory" - errors[0xfe03] = "No more restrictions were found" - errors[0xfe04] = "The file server was unable to lock the file within the specified time limit" - errors[0xfe05] = "The file server was unable to lock all files within the specified time limit" - errors[0xfe06] = "The bindery object associated with ObjectID is not a valid trustee" - errors[0xfe07] = "Directory locked" - errors[0xfe08] = "Bindery locked" - errors[0xfe09] = "Invalid semaphore name length" - errors[0xfe0a] = "The file server was unable to complete the operation within the specified time limit" - errors[0xfe0b] = "Transaction restart" - errors[0xfe0c] = "Bad packet" - errors[0xfe0d] = "Timeout" - errors[0xfe0e] = "User Not Found" - errors[0xfe0f] = "Trustee Not Found" - - errors[0xff00] = "Failure" - errors[0xff01] = "Lock error" - errors[0xff02] = "File not found" - errors[0xff03] = "The file not found or cannot be unlocked" - errors[0xff04] = "Record not found" - errors[0xff05] = "The logical record was not found" - errors[0xff06] = "The printer associated with Printer Number does not exist" - errors[0xff07] = "No such printer" - errors[0xff08] = "Unable to complete the request" - errors[0xff09] = "Unauthorized to change privileges of this trustee" - errors[0xff0a] = "No files matching the search criteria were found" - errors[0xff0b] = "A file matching the search criteria was not found" - errors[0xff0c] = "Verification failed" - errors[0xff0d] = "Object associated with ObjectID is not a manager" - errors[0xff0e] = "Invalid initial semaphore value" - errors[0xff0f] = "The semaphore handle is not valid" - errors[0xff10] = "SemaphoreHandle is not associated with a valid sempahore" - errors[0xff11] = "Invalid semaphore handle" - errors[0xff12] = "Transaction tracking is not available" - errors[0xff13] = "The transaction has not yet been written to disk" - errors[0xff14] = "Directory already exists" - errors[0xff15] = "The file already exists and the deletion flag was not set" - errors[0xff16] = "No matching files or directories were found" - errors[0xff17] = "A file or directory matching the search criteria was not found" - errors[0xff18] = "The file already exists" - errors[0xff19] = "Failure, No files found" - errors[0xff1a] = "Unlock Error" - errors[0xff1b] = "I/O Bound Error" - errors[0xff1c] = "Not Accepting Messages" - errors[0xff1d] = "No More Salvageable Files in Directory" - errors[0xff1e] = "Calling Station is Not a Manager" - errors[0xff1f] = "Bindery Failure" - errors[0xff20] = "NCP Extension Not Found" - errors[0xff21] = "Audit Property Not Found" - errors[0xff22] = "Server Set Parameter Not Found" + errors[0x0000] = "Ok" + errors[0x0001] = "Transaction tracking is available" + errors[0x0002] = "Ok. The data has been written" + errors[0x0003] = "Calling Station is a Manager" + + errors[0x0100] = "One or more of the Connection Numbers in the send list are invalid" + errors[0x0101] = "Invalid space limit" + errors[0x0102] = "Insufficient disk space" + errors[0x0103] = "Queue server cannot add jobs" + errors[0x0104] = "Out of disk space" + errors[0x0105] = "Semaphore overflow" + errors[0x0106] = "Invalid Parameter" + errors[0x0107] = "Invalid Number of Minutes to Delay" + errors[0x0108] = "Invalid Start or Network Number" + errors[0x0109] = "Cannot Obtain License" + errors[0x010a] = "No Purgeable Files Available" + + errors[0x0200] = "One or more clients in the send list are not logged in" + errors[0x0201] = "Queue server cannot attach" + + errors[0x0300] = "One or more clients in the send list are not accepting messages" + + errors[0x0400] = "Client already has message" + errors[0x0401] = "Queue server cannot service job" + + errors[0x7300] = "Revoke Handle Rights Not Found" + errors[0x7700] = "Buffer Too Small" + errors[0x7900] = "Invalid Parameter in Request Packet" + errors[0x7901] = "Nothing being Compressed" + errors[0x7a00] = "Connection Already Temporary" + errors[0x7b00] = "Connection Already Logged in" + errors[0x7c00] = "Connection Not Authenticated" + errors[0x7d00] = "Connection Not Logged In" + + errors[0x7e00] = "NCP failed boundary check" + errors[0x7e01] = "Invalid Length" + + errors[0x7f00] = "Lock Waiting" + errors[0x8000] = "Lock fail" + errors[0x8001] = "File in Use" + + errors[0x8100] = "A file handle could not be allocated by the file server" + errors[0x8101] = "Out of File Handles" + + errors[0x8200] = "Unauthorized to open the file" + errors[0x8300] = "Unable to read/write the volume. Possible bad sector on the file server" + errors[0x8301] = "Hard I/O Error" + + errors[0x8400] = "Unauthorized to create the directory" + errors[0x8401] = "Unauthorized to create the file" + + errors[0x8500] = "Unauthorized to delete the specified file" + errors[0x8501] = "Unauthorized to overwrite an existing file in this directory" + + errors[0x8700] = "An unexpected character was encountered in the filename" + errors[0x8701] = "Create Filename Error" + + errors[0x8800] = "Invalid file handle" + errors[0x8900] = "Unauthorized to search this file/directory" + errors[0x8a00] = "Unauthorized to delete this file/directory" + errors[0x8b00] = "Unauthorized to rename a file in this directory" + + errors[0x8c00] = "No set privileges" + errors[0x8c01] = "Unauthorized to modify a file in this directory" + errors[0x8c02] = "Unauthorized to change the restriction on this volume" + + errors[0x8d00] = "Some of the affected files are in use by another client" + errors[0x8d01] = "The affected file is in use" + + errors[0x8e00] = "All of the affected files are in use by another client" + errors[0x8f00] = "Some of the affected files are read-only" + + errors[0x9000] = "An attempt to modify a read-only volume occurred" + errors[0x9001] = "All of the affected files are read-only" + errors[0x9002] = "Read Only Access to Volume" + + errors[0x9100] = "Some of the affected files already exist" + errors[0x9101] = "Some Names Exist" + + errors[0x9200] = "Directory with the new name already exists" + errors[0x9201] = "All of the affected files already exist" + + errors[0x9300] = "Unauthorized to read from this file" + errors[0x9400] = "Unauthorized to write to this file" + errors[0x9500] = "The affected file is detached" + + errors[0x9600] = "The file server has run out of memory to service this request" + errors[0x9601] = "No alloc space for message" + errors[0x9602] = "Server Out of Space" + + errors[0x9800] = "The affected volume is not mounted" + errors[0x9801] = "The volume associated with Volume Number is not mounted" + errors[0x9802] = "The resulting volume does not exist" + errors[0x9803] = "The destination volume is not mounted" + errors[0x9804] = "Disk Map Error" + + errors[0x9900] = "The file server has run out of directory space on the affected volume" + errors[0x9a00] = "Invalid request to rename the affected file to another volume" + + errors[0x9b00] = "DirHandle is not associated with a valid directory path" + errors[0x9b01] = "A resulting directory handle is not associated with a valid directory path" + errors[0x9b02] = "The directory associated with DirHandle does not exist" + errors[0x9b03] = "Bad directory handle" + + errors[0x9c00] = "The resulting path is not valid" + errors[0x9c01] = "The resulting file path is not valid" + errors[0x9c02] = "The resulting directory path is not valid" + errors[0x9c03] = "Invalid path" + errors[0x9c04] = "No more trustees found, based on requested search sequence number" + + errors[0x9d00] = "A directory handle was not available for allocation" + + errors[0x9e00] = "The name of the directory does not conform to a legal name for this name space" + errors[0x9e01] = "The new directory name does not conform to a legal name for this name space" + errors[0x9e02] = "Bad File Name" + + errors[0x9f00] = "The request attempted to delete a directory that is in use by another client" + + errors[0xa000] = "The request attempted to delete a directory that is not empty" + errors[0xa100] = "An unrecoverable error occurred on the affected directory" + + errors[0xa200] = "The request attempted to read from a file region that is physically locked" + errors[0xa201] = "I/O Lock Error" + + errors[0xa400] = "Invalid directory rename attempted" + errors[0xa500] = "Invalid open create mode" + errors[0xa600] = "Auditor Access has been Removed" + errors[0xa700] = "Error Auditing Version" + + errors[0xa800] = "Invalid Support Module ID" + errors[0xa801] = "No Auditing Access Rights" + errors[0xa802] = "No Access Rights" + + errors[0xa900] = "Error Link in Path" + errors[0xa901] = "Invalid Path With Junction Present" + + errors[0xaa00] = "Invalid Data Type Flag" + + errors[0xac00] = "Packet Signature Required" + + errors[0xbe00] = "Invalid Data Stream" + errors[0xbf00] = "Requests for this name space are not valid on this volume" + + errors[0xc000] = "Unauthorized to retrieve accounting data" + + errors[0xc100] = "The ACCOUNT_BALANCE property does not exist" + errors[0xc101] = "No Account Balance" + + errors[0xc200] = "The object has exceeded its credit limit" + errors[0xc300] = "Too many holds have been placed against this account" + errors[0xc400] = "The client account has been disabled" + + errors[0xc500] = "Access to the account has been denied because of intruder detection" + errors[0xc501] = "Login lockout" + errors[0xc502] = "Server Login Locked" + + errors[0xc600] = "The caller does not have operator privileges" + errors[0xc601] = "The client does not have operator privileges" + + errors[0xc800] = "Missing EA Key" + errors[0xc900] = "EA Not Found" + errors[0xca00] = "Invalid EA Handle Type" + errors[0xcb00] = "EA No Key No Data" + errors[0xcc00] = "EA Number Mismatch" + errors[0xcd00] = "Extent Number Out of Range" + errors[0xce00] = "EA Bad Directory Number" + errors[0xcf00] = "Invalid EA Handle" + + errors[0xd000] = "Queue error" + errors[0xd001] = "EA Position Out of Range" + + errors[0xd100] = "The queue does not exist" + errors[0xd101] = "EA Access Denied" + + errors[0xd200] = "A queue server is not associated with this queue" + errors[0xd201] = "A queue server is not associated with the selected queue" + errors[0xd202] = "No queue server" + errors[0xd203] = "Data Page Odd Size" + + errors[0xd300] = "No queue rights" + errors[0xd301] = "EA Volume Not Mounted" + + errors[0xd400] = "The queue is full and cannot accept another request" + errors[0xd401] = "The queue associated with ObjectId is full and cannot accept another request" + errors[0xd402] = "Bad Page Boundary" + + errors[0xd500] = "A job does not exist in this queue" + errors[0xd501] = "No queue job" + errors[0xd502] = "The job associated with JobNumber does not exist in this queue" + errors[0xd503] = "Inspect Failure" + errors[0xd504] = "Unknown NCP Extension Number" + + errors[0xd600] = "The file server does not allow unencrypted passwords" + errors[0xd601] = "No job right" + errors[0xd602] = "EA Already Claimed" + + errors[0xd700] = "Bad account" + errors[0xd701] = "The old and new password strings are identical" + errors[0xd702] = "The job is currently being serviced" + errors[0xd703] = "The queue is currently servicing a job" + errors[0xd704] = "Queue servicing" + errors[0xd705] = "Odd Buffer Size" + + errors[0xd800] = "Queue not active" + errors[0xd801] = "No Scorecards" + + errors[0xd900] = "The file server cannot accept another connection as it has reached its limit" + errors[0xd901] = "The client is not security equivalent to one of the objects in the Q_SERVERS group property of the target queue" + errors[0xd902] = "Queue Station is not a server" + errors[0xd903] = "Bad EDS Signature" + errors[0xd904] = "Attempt to log in using an account which has limits on the number of concurrent connections and that number has been reached." + + errors[0xda00] = "Attempted to login to the file server during a restricted time period" + errors[0xda01] = "Queue halted" + errors[0xda02] = "EA Space Limit" + + errors[0xdb00] = "Attempted to login to the file server from an unauthorized workstation or network" + errors[0xdb01] = "The queue cannot attach another queue server" + errors[0xdb02] = "Maximum queue servers" + errors[0xdb03] = "EA Key Corrupt" + + errors[0xdc00] = "Account Expired" + errors[0xdc01] = "EA Key Limit" + + errors[0xdd00] = "Tally Corrupt" + errors[0xde00] = "Attempted to login to the file server with an incorrect password" + errors[0xdf00] = "Attempted to login to the file server with a password that has expired" + + errors[0xe000] = "No Login Connections Available" + errors[0xe700] = "No disk track" + errors[0xe800] = "Write to group" + errors[0xe900] = "The object is already a member of the group property" + + errors[0xea00] = "No such member" + errors[0xea01] = "The bindery object is not a member of the set" + errors[0xea02] = "Non-existent member" + + errors[0xeb00] = "The property is not a set property" + + errors[0xec00] = "No such set" + errors[0xec01] = "The set property does not exist" + + errors[0xed00] = "Property exists" + errors[0xed01] = "The property already exists" + errors[0xed02] = "An attempt was made to create a bindery object property that already exists" + + errors[0xee00] = "The object already exists" + errors[0xee01] = "The bindery object already exists" + + errors[0xef00] = "Illegal name" + errors[0xef01] = "Illegal characters in ObjectName field" + errors[0xef02] = "Invalid name" + + errors[0xf000] = "A wildcard was detected in a field that does not support wildcards" + errors[0xf001] = "An illegal wildcard was detected in ObjectName" + + errors[0xf100] = "The client does not have the rights to access this bindery object" + errors[0xf101] = "Bindery security" + errors[0xf102] = "Invalid bindery security" + + errors[0xf200] = "Unauthorized to read from this object" + errors[0xf300] = "Unauthorized to rename this object" + + errors[0xf400] = "Unauthorized to delete this object" + errors[0xf401] = "No object delete privileges" + errors[0xf402] = "Unauthorized to delete this queue" + + errors[0xf500] = "Unauthorized to create this object" + errors[0xf501] = "No object create" + + errors[0xf600] = "No property delete" + errors[0xf601] = "Unauthorized to delete the property of this object" + errors[0xf602] = "Unauthorized to delete this property" + + errors[0xf700] = "Unauthorized to create this property" + errors[0xf701] = "No property create privilege" + + errors[0xf800] = "Unauthorized to write to this property" + errors[0xf900] = "Unauthorized to read this property" + errors[0xfa00] = "Temporary remap error" + + errors[0xfb00] = "No such property" + errors[0xfb01] = "The file server does not support this request" + errors[0xfb02] = "The specified property does not exist" + errors[0xfb03] = "The PASSWORD property does not exist for this bindery object" + errors[0xfb04] = "NDS NCP not available" + errors[0xfb05] = "Bad Directory Handle" + errors[0xfb06] = "Unknown Request" + errors[0xfb07] = "Invalid Subfunction Request" + errors[0xfb08] = "Attempt to use an invalid parameter (drive number, path, or flag value) during a set drive path call" + errors[0xfb09] = "NMAS not running on this server, NCP NOT Supported" + errors[0xfb0a] = "Station Not Logged In" + errors[0xfb0b] = "Secret Store not running on this server, NCP Not supported" + + errors[0xfc00] = "The message queue cannot accept another message" + errors[0xfc01] = "The trustee associated with ObjectId does not exist" + errors[0xfc02] = "The specified bindery object does not exist" + errors[0xfc03] = "The bindery object associated with ObjectID does not exist" + errors[0xfc04] = "A bindery object does not exist that matches" + errors[0xfc05] = "The specified queue does not exist" + errors[0xfc06] = "No such object" + errors[0xfc07] = "The queue associated with ObjectID does not exist" + + errors[0xfd00] = "Bad station number" + errors[0xfd01] = "The connection associated with ConnectionNumber is not active" + errors[0xfd02] = "Lock collision" + errors[0xfd03] = "Transaction tracking is disabled" + + errors[0xfe00] = "I/O failure" + errors[0xfe01] = "The files containing the bindery on the file server are locked" + errors[0xfe02] = "A file with the specified name already exists in this directory" + errors[0xfe03] = "No more restrictions were found" + errors[0xfe04] = "The file server was unable to lock the file within the specified time limit" + errors[0xfe05] = "The file server was unable to lock all files within the specified time limit" + errors[0xfe06] = "The bindery object associated with ObjectID is not a valid trustee" + errors[0xfe07] = "Directory locked" + errors[0xfe08] = "Bindery locked" + errors[0xfe09] = "Invalid semaphore name length" + errors[0xfe0a] = "The file server was unable to complete the operation within the specified time limit" + errors[0xfe0b] = "Transaction restart" + errors[0xfe0c] = "Bad packet" + errors[0xfe0d] = "Timeout" + errors[0xfe0e] = "User Not Found" + errors[0xfe0f] = "Trustee Not Found" + + errors[0xff00] = "Failure" + errors[0xff01] = "Lock error" + errors[0xff02] = "File not found" + errors[0xff03] = "The file not found or cannot be unlocked" + errors[0xff04] = "Record not found" + errors[0xff05] = "The logical record was not found" + errors[0xff06] = "The printer associated with Printer Number does not exist" + errors[0xff07] = "No such printer" + errors[0xff08] = "Unable to complete the request" + errors[0xff09] = "Unauthorized to change privileges of this trustee" + errors[0xff0a] = "No files matching the search criteria were found" + errors[0xff0b] = "A file matching the search criteria was not found" + errors[0xff0c] = "Verification failed" + errors[0xff0d] = "Object associated with ObjectID is not a manager" + errors[0xff0e] = "Invalid initial semaphore value" + errors[0xff0f] = "The semaphore handle is not valid" + errors[0xff10] = "SemaphoreHandle is not associated with a valid sempahore" + errors[0xff11] = "Invalid semaphore handle" + errors[0xff12] = "Transaction tracking is not available" + errors[0xff13] = "The transaction has not yet been written to disk" + errors[0xff14] = "Directory already exists" + errors[0xff15] = "The file already exists and the deletion flag was not set" + errors[0xff16] = "No matching files or directories were found" + errors[0xff17] = "A file or directory matching the search criteria was not found" + errors[0xff18] = "The file already exists" + errors[0xff19] = "Failure, No files found" + errors[0xff1a] = "Unlock Error" + errors[0xff1b] = "I/O Bound Error" + errors[0xff1c] = "Not Accepting Messages" + errors[0xff1d] = "No More Salvageable Files in Directory" + errors[0xff1e] = "Calling Station is Not a Manager" + errors[0xff1f] = "Bindery Failure" + errors[0xff20] = "NCP Extension Not Found" + errors[0xff21] = "Audit Property Not Found" + errors[0xff22] = "Server Set Parameter Not Found" ############################################################################## # Produce C code ############################################################################## def ExamineVars(vars, structs_hash, vars_hash): - for var in vars: - if isinstance(var, struct): - structs_hash[var.HFName()] = var - struct_vars = var.Variables() - ExamineVars(struct_vars, structs_hash, vars_hash) - else: - vars_hash[repr(var)] = var - if isinstance(var, bitfield): - sub_vars = var.SubVariables() - ExamineVars(sub_vars, structs_hash, vars_hash) + for var in vars: + if isinstance(var, struct): + structs_hash[var.HFName()] = var + struct_vars = var.Variables() + ExamineVars(struct_vars, structs_hash, vars_hash) + else: + vars_hash[repr(var)] = var + if isinstance(var, bitfield): + sub_vars = var.SubVariables() + ExamineVars(sub_vars, structs_hash, vars_hash) def produce_code(): - global errors + global errors - print "/*" - print " * Do not modify this file. Changes will be overwritten." - print " * Generated automatically from %s" % (sys.argv[0]) - print " */\n" + print("/*") + print(" * Do not modify this file. Changes will be overwritten.") + print(" * Generated automatically from %s" % (sys.argv[0])) + print(" */\n") - print """ + print(""" /* * Portions Copyright (c) Gilbert Ramirez 2000-2002 * Portions Copyright (c) Novell, Inc. 2000-2005 @@ -5749,33 +5752,33 @@ static void ncp_postseq_cleanup(void); /* Endianness macros */ -#define BE 0 -#define LE 1 -#define NO_ENDIANNESS 0 +#define BE 0 +#define LE 1 +#define NO_ENDIANNESS 0 -#define NO_LENGTH -1 +#define NO_LENGTH -1 /* We use this int-pointer as a special flag in ptvc_record's */ static int ptvc_struct_int_storage; -#define PTVC_STRUCT (&ptvc_struct_int_storage) +#define PTVC_STRUCT (&ptvc_struct_int_storage) -/* Values used in the count-variable ("var"/"repeat") logic. */""" +/* Values used in the count-variable ("var"/"repeat") logic. */""") - if global_highest_var > -1: - print "#define NUM_REPEAT_VARS\t%d" % (global_highest_var + 1) - print "static guint repeat_vars[NUM_REPEAT_VARS];" - else: - print "#define NUM_REPEAT_VARS\t0" - print "static guint *repeat_vars = NULL;" + if global_highest_var > -1: + print("#define NUM_REPEAT_VARS\t%d" % (global_highest_var + 1)) + print("static guint repeat_vars[NUM_REPEAT_VARS];") + else: + print("#define NUM_REPEAT_VARS\t0") + print("static guint *repeat_vars = NULL;") - print """ -#define NO_VAR NUM_REPEAT_VARS -#define NO_REPEAT NUM_REPEAT_VARS + print(""" +#define NO_VAR NUM_REPEAT_VARS +#define NO_REPEAT NUM_REPEAT_VARS -#define REQ_COND_SIZE_CONSTANT 0 -#define REQ_COND_SIZE_VARIABLE 1 -#define NO_REQ_COND_SIZE 0 +#define REQ_COND_SIZE_CONSTANT 0 +#define REQ_COND_SIZE_VARIABLE 1 +#define NO_REQ_COND_SIZE 0 #define NTREE 0x00020000 @@ -6280,6266 +6283,6157 @@ static int hf_iter_other = -1; static int hf_nds_oid = -1; -""" +""") - # Look at all packet types in the packets collection, and cull information - # from them. - errors_used_list = [] - errors_used_hash = {} - groups_used_list = [] - groups_used_hash = {} - variables_used_hash = {} - structs_used_hash = {} - - for pkt in packets: - # Determine which error codes are used. - codes = pkt.CompletionCodes() - for code in codes.Records(): - if not errors_used_hash.has_key(code): - errors_used_hash[code] = len(errors_used_list) - errors_used_list.append(code) - - # Determine which groups are used. - group = pkt.Group() - if not groups_used_hash.has_key(group): - groups_used_hash[group] = len(groups_used_list) - groups_used_list.append(group) - - - - - # Determine which variables are used. - vars = pkt.Variables() - ExamineVars(vars, structs_used_hash, variables_used_hash) - - - # Print the hf variable declarations - sorted_vars = variables_used_hash.values() - sorted_vars.sort() - for var in sorted_vars: - print "static int " + var.HFName() + " = -1;" - - - # Print the value_string's - for var in sorted_vars: - if isinstance(var, val_string): - print "" - print var.Code() - - # Determine which error codes are not used - errors_not_used = {} - # Copy the keys from the error list... - for code in errors.keys(): - errors_not_used[code] = 1 - # ... and remove the ones that *were* used. - for code in errors_used_list: - del errors_not_used[code] - - # Print a remark showing errors not used - list_errors_not_used = errors_not_used.keys() - list_errors_not_used.sort() - for code in list_errors_not_used: - print "/* Error 0x%04x not used: %s */" % (code, errors[code]) - print "\n" - - # Print the errors table - print "/* Error strings. */" - print "static const char *ncp_errors[] = {" - for code in errors_used_list: - print '\t/* %02d (0x%04x) */ "%s",' % (errors_used_hash[code], code, errors[code]) - print "};\n" - - - - - # Determine which groups are not used - groups_not_used = {} - # Copy the keys from the group list... - for group in groups.keys(): - groups_not_used[group] = 1 - # ... and remove the ones that *were* used. - for group in groups_used_list: - del groups_not_used[group] - - # Print a remark showing groups not used - list_groups_not_used = groups_not_used.keys() - list_groups_not_used.sort() - for group in list_groups_not_used: - print "/* Group not used: %s = %s */" % (group, groups[group]) - print "\n" - - # Print the groups table - print "/* Group strings. */" - print "static const char *ncp_groups[] = {" - for group in groups_used_list: - print '\t/* %02d (%s) */ "%s",' % (groups_used_hash[group], group, groups[group]) - print "};\n" - - # Print the group macros - for group in groups_used_list: - name = string.upper(group) - print "#define NCP_GROUP_%s\t%d" % (name, groups_used_hash[group]) - print "\n" - - - # Print the conditional_records for all Request Conditions. - num = 0 - print "/* Request-Condition dfilter records. The NULL pointer" - print " is replaced by a pointer to the created dfilter_t. */" - if len(global_req_cond) == 0: - print "static conditional_record req_conds = NULL;" - else: - print "static conditional_record req_conds[] = {" - for req_cond in global_req_cond.keys(): - print "\t{ \"%s\", NULL }," % (req_cond,) - global_req_cond[req_cond] = num - num = num + 1 - print "};" - print "#define NUM_REQ_CONDS %d" % (num,) - print "#define NO_REQ_COND NUM_REQ_CONDS\n\n" - - - - # Print PTVC's for bitfields - ett_list = [] - print "/* PTVC records for bit-fields. */" - for var in sorted_vars: - if isinstance(var, bitfield): - sub_vars_ptvc = var.SubVariablesPTVC() - print "/* %s */" % (sub_vars_ptvc.Name()) - print sub_vars_ptvc.Code() - ett_list.append(sub_vars_ptvc.ETTName()) - - - # Print the PTVC's for structures - print "/* PTVC records for structs. */" - # Sort them - svhash = {} - for svar in structs_used_hash.values(): - svhash[svar.HFName()] = svar - if svar.descr: - ett_list.append(svar.ETTName()) - - struct_vars = svhash.keys() - struct_vars.sort() - for varname in struct_vars: - var = svhash[varname] - print var.Code() - - ett_list.sort() - - # Print regular PTVC's - print "/* PTVC records. These are re-used to save space. */" - for ptvc in ptvc_lists.Members(): - if not ptvc.Null() and not ptvc.Empty(): - print ptvc.Code() - - # Print error_equivalency tables - print "/* Error-Equivalency Tables. These are re-used to save space. */" - for compcodes in compcode_lists.Members(): - errors = compcodes.Records() - # Make sure the record for error = 0x00 comes last. - print "static const error_equivalency %s[] = {" % (compcodes.Name()) - for error in errors: - error_in_packet = error >> 8; - ncp_error_index = errors_used_hash[error] - print "\t{ 0x%02x, %d }, /* 0x%04x */" % (error_in_packet, - ncp_error_index, error) - print "\t{ 0x00, -1 }\n};\n" - - - - # Print integer arrays for all ncp_records that need - # a list of req_cond_indexes. Do it "uniquely" to save space; - # if multiple packets share the same set of req_cond's, - # then they'll share the same integer array - print "/* Request Condition Indexes */" - # First, make them unique - req_cond_collection = UniqueCollection("req_cond_collection") - for pkt in packets: - req_conds = pkt.CalculateReqConds() - if req_conds: - unique_list = req_cond_collection.Add(req_conds) - pkt.SetReqConds(unique_list) - else: - pkt.SetReqConds(None) - - # Print them - for req_cond in req_cond_collection.Members(): - print "static const int %s[] = {" % (req_cond.Name(),) - print "\t", - vals = [] - for text in req_cond.Records(): - vals.append(global_req_cond[text]) - vals.sort() - for val in vals: - print "%s, " % (val,), - - print "-1 };" - print "" - - - - # Functions without length parameter - funcs_without_length = {} - - # Print info string structures - print "/* Info Strings */" - for pkt in packets: - if pkt.req_info_str: - name = pkt.InfoStrName() + "_req" - var = pkt.req_info_str[0] - print "static const info_string_t %s = {" % (name,) - print "\t&%s," % (var.HFName(),) - print '\t"%s",' % (pkt.req_info_str[1],) - print '\t"%s"' % (pkt.req_info_str[2],) - print "};\n" - - - - # Print ncp_record packet records - print "#define SUBFUNC_WITH_LENGTH 0x02" - print "#define SUBFUNC_NO_LENGTH 0x01" - print "#define NO_SUBFUNC 0x00" - - print "/* ncp_record structs for packets */" - print "static const ncp_record ncp_packets[] = {" - for pkt in packets: - if pkt.HasSubFunction(): - func = pkt.FunctionCode('high') - if pkt.HasLength(): - subfunc_string = "SUBFUNC_WITH_LENGTH" - # Ensure that the function either has a length param or not - if funcs_without_length.has_key(func): - sys.exit("Function 0x%04x sometimes has length param, sometimes not." \ - % (pkt.FunctionCode(),)) - else: - subfunc_string = "SUBFUNC_NO_LENGTH" - funcs_without_length[func] = 1 - else: - subfunc_string = "NO_SUBFUNC" - print '\t{ 0x%02x, 0x%02x, %s, "%s",' % (pkt.FunctionCode('high'), - pkt.FunctionCode('low'), subfunc_string, pkt.Description()), - - print '\t%d /* %s */,' % (groups_used_hash[pkt.Group()], pkt.Group()) - - ptvc = pkt.PTVCRequest() - if not ptvc.Null() and not ptvc.Empty(): - ptvc_request = ptvc.Name() - else: - ptvc_request = 'NULL' - - ptvc = pkt.PTVCReply() - if not ptvc.Null() and not ptvc.Empty(): - ptvc_reply = ptvc.Name() - else: - ptvc_reply = 'NULL' - - errors = pkt.CompletionCodes() - - req_conds_obj = pkt.GetReqConds() - if req_conds_obj: - req_conds = req_conds_obj.Name() - else: - req_conds = "NULL" - - if not req_conds_obj: - req_cond_size = "NO_REQ_COND_SIZE" - else: - req_cond_size = pkt.ReqCondSize() - if req_cond_size == None: - msg.write("NCP packet %s needs a ReqCondSize*() call\n" \ - % (pkt.CName(),)) - sys.exit(1) - - if pkt.req_info_str: - req_info_str = "&" + pkt.InfoStrName() + "_req" - else: - req_info_str = "NULL" - - print '\t\t%s, %s, %s, %s, %s, %s },\n' % \ - (ptvc_request, ptvc_reply, errors.Name(), req_conds, - req_cond_size, req_info_str) - - print '\t{ 0, 0, 0, NULL, 0, NULL, NULL, NULL, NULL, NO_REQ_COND_SIZE, NULL }' - print "};\n" - - print "/* ncp funcs that require a subfunc */" - print "static const guint8 ncp_func_requires_subfunc[] = {" - hi_seen = {} - for pkt in packets: - if pkt.HasSubFunction(): - hi_func = pkt.FunctionCode('high') - if not hi_seen.has_key(hi_func): - print "\t0x%02x," % (hi_func) - hi_seen[hi_func] = 1 - print "\t0" - print "};\n" - - - print "/* ncp funcs that have no length parameter */" - print "static const guint8 ncp_func_has_no_length_parameter[] = {" - funcs = funcs_without_length.keys() - funcs.sort() - for func in funcs: - print "\t0x%02x," % (func,) - print "\t0" - print "};\n" + # Look at all packet types in the packets collection, and cull information + # from them. + errors_used_list = [] + errors_used_hash = {} + groups_used_list = [] + groups_used_hash = {} + variables_used_hash = {} + structs_used_hash = {} + + for pkt in packets: + # Determine which error codes are used. + codes = pkt.CompletionCodes() + for code in codes.Records(): + if code not in errors_used_hash: + errors_used_hash[code] = len(errors_used_list) + errors_used_list.append(code) + + # Determine which groups are used. + group = pkt.Group() + if group not in groups_used_hash: + groups_used_hash[group] = len(groups_used_list) + groups_used_list.append(group) + + + + + # Determine which variables are used. + vars = pkt.Variables() + ExamineVars(vars, structs_used_hash, variables_used_hash) + + + # Print the hf variable declarations + sorted_vars = list(variables_used_hash.values()) + sorted_vars.sort() + for var in sorted_vars: + print("static int " + var.HFName() + " = -1;") + + + # Print the value_string's + for var in sorted_vars: + if isinstance(var, val_string): + print("") + print(var.Code()) + + # Determine which error codes are not used + errors_not_used = {} + # Copy the keys from the error list... + for code in list(errors.keys()): + errors_not_used[code] = 1 + # ... and remove the ones that *were* used. + for code in errors_used_list: + del errors_not_used[code] + + # Print a remark showing errors not used + list_errors_not_used = list(errors_not_used.keys()) + list_errors_not_used.sort() + for code in list_errors_not_used: + print("/* Error 0x%04x not used: %s */" % (code, errors[code])) + print("\n") + + # Print the errors table + print("/* Error strings. */") + print("static const char *ncp_errors[] = {") + for code in errors_used_list: + print('\t/* %02d (0x%04x) */ "%s",' % (errors_used_hash[code], code, errors[code])) + print("};\n") + + + + + # Determine which groups are not used + groups_not_used = {} + # Copy the keys from the group list... + for group in list(groups.keys()): + groups_not_used[group] = 1 + # ... and remove the ones that *were* used. + for group in groups_used_list: + del groups_not_used[group] + + # Print a remark showing groups not used + list_groups_not_used = list(groups_not_used.keys()) + list_groups_not_used.sort() + for group in list_groups_not_used: + print("/* Group not used: %s = %s */" % (group, groups[group])) + print("\n") + + # Print the groups table + print("/* Group strings. */") + print("static const char *ncp_groups[] = {") + for group in groups_used_list: + print('\t/* %02d (%s) */ "%s",' % (groups_used_hash[group], group, groups[group])) + print("};\n") + + # Print the group macros + for group in groups_used_list: + name = str.upper(group) + print("#define NCP_GROUP_%s\t%d" % (name, groups_used_hash[group])) + print("\n") + + + # Print the conditional_records for all Request Conditions. + num = 0 + print("/* Request-Condition dfilter records. The NULL pointer") + print(" is replaced by a pointer to the created dfilter_t. */") + if len(global_req_cond) == 0: + print("static conditional_record req_conds = NULL;") + else: + print("static conditional_record req_conds[] = {") + req_cond_l = list(global_req_cond.keys()) + req_cond_l.sort() + for req_cond in req_cond_l: + print("\t{ \"%s\", NULL }," % (req_cond,)) + global_req_cond[req_cond] = num + num = num + 1 + print("};") + print("#define NUM_REQ_CONDS %d" % (num,)) + print("#define NO_REQ_COND NUM_REQ_CONDS\n\n") + + + + # Print PTVC's for bitfields + ett_list = [] + print("/* PTVC records for bit-fields. */") + for var in sorted_vars: + if isinstance(var, bitfield): + sub_vars_ptvc = var.SubVariablesPTVC() + print("/* %s */" % (sub_vars_ptvc.Name())) + print(sub_vars_ptvc.Code()) + ett_list.append(sub_vars_ptvc.ETTName()) + + + # Print the PTVC's for structures + print("/* PTVC records for structs. */") + # Sort them + svhash = {} + for svar in list(structs_used_hash.values()): + svhash[svar.HFName()] = svar + if svar.descr: + ett_list.append(svar.ETTName()) + + struct_vars = list(svhash.keys()) + struct_vars.sort() + for varname in struct_vars: + var = svhash[varname] + print(var.Code()) + + ett_list.sort() + + # Print regular PTVC's + print("/* PTVC records. These are re-used to save space. */") + for ptvc in ptvc_lists.Members(): + if not ptvc.Null() and not ptvc.Empty(): + print(ptvc.Code()) + + # Print error_equivalency tables + print("/* Error-Equivalency Tables. These are re-used to save space. */") + for compcodes in compcode_lists.Members(): + errors = compcodes.Records() + # Make sure the record for error = 0x00 comes last. + print("static const error_equivalency %s[] = {" % (compcodes.Name())) + for error in errors: + error_in_packet = error >> 8; + ncp_error_index = errors_used_hash[error] + print("\t{ 0x%02x, %d }, /* 0x%04x */" % (error_in_packet, + ncp_error_index, error)) + print("\t{ 0x00, -1 }\n};\n") + + + + # Print integer arrays for all ncp_records that need + # a list of req_cond_indexes. Do it "uniquely" to save space; + # if multiple packets share the same set of req_cond's, + # then they'll share the same integer array + print("/* Request Condition Indexes */") + # First, make them unique + req_cond_collection = UniqueCollection("req_cond_collection") + for pkt in packets: + req_conds = pkt.CalculateReqConds() + if req_conds: + unique_list = req_cond_collection.Add(req_conds) + pkt.SetReqConds(unique_list) + else: + pkt.SetReqConds(None) + + # Print them + for req_cond in req_cond_collection.Members(): + sys.stdout.write("static const int %s[] = {" % (req_cond.Name())) + sys.stdout.write("\t") + vals = [] + for text in req_cond.Records(): + vals.append(global_req_cond[text]) + vals.sort() + for val in vals: + sys.stdout.write("%s, " % (val,)) + + print("-1 };") + print("") + + + + # Functions without length parameter + funcs_without_length = {} + + # Print info string structures + print("/* Info Strings */") + for pkt in packets: + if pkt.req_info_str: + name = pkt.InfoStrName() + "_req" + var = pkt.req_info_str[0] + print("static const info_string_t %s = {" % (name,)) + print("\t&%s," % (var.HFName(),)) + print('\t"%s",' % (pkt.req_info_str[1],)) + print('\t"%s"' % (pkt.req_info_str[2],)) + print("};\n") + + + + # Print ncp_record packet records + print("#define SUBFUNC_WITH_LENGTH 0x02") + print("#define SUBFUNC_NO_LENGTH 0x01") + print("#define NO_SUBFUNC 0x00") + + print("/* ncp_record structs for packets */") + print("static const ncp_record ncp_packets[] = {") + for pkt in packets: + if pkt.HasSubFunction(): + func = pkt.FunctionCode('high') + if pkt.HasLength(): + subfunc_string = "SUBFUNC_WITH_LENGTH" + # Ensure that the function either has a length param or not + if func in funcs_without_length: + sys.exit("Function 0x%04x sometimes has length param, sometimes not." \ + % (pkt.FunctionCode(),)) + else: + subfunc_string = "SUBFUNC_NO_LENGTH" + funcs_without_length[func] = 1 + else: + subfunc_string = "NO_SUBFUNC" + sys.stdout.write('\t{ 0x%02x, 0x%02x, %s, "%s",' % (pkt.FunctionCode('high'), + pkt.FunctionCode('low'), subfunc_string, pkt.Description())) + + print('\t%d /* %s */,' % (groups_used_hash[pkt.Group()], pkt.Group())) + + ptvc = pkt.PTVCRequest() + if not ptvc.Null() and not ptvc.Empty(): + ptvc_request = ptvc.Name() + else: + ptvc_request = 'NULL' + + ptvc = pkt.PTVCReply() + if not ptvc.Null() and not ptvc.Empty(): + ptvc_reply = ptvc.Name() + else: + ptvc_reply = 'NULL' + + errors = pkt.CompletionCodes() + + req_conds_obj = pkt.GetReqConds() + if req_conds_obj: + req_conds = req_conds_obj.Name() + else: + req_conds = "NULL" + + if not req_conds_obj: + req_cond_size = "NO_REQ_COND_SIZE" + else: + req_cond_size = pkt.ReqCondSize() + if req_cond_size == None: + msg.write("NCP packet %s needs a ReqCondSize*() call\n" \ + % (pkt.CName(),)) + sys.exit(1) + + if pkt.req_info_str: + req_info_str = "&" + pkt.InfoStrName() + "_req" + else: + req_info_str = "NULL" + + print('\t\t%s, %s, %s, %s, %s, %s },\n' % \ + (ptvc_request, ptvc_reply, errors.Name(), req_conds, + req_cond_size, req_info_str)) + + print('\t{ 0, 0, 0, NULL, 0, NULL, NULL, NULL, NULL, NO_REQ_COND_SIZE, NULL }') + print("};\n") + + print("/* ncp funcs that require a subfunc */") + print("static const guint8 ncp_func_requires_subfunc[] = {") + hi_seen = {} + for pkt in packets: + if pkt.HasSubFunction(): + hi_func = pkt.FunctionCode('high') + if hi_func not in hi_seen: + print("\t0x%02x," % (hi_func)) + hi_seen[hi_func] = 1 + print("\t0") + print("};\n") + + + print("/* ncp funcs that have no length parameter */") + print("static const guint8 ncp_func_has_no_length_parameter[] = {") + funcs = list(funcs_without_length.keys()) + funcs.sort() + for func in funcs: + print("\t0x%02x," % (func,)) + print("\t0") + print("};\n") - print "" + print("") - # proto_register_ncp2222() - print """ + # proto_register_ncp2222() + print(""" static const value_string ncp_nds_verb_vals[] = { - { 1, "Resolve Name" }, - { 2, "Read Entry Information" }, - { 3, "Read" }, - { 4, "Compare" }, - { 5, "List" }, - { 6, "Search Entries" }, - { 7, "Add Entry" }, - { 8, "Remove Entry" }, - { 9, "Modify Entry" }, - { 10, "Modify RDN" }, - { 11, "Create Attribute" }, - { 12, "Read Attribute Definition" }, - { 13, "Remove Attribute Definition" }, - { 14, "Define Class" }, - { 15, "Read Class Definition " }, - { 16, "Modify Class Definition" }, - { 17, "Remove Class Definition" }, - { 18, "List Containable Classes" }, - { 19, "Get Effective Rights" }, - { 20, "Add Partition" }, - { 21, "Remove Partition" }, - { 22, "List Partitions" }, - { 23, "Split Partition" }, - { 24, "Join Partitions" }, - { 25, "Add Replica" }, - { 26, "Remove Replica" }, - { 27, "Open Stream" }, - { 28, "Search Filter" }, - { 29, "Create Subordinate Reference" }, - { 30, "Link Replica" }, - { 31, "Change Replica Type" }, - { 32, "Start Update Schema" }, - { 33, "End Update Schema" }, - { 34, "Update Schema" }, - { 35, "Start Update Replica" }, - { 36, "End Update Replica" }, - { 37, "Update Replica" }, - { 38, "Synchronize Partition" }, - { 39, "Synchronize Schema" }, - { 40, "Read Syntaxes" }, - { 41, "Get Replica Root ID" }, - { 42, "Begin Move Entry" }, - { 43, "Finish Move Entry" }, - { 44, "Release Moved Entry" }, - { 45, "Backup Entry" }, - { 46, "Restore Entry" }, - { 47, "Save DIB (Obsolete)" }, - { 48, "Control" }, - { 49, "Remove Backlink" }, - { 50, "Close Iteration" }, - { 51, "Mutate Entry" }, - { 52, "Audit Skulking" }, - { 53, "Get Server Address" }, - { 54, "Set Keys" }, - { 55, "Change Password" }, - { 56, "Verify Password" }, - { 57, "Begin Login" }, - { 58, "Finish Login" }, - { 59, "Begin Authentication" }, - { 60, "Finish Authentication" }, - { 61, "Logout" }, - { 62, "Repair Ring (Obsolete)" }, - { 63, "Repair Timestamps" }, - { 64, "Create Back Link" }, - { 65, "Delete External Reference" }, - { 66, "Rename External Reference" }, - { 67, "Create Queue Entry Directory" }, - { 68, "Remove Queue Entry Directory" }, - { 69, "Merge Entries" }, - { 70, "Change Tree Name" }, - { 71, "Partition Entry Count" }, - { 72, "Check Login Restrictions" }, - { 73, "Start Join" }, - { 74, "Low Level Split" }, - { 75, "Low Level Join" }, - { 76, "Abort Partition Operation" }, - { 77, "Get All Servers" }, - { 78, "Partition Function" }, - { 79, "Read References" }, - { 80, "Inspect Entry" }, - { 81, "Get Remote Entry ID" }, - { 82, "Change Security" }, - { 83, "Check Console Operator" }, - { 84, "Start Move Tree" }, - { 85, "Move Tree" }, - { 86, "End Move Tree" }, - { 87, "Low Level Abort Join" }, - { 88, "Check Security Equivalence" }, - { 89, "Merge Tree" }, - { 90, "Sync External Reference" }, - { 91, "Resend Entry" }, - { 92, "New Schema Epoch" }, - { 93, "Statistics" }, - { 94, "Ping" }, - { 95, "Get Bindery Contexts" }, - { 96, "Monitor Connection" }, - { 97, "Get DS Statistics" }, - { 98, "Reset DS Counters" }, - { 99, "Console" }, - { 100, "Read Stream" }, - { 101, "Write Stream" }, - { 102, "Create Orphan Partition" }, - { 103, "Remove Orphan Partition" }, - { 104, "Link Orphan Partition" }, - { 105, "Set Distributed Reference Link (DRL)" }, - { 106, "Available" }, - { 107, "Available" }, - { 108, "Verify Distributed Reference Link (DRL)" }, - { 109, "Verify Partition" }, - { 110, "Iterator" }, - { 111, "Available" }, - { 112, "Close Stream" }, - { 113, "Available" }, - { 114, "Read Status" }, - { 115, "Partition Sync Status" }, - { 116, "Read Reference Data" }, - { 117, "Write Reference Data" }, - { 118, "Resource Event" }, - { 119, "DIB Request (obsolete)" }, - { 120, "Set Replication Filter" }, - { 121, "Get Replication Filter" }, - { 122, "Change Attribute Definition" }, - { 123, "Schema in Use" }, - { 124, "Remove Keys" }, - { 125, "Clone" }, - { 126, "Multiple Operations Transaction" }, - { 240, "Ping" }, - { 255, "EDirectory Call" }, - { 0, NULL } + { 1, "Resolve Name" }, + { 2, "Read Entry Information" }, + { 3, "Read" }, + { 4, "Compare" }, + { 5, "List" }, + { 6, "Search Entries" }, + { 7, "Add Entry" }, + { 8, "Remove Entry" }, + { 9, "Modify Entry" }, + { 10, "Modify RDN" }, + { 11, "Create Attribute" }, + { 12, "Read Attribute Definition" }, + { 13, "Remove Attribute Definition" }, + { 14, "Define Class" }, + { 15, "Read Class Definition " }, + { 16, "Modify Class Definition" }, + { 17, "Remove Class Definition" }, + { 18, "List Containable Classes" }, + { 19, "Get Effective Rights" }, + { 20, "Add Partition" }, + { 21, "Remove Partition" }, + { 22, "List Partitions" }, + { 23, "Split Partition" }, + { 24, "Join Partitions" }, + { 25, "Add Replica" }, + { 26, "Remove Replica" }, + { 27, "Open Stream" }, + { 28, "Search Filter" }, + { 29, "Create Subordinate Reference" }, + { 30, "Link Replica" }, + { 31, "Change Replica Type" }, + { 32, "Start Update Schema" }, + { 33, "End Update Schema" }, + { 34, "Update Schema" }, + { 35, "Start Update Replica" }, + { 36, "End Update Replica" }, + { 37, "Update Replica" }, + { 38, "Synchronize Partition" }, + { 39, "Synchronize Schema" }, + { 40, "Read Syntaxes" }, + { 41, "Get Replica Root ID" }, + { 42, "Begin Move Entry" }, + { 43, "Finish Move Entry" }, + { 44, "Release Moved Entry" }, + { 45, "Backup Entry" }, + { 46, "Restore Entry" }, + { 47, "Save DIB (Obsolete)" }, + { 48, "Control" }, + { 49, "Remove Backlink" }, + { 50, "Close Iteration" }, + { 51, "Mutate Entry" }, + { 52, "Audit Skulking" }, + { 53, "Get Server Address" }, + { 54, "Set Keys" }, + { 55, "Change Password" }, + { 56, "Verify Password" }, + { 57, "Begin Login" }, + { 58, "Finish Login" }, + { 59, "Begin Authentication" }, + { 60, "Finish Authentication" }, + { 61, "Logout" }, + { 62, "Repair Ring (Obsolete)" }, + { 63, "Repair Timestamps" }, + { 64, "Create Back Link" }, + { 65, "Delete External Reference" }, + { 66, "Rename External Reference" }, + { 67, "Create Queue Entry Directory" }, + { 68, "Remove Queue Entry Directory" }, + { 69, "Merge Entries" }, + { 70, "Change Tree Name" }, + { 71, "Partition Entry Count" }, + { 72, "Check Login Restrictions" }, + { 73, "Start Join" }, + { 74, "Low Level Split" }, + { 75, "Low Level Join" }, + { 76, "Abort Partition Operation" }, + { 77, "Get All Servers" }, + { 78, "Partition Function" }, + { 79, "Read References" }, + { 80, "Inspect Entry" }, + { 81, "Get Remote Entry ID" }, + { 82, "Change Security" }, + { 83, "Check Console Operator" }, + { 84, "Start Move Tree" }, + { 85, "Move Tree" }, + { 86, "End Move Tree" }, + { 87, "Low Level Abort Join" }, + { 88, "Check Security Equivalence" }, + { 89, "Merge Tree" }, + { 90, "Sync External Reference" }, + { 91, "Resend Entry" }, + { 92, "New Schema Epoch" }, + { 93, "Statistics" }, + { 94, "Ping" }, + { 95, "Get Bindery Contexts" }, + { 96, "Monitor Connection" }, + { 97, "Get DS Statistics" }, + { 98, "Reset DS Counters" }, + { 99, "Console" }, + { 100, "Read Stream" }, + { 101, "Write Stream" }, + { 102, "Create Orphan Partition" }, + { 103, "Remove Orphan Partition" }, + { 104, "Link Orphan Partition" }, + { 105, "Set Distributed Reference Link (DRL)" }, + { 106, "Available" }, + { 107, "Available" }, + { 108, "Verify Distributed Reference Link (DRL)" }, + { 109, "Verify Partition" }, + { 110, "Iterator" }, + { 111, "Available" }, + { 112, "Close Stream" }, + { 113, "Available" }, + { 114, "Read Status" }, + { 115, "Partition Sync Status" }, + { 116, "Read Reference Data" }, + { 117, "Write Reference Data" }, + { 118, "Resource Event" }, + { 119, "DIB Request (obsolete)" }, + { 120, "Set Replication Filter" }, + { 121, "Get Replication Filter" }, + { 122, "Change Attribute Definition" }, + { 123, "Schema in Use" }, + { 124, "Remove Keys" }, + { 125, "Clone" }, + { 126, "Multiple Operations Transaction" }, + { 240, "Ping" }, + { 255, "EDirectory Call" }, + { 0, NULL } }; static const value_string connection_status_vals[] = { - { 0x00, "Ok" }, - { 0x01, "Bad Service Connection" }, - { 0x10, "File Server is Down" }, - { 0x40, "Broadcast Message Pending" }, - { 0, NULL } + { 0x00, "Ok" }, + { 0x01, "Bad Service Connection" }, + { 0x10, "File Server is Down" }, + { 0x40, "Broadcast Message Pending" }, + { 0, NULL } }; void proto_register_ncp2222(void) { - static hf_register_info hf[] = { - { &hf_ncp_func, - { "Function", "ncp.func", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + static hf_register_info hf[] = { + { &hf_ncp_func, + { "Function", "ncp.func", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_length, - { "Packet Length", "ncp.length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_length, + { "Packet Length", "ncp.length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_subfunc, - { "SubFunction", "ncp.subfunc", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_subfunc, + { "SubFunction", "ncp.subfunc", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_completion_code, - { "Completion Code", "ncp.completion_code", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_completion_code, + { "Completion Code", "ncp.completion_code", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_group, - { "NCP Group Type", "ncp.group", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_group, + { "NCP Group Type", "ncp.group", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_fragment_handle, - { "NDS Fragment Handle", "ncp.ndsfrag", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_fragment_handle, + { "NDS Fragment Handle", "ncp.ndsfrag", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_fragment_size, - { "NDS Fragment Size", "ncp.ndsfragsize", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_fragment_size, + { "NDS Fragment Size", "ncp.ndsfragsize", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_message_size, - { "Message Size", "ncp.ndsmessagesize", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_message_size, + { "Message Size", "ncp.ndsmessagesize", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_nds_flag, - { "Flags", "ncp.ndsflag", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_nds_flag, + { "Flags", "ncp.ndsflag", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_nds_verb, - { "NDS Verb", "ncp.ndsverb", FT_UINT8, BASE_HEX, VALS(ncp_nds_verb_vals), 0x0, NULL, HFILL }}, + { &hf_ncp_nds_verb, + { "NDS Verb", "ncp.ndsverb", FT_UINT8, BASE_HEX, VALS(ncp_nds_verb_vals), 0x0, NULL, HFILL }}, - { &hf_ping_version, - { "NDS Version", "ncp.ping_version", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_ping_version, + { "NDS Version", "ncp.ping_version", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, #if 0 /* Unused ? */ - { &hf_nds_version, - { "NDS Version", "ncp.nds_version", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_version, + { "NDS Version", "ncp.nds_version", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, #endif - { &hf_nds_tree_name, - { "Tree Name", "ncp.nds_tree_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_tree_name, + { "Tree Name", "ncp.nds_tree_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - /* - * XXX - the page at - * - * http://www.odyssea.com/whats_new/tcpipnet/tcpipnet.html - * - * says of the connection status "The Connection Code field may - * contain values that indicate the status of the client host to - * server connection. A value of 1 in the fourth bit of this data - * byte indicates that the server is unavailable (server was - * downed). - * - * The page at - * - * http://www.unm.edu/~network/presentations/course/appendix/appendix_f/tsld088.htm - * - * says that bit 0 is "bad service", bit 2 is "no connection - * available", bit 4 is "service down", and bit 6 is "server - * has a broadcast message waiting for the client". - * - * Should it be displayed in hex, and should those bits (and any - * other bits with significance) be displayed as bitfields - * underneath it? - */ - { &hf_ncp_connection_status, - { "Connection Status", "ncp.connection_status", FT_UINT8, BASE_DEC, VALS(connection_status_vals), 0x0, NULL, HFILL }}, + /* + * XXX - the page at + * + * http://www.odyssea.com/whats_new/tcpipnet/tcpipnet.html + * + * says of the connection status "The Connection Code field may + * contain values that indicate the status of the client host to + * server connection. A value of 1 in the fourth bit of this data + * byte indicates that the server is unavailable (server was + * downed). + * + * The page at + * + * http://www.unm.edu/~network/presentations/course/appendix/appendix_f/tsld088.htm + * + * says that bit 0 is "bad service", bit 2 is "no connection + * available", bit 4 is "service down", and bit 6 is "server + * has a broadcast message waiting for the client". + * + * Should it be displayed in hex, and should those bits (and any + * other bits with significance) be displayed as bitfields + * underneath it? + */ + { &hf_ncp_connection_status, + { "Connection Status", "ncp.connection_status", FT_UINT8, BASE_DEC, VALS(connection_status_vals), 0x0, NULL, HFILL }}, - { &hf_ncp_req_frame_num, - { "Response to Request in Frame Number", "ncp.req_frame_num", FT_FRAMENUM, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_req_frame_num, + { "Response to Request in Frame Number", "ncp.req_frame_num", FT_FRAMENUM, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_req_frame_time, - { "Time from Request", "ncp.time", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, "Time between request and response in seconds", HFILL }}, + { &hf_ncp_req_frame_time, + { "Time from Request", "ncp.time", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, "Time between request and response in seconds", HFILL }}, #if 0 /* Unused ? */ - { &hf_nds_flags, - { "NDS Return Flags", "ncp.nds_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_flags, + { "NDS Return Flags", "ncp.nds_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, #endif - { &hf_nds_reply_depth, - { "Distance from Root", "ncp.ndsdepth", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_reply_depth, + { "Distance from Root", "ncp.ndsdepth", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_reply_rev, - { "NDS Revision", "ncp.ndsrev", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_reply_rev, + { "NDS Revision", "ncp.ndsrev", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_reply_flags, - { "Flags", "ncp.ndsflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_reply_flags, + { "Flags", "ncp.ndsflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_p1type, - { "NDS Parameter Type", "ncp.p1type", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_p1type, + { "NDS Parameter Type", "ncp.p1type", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_uint32value, - { "NDS Value", "ncp.uint32value", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_uint32value, + { "NDS Value", "ncp.uint32value", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_bit1, - { "Typeless", "ncp.nds_bit1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_nds_bit1, + { "Typeless", "ncp.nds_bit1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_nds_bit2, - { "All Containers", "ncp.nds_bit2", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_nds_bit2, + { "All Containers", "ncp.nds_bit2", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_nds_bit3, - { "Slashed", "ncp.nds_bit3", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_nds_bit3, + { "Slashed", "ncp.nds_bit3", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_nds_bit4, - { "Dotted", "ncp.nds_bit4", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_nds_bit4, + { "Dotted", "ncp.nds_bit4", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_nds_bit5, - { "Tuned", "ncp.nds_bit5", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_nds_bit5, + { "Tuned", "ncp.nds_bit5", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_nds_bit6, - { "Not Defined", "ncp.nds_bit6", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_nds_bit6, + { "Not Defined", "ncp.nds_bit6", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_nds_bit7, - { "Not Defined", "ncp.nds_bit7", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_nds_bit7, + { "Not Defined", "ncp.nds_bit7", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_nds_bit8, - { "Not Defined", "ncp.nds_bit8", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_nds_bit8, + { "Not Defined", "ncp.nds_bit8", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_nds_bit9, - { "Not Defined", "ncp.nds_bit9", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_nds_bit9, + { "Not Defined", "ncp.nds_bit9", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_nds_bit10, - { "Not Defined", "ncp.nds_bit10", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_nds_bit10, + { "Not Defined", "ncp.nds_bit10", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_nds_bit11, - { "Not Defined", "ncp.nds_bit11", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_nds_bit11, + { "Not Defined", "ncp.nds_bit11", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_nds_bit12, - { "Not Defined", "ncp.nds_bit12", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_nds_bit12, + { "Not Defined", "ncp.nds_bit12", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_nds_bit13, - { "Not Defined", "ncp.nds_bit13", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_nds_bit13, + { "Not Defined", "ncp.nds_bit13", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_nds_bit14, - { "Not Defined", "ncp.nds_bit14", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_nds_bit14, + { "Not Defined", "ncp.nds_bit14", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_nds_bit15, - { "Not Defined", "ncp.nds_bit15", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_nds_bit15, + { "Not Defined", "ncp.nds_bit15", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_nds_bit16, - { "Not Defined", "ncp.nds_bit16", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_nds_bit16, + { "Not Defined", "ncp.nds_bit16", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1outflags, - { "Output Flags", "ncp.bit1outflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1outflags, + { "Output Flags", "ncp.bit1outflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2outflags, - { "Entry ID", "ncp.bit2outflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2outflags, + { "Entry ID", "ncp.bit2outflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3outflags, - { "Replica State", "ncp.bit3outflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3outflags, + { "Replica State", "ncp.bit3outflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4outflags, - { "Modification Timestamp", "ncp.bit4outflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4outflags, + { "Modification Timestamp", "ncp.bit4outflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5outflags, - { "Purge Time", "ncp.bit5outflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5outflags, + { "Purge Time", "ncp.bit5outflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6outflags, - { "Local Partition ID", "ncp.bit6outflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6outflags, + { "Local Partition ID", "ncp.bit6outflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7outflags, - { "Distinguished Name", "ncp.bit7outflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7outflags, + { "Distinguished Name", "ncp.bit7outflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8outflags, - { "Replica Type", "ncp.bit8outflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8outflags, + { "Replica Type", "ncp.bit8outflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9outflags, - { "Partition Busy", "ncp.bit9outflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9outflags, + { "Partition Busy", "ncp.bit9outflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10outflags, - { "Not Defined", "ncp.bit10outflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10outflags, + { "Not Defined", "ncp.bit10outflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11outflags, - { "Not Defined", "ncp.bit11outflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11outflags, + { "Not Defined", "ncp.bit11outflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12outflags, - { "Not Defined", "ncp.bit12outflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12outflags, + { "Not Defined", "ncp.bit12outflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13outflags, - { "Not Defined", "ncp.bit13outflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13outflags, + { "Not Defined", "ncp.bit13outflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14outflags, - { "Not Defined", "ncp.bit14outflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14outflags, + { "Not Defined", "ncp.bit14outflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15outflags, - { "Not Defined", "ncp.bit15outflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15outflags, + { "Not Defined", "ncp.bit15outflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16outflags, - { "Not Defined", "ncp.bit16outflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16outflags, + { "Not Defined", "ncp.bit16outflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1nflags, - { "Entry ID", "ncp.bit1nflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1nflags, + { "Entry ID", "ncp.bit1nflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2nflags, - { "Readable", "ncp.bit2nflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2nflags, + { "Readable", "ncp.bit2nflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3nflags, - { "Writeable", "ncp.bit3nflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3nflags, + { "Writeable", "ncp.bit3nflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4nflags, - { "Master", "ncp.bit4nflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4nflags, + { "Master", "ncp.bit4nflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5nflags, - { "Create ID", "ncp.bit5nflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5nflags, + { "Create ID", "ncp.bit5nflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6nflags, - { "Walk Tree", "ncp.bit6nflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6nflags, + { "Walk Tree", "ncp.bit6nflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7nflags, - { "Dereference Alias", "ncp.bit7nflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7nflags, + { "Dereference Alias", "ncp.bit7nflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8nflags, - { "Not Defined", "ncp.bit8nflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8nflags, + { "Not Defined", "ncp.bit8nflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9nflags, - { "Not Defined", "ncp.bit9nflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9nflags, + { "Not Defined", "ncp.bit9nflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10nflags, - { "Not Defined", "ncp.bit10nflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10nflags, + { "Not Defined", "ncp.bit10nflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11nflags, - { "Not Defined", "ncp.bit11nflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11nflags, + { "Not Defined", "ncp.bit11nflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12nflags, - { "Not Defined", "ncp.bit12nflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12nflags, + { "Not Defined", "ncp.bit12nflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13nflags, - { "Not Defined", "ncp.bit13nflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13nflags, + { "Not Defined", "ncp.bit13nflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14nflags, - { "Prefer Referrals", "ncp.bit14nflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14nflags, + { "Prefer Referrals", "ncp.bit14nflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15nflags, - { "Prefer Only Referrals", "ncp.bit15nflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15nflags, + { "Prefer Only Referrals", "ncp.bit15nflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16nflags, - { "Not Defined", "ncp.bit16nflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16nflags, + { "Not Defined", "ncp.bit16nflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1rflags, - { "Typeless", "ncp.bit1rflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1rflags, + { "Typeless", "ncp.bit1rflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2rflags, - { "Slashed", "ncp.bit2rflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2rflags, + { "Slashed", "ncp.bit2rflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3rflags, - { "Dotted", "ncp.bit3rflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3rflags, + { "Dotted", "ncp.bit3rflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4rflags, - { "Tuned", "ncp.bit4rflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4rflags, + { "Tuned", "ncp.bit4rflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5rflags, - { "Not Defined", "ncp.bit5rflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5rflags, + { "Not Defined", "ncp.bit5rflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6rflags, - { "Not Defined", "ncp.bit6rflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6rflags, + { "Not Defined", "ncp.bit6rflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7rflags, - { "Not Defined", "ncp.bit7rflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7rflags, + { "Not Defined", "ncp.bit7rflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8rflags, - { "Not Defined", "ncp.bit8rflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8rflags, + { "Not Defined", "ncp.bit8rflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9rflags, - { "Not Defined", "ncp.bit9rflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9rflags, + { "Not Defined", "ncp.bit9rflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10rflags, - { "Not Defined", "ncp.bit10rflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10rflags, + { "Not Defined", "ncp.bit10rflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11rflags, - { "Not Defined", "ncp.bit11rflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11rflags, + { "Not Defined", "ncp.bit11rflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12rflags, - { "Not Defined", "ncp.bit12rflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12rflags, + { "Not Defined", "ncp.bit12rflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13rflags, - { "Not Defined", "ncp.bit13rflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13rflags, + { "Not Defined", "ncp.bit13rflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14rflags, - { "Not Defined", "ncp.bit14rflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14rflags, + { "Not Defined", "ncp.bit14rflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15rflags, - { "Not Defined", "ncp.bit15rflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15rflags, + { "Not Defined", "ncp.bit15rflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16rflags, - { "Not Defined", "ncp.bit16rflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16rflags, + { "Not Defined", "ncp.bit16rflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1eflags, - { "Alias Entry", "ncp.bit1eflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1eflags, + { "Alias Entry", "ncp.bit1eflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2eflags, - { "Partition Root", "ncp.bit2eflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2eflags, + { "Partition Root", "ncp.bit2eflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3eflags, - { "Container Entry", "ncp.bit3eflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3eflags, + { "Container Entry", "ncp.bit3eflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4eflags, - { "Container Alias", "ncp.bit4eflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4eflags, + { "Container Alias", "ncp.bit4eflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5eflags, - { "Matches List Filter", "ncp.bit5eflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5eflags, + { "Matches List Filter", "ncp.bit5eflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6eflags, - { "Reference Entry", "ncp.bit6eflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6eflags, + { "Reference Entry", "ncp.bit6eflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7eflags, - { "40x Reference Entry", "ncp.bit7eflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7eflags, + { "40x Reference Entry", "ncp.bit7eflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8eflags, - { "Back Linked", "ncp.bit8eflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8eflags, + { "Back Linked", "ncp.bit8eflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9eflags, - { "New Entry", "ncp.bit9eflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9eflags, + { "New Entry", "ncp.bit9eflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10eflags, - { "Temporary Reference", "ncp.bit10eflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10eflags, + { "Temporary Reference", "ncp.bit10eflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11eflags, - { "Audited", "ncp.bit11eflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11eflags, + { "Audited", "ncp.bit11eflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12eflags, - { "Entry Not Present", "ncp.bit12eflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12eflags, + { "Entry Not Present", "ncp.bit12eflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13eflags, - { "Entry Verify CTS", "ncp.bit13eflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13eflags, + { "Entry Verify CTS", "ncp.bit13eflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14eflags, - { "Entry Damaged", "ncp.bit14eflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14eflags, + { "Entry Damaged", "ncp.bit14eflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15eflags, - { "Not Defined", "ncp.bit15rflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15eflags, + { "Not Defined", "ncp.bit15rflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16eflags, - { "Not Defined", "ncp.bit16rflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16eflags, + { "Not Defined", "ncp.bit16rflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1infoflagsl, - { "Output Flags", "ncp.bit1infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1infoflagsl, + { "Output Flags", "ncp.bit1infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2infoflagsl, - { "Entry ID", "ncp.bit2infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2infoflagsl, + { "Entry ID", "ncp.bit2infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3infoflagsl, - { "Entry Flags", "ncp.bit3infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3infoflagsl, + { "Entry Flags", "ncp.bit3infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4infoflagsl, - { "Subordinate Count", "ncp.bit4infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4infoflagsl, + { "Subordinate Count", "ncp.bit4infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5infoflagsl, - { "Modification Time", "ncp.bit5infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5infoflagsl, + { "Modification Time", "ncp.bit5infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6infoflagsl, - { "Modification Timestamp", "ncp.bit6infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6infoflagsl, + { "Modification Timestamp", "ncp.bit6infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7infoflagsl, - { "Creation Timestamp", "ncp.bit7infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7infoflagsl, + { "Creation Timestamp", "ncp.bit7infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8infoflagsl, - { "Partition Root ID", "ncp.bit8infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8infoflagsl, + { "Partition Root ID", "ncp.bit8infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9infoflagsl, - { "Parent ID", "ncp.bit9infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9infoflagsl, + { "Parent ID", "ncp.bit9infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10infoflagsl, - { "Revision Count", "ncp.bit10infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10infoflagsl, + { "Revision Count", "ncp.bit10infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11infoflagsl, - { "Replica Type", "ncp.bit11infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11infoflagsl, + { "Replica Type", "ncp.bit11infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12infoflagsl, - { "Base Class", "ncp.bit12infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12infoflagsl, + { "Base Class", "ncp.bit12infoflagsl", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13infoflagsl, - { "Relative Distinguished Name", "ncp.bit13infoflagsl", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13infoflagsl, + { "Relative Distinguished Name", "ncp.bit13infoflagsl", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14infoflagsl, - { "Distinguished Name", "ncp.bit14infoflagsl", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14infoflagsl, + { "Distinguished Name", "ncp.bit14infoflagsl", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15infoflagsl, - { "Root Distinguished Name", "ncp.bit15infoflagsl", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15infoflagsl, + { "Root Distinguished Name", "ncp.bit15infoflagsl", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16infoflagsl, - { "Parent Distinguished Name", "ncp.bit16infoflagsl", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16infoflagsl, + { "Parent Distinguished Name", "ncp.bit16infoflagsl", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1infoflagsh, - { "Purge Time", "ncp.bit1infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1infoflagsh, + { "Purge Time", "ncp.bit1infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2infoflagsh, - { "Dereference Base Class", "ncp.bit2infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2infoflagsh, + { "Dereference Base Class", "ncp.bit2infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3infoflagsh, - { "Not Defined", "ncp.bit3infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3infoflagsh, + { "Not Defined", "ncp.bit3infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4infoflagsh, - { "Not Defined", "ncp.bit4infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4infoflagsh, + { "Not Defined", "ncp.bit4infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5infoflagsh, - { "Not Defined", "ncp.bit5infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5infoflagsh, + { "Not Defined", "ncp.bit5infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6infoflagsh, - { "Not Defined", "ncp.bit6infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6infoflagsh, + { "Not Defined", "ncp.bit6infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7infoflagsh, - { "Not Defined", "ncp.bit7infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7infoflagsh, + { "Not Defined", "ncp.bit7infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8infoflagsh, - { "Not Defined", "ncp.bit8infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8infoflagsh, + { "Not Defined", "ncp.bit8infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9infoflagsh, - { "Not Defined", "ncp.bit9infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9infoflagsh, + { "Not Defined", "ncp.bit9infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10infoflagsh, - { "Not Defined", "ncp.bit10infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10infoflagsh, + { "Not Defined", "ncp.bit10infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11infoflagsh, - { "Not Defined", "ncp.bit11infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11infoflagsh, + { "Not Defined", "ncp.bit11infoflagsh", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12infoflagsh, - { "Not Defined", "ncp.bit12infoflagshs", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12infoflagsh, + { "Not Defined", "ncp.bit12infoflagshs", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13infoflagsh, - { "Not Defined", "ncp.bit13infoflagsh", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13infoflagsh, + { "Not Defined", "ncp.bit13infoflagsh", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14infoflagsh, - { "Not Defined", "ncp.bit14infoflagsh", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14infoflagsh, + { "Not Defined", "ncp.bit14infoflagsh", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15infoflagsh, - { "Not Defined", "ncp.bit15infoflagsh", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15infoflagsh, + { "Not Defined", "ncp.bit15infoflagsh", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16infoflagsh, - { "Not Defined", "ncp.bit16infoflagsh", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16infoflagsh, + { "Not Defined", "ncp.bit16infoflagsh", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1lflags, - { "List Typeless", "ncp.bit1lflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1lflags, + { "List Typeless", "ncp.bit1lflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2lflags, - { "List Containers", "ncp.bit2lflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2lflags, + { "List Containers", "ncp.bit2lflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3lflags, - { "List Slashed", "ncp.bit3lflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3lflags, + { "List Slashed", "ncp.bit3lflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4lflags, - { "List Dotted", "ncp.bit4lflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4lflags, + { "List Dotted", "ncp.bit4lflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5lflags, - { "Dereference Alias", "ncp.bit5lflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5lflags, + { "Dereference Alias", "ncp.bit5lflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6lflags, - { "List All Containers", "ncp.bit6lflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6lflags, + { "List All Containers", "ncp.bit6lflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7lflags, - { "List Obsolete", "ncp.bit7lflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7lflags, + { "List Obsolete", "ncp.bit7lflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8lflags, - { "List Tuned Output", "ncp.bit8lflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8lflags, + { "List Tuned Output", "ncp.bit8lflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9lflags, - { "List External Reference", "ncp.bit9lflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9lflags, + { "List External Reference", "ncp.bit9lflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10lflags, - { "Not Defined", "ncp.bit10lflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10lflags, + { "Not Defined", "ncp.bit10lflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11lflags, - { "Not Defined", "ncp.bit11lflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11lflags, + { "Not Defined", "ncp.bit11lflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12lflags, - { "Not Defined", "ncp.bit12lflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12lflags, + { "Not Defined", "ncp.bit12lflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13lflags, - { "Not Defined", "ncp.bit13lflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13lflags, + { "Not Defined", "ncp.bit13lflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14lflags, - { "Not Defined", "ncp.bit14lflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14lflags, + { "Not Defined", "ncp.bit14lflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15lflags, - { "Not Defined", "ncp.bit15lflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15lflags, + { "Not Defined", "ncp.bit15lflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16lflags, - { "Not Defined", "ncp.bit16lflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16lflags, + { "Not Defined", "ncp.bit16lflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1l1flagsl, - { "Output Flags", "ncp.bit1l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1l1flagsl, + { "Output Flags", "ncp.bit1l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2l1flagsl, - { "Entry ID", "ncp.bit2l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2l1flagsl, + { "Entry ID", "ncp.bit2l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3l1flagsl, - { "Replica State", "ncp.bit3l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3l1flagsl, + { "Replica State", "ncp.bit3l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4l1flagsl, - { "Modification Timestamp", "ncp.bit4l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4l1flagsl, + { "Modification Timestamp", "ncp.bit4l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5l1flagsl, - { "Purge Time", "ncp.bit5l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5l1flagsl, + { "Purge Time", "ncp.bit5l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6l1flagsl, - { "Local Partition ID", "ncp.bit6l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6l1flagsl, + { "Local Partition ID", "ncp.bit6l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7l1flagsl, - { "Distinguished Name", "ncp.bit7l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7l1flagsl, + { "Distinguished Name", "ncp.bit7l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8l1flagsl, - { "Replica Type", "ncp.bit8l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8l1flagsl, + { "Replica Type", "ncp.bit8l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9l1flagsl, - { "Partition Busy", "ncp.bit9l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9l1flagsl, + { "Partition Busy", "ncp.bit9l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10l1flagsl, - { "Not Defined", "ncp.bit10l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10l1flagsl, + { "Not Defined", "ncp.bit10l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11l1flagsl, - { "Not Defined", "ncp.bit11l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11l1flagsl, + { "Not Defined", "ncp.bit11l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12l1flagsl, - { "Not Defined", "ncp.bit12l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12l1flagsl, + { "Not Defined", "ncp.bit12l1flagsl", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13l1flagsl, - { "Not Defined", "ncp.bit13l1flagsl", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13l1flagsl, + { "Not Defined", "ncp.bit13l1flagsl", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14l1flagsl, - { "Not Defined", "ncp.bit14l1flagsl", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14l1flagsl, + { "Not Defined", "ncp.bit14l1flagsl", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15l1flagsl, - { "Not Defined", "ncp.bit15l1flagsl", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15l1flagsl, + { "Not Defined", "ncp.bit15l1flagsl", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16l1flagsl, - { "Not Defined", "ncp.bit16l1flagsl", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16l1flagsl, + { "Not Defined", "ncp.bit16l1flagsl", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1l1flagsh, - { "Not Defined", "ncp.bit1l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1l1flagsh, + { "Not Defined", "ncp.bit1l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2l1flagsh, - { "Not Defined", "ncp.bit2l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2l1flagsh, + { "Not Defined", "ncp.bit2l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3l1flagsh, - { "Not Defined", "ncp.bit3l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3l1flagsh, + { "Not Defined", "ncp.bit3l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4l1flagsh, - { "Not Defined", "ncp.bit4l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4l1flagsh, + { "Not Defined", "ncp.bit4l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5l1flagsh, - { "Not Defined", "ncp.bit5l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5l1flagsh, + { "Not Defined", "ncp.bit5l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6l1flagsh, - { "Not Defined", "ncp.bit6l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6l1flagsh, + { "Not Defined", "ncp.bit6l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7l1flagsh, - { "Not Defined", "ncp.bit7l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7l1flagsh, + { "Not Defined", "ncp.bit7l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8l1flagsh, - { "Not Defined", "ncp.bit8l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8l1flagsh, + { "Not Defined", "ncp.bit8l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9l1flagsh, - { "Not Defined", "ncp.bit9l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9l1flagsh, + { "Not Defined", "ncp.bit9l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10l1flagsh, - { "Not Defined", "ncp.bit10l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10l1flagsh, + { "Not Defined", "ncp.bit10l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11l1flagsh, - { "Not Defined", "ncp.bit11l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11l1flagsh, + { "Not Defined", "ncp.bit11l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12l1flagsh, - { "Not Defined", "ncp.bit12l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12l1flagsh, + { "Not Defined", "ncp.bit12l1flagsh", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13l1flagsh, - { "Not Defined", "ncp.bit13l1flagsh", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13l1flagsh, + { "Not Defined", "ncp.bit13l1flagsh", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14l1flagsh, - { "Not Defined", "ncp.bit14l1flagsh", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14l1flagsh, + { "Not Defined", "ncp.bit14l1flagsh", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15l1flagsh, - { "Not Defined", "ncp.bit15l1flagsh", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15l1flagsh, + { "Not Defined", "ncp.bit15l1flagsh", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16l1flagsh, - { "Not Defined", "ncp.bit16l1flagsh", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16l1flagsh, + { "Not Defined", "ncp.bit16l1flagsh", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1vflags, - { "Naming", "ncp.bit1vflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1vflags, + { "Naming", "ncp.bit1vflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2vflags, - { "Base Class", "ncp.bit2vflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2vflags, + { "Base Class", "ncp.bit2vflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3vflags, - { "Present", "ncp.bit3vflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3vflags, + { "Present", "ncp.bit3vflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4vflags, - { "Value Damaged", "ncp.bit4vflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4vflags, + { "Value Damaged", "ncp.bit4vflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5vflags, - { "Not Defined", "ncp.bit5vflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5vflags, + { "Not Defined", "ncp.bit5vflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6vflags, - { "Not Defined", "ncp.bit6vflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6vflags, + { "Not Defined", "ncp.bit6vflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7vflags, - { "Not Defined", "ncp.bit7vflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7vflags, + { "Not Defined", "ncp.bit7vflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8vflags, - { "Not Defined", "ncp.bit8vflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8vflags, + { "Not Defined", "ncp.bit8vflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9vflags, - { "Not Defined", "ncp.bit9vflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9vflags, + { "Not Defined", "ncp.bit9vflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10vflags, - { "Not Defined", "ncp.bit10vflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10vflags, + { "Not Defined", "ncp.bit10vflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11vflags, - { "Not Defined", "ncp.bit11vflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11vflags, + { "Not Defined", "ncp.bit11vflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12vflags, - { "Not Defined", "ncp.bit12vflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12vflags, + { "Not Defined", "ncp.bit12vflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13vflags, - { "Not Defined", "ncp.bit13vflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13vflags, + { "Not Defined", "ncp.bit13vflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14vflags, - { "Not Defined", "ncp.bit14vflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14vflags, + { "Not Defined", "ncp.bit14vflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15vflags, - { "Not Defined", "ncp.bit15vflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15vflags, + { "Not Defined", "ncp.bit15vflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16vflags, - { "Not Defined", "ncp.bit16vflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16vflags, + { "Not Defined", "ncp.bit16vflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1cflags, - { "Container", "ncp.bit1cflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1cflags, + { "Container", "ncp.bit1cflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2cflags, - { "Effective", "ncp.bit2cflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2cflags, + { "Effective", "ncp.bit2cflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3cflags, - { "Class Definition Cannot be Removed", "ncp.bit3cflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3cflags, + { "Class Definition Cannot be Removed", "ncp.bit3cflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4cflags, - { "Ambiguous Naming", "ncp.bit4cflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4cflags, + { "Ambiguous Naming", "ncp.bit4cflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5cflags, - { "Ambiguous Containment", "ncp.bit5cflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5cflags, + { "Ambiguous Containment", "ncp.bit5cflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6cflags, - { "Auxiliary", "ncp.bit6cflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6cflags, + { "Auxiliary", "ncp.bit6cflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7cflags, - { "Operational", "ncp.bit7cflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7cflags, + { "Operational", "ncp.bit7cflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8cflags, - { "Sparse Required", "ncp.bit8cflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8cflags, + { "Sparse Required", "ncp.bit8cflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9cflags, - { "Sparse Operational", "ncp.bit9cflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9cflags, + { "Sparse Operational", "ncp.bit9cflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10cflags, - { "Not Defined", "ncp.bit10cflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10cflags, + { "Not Defined", "ncp.bit10cflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11cflags, - { "Not Defined", "ncp.bit11cflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11cflags, + { "Not Defined", "ncp.bit11cflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12cflags, - { "Not Defined", "ncp.bit12cflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12cflags, + { "Not Defined", "ncp.bit12cflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13cflags, - { "Not Defined", "ncp.bit13cflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13cflags, + { "Not Defined", "ncp.bit13cflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14cflags, - { "Not Defined", "ncp.bit14cflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14cflags, + { "Not Defined", "ncp.bit14cflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15cflags, - { "Not Defined", "ncp.bit15cflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15cflags, + { "Not Defined", "ncp.bit15cflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16cflags, - { "Not Defined", "ncp.bit16cflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16cflags, + { "Not Defined", "ncp.bit16cflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1acflags, - { "Single Valued", "ncp.bit1acflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1acflags, + { "Single Valued", "ncp.bit1acflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2acflags, - { "Sized", "ncp.bit2acflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2acflags, + { "Sized", "ncp.bit2acflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3acflags, - { "Non-Removable", "ncp.bit3acflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3acflags, + { "Non-Removable", "ncp.bit3acflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4acflags, - { "Read Only", "ncp.bit4acflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4acflags, + { "Read Only", "ncp.bit4acflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5acflags, - { "Hidden", "ncp.bit5acflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5acflags, + { "Hidden", "ncp.bit5acflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6acflags, - { "String", "ncp.bit6acflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6acflags, + { "String", "ncp.bit6acflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7acflags, - { "Synchronize Immediate", "ncp.bit7acflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7acflags, + { "Synchronize Immediate", "ncp.bit7acflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8acflags, - { "Public Read", "ncp.bit8acflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8acflags, + { "Public Read", "ncp.bit8acflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9acflags, - { "Server Read", "ncp.bit9acflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9acflags, + { "Server Read", "ncp.bit9acflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10acflags, - { "Write Managed", "ncp.bit10acflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10acflags, + { "Write Managed", "ncp.bit10acflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11acflags, - { "Per Replica", "ncp.bit11acflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11acflags, + { "Per Replica", "ncp.bit11acflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12acflags, - { "Never Schedule Synchronization", "ncp.bit12acflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12acflags, + { "Never Schedule Synchronization", "ncp.bit12acflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13acflags, - { "Operational", "ncp.bit13acflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13acflags, + { "Operational", "ncp.bit13acflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14acflags, - { "Not Defined", "ncp.bit14acflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14acflags, + { "Not Defined", "ncp.bit14acflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15acflags, - { "Not Defined", "ncp.bit15acflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15acflags, + { "Not Defined", "ncp.bit15acflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16acflags, - { "Not Defined", "ncp.bit16acflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16acflags, + { "Not Defined", "ncp.bit16acflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_nds_reply_error, - { "NDS Error", "ncp.ndsreplyerror", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_reply_error, + { "NDS Error", "ncp.ndsreplyerror", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_net, - { "Network","ncp.ndsnet", FT_IPXNET, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_net, + { "Network","ncp.ndsnet", FT_IPXNET, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_node, - { "Node", "ncp.ndsnode", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_node, + { "Node", "ncp.ndsnode", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_socket, - { "Socket", "ncp.ndssocket", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_socket, + { "Socket", "ncp.ndssocket", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_add_ref_ip, - { "Address Referral", "ncp.ipref", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_add_ref_ip, + { "Address Referral", "ncp.ipref", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_add_ref_udp, - { "Address Referral", "ncp.udpref", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_add_ref_udp, + { "Address Referral", "ncp.udpref", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_add_ref_tcp, - { "Address Referral", "ncp.tcpref", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_add_ref_tcp, + { "Address Referral", "ncp.tcpref", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_referral_record, - { "Referral Record", "ncp.ref_rec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_referral_record, + { "Referral Record", "ncp.ref_rec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_referral_addcount, - { "Address Count", "ncp.ref_addcount", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_referral_addcount, + { "Address Count", "ncp.ref_addcount", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_port, - { "Port", "ncp.ndsport", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_port, + { "Port", "ncp.ndsport", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_mv_string, - { "Attribute Name", "ncp.mv_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_mv_string, + { "Attribute Name", "ncp.mv_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_syntax, - { "Attribute Syntax", "ncp.nds_syntax", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_syntax, + { "Attribute Syntax", "ncp.nds_syntax", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_value_string, - { "Value", "ncp.value_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_value_string, + { "Value", "ncp.value_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_stream_name, - { "Stream Name", "ncp.nds_stream_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_stream_name, + { "Stream Name", "ncp.nds_stream_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_buffer_size, - { "NDS Reply Buffer Size", "ncp.nds_reply_buf", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_buffer_size, + { "NDS Reply Buffer Size", "ncp.nds_reply_buf", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_ver, - { "NDS Version", "ncp.nds_ver", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_ver, + { "NDS Version", "ncp.nds_ver", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_nflags, - { "Flags", "ncp.nds_nflags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_nflags, + { "Flags", "ncp.nds_nflags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_rflags, - { "Request Flags", "ncp.nds_rflags", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_rflags, + { "Request Flags", "ncp.nds_rflags", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_eflags, - { "Entry Flags", "ncp.nds_eflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_eflags, + { "Entry Flags", "ncp.nds_eflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_scope, - { "Scope", "ncp.nds_scope", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_scope, + { "Scope", "ncp.nds_scope", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_name, - { "Name", "ncp.nds_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_name, + { "Name", "ncp.nds_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_name_type, - { "Name Type", "ncp.nds_name_type", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_name_type, + { "Name Type", "ncp.nds_name_type", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_comm_trans, - { "Communications Transport", "ncp.nds_comm_trans", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_comm_trans, + { "Communications Transport", "ncp.nds_comm_trans", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_tree_trans, - { "Tree Walker Transport", "ncp.nds_tree_trans", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_tree_trans, + { "Tree Walker Transport", "ncp.nds_tree_trans", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_iteration, - { "Iteration Handle", "ncp.nds_iteration", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_iteration, + { "Iteration Handle", "ncp.nds_iteration", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_iterator, - { "Iterator", "ncp.nds_iterator", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_iterator, + { "Iterator", "ncp.nds_iterator", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_file_handle, - { "File Handle", "ncp.nds_file_handle", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_file_handle, + { "File Handle", "ncp.nds_file_handle", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_file_size, - { "File Size", "ncp.nds_file_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_file_size, + { "File Size", "ncp.nds_file_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_eid, - { "NDS EID", "ncp.nds_eid", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_eid, + { "NDS EID", "ncp.nds_eid", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_depth, - { "Distance object is from Root", "ncp.nds_depth", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_depth, + { "Distance object is from Root", "ncp.nds_depth", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_info_type, - { "Info Type", "ncp.nds_info_type", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_info_type, + { "Info Type", "ncp.nds_info_type", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_class_def_type, - { "Class Definition Type", "ncp.nds_class_def_type", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_class_def_type, + { "Class Definition Type", "ncp.nds_class_def_type", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_all_attr, - { "All Attributes", "ncp.nds_all_attr", FT_UINT32, BASE_DEC, NULL, 0x0, "Return all Attributes?", HFILL }}, + { &hf_nds_all_attr, + { "All Attributes", "ncp.nds_all_attr", FT_UINT32, BASE_DEC, NULL, 0x0, "Return all Attributes?", HFILL }}, - { &hf_nds_return_all_classes, - { "All Classes", "ncp.nds_return_all_classes", FT_STRING, BASE_NONE, NULL, 0x0, "Return all Classes?", HFILL }}, + { &hf_nds_return_all_classes, + { "All Classes", "ncp.nds_return_all_classes", FT_STRING, BASE_NONE, NULL, 0x0, "Return all Classes?", HFILL }}, - { &hf_nds_req_flags, - { "Request Flags", "ncp.nds_req_flags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_req_flags, + { "Request Flags", "ncp.nds_req_flags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_attr, - { "Attributes", "ncp.nds_attributes", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_attr, + { "Attributes", "ncp.nds_attributes", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_classes, - { "Classes", "ncp.nds_classes", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_classes, + { "Classes", "ncp.nds_classes", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_crc, - { "CRC", "ncp.nds_crc", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_crc, + { "CRC", "ncp.nds_crc", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_referrals, - { "Referrals", "ncp.nds_referrals", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_referrals, + { "Referrals", "ncp.nds_referrals", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_result_flags, - { "Result Flags", "ncp.nds_result_flags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_result_flags, + { "Result Flags", "ncp.nds_result_flags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_stream_flags, - { "Streams Flags", "ncp.nds_stream_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_stream_flags, + { "Streams Flags", "ncp.nds_stream_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_tag_string, - { "Tags", "ncp.nds_tags", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_tag_string, + { "Tags", "ncp.nds_tags", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_value_bytes, - { "Bytes", "ncp.value_bytes", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_value_bytes, + { "Bytes", "ncp.value_bytes", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_replica_type, - { "Replica Type", "ncp.rtype", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_replica_type, + { "Replica Type", "ncp.rtype", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_replica_state, - { "Replica State", "ncp.rstate", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_replica_state, + { "Replica State", "ncp.rstate", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_rnum, - { "Replica Number", "ncp.rnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_rnum, + { "Replica Number", "ncp.rnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_revent, - { "Event", "ncp.revent", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_revent, + { "Event", "ncp.revent", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_replica_number, - { "Replica Number", "ncp.rnum", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_replica_number, + { "Replica Number", "ncp.rnum", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_min_nds_ver, - { "Minimum NDS Version", "ncp.min_nds_version", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_min_nds_ver, + { "Minimum NDS Version", "ncp.min_nds_version", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_ver_include, - { "Include NDS Version", "ncp.inc_nds_ver", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_ver_include, + { "Include NDS Version", "ncp.inc_nds_ver", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_ver_exclude, - { "Exclude NDS Version", "ncp.exc_nds_ver", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_ver_exclude, + { "Exclude NDS Version", "ncp.exc_nds_ver", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, #if 0 /* Unused ? */ - { &hf_nds_es, - { "Input Entry Specifier", "ncp.nds_es", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_es, + { "Input Entry Specifier", "ncp.nds_es", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, #endif - { &hf_es_type, - { "Entry Specifier Type", "ncp.nds_es_type", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_es_type, + { "Entry Specifier Type", "ncp.nds_es_type", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_rdn_string, - { "RDN", "ncp.nds_rdn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_rdn_string, + { "RDN", "ncp.nds_rdn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, #if 0 /* Unused ? */ - { &hf_delim_string, - { "Delimiter", "ncp.nds_delim", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_delim_string, + { "Delimiter", "ncp.nds_delim", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, #endif - { &hf_nds_dn_output_type, - { "Output Entry Specifier Type", "ncp.nds_out_es_type", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_dn_output_type, + { "Output Entry Specifier Type", "ncp.nds_out_es_type", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_nested_output_type, - { "Nested Output Entry Specifier Type", "ncp.nds_nested_out_es", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_nested_output_type, + { "Nested Output Entry Specifier Type", "ncp.nds_nested_out_es", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_output_delimiter, - { "Output Delimiter", "ncp.nds_out_delimiter", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_output_delimiter, + { "Output Delimiter", "ncp.nds_out_delimiter", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_output_entry_specifier, - { "Output Entry Specifier", "ncp.nds_out_es", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_output_entry_specifier, + { "Output Entry Specifier", "ncp.nds_out_es", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_es_value, - { "Entry Specifier Value", "ncp.nds_es_value", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_es_value, + { "Entry Specifier Value", "ncp.nds_es_value", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_es_rdn_count, - { "RDN Count", "ncp.nds_es_rdn_count", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_es_rdn_count, + { "RDN Count", "ncp.nds_es_rdn_count", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_replica_num, - { "Replica Number", "ncp.nds_replica_num", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_replica_num, + { "Replica Number", "ncp.nds_replica_num", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_es_seconds, - { "Seconds", "ncp.nds_es_seconds", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, + { &hf_es_seconds, + { "Seconds", "ncp.nds_es_seconds", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_event_num, - { "Event Number", "ncp.nds_event_num", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_event_num, + { "Event Number", "ncp.nds_event_num", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_compare_results, - { "Compare Results", "ncp.nds_compare_results", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_compare_results, + { "Compare Results", "ncp.nds_compare_results", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_parent, - { "Parent ID", "ncp.nds_parent", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_parent, + { "Parent ID", "ncp.nds_parent", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_name_filter, - { "Name Filter", "ncp.nds_name_filter", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_name_filter, + { "Name Filter", "ncp.nds_name_filter", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_class_filter, - { "Class Filter", "ncp.nds_class_filter", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_class_filter, + { "Class Filter", "ncp.nds_class_filter", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_time_filter, - { "Time Filter", "ncp.nds_time_filter", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_time_filter, + { "Time Filter", "ncp.nds_time_filter", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_partition_root_id, - { "Partition Root ID", "ncp.nds_partition_root_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_partition_root_id, + { "Partition Root ID", "ncp.nds_partition_root_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_replicas, - { "Replicas", "ncp.nds_replicas", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_replicas, + { "Replicas", "ncp.nds_replicas", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_purge, - { "Purge Time", "ncp.nds_purge", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_purge, + { "Purge Time", "ncp.nds_purge", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_local_partition, - { "Local Partition ID", "ncp.nds_local_partition", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_local_partition, + { "Local Partition ID", "ncp.nds_local_partition", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_partition_busy, - { "Partition Busy", "ncp.nds_partition_busy", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_partition_busy, + { "Partition Busy", "ncp.nds_partition_busy", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_number_of_changes, - { "Number of Attribute Changes", "ncp.nds_number_of_changes", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_number_of_changes, + { "Number of Attribute Changes", "ncp.nds_number_of_changes", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_sub_count, - { "Subordinate Count", "ncp.sub_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_sub_count, + { "Subordinate Count", "ncp.sub_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_revision, - { "Revision Count", "ncp.nds_rev_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_revision, + { "Revision Count", "ncp.nds_rev_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_base_class, - { "Base Class", "ncp.nds_base_class", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_base_class, + { "Base Class", "ncp.nds_base_class", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_relative_dn, - { "Relative Distinguished Name", "ncp.nds_relative_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_relative_dn, + { "Relative Distinguished Name", "ncp.nds_relative_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, #if 0 /* Unused ? */ - { &hf_nds_root_dn, - { "Root Distinguished Name", "ncp.nds_root_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_root_dn, + { "Root Distinguished Name", "ncp.nds_root_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, #endif #if 0 /* Unused ? */ - { &hf_nds_parent_dn, - { "Parent Distinguished Name", "ncp.nds_parent_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_parent_dn, + { "Parent Distinguished Name", "ncp.nds_parent_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, #endif - { &hf_deref_base, - { "Dereference Base Class", "ncp.nds_deref_base", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_deref_base, + { "Dereference Base Class", "ncp.nds_deref_base", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_base, - { "Base Class", "ncp.nds_base", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_base, + { "Base Class", "ncp.nds_base", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_super, - { "Super Class", "ncp.nds_super", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_super, + { "Super Class", "ncp.nds_super", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, #if 0 /* Unused ? */ - { &hf_nds_entry_info, - { "Entry Information", "ncp.nds_entry_info", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_entry_info, + { "Entry Information", "ncp.nds_entry_info", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, #endif - { &hf_nds_privileges, - { "Privileges", "ncp.nds_privileges", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_privileges, + { "Privileges", "ncp.nds_privileges", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_compare_attributes, - { "Compare Attributes?", "ncp.nds_compare_attributes", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_nds_compare_attributes, + { "Compare Attributes?", "ncp.nds_compare_attributes", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_nds_read_attribute, - { "Read Attribute?", "ncp.nds_read_attribute", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_nds_read_attribute, + { "Read Attribute?", "ncp.nds_read_attribute", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_nds_write_add_delete_attribute, - { "Write, Add, Delete Attribute?", "ncp.nds_write_add_delete_attribute", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_nds_write_add_delete_attribute, + { "Write, Add, Delete Attribute?", "ncp.nds_write_add_delete_attribute", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_nds_add_delete_self, - { "Add/Delete Self?", "ncp.nds_add_delete_self", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_nds_add_delete_self, + { "Add/Delete Self?", "ncp.nds_add_delete_self", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_nds_privilege_not_defined, - { "Privilege Not defined", "ncp.nds_privilege_not_defined", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_nds_privilege_not_defined, + { "Privilege Not defined", "ncp.nds_privilege_not_defined", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_nds_supervisor, - { "Supervisor?", "ncp.nds_supervisor", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_nds_supervisor, + { "Supervisor?", "ncp.nds_supervisor", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_nds_inheritance_control, - { "Inheritance?", "ncp.nds_inheritance_control", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_nds_inheritance_control, + { "Inheritance?", "ncp.nds_inheritance_control", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_nds_browse_entry, - { "Browse Entry?", "ncp.nds_browse_entry", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_nds_browse_entry, + { "Browse Entry?", "ncp.nds_browse_entry", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_nds_add_entry, - { "Add Entry?", "ncp.nds_add_entry", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_nds_add_entry, + { "Add Entry?", "ncp.nds_add_entry", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_nds_delete_entry, - { "Delete Entry?", "ncp.nds_delete_entry", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_nds_delete_entry, + { "Delete Entry?", "ncp.nds_delete_entry", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_nds_rename_entry, - { "Rename Entry?", "ncp.nds_rename_entry", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_nds_rename_entry, + { "Rename Entry?", "ncp.nds_rename_entry", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_nds_supervisor_entry, - { "Supervisor?", "ncp.nds_supervisor_entry", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_nds_supervisor_entry, + { "Supervisor?", "ncp.nds_supervisor_entry", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_nds_entry_privilege_not_defined, - { "Privilege Not Defined", "ncp.nds_entry_privilege_not_defined", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_nds_entry_privilege_not_defined, + { "Privilege Not Defined", "ncp.nds_entry_privilege_not_defined", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_nds_vflags, - { "Value Flags", "ncp.nds_vflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_vflags, + { "Value Flags", "ncp.nds_vflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_value_len, - { "Value Length", "ncp.nds_vlength", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_value_len, + { "Value Length", "ncp.nds_vlength", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_cflags, - { "Class Flags", "ncp.nds_cflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_cflags, + { "Class Flags", "ncp.nds_cflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_asn1, - { "ASN.1 ID", "ncp.nds_asn1", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_asn1, + { "ASN.1 ID", "ncp.nds_asn1", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_acflags, - { "Attribute Constraint Flags", "ncp.nds_acflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_acflags, + { "Attribute Constraint Flags", "ncp.nds_acflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_upper, - { "Upper Limit Value", "ncp.nds_upper", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_upper, + { "Upper Limit Value", "ncp.nds_upper", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_lower, - { "Lower Limit Value", "ncp.nds_lower", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_lower, + { "Lower Limit Value", "ncp.nds_lower", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_trustee_dn, - { "Trustee Distinguished Name", "ncp.nds_trustee_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_trustee_dn, + { "Trustee Distinguished Name", "ncp.nds_trustee_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_attribute_dn, - { "Attribute Name", "ncp.nds_attribute_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_attribute_dn, + { "Attribute Name", "ncp.nds_attribute_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_acl_add, - { "Access Control Lists to Add", "ncp.nds_acl_add", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_acl_add, + { "Access Control Lists to Add", "ncp.nds_acl_add", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_acl_del, - { "Access Control Lists to Delete", "ncp.nds_acl_del", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_acl_del, + { "Access Control Lists to Delete", "ncp.nds_acl_del", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_att_add, - { "Attribute to Add", "ncp.nds_att_add", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_att_add, + { "Attribute to Add", "ncp.nds_att_add", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_att_del, - { "Attribute to Delete", "ncp.nds_att_del", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_att_del, + { "Attribute to Delete", "ncp.nds_att_del", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_keep, - { "Delete Original RDN", "ncp.nds_keep", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_keep, + { "Delete Original RDN", "ncp.nds_keep", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_new_rdn, - { "New Relative Distinguished Name", "ncp.nds_new_rdn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_new_rdn, + { "New Relative Distinguished Name", "ncp.nds_new_rdn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_time_delay, - { "Time Delay", "ncp.nds_time_delay", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_time_delay, + { "Time Delay", "ncp.nds_time_delay", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_root_name, - { "Root Most Object Name", "ncp.nds_root_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_root_name, + { "Root Most Object Name", "ncp.nds_root_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_new_part_id, - { "New Partition Root ID", "ncp.nds_new_part_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_new_part_id, + { "New Partition Root ID", "ncp.nds_new_part_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_child_part_id, - { "Child Partition Root ID", "ncp.nds_child_part_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_child_part_id, + { "Child Partition Root ID", "ncp.nds_child_part_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_master_part_id, - { "Master Partition Root ID", "ncp.nds_master_part_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_master_part_id, + { "Master Partition Root ID", "ncp.nds_master_part_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_target_name, - { "Target Server Name", "ncp.nds_target_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_target_name, + { "Target Server Name", "ncp.nds_target_dn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_bit1pingflags1, - { "Supported Fields", "ncp.bit1pingflags1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1pingflags1, + { "Supported Fields", "ncp.bit1pingflags1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2pingflags1, - { "Depth", "ncp.bit2pingflags1", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2pingflags1, + { "Depth", "ncp.bit2pingflags1", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3pingflags1, - { "Build Number", "ncp.bit3pingflags1", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3pingflags1, + { "Build Number", "ncp.bit3pingflags1", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4pingflags1, - { "Flags", "ncp.bit4pingflags1", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4pingflags1, + { "Flags", "ncp.bit4pingflags1", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5pingflags1, - { "Verification Flags", "ncp.bit5pingflags1", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5pingflags1, + { "Verification Flags", "ncp.bit5pingflags1", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6pingflags1, - { "Letter Version", "ncp.bit6pingflags1", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6pingflags1, + { "Letter Version", "ncp.bit6pingflags1", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7pingflags1, - { "OS Version", "ncp.bit7pingflags1", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7pingflags1, + { "OS Version", "ncp.bit7pingflags1", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8pingflags1, - { "Not Defined", "ncp.bit8pingflags1", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8pingflags1, + { "Not Defined", "ncp.bit8pingflags1", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9pingflags1, - { "License Flags", "ncp.bit9pingflags1", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9pingflags1, + { "License Flags", "ncp.bit9pingflags1", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10pingflags1, - { "DS Time", "ncp.bit10pingflags1", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10pingflags1, + { "DS Time", "ncp.bit10pingflags1", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11pingflags1, - { "Server Time", "ncp.bit11pingflags1", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11pingflags1, + { "Server Time", "ncp.bit11pingflags1", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12pingflags1, - { "Create Time", "ncp.bit12pingflags1", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12pingflags1, + { "Create Time", "ncp.bit12pingflags1", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13pingflags1, - { "Not Defined", "ncp.bit13pingflags1", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13pingflags1, + { "Not Defined", "ncp.bit13pingflags1", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14pingflags1, - { "Not Defined", "ncp.bit14pingflags1", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14pingflags1, + { "Not Defined", "ncp.bit14pingflags1", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15pingflags1, - { "Not Defined", "ncp.bit15pingflags1", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15pingflags1, + { "Not Defined", "ncp.bit15pingflags1", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16pingflags1, - { "Not Defined", "ncp.bit16pingflags1", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16pingflags1, + { "Not Defined", "ncp.bit16pingflags1", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1pingflags2, - { "Sap Name", "ncp.bit1pingflags2", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1pingflags2, + { "Sap Name", "ncp.bit1pingflags2", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2pingflags2, - { "Tree Name", "ncp.bit2pingflags2", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2pingflags2, + { "Tree Name", "ncp.bit2pingflags2", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3pingflags2, - { "OS Name", "ncp.bit3pingflags2", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3pingflags2, + { "OS Name", "ncp.bit3pingflags2", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4pingflags2, - { "Hardware Name", "ncp.bit4pingflags2", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4pingflags2, + { "Hardware Name", "ncp.bit4pingflags2", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5pingflags2, - { "Vendor Name", "ncp.bit5pingflags2", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5pingflags2, + { "Vendor Name", "ncp.bit5pingflags2", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6pingflags2, - { "Not Defined", "ncp.bit6pingflags2", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6pingflags2, + { "Not Defined", "ncp.bit6pingflags2", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7pingflags2, - { "Not Defined", "ncp.bit7pingflags2", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7pingflags2, + { "Not Defined", "ncp.bit7pingflags2", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8pingflags2, - { "Not Defined", "ncp.bit8pingflags2", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8pingflags2, + { "Not Defined", "ncp.bit8pingflags2", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9pingflags2, - { "Not Defined", "ncp.bit9pingflags2", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9pingflags2, + { "Not Defined", "ncp.bit9pingflags2", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10pingflags2, - { "Not Defined", "ncp.bit10pingflags2", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10pingflags2, + { "Not Defined", "ncp.bit10pingflags2", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11pingflags2, - { "Not Defined", "ncp.bit11pingflags2", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11pingflags2, + { "Not Defined", "ncp.bit11pingflags2", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12pingflags2, - { "Not Defined", "ncp.bit12pingflags2", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12pingflags2, + { "Not Defined", "ncp.bit12pingflags2", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13pingflags2, - { "Not Defined", "ncp.bit13pingflags2", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13pingflags2, + { "Not Defined", "ncp.bit13pingflags2", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14pingflags2, - { "Not Defined", "ncp.bit14pingflags2", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14pingflags2, + { "Not Defined", "ncp.bit14pingflags2", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15pingflags2, - { "Not Defined", "ncp.bit15pingflags2", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15pingflags2, + { "Not Defined", "ncp.bit15pingflags2", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16pingflags2, - { "Not Defined", "ncp.bit16pingflags2", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16pingflags2, + { "Not Defined", "ncp.bit16pingflags2", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1pingpflags1, - { "Root Most Master Replica", "ncp.bit1pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1pingpflags1, + { "Root Most Master Replica", "ncp.bit1pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2pingpflags1, - { "Is Time Synchronized?", "ncp.bit2pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2pingpflags1, + { "Is Time Synchronized?", "ncp.bit2pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3pingpflags1, - { "Is Time Valid?", "ncp.bit3pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3pingpflags1, + { "Is Time Valid?", "ncp.bit3pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4pingpflags1, - { "Is DS Time Synchronized?", "ncp.bit4pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4pingpflags1, + { "Is DS Time Synchronized?", "ncp.bit4pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5pingpflags1, - { "Does Agent Have All Replicas?", "ncp.bit5pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5pingpflags1, + { "Does Agent Have All Replicas?", "ncp.bit5pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6pingpflags1, - { "Not Defined", "ncp.bit6pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6pingpflags1, + { "Not Defined", "ncp.bit6pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7pingpflags1, - { "Not Defined", "ncp.bit7pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7pingpflags1, + { "Not Defined", "ncp.bit7pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8pingpflags1, - { "Not Defined", "ncp.bit8pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8pingpflags1, + { "Not Defined", "ncp.bit8pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9pingpflags1, - { "Not Defined", "ncp.bit9pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9pingpflags1, + { "Not Defined", "ncp.bit9pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10pingpflags1, - { "Not Defined", "ncp.bit10pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10pingpflags1, + { "Not Defined", "ncp.bit10pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11pingpflags1, - { "Not Defined", "ncp.bit11pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11pingpflags1, + { "Not Defined", "ncp.bit11pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12pingpflags1, - { "Not Defined", "ncp.bit12pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12pingpflags1, + { "Not Defined", "ncp.bit12pingpflags1", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13pingpflags1, - { "Not Defined", "ncp.bit13pingpflags1", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13pingpflags1, + { "Not Defined", "ncp.bit13pingpflags1", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14pingpflags1, - { "Not Defined", "ncp.bit14pingpflags1", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14pingpflags1, + { "Not Defined", "ncp.bit14pingpflags1", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15pingpflags1, - { "Not Defined", "ncp.bit15pingpflags1", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15pingpflags1, + { "Not Defined", "ncp.bit15pingpflags1", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16pingpflags1, - { "Not Defined", "ncp.bit16pingpflags1", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16pingpflags1, + { "Not Defined", "ncp.bit16pingpflags1", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_bit1pingvflags1, - { "Checksum", "ncp.bit1pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1pingvflags1, + { "Checksum", "ncp.bit1pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2pingvflags1, - { "CRC32", "ncp.bit2pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2pingvflags1, + { "CRC32", "ncp.bit2pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3pingvflags1, - { "Not Defined", "ncp.bit3pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3pingvflags1, + { "Not Defined", "ncp.bit3pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4pingvflags1, - { "Not Defined", "ncp.bit4pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4pingvflags1, + { "Not Defined", "ncp.bit4pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5pingvflags1, - { "Not Defined", "ncp.bit5pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5pingvflags1, + { "Not Defined", "ncp.bit5pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6pingvflags1, - { "Not Defined", "ncp.bit6pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6pingvflags1, + { "Not Defined", "ncp.bit6pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7pingvflags1, - { "Not Defined", "ncp.bit7pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7pingvflags1, + { "Not Defined", "ncp.bit7pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8pingvflags1, - { "Not Defined", "ncp.bit8pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8pingvflags1, + { "Not Defined", "ncp.bit8pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9pingvflags1, - { "Not Defined", "ncp.bit9pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9pingvflags1, + { "Not Defined", "ncp.bit9pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10pingvflags1, - { "Not Defined", "ncp.bit10pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10pingvflags1, + { "Not Defined", "ncp.bit10pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11pingvflags1, - { "Not Defined", "ncp.bit11pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11pingvflags1, + { "Not Defined", "ncp.bit11pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12pingvflags1, - { "Not Defined", "ncp.bit12pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12pingvflags1, + { "Not Defined", "ncp.bit12pingvflags1", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13pingvflags1, - { "Not Defined", "ncp.bit13pingvflags1", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13pingvflags1, + { "Not Defined", "ncp.bit13pingvflags1", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14pingvflags1, - { "Not Defined", "ncp.bit14pingvflags1", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14pingvflags1, + { "Not Defined", "ncp.bit14pingvflags1", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15pingvflags1, - { "Not Defined", "ncp.bit15pingvflags1", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15pingvflags1, + { "Not Defined", "ncp.bit15pingvflags1", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16pingvflags1, - { "Not Defined", "ncp.bit16pingvflags1", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16pingvflags1, + { "Not Defined", "ncp.bit16pingvflags1", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_nds_letter_ver, - { "Letter Version", "ncp.nds_letter_ver", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_letter_ver, + { "Letter Version", "ncp.nds_letter_ver", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_os_majver, - { "OS Major Version", "ncp.nds_os_majver", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_os_majver, + { "OS Major Version", "ncp.nds_os_majver", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_os_minver, - { "OS Minor Version", "ncp.nds_os_minver", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_os_minver, + { "OS Minor Version", "ncp.nds_os_minver", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_lic_flags, - { "License Flags", "ncp.nds_lic_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_lic_flags, + { "License Flags", "ncp.nds_lic_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_ds_time, - { "DS Time", "ncp.nds_ds_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_ds_time, + { "DS Time", "ncp.nds_ds_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_svr_time, - { "Server Time", "ncp.nds_svr_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_svr_time, + { "Server Time", "ncp.nds_svr_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_crt_time, - { "Agent Create Time", "ncp.nds_crt_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_crt_time, + { "Agent Create Time", "ncp.nds_crt_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_ping_version, - { "Ping Version", "ncp.nds_ping_version", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_ping_version, + { "Ping Version", "ncp.nds_ping_version", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_search_scope, - { "Search Scope", "ncp.nds_search_scope", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_search_scope, + { "Search Scope", "ncp.nds_search_scope", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_num_objects, - { "Number of Objects to Search", "ncp.nds_num_objects", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_num_objects, + { "Number of Objects to Search", "ncp.nds_num_objects", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_bit1siflags, - { "Names", "ncp.bit1siflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_bit1siflags, + { "Names", "ncp.bit1siflags", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_bit2siflags, - { "Names and Values", "ncp.bit2siflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_bit2siflags, + { "Names and Values", "ncp.bit2siflags", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_bit3siflags, - { "Effective Privileges", "ncp.bit3siflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_bit3siflags, + { "Effective Privileges", "ncp.bit3siflags", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_bit4siflags, - { "Value Info", "ncp.bit4siflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_bit4siflags, + { "Value Info", "ncp.bit4siflags", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_bit5siflags, - { "Abbreviated Value", "ncp.bit5siflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_bit5siflags, + { "Abbreviated Value", "ncp.bit5siflags", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_bit6siflags, - { "Not Defined", "ncp.bit6siflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_bit6siflags, + { "Not Defined", "ncp.bit6siflags", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_bit7siflags, - { "Not Defined", "ncp.bit7siflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_bit7siflags, + { "Not Defined", "ncp.bit7siflags", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_bit8siflags, - { "Not Defined", "ncp.bit8siflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_bit8siflags, + { "Not Defined", "ncp.bit8siflags", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_bit9siflags, - { "Expanded Class", "ncp.bit9siflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_bit9siflags, + { "Expanded Class", "ncp.bit9siflags", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_bit10siflags, - { "Not Defined", "ncp.bit10siflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_bit10siflags, + { "Not Defined", "ncp.bit10siflags", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_bit11siflags, - { "Not Defined", "ncp.bit11siflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_bit11siflags, + { "Not Defined", "ncp.bit11siflags", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_bit12siflags, - { "Not Defined", "ncp.bit12siflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_bit12siflags, + { "Not Defined", "ncp.bit12siflags", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_bit13siflags, - { "Not Defined", "ncp.bit13siflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_bit13siflags, + { "Not Defined", "ncp.bit13siflags", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_bit14siflags, - { "Not Defined", "ncp.bit14siflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_bit14siflags, + { "Not Defined", "ncp.bit14siflags", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_bit15siflags, - { "Not Defined", "ncp.bit15siflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_bit15siflags, + { "Not Defined", "ncp.bit15siflags", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_bit16siflags, - { "Not Defined", "ncp.bit16siflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_bit16siflags, + { "Not Defined", "ncp.bit16siflags", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_nds_segment_overlap, - { "Segment overlap", "nds.segment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Segment overlaps with other segments", HFILL }}, + { &hf_nds_segment_overlap, + { "Segment overlap", "nds.segment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Segment overlaps with other segments", HFILL }}, - { &hf_nds_segment_overlap_conflict, - { "Conflicting data in segment overlap", "nds.segment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Overlapping segments contained conflicting data", HFILL }}, + { &hf_nds_segment_overlap_conflict, + { "Conflicting data in segment overlap", "nds.segment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Overlapping segments contained conflicting data", HFILL }}, - { &hf_nds_segment_multiple_tails, - { "Multiple tail segments found", "nds.segment.multipletails", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Several tails were found when desegmenting the packet", HFILL }}, + { &hf_nds_segment_multiple_tails, + { "Multiple tail segments found", "nds.segment.multipletails", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Several tails were found when desegmenting the packet", HFILL }}, - { &hf_nds_segment_too_long_segment, - { "Segment too long", "nds.segment.toolongsegment", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Segment contained data past end of packet", HFILL }}, + { &hf_nds_segment_too_long_segment, + { "Segment too long", "nds.segment.toolongsegment", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Segment contained data past end of packet", HFILL }}, - { &hf_nds_segment_error, - { "Desegmentation error", "nds.segment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "Desegmentation error due to illegal segments", HFILL }}, + { &hf_nds_segment_error, + { "Desegmentation error", "nds.segment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "Desegmentation error due to illegal segments", HFILL }}, - { &hf_nds_segment_count, - { "Segment count", "nds.segment.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_segment_count, + { "Segment count", "nds.segment.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_reassembled_length, - { "Reassembled NDS length", "nds.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL }}, + { &hf_nds_reassembled_length, + { "Reassembled NDS length", "nds.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL }}, - { &hf_nds_segment, - { "NDS Fragment", "nds.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "NDPS Fragment", HFILL }}, + { &hf_nds_segment, + { "NDS Fragment", "nds.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "NDPS Fragment", HFILL }}, - { &hf_nds_segments, - { "NDS Fragments", "nds.fragments", FT_NONE, BASE_NONE, NULL, 0x0, "NDPS Fragments", HFILL }}, + { &hf_nds_segments, + { "NDS Fragments", "nds.fragments", FT_NONE, BASE_NONE, NULL, 0x0, "NDPS Fragments", HFILL }}, - { &hf_nds_verb2b_req_flags, - { "Flags", "ncp.nds_verb2b_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_verb2b_req_flags, + { "Flags", "ncp.nds_verb2b_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_ip_address, - { "IP Address", "ncp.ip_addr", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_ip_address, + { "IP Address", "ncp.ip_addr", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_copyright, - { "Copyright", "ncp.copyright", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_ncp_copyright, + { "Copyright", "ncp.copyright", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_ndsprot1flag, - { "Not Defined", "ncp.nds_prot_bit1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, + { &hf_ndsprot1flag, + { "Not Defined", "ncp.nds_prot_bit1", FT_BOOLEAN, 16, NULL, 0x00000001, NULL, HFILL }}, - { &hf_ndsprot2flag, - { "Not Defined", "ncp.nds_prot_bit2", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, + { &hf_ndsprot2flag, + { "Not Defined", "ncp.nds_prot_bit2", FT_BOOLEAN, 16, NULL, 0x00000002, NULL, HFILL }}, - { &hf_ndsprot3flag, - { "Not Defined", "ncp.nds_prot_bit3", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, + { &hf_ndsprot3flag, + { "Not Defined", "ncp.nds_prot_bit3", FT_BOOLEAN, 16, NULL, 0x00000004, NULL, HFILL }}, - { &hf_ndsprot4flag, - { "Not Defined", "ncp.nds_prot_bit4", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, + { &hf_ndsprot4flag, + { "Not Defined", "ncp.nds_prot_bit4", FT_BOOLEAN, 16, NULL, 0x00000008, NULL, HFILL }}, - { &hf_ndsprot5flag, - { "Not Defined", "ncp.nds_prot_bit5", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, + { &hf_ndsprot5flag, + { "Not Defined", "ncp.nds_prot_bit5", FT_BOOLEAN, 16, NULL, 0x00000010, NULL, HFILL }}, - { &hf_ndsprot6flag, - { "Not Defined", "ncp.nds_prot_bit6", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, + { &hf_ndsprot6flag, + { "Not Defined", "ncp.nds_prot_bit6", FT_BOOLEAN, 16, NULL, 0x00000020, NULL, HFILL }}, - { &hf_ndsprot7flag, - { "Not Defined", "ncp.nds_prot_bit7", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, + { &hf_ndsprot7flag, + { "Not Defined", "ncp.nds_prot_bit7", FT_BOOLEAN, 16, NULL, 0x00000040, NULL, HFILL }}, - { &hf_ndsprot8flag, - { "Not Defined", "ncp.nds_prot_bit8", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, + { &hf_ndsprot8flag, + { "Not Defined", "ncp.nds_prot_bit8", FT_BOOLEAN, 16, NULL, 0x00000080, NULL, HFILL }}, - { &hf_ndsprot9flag, - { "Not Defined", "ncp.nds_prot_bit9", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, + { &hf_ndsprot9flag, + { "Not Defined", "ncp.nds_prot_bit9", FT_BOOLEAN, 16, NULL, 0x00000100, NULL, HFILL }}, - { &hf_ndsprot10flag, - { "Not Defined", "ncp.nds_prot_bit10", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, + { &hf_ndsprot10flag, + { "Not Defined", "ncp.nds_prot_bit10", FT_BOOLEAN, 16, NULL, 0x00000200, NULL, HFILL }}, - { &hf_ndsprot11flag, - { "Not Defined", "ncp.nds_prot_bit11", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, + { &hf_ndsprot11flag, + { "Not Defined", "ncp.nds_prot_bit11", FT_BOOLEAN, 16, NULL, 0x00000400, NULL, HFILL }}, - { &hf_ndsprot12flag, - { "Not Defined", "ncp.nds_prot_bit12", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, + { &hf_ndsprot12flag, + { "Not Defined", "ncp.nds_prot_bit12", FT_BOOLEAN, 16, NULL, 0x00000800, NULL, HFILL }}, - { &hf_ndsprot13flag, - { "Not Defined", "ncp.nds_prot_bit13", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, + { &hf_ndsprot13flag, + { "Not Defined", "ncp.nds_prot_bit13", FT_BOOLEAN, 16, NULL, 0x00001000, NULL, HFILL }}, - { &hf_ndsprot14flag, - { "Not Defined", "ncp.nds_prot_bit14", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, + { &hf_ndsprot14flag, + { "Not Defined", "ncp.nds_prot_bit14", FT_BOOLEAN, 16, NULL, 0x00002000, NULL, HFILL }}, - { &hf_ndsprot15flag, - { "Include CRC in NDS Header", "ncp.nds_prot_bit15", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, + { &hf_ndsprot15flag, + { "Include CRC in NDS Header", "ncp.nds_prot_bit15", FT_BOOLEAN, 16, NULL, 0x00004000, NULL, HFILL }}, - { &hf_ndsprot16flag, - { "Client is a Server", "ncp.nds_prot_bit16", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, + { &hf_ndsprot16flag, + { "Client is a Server", "ncp.nds_prot_bit16", FT_BOOLEAN, 16, NULL, 0x00008000, NULL, HFILL }}, - { &hf_nds_svr_dst_name, - { "Server Distinguished Name", "ncp.nds_svr_dist_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_svr_dst_name, + { "Server Distinguished Name", "ncp.nds_svr_dist_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_tune_mark, - { "Tune Mark", "ncp.ndstunemark", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_tune_mark, + { "Tune Mark", "ncp.ndstunemark", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, #if 0 /* Unused ? */ - { &hf_nds_create_time, - { "NDS Creation Time", "ncp.ndscreatetime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_create_time, + { "NDS Creation Time", "ncp.ndscreatetime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, #endif - { &hf_srvr_param_string, - { "Set Parameter Value", "ncp.srvr_param_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_srvr_param_string, + { "Set Parameter Value", "ncp.srvr_param_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_srvr_param_number, - { "Set Parameter Value", "ncp.srvr_param_string", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_srvr_param_number, + { "Set Parameter Value", "ncp.srvr_param_string", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_srvr_param_boolean, - { "Set Parameter Value", "ncp.srvr_param_boolean", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_srvr_param_boolean, + { "Set Parameter Value", "ncp.srvr_param_boolean", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_number_of_items, - { "Number of Items", "ncp.ndsitems", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_number_of_items, + { "Number of Items", "ncp.ndsitems", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ncp_nds_iterverb, - { "NDS Iteration Verb", "ncp.ndsiterverb", FT_UINT32, BASE_HEX, NULL /*VALS(iterator_subverbs)*/, 0x0, NULL, HFILL }}, + { &hf_ncp_nds_iterverb, + { "NDS Iteration Verb", "ncp.ndsiterverb", FT_UINT32, BASE_HEX, NULL /*VALS(iterator_subverbs)*/, 0x0, NULL, HFILL }}, - { &hf_iter_completion_code, - { "Iteration Completion Code", "ncp.iter_completion_code", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_iter_completion_code, + { "Iteration Completion Code", "ncp.iter_completion_code", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, #if 0 /* Unused ? */ - { &hf_nds_iterobj, - { "Iterator Object", "ncp.ndsiterobj", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_iterobj, + { "Iterator Object", "ncp.ndsiterobj", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, #endif - { &hf_iter_verb_completion_code, - { "Completion Code", "ncp.iter_verb_completion_code", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_iter_verb_completion_code, + { "Completion Code", "ncp.iter_verb_completion_code", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_iter_ans, - { "Iterator Answer", "ncp.iter_answer", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_iter_ans, + { "Iterator Answer", "ncp.iter_answer", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_positionable, - { "Positionable", "ncp.iterpositionable", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_positionable, + { "Positionable", "ncp.iterpositionable", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_num_skipped, - { "Number Skipped", "ncp.iternumskipped", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_num_skipped, + { "Number Skipped", "ncp.iternumskipped", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_num_to_skip, - { "Number to Skip", "ncp.iternumtoskip", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_num_to_skip, + { "Number to Skip", "ncp.iternumtoskip", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_timelimit, - { "Time Limit", "ncp.itertimelimit", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_timelimit, + { "Time Limit", "ncp.itertimelimit", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_iter_index, - { "Iterator Index", "ncp.iterindex", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_iter_index, + { "Iterator Index", "ncp.iterindex", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_num_to_get, - { "Number to Get", "ncp.iternumtoget", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_num_to_get, + { "Number to Get", "ncp.iternumtoget", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, #if 0 /* Unused ? */ - { &hf_ret_info_type, - { "Return Information Type", "ncp.iterretinfotype", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_ret_info_type, + { "Return Information Type", "ncp.iterretinfotype", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, #endif - { &hf_data_size, - { "Data Size", "ncp.iterdatasize", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_data_size, + { "Data Size", "ncp.iterdatasize", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_this_count, - { "Number of Items", "ncp.itercount", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_this_count, + { "Number of Items", "ncp.itercount", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_max_entries, - { "Maximum Entries", "ncp.itermaxentries", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_max_entries, + { "Maximum Entries", "ncp.itermaxentries", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_move_position, - { "Move Position", "ncp.itermoveposition", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_move_position, + { "Move Position", "ncp.itermoveposition", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_iter_copy, - { "Iterator Copy", "ncp.itercopy", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_iter_copy, + { "Iterator Copy", "ncp.itercopy", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_iter_position, - { "Iteration Position", "ncp.iterposition", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_iter_position, + { "Iteration Position", "ncp.iterposition", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_iter_search, - { "Search Filter", "ncp.iter_search", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_iter_search, + { "Search Filter", "ncp.iter_search", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_iter_other, - { "Other Iteration", "ncp.iterother", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_iter_other, + { "Other Iteration", "ncp.iterother", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_nds_oid, - { "Object ID", "ncp.nds_oid", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_nds_oid, + { "Object ID", "ncp.nds_oid", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - """ - # Print the registration code for the hf variables - for var in sorted_vars: - print "\t{ &%s," % (var.HFName()) - print "\t{ \"%s\", \"%s\", %s, %s, %s, 0x%x, NULL, HFILL }},\n" % \ - (var.Description(), var.DFilter(), - var.WiresharkFType(), var.Display(), var.ValuesName(), - var.Mask()) +""") + # Print the registration code for the hf variables + for var in sorted_vars: + print("\t{ &%s," % (var.HFName())) + print("\t{ \"%s\", \"%s\", %s, %s, %s, 0x%x, NULL, HFILL }},\n" % \ + (var.Description(), var.DFilter(), + var.WiresharkFType(), var.Display(), var.ValuesName(), + var.Mask())) - print "\t};\n" + print("\t};\n") - if ett_list: - print "\tstatic gint *ett[] = {" + if ett_list: + print("\tstatic gint *ett[] = {") - for ett in ett_list: - print "\t\t&%s," % (ett,) + for ett in ett_list: + print("\t\t&%s," % (ett,)) - print "\t};\n" + print("\t};\n") - print """ - proto_register_field_array(proto_ncp, hf, array_length(hf));""" + print(""" + proto_register_field_array(proto_ncp, hf, array_length(hf));""") - if ett_list: - print """ - proto_register_subtree_array(ett, array_length(ett));""" + if ett_list: + print(""" +proto_register_subtree_array(ett, array_length(ett));""") - print """ - register_init_routine(&ncp_init_protocol); - register_postseq_cleanup_routine(&ncp_postseq_cleanup);""" + print(""" + register_init_routine(&ncp_init_protocol); + register_postseq_cleanup_routine(&ncp_postseq_cleanup);""") - # End of proto_register_ncp2222() - print "}" - print "" - print '#include "packet-ncp2222.inc"' + # End of proto_register_ncp2222() + print("}") + print("") + print('#include "packet-ncp2222.inc"') def usage(): - print "Usage: ncp2222.py -o output_file" - sys.exit(1) + print("Usage: ncp2222.py -o output_file") + sys.exit(1) def main(): - global compcode_lists - global ptvc_lists - global msg - - optstring = "o:" - out_filename = None - - try: - opts, args = getopt.getopt(sys.argv[1:], optstring) - except getopt.error: - usage() - - for opt, arg in opts: - if opt == "-o": - out_filename = arg - else: - usage() - - if len(args) != 0: - usage() - - if not out_filename: - usage() - - # Create the output file - try: - out_file = open(out_filename, "w") - except IOError, err: - sys.exit("Could not open %s for writing: %s" % (out_filename, - err)) - - # Set msg to current stdout - msg = sys.stdout - - # Set stdout to the output file - sys.stdout = out_file - - msg.write("Processing NCP definitions...\n") - # Run the code, and if we catch any exception, - # erase the output file. - try: - compcode_lists = UniqueCollection('Completion Code Lists') - ptvc_lists = UniqueCollection('PTVC Lists') - - define_errors() - define_groups() - - define_ncp2222() - - msg.write("Defined %d NCP types.\n" % (len(packets),)) - produce_code() - except: - traceback.print_exc(20, msg) - try: - out_file.close() - except IOError, err: - msg.write("Could not close %s: %s\n" % (out_filename, err)) - - try: - if os.path.exists(out_filename): - os.remove(out_filename) - except OSError, err: - msg.write("Could not remove %s: %s\n" % (out_filename, err)) + global compcode_lists + global ptvc_lists + global msg + + optstring = "o:" + out_filename = None + + try: + opts, args = getopt.getopt(sys.argv[1:], optstring) + except getopt.error: + usage() + + for opt, arg in opts: + if opt == "-o": + out_filename = arg + else: + usage() + + if len(args) != 0: + usage() + + if not out_filename: + usage() + + # Create the output file + try: + out_file = open(out_filename, "w") + except IOError: + sys.exit("Could not open %s for writing: %s" % (out_filename, + IOError)) + + # Set msg to current stdout + msg = sys.stdout + + # Set stdout to the output file + sys.stdout = out_file + + msg.write("Processing NCP definitions...\n") + # Run the code, and if we catch any exception, + # erase the output file. + try: + compcode_lists = UniqueCollection('Completion Code Lists') + ptvc_lists = UniqueCollection('PTVC Lists') + + define_errors() + define_groups() + + define_ncp2222() + + msg.write("Defined %d NCP types.\n" % (len(packets),)) + produce_code() + except: + traceback.print_exc(20, msg) + try: + out_file.close() + except IOError: + msg.write("Could not close %s: %s\n" % (out_filename, IOError)) + + try: + if os.path.exists(out_filename): + os.remove(out_filename) + except OSError: + msg.write("Could not remove %s: %s\n" % (out_filename, OSError)) - sys.exit(1) + sys.exit(1) def define_ncp2222(): - ############################################################################## - # NCP Packets. Here I list functions and subfunctions in hexadecimal like the - # NCP book (and I believe LanAlyzer does this too). - # However, Novell lists these in decimal in their on-line documentation. - ############################################################################## - # 2222/01 - pkt = NCP(0x01, "File Set Lock", 'sync') - pkt.Request(7) - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - # 2222/02 - pkt = NCP(0x02, "File Release Lock", 'sync') - pkt.Request(7) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xff00]) - # 2222/03 - pkt = NCP(0x03, "Log File Exclusive", 'sync') - pkt.Request( (12, 267), [ - rec( 7, 1, DirHandle ), - rec( 8, 1, LockFlag ), - rec( 9, 2, TimeoutLimit, BE ), - rec( 11, (1, 256), FilePath ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8200, 0x9600, 0xfe0d, 0xff01]) - # 2222/04 - pkt = NCP(0x04, "Lock File Set", 'sync') - pkt.Request( 9, [ - rec( 7, 2, TimeoutLimit ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xfe0d, 0xff01]) - ## 2222/05 - pkt = NCP(0x05, "Release File", 'sync') - pkt.Request( (9, 264), [ - rec( 7, 1, DirHandle ), - rec( 8, (1, 256), FilePath ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9b00, 0x9c03, 0xff1a]) - # 2222/06 - pkt = NCP(0x06, "Release File Set", 'sync') - pkt.Request( 8, [ - rec( 7, 1, LockFlag ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - # 2222/07 - pkt = NCP(0x07, "Clear File", 'sync') - pkt.Request( (9, 264), [ - rec( 7, 1, DirHandle ), - rec( 8, (1, 256), FilePath ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9b03, 0x9c03, - 0xa100, 0xfd00, 0xff1a]) - # 2222/08 - pkt = NCP(0x08, "Clear File Set", 'sync') - pkt.Request( 8, [ - rec( 7, 1, LockFlag ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - # 2222/09 - pkt = NCP(0x09, "Log Logical Record", 'sync') - pkt.Request( (11, 138), [ - rec( 7, 1, LockFlag ), - rec( 8, 2, TimeoutLimit, BE ), - rec( 10, (1, 128), LogicalRecordName ), - ], info_str=(LogicalRecordName, "Log Logical Record: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xfe0d, 0xff1a]) - # 2222/0A, 10 - pkt = NCP(0x0A, "Lock Logical Record Set", 'sync') - pkt.Request( 10, [ - rec( 7, 1, LockFlag ), - rec( 8, 2, TimeoutLimit ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xfe0d, 0xff1a]) - # 2222/0B, 11 - pkt = NCP(0x0B, "Clear Logical Record", 'sync') - pkt.Request( (8, 135), [ - rec( 7, (1, 128), LogicalRecordName ), - ], info_str=(LogicalRecordName, "Clear Logical Record: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xff1a]) - # 2222/0C, 12 - pkt = NCP(0x0C, "Release Logical Record", 'sync') - pkt.Request( (8, 135), [ - rec( 7, (1, 128), LogicalRecordName ), - ], info_str=(LogicalRecordName, "Release Logical Record: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xff1a]) - # 2222/0D, 13 - pkt = NCP(0x0D, "Release Logical Record Set", 'sync') - pkt.Request( 8, [ - rec( 7, 1, LockFlag ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - # 2222/0E, 14 - pkt = NCP(0x0E, "Clear Logical Record Set", 'sync') - pkt.Request( 8, [ - rec( 7, 1, LockFlag ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - # 2222/1100, 17/00 - pkt = NCP(0x1100, "Write to Spool File", 'print') - pkt.Request( (11, 16), [ - rec( 10, ( 1, 6 ), Data ), - ], info_str=(Data, "Write to Spool File: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0104, 0x8000, 0x8101, 0x8701, 0x8800, - 0x8d00, 0x8e00, 0x8f00, 0x9001, 0x9400, 0x9500, - 0x9600, 0x9804, 0x9900, 0xa100, 0xa201, 0xff19]) - # 2222/1101, 17/01 - pkt = NCP(0x1101, "Close Spool File", 'print') - pkt.Request( 11, [ - rec( 10, 1, AbortQueueFlag ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8701, 0x8800, 0x8d00, - 0x8e00, 0x8f00, 0x9001, 0x9300, 0x9400, 0x9500, - 0x9600, 0x9804, 0x9900, 0x9b03, 0x9c03, 0x9d00, - 0xa100, 0xd000, 0xd100, 0xd202, 0xd300, 0xd400, - 0xda01, 0xe800, 0xea00, 0xeb00, 0xec00, 0xfc06, - 0xfd00, 0xfe07, 0xff06]) - # 2222/1102, 17/02 - pkt = NCP(0x1102, "Set Spool File Flags", 'print') - pkt.Request( 30, [ - rec( 10, 1, PrintFlags ), - rec( 11, 1, TabSize ), - rec( 12, 1, TargetPrinter ), - rec( 13, 1, Copies ), - rec( 14, 1, FormType ), - rec( 15, 1, Reserved ), - rec( 16, 14, BannerName ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xd202, 0xd300, 0xe800, 0xea00, - 0xeb00, 0xec00, 0xfc06, 0xfe07, 0xff06]) - - # 2222/1103, 17/03 - pkt = NCP(0x1103, "Spool A Disk File", 'print') - pkt.Request( (12, 23), [ - rec( 10, 1, DirHandle ), - rec( 11, (1, 12), Data ), - ], info_str=(Data, "Spool a Disk File: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8701, 0x8800, 0x8d00, - 0x8e00, 0x8f00, 0x9001, 0x9300, 0x9400, 0x9500, - 0x9600, 0x9804, 0x9900, 0x9b03, 0x9c03, 0x9d00, - 0xa100, 0xd000, 0xd100, 0xd202, 0xd300, 0xd400, - 0xda01, 0xe800, 0xea00, 0xeb00, 0xec00, 0xfc06, - 0xfd00, 0xfe07, 0xff06]) - - # 2222/1106, 17/06 - pkt = NCP(0x1106, "Get Printer Status", 'print') - pkt.Request( 11, [ - rec( 10, 1, TargetPrinter ), - ]) - pkt.Reply(12, [ - rec( 8, 1, PrinterHalted ), - rec( 9, 1, PrinterOffLine ), - rec( 10, 1, CurrentFormType ), - rec( 11, 1, RedirectedPrinter ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xfb05, 0xfd00, 0xff06]) - - # 2222/1109, 17/09 - pkt = NCP(0x1109, "Create Spool File", 'print') - pkt.Request( (12, 23), [ - rec( 10, 1, DirHandle ), - rec( 11, (1, 12), Data ), - ], info_str=(Data, "Create Spool File: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8400, 0x8701, 0x8d00, - 0x8f00, 0x9001, 0x9400, 0x9600, 0x9804, 0x9900, - 0x9b03, 0x9c03, 0xa100, 0xd000, 0xd100, 0xd202, - 0xd300, 0xd400, 0xda01, 0xe800, 0xea00, 0xeb00, - 0xec00, 0xfc06, 0xfd00, 0xfe07, 0xff06]) - - # 2222/110A, 17/10 - pkt = NCP(0x110A, "Get Printer's Queue", 'print') - pkt.Request( 11, [ - rec( 10, 1, TargetPrinter ), - ]) - pkt.Reply( 12, [ - rec( 8, 4, ObjectID, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xff06]) - - # 2222/12, 18 - pkt = NCP(0x12, "Get Volume Info with Number", 'file') - pkt.Request( 8, [ - rec( 7, 1, VolumeNumber ) - ],info_str=(VolumeNumber, "Get Volume Information for Volume %d", ", %d")) - pkt.Reply( 36, [ - rec( 8, 2, SectorsPerCluster, BE ), - rec( 10, 2, TotalVolumeClusters, BE ), - rec( 12, 2, AvailableClusters, BE ), - rec( 14, 2, TotalDirectorySlots, BE ), - rec( 16, 2, AvailableDirectorySlots, BE ), - rec( 18, 16, VolumeName ), - rec( 34, 2, RemovableFlag, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x9804]) - - # 2222/13, 19 - pkt = NCP(0x13, "Get Station Number", 'connection') - pkt.Request(7) - pkt.Reply(11, [ - rec( 8, 3, StationNumber ) - ]) - pkt.CompletionCodes([0x0000, 0xff00]) - - # 2222/14, 20 - pkt = NCP(0x14, "Get File Server Date And Time", 'fileserver') - pkt.Request(7) - pkt.Reply(15, [ - rec( 8, 1, Year ), - rec( 9, 1, Month ), - rec( 10, 1, Day ), - rec( 11, 1, Hour ), - rec( 12, 1, Minute ), - rec( 13, 1, Second ), - rec( 14, 1, DayOfWeek ), - ]) - pkt.CompletionCodes([0x0000]) - - # 2222/1500, 21/00 - pkt = NCP(0x1500, "Send Broadcast Message", 'message') - pkt.Request((13, 70), [ - rec( 10, 1, ClientListLen, var="x" ), - rec( 11, 1, TargetClientList, repeat="x" ), - rec( 12, (1, 58), TargetMessage ), - ], info_str=(TargetMessage, "Send Broadcast Message: %s", ", %s")) - pkt.Reply(10, [ - rec( 8, 1, ClientListLen, var="x" ), - rec( 9, 1, SendStatus, repeat="x" ) - ]) - pkt.CompletionCodes([0x0000, 0xfd00]) - - # 2222/1501, 21/01 - pkt = NCP(0x1501, "Get Broadcast Message", 'message') - pkt.Request(10) - pkt.Reply((9,66), [ - rec( 8, (1, 58), TargetMessage ) - ]) - pkt.CompletionCodes([0x0000, 0xfd00]) - - # 2222/1502, 21/02 - pkt = NCP(0x1502, "Disable Broadcasts", 'message') - pkt.Request(10) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xfb0a]) - - # 2222/1503, 21/03 - pkt = NCP(0x1503, "Enable Broadcasts", 'message') - pkt.Request(10) - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - - # 2222/1509, 21/09 - pkt = NCP(0x1509, "Broadcast To Console", 'message') - pkt.Request((11, 68), [ - rec( 10, (1, 58), TargetMessage ) - ], info_str=(TargetMessage, "Broadcast to Console: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - - # 2222/150A, 21/10 - pkt = NCP(0x150A, "Send Broadcast Message", 'message') - pkt.Request((17, 74), [ - rec( 10, 2, ClientListCount, LE, var="x" ), - rec( 12, 4, ClientList, LE, repeat="x" ), - rec( 16, (1, 58), TargetMessage ), - ], info_str=(TargetMessage, "Send Broadcast Message: %s", ", %s")) - pkt.Reply(14, [ - rec( 8, 2, ClientListCount, LE, var="x" ), - rec( 10, 4, ClientCompFlag, LE, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0xfd00]) - - # 2222/150B, 21/11 - pkt = NCP(0x150B, "Get Broadcast Message", 'message') - pkt.Request(10) - pkt.Reply((9,66), [ - rec( 8, (1, 58), TargetMessage ) - ]) - pkt.CompletionCodes([0x0000, 0xfd00]) - - # 2222/150C, 21/12 - pkt = NCP(0x150C, "Connection Message Control", 'message') - pkt.Request(22, [ - rec( 10, 1, ConnectionControlBits ), - rec( 11, 3, Reserved3 ), - rec( 14, 4, ConnectionListCount, LE, var="x" ), - rec( 18, 4, ConnectionList, LE, repeat="x" ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xff00]) - - # 2222/1600, 22/0 - pkt = NCP(0x1600, "Set Directory Handle", 'file') - pkt.Request((13,267), [ - rec( 10, 1, TargetDirHandle ), - rec( 11, 1, DirHandle ), - rec( 12, (1, 255), Path ), - ], info_str=(Path, "Set Directory Handle to: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9b03, 0x9c03, 0xa100, 0xfa00, - 0xfd00, 0xff00]) - - - # 2222/1601, 22/1 - pkt = NCP(0x1601, "Get Directory Path", 'file') - pkt.Request(11, [ - rec( 10, 1, DirHandle ), - ],info_str=(DirHandle, "Get Directory Path for Directory Handle %d", ", %d")) - pkt.Reply((9,263), [ - rec( 8, (1,255), Path ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0x9b00, 0x9c00, 0xa100]) - - # 2222/1602, 22/2 - pkt = NCP(0x1602, "Scan Directory Information", 'file') - pkt.Request((14,268), [ - rec( 10, 1, DirHandle ), - rec( 11, 2, StartingSearchNumber, BE ), - rec( 13, (1, 255), Path ), - ], info_str=(Path, "Scan Directory Information: %s", ", %s")) - pkt.Reply(36, [ - rec( 8, 16, DirectoryPath ), - rec( 24, 2, CreationDate, BE ), - rec( 26, 2, CreationTime, BE ), - rec( 28, 4, CreatorID, BE ), - rec( 32, 1, AccessRightsMask ), - rec( 33, 1, Reserved ), - rec( 34, 2, NextSearchNumber, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9b03, 0x9c03, 0xa100, 0xfa00, - 0xfd00, 0xff00]) - - # 2222/1603, 22/3 - pkt = NCP(0x1603, "Get Effective Directory Rights", 'file') - pkt.Request((12,266), [ - rec( 10, 1, DirHandle ), - rec( 11, (1, 255), Path ), - ], info_str=(Path, "Get Effective Directory Rights: %s", ", %s")) - pkt.Reply(9, [ - rec( 8, 1, AccessRightsMask ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9b03, 0x9c03, 0xa100, 0xfa00, - 0xfd00, 0xff00]) - - # 2222/1604, 22/4 - pkt = NCP(0x1604, "Modify Maximum Rights Mask", 'file') - pkt.Request((14,268), [ - rec( 10, 1, DirHandle ), - rec( 11, 1, RightsGrantMask ), - rec( 12, 1, RightsRevokeMask ), - rec( 13, (1, 255), Path ), - ], info_str=(Path, "Modify Maximum Rights Mask: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8c00, 0x9600, 0x9804, 0x9b03, 0x9c03, 0xa100, 0xfa00, - 0xfd00, 0xff00]) - - # 2222/1605, 22/5 - pkt = NCP(0x1605, "Get Volume Number", 'file') - pkt.Request((11, 265), [ - rec( 10, (1,255), VolumeNameLen ), - ], info_str=(VolumeNameLen, "Get Volume Number for: %s", ", %s")) - pkt.Reply(9, [ - rec( 8, 1, VolumeNumber ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0x9804]) - - # 2222/1606, 22/6 - pkt = NCP(0x1606, "Get Volume Name", 'file') - pkt.Request(11, [ - rec( 10, 1, VolumeNumber ), - ],info_str=(VolumeNumber, "Get Name for Volume %d", ", %d")) - pkt.Reply((9, 263), [ - rec( 8, (1,255), VolumeNameLen ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0xff00]) - - # 2222/160A, 22/10 - pkt = NCP(0x160A, "Create Directory", 'file') - pkt.Request((13,267), [ - rec( 10, 1, DirHandle ), - rec( 11, 1, AccessRightsMask ), - rec( 12, (1, 255), Path ), - ], info_str=(Path, "Create Directory: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8400, 0x9600, 0x9804, 0x9900, 0x9b03, 0x9c03, - 0x9e00, 0xa100, 0xfd00, 0xff00]) - - # 2222/160B, 22/11 - pkt = NCP(0x160B, "Delete Directory", 'file') - pkt.Request((13,267), [ - rec( 10, 1, DirHandle ), - rec( 11, 1, Reserved ), - rec( 12, (1, 255), Path ), - ], info_str=(Path, "Delete Directory: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8a00, 0x9600, 0x9804, 0x9b03, 0x9c03, - 0x9f00, 0xa000, 0xa100, 0xfd00, 0xff00]) - - # 2222/160C, 22/12 - pkt = NCP(0x160C, "Scan Directory for Trustees", 'file') - pkt.Request((13,267), [ - rec( 10, 1, DirHandle ), - rec( 11, 1, TrusteeSetNumber ), - rec( 12, (1, 255), Path ), - ], info_str=(Path, "Scan Directory for Trustees: %s", ", %s")) - pkt.Reply(57, [ - rec( 8, 16, DirectoryPath ), - rec( 24, 2, CreationDate, BE ), - rec( 26, 2, CreationTime, BE ), - rec( 28, 4, CreatorID ), - rec( 32, 4, TrusteeID, BE ), - rec( 36, 4, TrusteeID, BE ), - rec( 40, 4, TrusteeID, BE ), - rec( 44, 4, TrusteeID, BE ), - rec( 48, 4, TrusteeID, BE ), - rec( 52, 1, AccessRightsMask ), - rec( 53, 1, AccessRightsMask ), - rec( 54, 1, AccessRightsMask ), - rec( 55, 1, AccessRightsMask ), - rec( 56, 1, AccessRightsMask ), - ]) - pkt.CompletionCodes([0x0000, 0x8c00, 0x9600, 0x9804, 0x9b03, 0x9c03, - 0xa100, 0xfd00, 0xff00]) - - # 2222/160D, 22/13 - pkt = NCP(0x160D, "Add Trustee to Directory", 'file') - pkt.Request((17,271), [ - rec( 10, 1, DirHandle ), - rec( 11, 4, TrusteeID, BE ), - rec( 15, 1, AccessRightsMask ), - rec( 16, (1, 255), Path ), - ], info_str=(Path, "Add Trustee to Directory: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8c00, 0x9600, 0x9804, 0x9900, 0x9b03, 0x9c03, - 0xa100, 0xfc06, 0xfd00, 0xff00]) - - # 2222/160E, 22/14 - pkt = NCP(0x160E, "Delete Trustee from Directory", 'file') - pkt.Request((17,271), [ - rec( 10, 1, DirHandle ), - rec( 11, 4, TrusteeID, BE ), - rec( 15, 1, Reserved ), - rec( 16, (1, 255), Path ), - ], info_str=(Path, "Delete Trustee from Directory: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8c00, 0x9600, 0x9804, 0x9900, 0x9b03, 0x9c03, - 0xa100, 0xfc06, 0xfd00, 0xfe07, 0xff00]) - - # 2222/160F, 22/15 - pkt = NCP(0x160F, "Rename Directory", 'file') - pkt.Request((13, 521), [ - rec( 10, 1, DirHandle ), - rec( 11, (1, 255), Path ), - rec( -1, (1, 255), NewPath ), - ], info_str=(Path, "Rename Directory: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8b00, 0x9200, 0x9600, 0x9804, 0x9b03, 0x9c03, - 0x9e00, 0xa100, 0xef00, 0xfd00, 0xff00]) - - # 2222/1610, 22/16 - pkt = NCP(0x1610, "Purge Erased Files", 'file') - pkt.Request(10) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8100, 0x9600, 0x9804, 0xa100, 0xff00]) - - # 2222/1611, 22/17 - pkt = NCP(0x1611, "Recover Erased File", 'file') - pkt.Request(11, [ - rec( 10, 1, DirHandle ), - ],info_str=(DirHandle, "Recover Erased File from Directory Handle %d", ", %d")) - pkt.Reply(38, [ - rec( 8, 15, OldFileName ), - rec( 23, 15, NewFileName ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9b03, 0x9c03, - 0xa100, 0xfd00, 0xff00]) - # 2222/1612, 22/18 - pkt = NCP(0x1612, "Alloc Permanent Directory Handle", 'file') - pkt.Request((13, 267), [ - rec( 10, 1, DirHandle ), - rec( 11, 1, DirHandleName ), - rec( 12, (1,255), Path ), - ], info_str=(Path, "Allocate Permanent Directory Handle: %s", ", %s")) - pkt.Reply(10, [ - rec( 8, 1, DirHandle ), - rec( 9, 1, AccessRightsMask ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9900, 0x9b00, 0x9c03, 0x9d00, - 0xa100, 0xfd00, 0xff00]) - # 2222/1613, 22/19 - pkt = NCP(0x1613, "Alloc Temporary Directory Handle", 'file') - pkt.Request((13, 267), [ - rec( 10, 1, DirHandle ), - rec( 11, 1, DirHandleName ), - rec( 12, (1,255), Path ), - ], info_str=(Path, "Allocate Temporary Directory Handle: %s", ", %s")) - pkt.Reply(10, [ - rec( 8, 1, DirHandle ), - rec( 9, 1, AccessRightsMask ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9900, 0x9c03, 0x9d00, - 0xa100, 0xfd00, 0xff00]) - # 2222/1614, 22/20 - pkt = NCP(0x1614, "Deallocate Directory Handle", 'file') - pkt.Request(11, [ - rec( 10, 1, DirHandle ), - ],info_str=(DirHandle, "Deallocate Directory Handle %d", ", %d")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9b03]) - # 2222/1615, 22/21 - pkt = NCP(0x1615, "Get Volume Info with Handle", 'file') - pkt.Request( 11, [ - rec( 10, 1, DirHandle ) - ],info_str=(DirHandle, "Get Volume Information with Handle %d", ", %d")) - pkt.Reply( 36, [ - rec( 8, 2, SectorsPerCluster, BE ), - rec( 10, 2, TotalVolumeClusters, BE ), - rec( 12, 2, AvailableClusters, BE ), - rec( 14, 2, TotalDirectorySlots, BE ), - rec( 16, 2, AvailableDirectorySlots, BE ), - rec( 18, 16, VolumeName ), - rec( 34, 2, RemovableFlag, BE ), - ]) - pkt.CompletionCodes([0x0000, 0xff00]) - # 2222/1616, 22/22 - pkt = NCP(0x1616, "Alloc Special Temporary Directory Handle", 'file') - pkt.Request((13, 267), [ - rec( 10, 1, DirHandle ), - rec( 11, 1, DirHandleName ), - rec( 12, (1,255), Path ), - ], info_str=(Path, "Allocate Special Temporary Directory Handle: %s", ", %s")) - pkt.Reply(10, [ - rec( 8, 1, DirHandle ), - rec( 9, 1, AccessRightsMask ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9900, 0x9b00, 0x9c03, 0x9d00, - 0xa100, 0xfd00, 0xff00]) - # 2222/1617, 22/23 - pkt = NCP(0x1617, "Extract a Base Handle", 'file') - pkt.Request(11, [ - rec( 10, 1, DirHandle ), - ],info_str=(DirHandle, "Extract a Base Handle from Directory Handle %d", ", %d")) - pkt.Reply(22, [ - rec( 8, 10, ServerNetworkAddress ), - rec( 18, 4, DirHandleLong ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0x9b03]) - # 2222/1618, 22/24 - pkt = NCP(0x1618, "Restore an Extracted Base Handle", 'file') - pkt.Request(24, [ - rec( 10, 10, ServerNetworkAddress ), - rec( 20, 4, DirHandleLong ), - ]) - pkt.Reply(10, [ - rec( 8, 1, DirHandle ), - rec( 9, 1, AccessRightsMask ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9b03, 0x9c00, 0x9d00, 0xa100, - 0xfd00, 0xff00]) - # 2222/1619, 22/25 - pkt = NCP(0x1619, "Set Directory Information", 'file') - pkt.Request((21, 275), [ - rec( 10, 1, DirHandle ), - rec( 11, 2, CreationDate ), - rec( 13, 2, CreationTime ), - rec( 15, 4, CreatorID, BE ), - rec( 19, 1, AccessRightsMask ), - rec( 20, (1,255), Path ), - ], info_str=(Path, "Set Directory Information: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8c00, 0x9600, 0x9804, 0x9b03, 0x9c00, 0xa100, - 0xff16]) - # 2222/161A, 22/26 - pkt = NCP(0x161A, "Get Path Name of a Volume-Directory Number Pair", 'file') - pkt.Request(13, [ - rec( 10, 1, VolumeNumber ), - rec( 11, 2, DirectoryEntryNumberWord ), - ]) - pkt.Reply((9,263), [ - rec( 8, (1,255), Path ), - ]) - pkt.CompletionCodes([0x0000, 0x9804, 0x9c00, 0xa100]) - # 2222/161B, 22/27 - pkt = NCP(0x161B, "Scan Salvageable Files", 'file') - pkt.Request(15, [ - rec( 10, 1, DirHandle ), - rec( 11, 4, SequenceNumber ), - ]) - pkt.Reply(140, [ - rec( 8, 4, SequenceNumber ), - rec( 12, 2, Subdirectory ), - rec( 14, 2, Reserved2 ), - rec( 16, 4, AttributesDef32 ), - rec( 20, 1, UniqueID ), - rec( 21, 1, FlagsDef ), - rec( 22, 1, DestNameSpace ), - rec( 23, 1, FileNameLen ), - rec( 24, 12, FileName12 ), - rec( 36, 2, CreationTime ), - rec( 38, 2, CreationDate ), - rec( 40, 4, CreatorID, BE ), - rec( 44, 2, ArchivedTime ), - rec( 46, 2, ArchivedDate ), - rec( 48, 4, ArchiverID, BE ), - rec( 52, 2, UpdateTime ), - rec( 54, 2, UpdateDate ), - rec( 56, 4, UpdateID, BE ), - rec( 60, 4, FileSize, BE ), - rec( 64, 44, Reserved44 ), - rec( 108, 2, InheritedRightsMask ), - rec( 110, 2, LastAccessedDate ), - rec( 112, 4, DeletedFileTime ), - rec( 116, 2, DeletedTime ), - rec( 118, 2, DeletedDate ), - rec( 120, 4, DeletedID, BE ), - rec( 124, 16, Reserved16 ), - ]) - pkt.CompletionCodes([0x0000, 0xfb01, 0x9801, 0xff1d]) - # 2222/161C, 22/28 - pkt = NCP(0x161C, "Recover Salvageable File", 'file') - pkt.Request((17,525), [ - rec( 10, 1, DirHandle ), - rec( 11, 4, SequenceNumber ), - rec( 15, (1, 255), FileName ), - rec( -1, (1, 255), NewFileNameLen ), - ], info_str=(FileName, "Recover File: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8401, 0x9c03, 0xfe02]) - # 2222/161D, 22/29 - pkt = NCP(0x161D, "Purge Salvageable File", 'file') - pkt.Request(15, [ - rec( 10, 1, DirHandle ), - rec( 11, 4, SequenceNumber ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8500, 0x9c03]) - # 2222/161E, 22/30 - pkt = NCP(0x161E, "Scan a Directory", 'file') - pkt.Request((17, 271), [ - rec( 10, 1, DirHandle ), - rec( 11, 1, DOSFileAttributes ), - rec( 12, 4, SequenceNumber ), - rec( 16, (1, 255), SearchPattern ), - ], info_str=(SearchPattern, "Scan a Directory: %s", ", %s")) - pkt.Reply(140, [ - rec( 8, 4, SequenceNumber ), - rec( 12, 4, Subdirectory ), - rec( 16, 4, AttributesDef32 ), - rec( 20, 1, UniqueID, LE ), - rec( 21, 1, PurgeFlags ), - rec( 22, 1, DestNameSpace ), - rec( 23, 1, NameLen ), - rec( 24, 12, Name12 ), - rec( 36, 2, CreationTime ), - rec( 38, 2, CreationDate ), - rec( 40, 4, CreatorID, BE ), - rec( 44, 2, ArchivedTime ), - rec( 46, 2, ArchivedDate ), - rec( 48, 4, ArchiverID, BE ), - rec( 52, 2, UpdateTime ), - rec( 54, 2, UpdateDate ), - rec( 56, 4, UpdateID, BE ), - rec( 60, 4, FileSize, BE ), - rec( 64, 44, Reserved44 ), - rec( 108, 2, InheritedRightsMask ), - rec( 110, 2, LastAccessedDate ), - rec( 112, 28, Reserved28 ), - ]) - pkt.CompletionCodes([0x0000, 0x8500, 0x9c03]) - # 2222/161F, 22/31 - pkt = NCP(0x161F, "Get Directory Entry", 'file') - pkt.Request(11, [ - rec( 10, 1, DirHandle ), - ]) - pkt.Reply(136, [ - rec( 8, 4, Subdirectory ), - rec( 12, 4, AttributesDef32 ), - rec( 16, 1, UniqueID, LE ), - rec( 17, 1, PurgeFlags ), - rec( 18, 1, DestNameSpace ), - rec( 19, 1, NameLen ), - rec( 20, 12, Name12 ), - rec( 32, 2, CreationTime ), - rec( 34, 2, CreationDate ), - rec( 36, 4, CreatorID, BE ), - rec( 40, 2, ArchivedTime ), - rec( 42, 2, ArchivedDate ), - rec( 44, 4, ArchiverID, BE ), - rec( 48, 2, UpdateTime ), - rec( 50, 2, UpdateDate ), - rec( 52, 4, NextTrusteeEntry, BE ), - rec( 56, 48, Reserved48 ), - rec( 104, 2, MaximumSpace ), - rec( 106, 2, InheritedRightsMask ), - rec( 108, 28, Undefined28 ), - ]) - pkt.CompletionCodes([0x0000, 0x8900, 0xbf00, 0xfb00]) - # 2222/1620, 22/32 - pkt = NCP(0x1620, "Scan Volume's User Disk Restrictions", 'file') - pkt.Request(15, [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, SequenceNumber ), - ]) - pkt.Reply(17, [ - rec( 8, 1, NumberOfEntries, var="x" ), - rec( 9, 8, ObjectIDStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9800]) - # 2222/1621, 22/33 - pkt = NCP(0x1621, "Add User Disk Space Restriction", 'file') - pkt.Request(19, [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, ObjectID ), - rec( 15, 4, DiskSpaceLimit ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8c00, 0x9600, 0x9800]) - # 2222/1622, 22/34 - pkt = NCP(0x1622, "Remove User Disk Space Restrictions", 'file') - pkt.Request(15, [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, ObjectID ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8c00, 0xfe0e]) - # 2222/1623, 22/35 - pkt = NCP(0x1623, "Get Directory Disk Space Restriction", 'file') - pkt.Request(11, [ - rec( 10, 1, DirHandle ), - ]) - pkt.Reply(18, [ - rec( 8, 1, NumberOfEntries ), - rec( 9, 1, Level ), - rec( 10, 4, MaxSpace ), - rec( 14, 4, CurrentSpace ), - ]) - pkt.CompletionCodes([0x0000]) - # 2222/1624, 22/36 - pkt = NCP(0x1624, "Set Directory Disk Space Restriction", 'file') - pkt.Request(15, [ - rec( 10, 1, DirHandle ), - rec( 11, 4, DiskSpaceLimit ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0101, 0x8c00, 0xbf00]) - # 2222/1625, 22/37 - pkt = NCP(0x1625, "Set Directory Entry Information", 'file') - pkt.Request(NO_LENGTH_CHECK, [ - # - # XXX - this didn't match what was in the spec for 22/37 - # on the Novell Web site. - # - rec( 10, 1, DirHandle ), - rec( 11, 1, SearchAttributes ), - rec( 12, 4, SequenceNumber ), - rec( 16, 2, ChangeBits ), - rec( 18, 2, Reserved2 ), - rec( 20, 4, Subdirectory ), - #srec(DOSDirectoryEntryStruct, req_cond="ncp.search_att_sub == TRUE"), - srec(DOSFileEntryStruct, req_cond="ncp.search_att_sub == FALSE"), - ]) - pkt.Reply(8) - pkt.ReqCondSizeConstant() - pkt.CompletionCodes([0x0000, 0x0106, 0x8c00, 0xbf00]) - # 2222/1626, 22/38 - pkt = NCP(0x1626, "Scan File or Directory for Extended Trustees", 'file') - pkt.Request((13,267), [ - rec( 10, 1, DirHandle ), - rec( 11, 1, SequenceByte ), - rec( 12, (1, 255), Path ), - ], info_str=(Path, "Scan for Extended Trustees: %s", ", %s")) - pkt.Reply(91, [ - rec( 8, 1, NumberOfEntries, var="x" ), - rec( 9, 4, ObjectID ), - rec( 13, 4, ObjectID ), - rec( 17, 4, ObjectID ), - rec( 21, 4, ObjectID ), - rec( 25, 4, ObjectID ), - rec( 29, 4, ObjectID ), - rec( 33, 4, ObjectID ), - rec( 37, 4, ObjectID ), - rec( 41, 4, ObjectID ), - rec( 45, 4, ObjectID ), - rec( 49, 4, ObjectID ), - rec( 53, 4, ObjectID ), - rec( 57, 4, ObjectID ), - rec( 61, 4, ObjectID ), - rec( 65, 4, ObjectID ), - rec( 69, 4, ObjectID ), - rec( 73, 4, ObjectID ), - rec( 77, 4, ObjectID ), - rec( 81, 4, ObjectID ), - rec( 85, 4, ObjectID ), - rec( 89, 2, AccessRightsMaskWord, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9800, 0x9b00, 0x9c00]) - # 2222/1627, 22/39 - pkt = NCP(0x1627, "Add Extended Trustee to Directory or File", 'file') - pkt.Request((18,272), [ - rec( 10, 1, DirHandle ), - rec( 11, 4, ObjectID, BE ), - rec( 15, 2, TrusteeRights ), - rec( 17, (1, 255), Path ), - ], info_str=(Path, "Add Extended Trustee: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9000]) - # 2222/1628, 22/40 - pkt = NCP(0x1628, "Scan Directory Disk Space", 'file') - pkt.Request((17,271), [ - rec( 10, 1, DirHandle ), - rec( 11, 1, SearchAttributes ), - rec( 12, 4, SequenceNumber ), - rec( 16, (1, 255), SearchPattern ), - ], info_str=(SearchPattern, "Scan Directory Disk Space: %s", ", %s")) - pkt.Reply((148), [ - rec( 8, 4, SequenceNumber ), - rec( 12, 4, Subdirectory ), - rec( 16, 4, AttributesDef32 ), - rec( 20, 1, UniqueID ), - rec( 21, 1, PurgeFlags ), - rec( 22, 1, DestNameSpace ), - rec( 23, 1, NameLen ), - rec( 24, 12, Name12 ), - rec( 36, 2, CreationTime ), - rec( 38, 2, CreationDate ), - rec( 40, 4, CreatorID, BE ), - rec( 44, 2, ArchivedTime ), - rec( 46, 2, ArchivedDate ), - rec( 48, 4, ArchiverID, BE ), - rec( 52, 2, UpdateTime ), - rec( 54, 2, UpdateDate ), - rec( 56, 4, UpdateID, BE ), - rec( 60, 4, DataForkSize, BE ), - rec( 64, 4, DataForkFirstFAT, BE ), - rec( 68, 4, NextTrusteeEntry, BE ), - rec( 72, 36, Reserved36 ), - rec( 108, 2, InheritedRightsMask ), - rec( 110, 2, LastAccessedDate ), - rec( 112, 4, DeletedFileTime ), - rec( 116, 2, DeletedTime ), - rec( 118, 2, DeletedDate ), - rec( 120, 4, DeletedID, BE ), - rec( 124, 8, Undefined8 ), - rec( 132, 4, PrimaryEntry, LE ), - rec( 136, 4, NameList, LE ), - rec( 140, 4, OtherFileForkSize, BE ), - rec( 144, 4, OtherFileForkFAT, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x8900, 0x9c03, 0xfb01, 0xff00]) - # 2222/1629, 22/41 - pkt = NCP(0x1629, "Get Object Disk Usage and Restrictions", 'file') - pkt.Request(15, [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, ObjectID, LE ), - ]) - pkt.Reply(16, [ - rec( 8, 4, Restriction ), - rec( 12, 4, InUse ), - ]) - pkt.CompletionCodes([0x0000, 0x9802]) - # 2222/162A, 22/42 - pkt = NCP(0x162A, "Get Effective Rights for Directory Entry", 'file') - pkt.Request((12,266), [ - rec( 10, 1, DirHandle ), - rec( 11, (1, 255), Path ), - ], info_str=(Path, "Get Effective Rights: %s", ", %s")) - pkt.Reply(10, [ - rec( 8, 2, AccessRightsMaskWord ), - ]) - pkt.CompletionCodes([0x0000, 0x9804, 0x9c03]) - # 2222/162B, 22/43 - pkt = NCP(0x162B, "Remove Extended Trustee from Dir or File", 'file') - pkt.Request((17,271), [ - rec( 10, 1, DirHandle ), - rec( 11, 4, ObjectID, BE ), - rec( 15, 1, Unused ), - rec( 16, (1, 255), Path ), - ], info_str=(Path, "Remove Extended Trustee from %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9002, 0x9c03, 0xfe0f, 0xff09]) - # 2222/162C, 22/44 - pkt = NCP(0x162C, "Get Volume and Purge Information", 'file') - pkt.Request( 11, [ - rec( 10, 1, VolumeNumber ) - ],info_str=(VolumeNumber, "Get Volume and Purge Information for Volume %d", ", %d")) - pkt.Reply( (38,53), [ - rec( 8, 4, TotalBlocks ), - rec( 12, 4, FreeBlocks ), - rec( 16, 4, PurgeableBlocks ), - rec( 20, 4, NotYetPurgeableBlocks ), - rec( 24, 4, TotalDirectoryEntries ), - rec( 28, 4, AvailableDirEntries ), - rec( 32, 4, Reserved4 ), - rec( 36, 1, SectorsPerBlock ), - rec( 37, (1,16), VolumeNameLen ), - ]) - pkt.CompletionCodes([0x0000]) - # 2222/162D, 22/45 - pkt = NCP(0x162D, "Get Directory Information", 'file') - pkt.Request( 11, [ - rec( 10, 1, DirHandle ) - ]) - pkt.Reply( (30, 45), [ - rec( 8, 4, TotalBlocks ), - rec( 12, 4, AvailableBlocks ), - rec( 16, 4, TotalDirectoryEntries ), - rec( 20, 4, AvailableDirEntries ), - rec( 24, 4, Reserved4 ), - rec( 28, 1, SectorsPerBlock ), - rec( 29, (1,16), VolumeNameLen ), - ]) - pkt.CompletionCodes([0x0000, 0x9b03]) - # 2222/162E, 22/46 - pkt = NCP(0x162E, "Rename Or Move", 'file') - pkt.Request( (17,525), [ - rec( 10, 1, SourceDirHandle ), - rec( 11, 1, SearchAttributes ), - rec( 12, 1, SourcePathComponentCount ), - rec( 13, (1,255), SourcePath ), - rec( -1, 1, DestDirHandle ), - rec( -1, 1, DestPathComponentCount ), - rec( -1, (1,255), DestPath ), - ], info_str=(SourcePath, "Rename or Move: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0102, 0x8701, 0x8b00, 0x8d00, 0x8e00, - 0x8f00, 0x9001, 0x9101, 0x9201, 0x9a00, 0x9b03, - 0x9c03, 0xa400, 0xff17]) - # 2222/162F, 22/47 - pkt = NCP(0x162F, "Get Name Space Information", 'file') - pkt.Request( 11, [ - rec( 10, 1, VolumeNumber ) - ],info_str=(VolumeNumber, "Get Name Space Information for Volume %d", ", %d")) - pkt.Reply( (15,523), [ - # - # XXX - why does this not display anything at all - # if the stuff after the first IndexNumber is - # un-commented? That stuff really is there.... - # - rec( 8, 1, DefinedNameSpaces, var="v" ), - rec( 9, (1,255), NameSpaceName, repeat="v" ), - rec( -1, 1, DefinedDataStreams, var="w" ), - rec( -1, (2,256), DataStreamInfo, repeat="w" ), - rec( -1, 1, LoadedNameSpaces, var="x" ), - rec( -1, 1, IndexNumber, repeat="x" ), -# rec( -1, 1, VolumeNameSpaces, var="y" ), -# rec( -1, 1, IndexNumber, repeat="y" ), -# rec( -1, 1, VolumeDataStreams, var="z" ), -# rec( -1, 1, IndexNumber, repeat="z" ), - ]) - pkt.CompletionCodes([0x0000, 0x9802, 0xff00]) - # 2222/1630, 22/48 - pkt = NCP(0x1630, "Get Name Space Directory Entry", 'file') - pkt.Request( 16, [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, DOSSequence ), - rec( 15, 1, SrcNameSpace ), - ]) - pkt.Reply( 112, [ - rec( 8, 4, SequenceNumber ), - rec( 12, 4, Subdirectory ), - rec( 16, 4, AttributesDef32 ), - rec( 20, 1, UniqueID ), - rec( 21, 1, Flags ), - rec( 22, 1, SrcNameSpace ), - rec( 23, 1, NameLength ), - rec( 24, 12, Name12 ), - rec( 36, 2, CreationTime ), - rec( 38, 2, CreationDate ), - rec( 40, 4, CreatorID, BE ), - rec( 44, 2, ArchivedTime ), - rec( 46, 2, ArchivedDate ), - rec( 48, 4, ArchiverID ), - rec( 52, 2, UpdateTime ), - rec( 54, 2, UpdateDate ), - rec( 56, 4, UpdateID ), - rec( 60, 4, FileSize ), - rec( 64, 44, Reserved44 ), - rec( 108, 2, InheritedRightsMask ), - rec( 110, 2, LastAccessedDate ), - ]) - pkt.CompletionCodes([0x0000, 0x8900, 0x9802, 0xbf00]) - # 2222/1631, 22/49 - pkt = NCP(0x1631, "Open Data Stream", 'file') - pkt.Request( (15,269), [ - rec( 10, 1, DataStream ), - rec( 11, 1, DirHandle ), - rec( 12, 1, AttributesDef ), - rec( 13, 1, OpenRights ), - rec( 14, (1, 255), FileName ), - ], info_str=(FileName, "Open Data Stream: %s", ", %s")) - pkt.Reply( 12, [ - rec( 8, 4, CCFileHandle, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8200, 0x9002, 0xbe00, 0xff00]) - # 2222/1632, 22/50 - pkt = NCP(0x1632, "Get Object Effective Rights for Directory Entry", 'file') - pkt.Request( (16,270), [ - rec( 10, 4, ObjectID, BE ), - rec( 14, 1, DirHandle ), - rec( 15, (1, 255), Path ), - ], info_str=(Path, "Get Object Effective Rights: %s", ", %s")) - pkt.Reply( 10, [ - rec( 8, 2, TrusteeRights ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0x9b00, 0x9c03, 0xfc06]) - # 2222/1633, 22/51 - pkt = NCP(0x1633, "Get Extended Volume Information", 'file') - pkt.Request( 11, [ - rec( 10, 1, VolumeNumber ), - ],info_str=(VolumeNumber, "Get Extended Volume Information for Volume %d", ", %d")) - pkt.Reply( (139,266), [ - rec( 8, 2, VolInfoReplyLen ), - rec( 10, 128, VolInfoStructure), - rec( 138, (1,128), VolumeNameLen ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0x9804, 0xfb08, 0xff00]) - # 2222/1634, 22/52 - pkt = NCP(0x1634, "Get Mount Volume List", 'file') - pkt.Request( 22, [ - rec( 10, 4, StartVolumeNumber ), - rec( 14, 4, VolumeRequestFlags, LE ), - rec( 18, 4, SrcNameSpace ), - ]) - pkt.Reply( NO_LENGTH_CHECK, [ - rec( 8, 4, ItemsInPacket, var="x" ), - rec( 12, 4, NextVolumeNumber ), - srec( VolumeStruct, req_cond="ncp.volume_request_flags==0x0000", repeat="x" ), - srec( VolumeWithNameStruct, req_cond="ncp.volume_request_flags==0x0001", repeat="x" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x9802]) - # 2222/1635, 22/53 - pkt = NCP(0x1635, "Get Volume Capabilities", 'file') - pkt.Request( 18, [ - rec( 10, 4, VolumeNumberLong ), - rec( 14, 4, VersionNumberLong ), - ]) - pkt.Reply( 744, [ - rec( 8, 4, VolumeCapabilities ), - rec( 12, 28, Reserved28 ), - rec( 40, 64, VolumeNameStringz ), - rec( 104, 128, VolumeGUID ), - rec( 232, 256, PoolName ), - rec( 488, 256, VolumeMountPoint ), - ]) - pkt.CompletionCodes([0x0000]) - # 2222/1700, 23/00 - pkt = NCP(0x1700, "Login User", 'connection') - pkt.Request( (12, 58), [ - rec( 10, (1,16), UserName ), - rec( -1, (1,32), Password ), - ], info_str=(UserName, "Login User: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9602, 0xc101, 0xc200, 0xc501, 0xd700, - 0xd900, 0xda00, 0xdb00, 0xde00, 0xdf00, 0xe800, - 0xec00, 0xed00, 0xef00, 0xf001, 0xf100, 0xf200, - 0xf600, 0xfb00, 0xfc06, 0xfe07, 0xff00]) - # 2222/1701, 23/01 - pkt = NCP(0x1701, "Change User Password", 'bindery') - pkt.Request( (13, 90), [ - rec( 10, (1,16), UserName ), - rec( -1, (1,32), Password ), - rec( -1, (1,32), NewPassword ), - ], info_str=(UserName, "Change Password for User: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xd600, 0xf001, 0xf101, 0xf501, - 0xfc06, 0xfe07, 0xff00]) - # 2222/1702, 23/02 - pkt = NCP(0x1702, "Get User Connection List", 'connection') - pkt.Request( (11, 26), [ - rec( 10, (1,16), UserName ), - ], info_str=(UserName, "Get User Connection: %s", ", %s")) - pkt.Reply( (9, 136), [ - rec( 8, (1, 128), ConnectionNumberList ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xf001, 0xfc06, 0xfe07, 0xff00]) - # 2222/1703, 23/03 - pkt = NCP(0x1703, "Get User Number", 'bindery') - pkt.Request( (11, 26), [ - rec( 10, (1,16), UserName ), - ], info_str=(UserName, "Get User Number: %s", ", %s")) - pkt.Reply( 12, [ - rec( 8, 4, ObjectID, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xf001, 0xfc06, 0xfe07, 0xff00]) - # 2222/1705, 23/05 - pkt = NCP(0x1705, "Get Station's Logged Info", 'connection') - pkt.Request( 11, [ - rec( 10, 1, TargetConnectionNumber ), - ],info_str=(TargetConnectionNumber, "Get Station's Logged Information on Connection %d", ", %d")) - pkt.Reply( 266, [ - rec( 8, 16, UserName16 ), - rec( 24, 7, LoginTime ), - rec( 31, 39, FullName ), - rec( 70, 4, UserID, BE ), - rec( 74, 128, SecurityEquivalentList ), - rec( 202, 64, Reserved64 ), - ]) - pkt.CompletionCodes([0x0000, 0x9602, 0xfc06, 0xfd00, 0xfe07, 0xff00]) - # 2222/1707, 23/07 - pkt = NCP(0x1707, "Get Group Number", 'bindery') - pkt.Request( 14, [ - rec( 10, 4, ObjectID, BE ), - ]) - pkt.Reply( 62, [ - rec( 8, 4, ObjectID, BE ), - rec( 12, 2, ObjectType, BE ), - rec( 14, 48, ObjectNameLen ), - ]) - pkt.CompletionCodes([0x0000, 0x9602, 0xf101, 0xfc06, 0xfe07, 0xff00]) - # 2222/170C, 23/12 - pkt = NCP(0x170C, "Verify Serialization", 'fileserver') - pkt.Request( 14, [ - rec( 10, 4, ServerSerialNumber ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xff00]) - # 2222/170D, 23/13 - pkt = NCP(0x170D, "Log Network Message", 'file') - pkt.Request( (11, 68), [ - rec( 10, (1, 58), TargetMessage ), - ], info_str=(TargetMessage, "Log Network Message: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8000, 0x8100, 0x8800, 0x8d00, 0x8e00, 0x8f00, - 0x9001, 0x9400, 0x9600, 0x9804, 0x9900, 0x9b00, 0xa100, - 0xa201, 0xff00]) - # 2222/170E, 23/14 - pkt = NCP(0x170E, "Get Disk Utilization", 'fileserver') - pkt.Request( 15, [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, TrusteeID, BE ), - ]) - pkt.Reply( 19, [ - rec( 8, 1, VolumeNumber ), - rec( 9, 4, TrusteeID, BE ), - rec( 13, 2, DirectoryCount, BE ), - rec( 15, 2, FileCount, BE ), - rec( 17, 2, ClusterCount, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0xa100, 0xf200]) - # 2222/170F, 23/15 - pkt = NCP(0x170F, "Scan File Information", 'file') - pkt.Request((15,269), [ - rec( 10, 2, LastSearchIndex ), - rec( 12, 1, DirHandle ), - rec( 13, 1, SearchAttributes ), - rec( 14, (1, 255), FileName ), - ], info_str=(FileName, "Scan File Information: %s", ", %s")) - pkt.Reply( 102, [ - rec( 8, 2, NextSearchIndex ), - rec( 10, 14, FileName14 ), - rec( 24, 2, AttributesDef16 ), - rec( 26, 4, FileSize, BE ), - rec( 30, 2, CreationDate, BE ), - rec( 32, 2, LastAccessedDate, BE ), - rec( 34, 2, ModifiedDate, BE ), - rec( 36, 2, ModifiedTime, BE ), - rec( 38, 4, CreatorID, BE ), - rec( 42, 2, ArchivedDate, BE ), - rec( 44, 2, ArchivedTime, BE ), - rec( 46, 56, Reserved56 ), - ]) - pkt.CompletionCodes([0x0000, 0x8800, 0x8900, 0x9300, 0x9400, 0x9804, 0x9b00, 0x9c00, - 0xa100, 0xfd00, 0xff17]) - # 2222/1710, 23/16 - pkt = NCP(0x1710, "Set File Information", 'file') - pkt.Request((91,345), [ - rec( 10, 2, AttributesDef16 ), - rec( 12, 4, FileSize, BE ), - rec( 16, 2, CreationDate, BE ), - rec( 18, 2, LastAccessedDate, BE ), - rec( 20, 2, ModifiedDate, BE ), - rec( 22, 2, ModifiedTime, BE ), - rec( 24, 4, CreatorID, BE ), - rec( 28, 2, ArchivedDate, BE ), - rec( 30, 2, ArchivedTime, BE ), - rec( 32, 56, Reserved56 ), - rec( 88, 1, DirHandle ), - rec( 89, 1, SearchAttributes ), - rec( 90, (1, 255), FileName ), - ], info_str=(FileName, "Set Information for File: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8800, 0x8c00, 0x8e00, 0x9400, 0x9600, 0x9804, - 0x9b03, 0x9c00, 0xa100, 0xa201, 0xfc06, 0xfd00, 0xfe07, - 0xff17]) - # 2222/1711, 23/17 - pkt = NCP(0x1711, "Get File Server Information", 'fileserver') - pkt.Request(10) - pkt.Reply(136, [ - rec( 8, 48, ServerName ), - rec( 56, 1, OSMajorVersion ), - rec( 57, 1, OSMinorVersion ), - rec( 58, 2, ConnectionsSupportedMax, BE ), - rec( 60, 2, ConnectionsInUse, BE ), - rec( 62, 2, VolumesSupportedMax, BE ), - rec( 64, 1, OSRevision ), - rec( 65, 1, SFTSupportLevel ), - rec( 66, 1, TTSLevel ), - rec( 67, 2, ConnectionsMaxUsed, BE ), - rec( 69, 1, AccountVersion ), - rec( 70, 1, VAPVersion ), - rec( 71, 1, QueueingVersion ), - rec( 72, 1, PrintServerVersion ), - rec( 73, 1, VirtualConsoleVersion ), - rec( 74, 1, SecurityRestrictionVersion ), - rec( 75, 1, InternetBridgeVersion ), - rec( 76, 1, MixedModePathFlag ), - rec( 77, 1, LocalLoginInfoCcode ), - rec( 78, 2, ProductMajorVersion, BE ), - rec( 80, 2, ProductMinorVersion, BE ), - rec( 82, 2, ProductRevisionVersion, BE ), - rec( 84, 1, OSLanguageID, LE ), - rec( 85, 1, SixtyFourBitOffsetsSupportedFlag ), - rec( 86, 1, OESServer ), - rec( 87, 1, OESLinuxOrNetWare ), - rec( 88, 48, Reserved48 ), - ]) - pkt.CompletionCodes([0x0000, 0x9600]) - # 2222/1712, 23/18 - pkt = NCP(0x1712, "Get Network Serial Number", 'fileserver') - pkt.Request(10) - pkt.Reply(14, [ - rec( 8, 4, ServerSerialNumber ), - rec( 12, 2, ApplicationNumber ), - ]) - pkt.CompletionCodes([0x0000, 0x9600]) - # 2222/1713, 23/19 - pkt = NCP(0x1713, "Get Internet Address", 'connection') - pkt.Request(11, [ - rec( 10, 1, TargetConnectionNumber ), - ],info_str=(TargetConnectionNumber, "Get Internet Address for Connection %d", ", %d")) - pkt.Reply(20, [ - rec( 8, 4, NetworkAddress, BE ), - rec( 12, 6, NetworkNodeAddress ), - rec( 18, 2, NetworkSocket, BE ), - ]) - pkt.CompletionCodes([0x0000, 0xff00]) - # 2222/1714, 23/20 - pkt = NCP(0x1714, "Login Object", 'connection') - pkt.Request( (14, 60), [ - rec( 10, 2, ObjectType, BE ), - rec( 12, (1,16), ClientName ), - rec( -1, (1,32), Password ), - ], info_str=(UserName, "Login Object: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9602, 0xc101, 0xc200, 0xc501, 0xd600, 0xd700, - 0xd900, 0xda00, 0xdb00, 0xde00, 0xdf00, 0xe800, 0xec00, - 0xed00, 0xef00, 0xf001, 0xf100, 0xf200, 0xf600, 0xfb00, - 0xfc06, 0xfe07, 0xff00]) - # 2222/1715, 23/21 - pkt = NCP(0x1715, "Get Object Connection List", 'connection') - pkt.Request( (13, 28), [ - rec( 10, 2, ObjectType, BE ), - rec( 12, (1,16), ObjectName ), - ], info_str=(UserName, "Get Object Connection List: %s", ", %s")) - pkt.Reply( (9, 136), [ - rec( 8, (1, 128), ConnectionNumberList ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xf001, 0xfc06, 0xfe07, 0xff00]) - # 2222/1716, 23/22 - pkt = NCP(0x1716, "Get Station's Logged Info", 'connection') - pkt.Request( 11, [ - rec( 10, 1, TargetConnectionNumber ), - ]) - pkt.Reply( 70, [ - rec( 8, 4, UserID, BE ), - rec( 12, 2, ObjectType, BE ), - rec( 14, 48, ObjectNameLen ), - rec( 62, 7, LoginTime ), - rec( 69, 1, Reserved ), - ]) - pkt.CompletionCodes([0x0000, 0x9602, 0xfb0a, 0xfc06, 0xfd00, 0xfe07, 0xff00]) - # 2222/1717, 23/23 - pkt = NCP(0x1717, "Get Login Key", 'connection') - pkt.Request(10) - pkt.Reply( 16, [ - rec( 8, 8, LoginKey ), - ]) - pkt.CompletionCodes([0x0000, 0x9602]) - # 2222/1718, 23/24 - pkt = NCP(0x1718, "Keyed Object Login", 'connection') - pkt.Request( (21, 68), [ - rec( 10, 8, LoginKey ), - rec( 18, 2, ObjectType, BE ), - rec( 20, (1,48), ObjectName ), - ], info_str=(ObjectName, "Keyed Object Login: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9602, 0xc101, 0xc200, 0xc500, 0xd904, 0xda00, - 0xdb00, 0xdc00, 0xde00, 0xff00]) - # 2222/171A, 23/26 - pkt = NCP(0x171A, "Get Internet Address", 'connection') - pkt.Request(12, [ - rec( 10, 2, TargetConnectionNumber ), - ]) - # Dissect reply in packet-ncp2222.inc - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - # 2222/171B, 23/27 - pkt = NCP(0x171B, "Get Object Connection List", 'connection') - pkt.Request( (17,64), [ - rec( 10, 4, SearchConnNumber ), - rec( 14, 2, ObjectType, BE ), - rec( 16, (1,48), ObjectName ), - ], info_str=(ObjectName, "Get Object Connection List: %s", ", %s")) - pkt.Reply( (13), [ - rec( 8, 1, ConnListLen, var="x" ), - rec( 9, 4, ConnectionNumber, LE, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xf001, 0xfc06, 0xfe07, 0xff00]) - # 2222/171C, 23/28 - pkt = NCP(0x171C, "Get Station's Logged Info", 'connection') - pkt.Request( 14, [ - rec( 10, 4, TargetConnectionNumber ), - ]) - pkt.Reply( 70, [ - rec( 8, 4, UserID, BE ), - rec( 12, 2, ObjectType, BE ), - rec( 14, 48, ObjectNameLen ), - rec( 62, 7, LoginTime ), - rec( 69, 1, Reserved ), - ]) - pkt.CompletionCodes([0x0000, 0x7d00, 0x9602, 0xfb02, 0xfc06, 0xfd00, 0xfe07, 0xff00]) - # 2222/171D, 23/29 - pkt = NCP(0x171D, "Change Connection State", 'connection') - pkt.Request( 11, [ - rec( 10, 1, RequestCode ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0109, 0x7a00, 0x7b00, 0x7c00, 0xe000, 0xfb06, 0xfd00]) - # 2222/171E, 23/30 - pkt = NCP(0x171E, "Set Watchdog Delay Interval", 'connection') - pkt.Request( 14, [ - rec( 10, 4, NumberOfMinutesToDelay ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0107]) - # 2222/171F, 23/31 - pkt = NCP(0x171F, "Get Connection List From Object", 'connection') - pkt.Request( 18, [ - rec( 10, 4, ObjectID, BE ), - rec( 14, 4, ConnectionNumber ), - ]) - pkt.Reply( (9, 136), [ - rec( 8, (1, 128), ConnectionNumberList ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xf001, 0xfc06, 0xfe07, 0xff00]) - # 2222/1720, 23/32 - pkt = NCP(0x1720, "Scan Bindery Object (List)", 'bindery') - pkt.Request((23,70), [ - rec( 10, 4, NextObjectID, BE ), - rec( 14, 2, ObjectType, BE ), - rec( 16, 2, Reserved2 ), - rec( 18, 4, InfoFlags ), - rec( 22, (1,48), ObjectName ), - ], info_str=(ObjectName, "Scan Bindery Object: %s", ", %s")) - pkt.Reply(NO_LENGTH_CHECK, [ - rec( 8, 4, ObjectInfoReturnCount ), - rec( 12, 4, NextObjectID, BE ), - rec( 16, 4, ObjectID ), - srec(ObjectTypeStruct, req_cond="ncp.info_flags_type == TRUE"), - srec(ObjectSecurityStruct, req_cond="ncp.info_flags_security == TRUE"), - srec(ObjectFlagsStruct, req_cond="ncp.info_flags_flags == TRUE"), - srec(ObjectNameStruct, req_cond="ncp.info_flags_name == TRUE"), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x9600, 0xef01, 0xfc02, 0xfe01, 0xff00]) - # 2222/1721, 23/33 - pkt = NCP(0x1721, "Generate GUIDs", 'connection') - pkt.Request( 14, [ - rec( 10, 4, ReturnInfoCount ), - ]) - pkt.Reply(28, [ - rec( 8, 4, ReturnInfoCount, var="x" ), - rec( 12, 16, GUID, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01]) - # 2222/1722, 23/34 - pkt = NCP(0x1722, "Set Connection Language Encoding", 'connection') - pkt.Request( 22, [ - rec( 10, 4, SetMask ), - rec( 14, 4, NCPEncodedStringsBits ), - rec( 18, 4, CodePage ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - # 2222/1732, 23/50 - pkt = NCP(0x1732, "Create Bindery Object", 'bindery') - pkt.Request( (15,62), [ - rec( 10, 1, ObjectFlags ), - rec( 11, 1, ObjectSecurity ), - rec( 12, 2, ObjectType, BE ), - rec( 14, (1,48), ObjectName ), - ], info_str=(ObjectName, "Create Bindery Object: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xe700, 0xee00, 0xef00, 0xf101, 0xf501, - 0xfc06, 0xfe07, 0xff00]) - # 2222/1733, 23/51 - pkt = NCP(0x1733, "Delete Bindery Object", 'bindery') - pkt.Request( (13,60), [ - rec( 10, 2, ObjectType, BE ), - rec( 12, (1,48), ObjectName ), - ], info_str=(ObjectName, "Delete Bindery Object: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xf000, 0xf200, 0xf400, 0xf600, 0xfb00, - 0xfc06, 0xfe07, 0xff00]) - # 2222/1734, 23/52 - pkt = NCP(0x1734, "Rename Bindery Object", 'bindery') - pkt.Request( (14,108), [ - rec( 10, 2, ObjectType, BE ), - rec( 12, (1,48), ObjectName ), - rec( -1, (1,48), NewObjectName ), - ], info_str=(ObjectName, "Rename Bindery Object: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xee00, 0xf000, 0xf300, 0xfc06, 0xfe07, 0xff00]) - # 2222/1735, 23/53 - pkt = NCP(0x1735, "Get Bindery Object ID", 'bindery') - pkt.Request((13,60), [ - rec( 10, 2, ObjectType, BE ), - rec( 12, (1,48), ObjectName ), - ], info_str=(ObjectName, "Get Bindery Object: %s", ", %s")) - pkt.Reply(62, [ - rec( 8, 4, ObjectID, BE ), - rec( 12, 2, ObjectType, BE ), - rec( 14, 48, ObjectNameLen ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xef01, 0xf000, 0xfc02, 0xfe01, 0xff00]) - # 2222/1736, 23/54 - pkt = NCP(0x1736, "Get Bindery Object Name", 'bindery') - pkt.Request( 14, [ - rec( 10, 4, ObjectID, BE ), - ]) - pkt.Reply( 62, [ - rec( 8, 4, ObjectID, BE ), - rec( 12, 2, ObjectType, BE ), - rec( 14, 48, ObjectNameLen ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xf101, 0xfc02, 0xfe01, 0xff00]) - # 2222/1737, 23/55 - pkt = NCP(0x1737, "Scan Bindery Object", 'bindery') - pkt.Request((17,64), [ - rec( 10, 4, ObjectID, BE ), - rec( 14, 2, ObjectType, BE ), - rec( 16, (1,48), ObjectName ), - ], info_str=(ObjectName, "Scan Bindery Object: %s", ", %s")) - pkt.Reply(65, [ - rec( 8, 4, ObjectID, BE ), - rec( 12, 2, ObjectType, BE ), - rec( 14, 48, ObjectNameLen ), - rec( 62, 1, ObjectFlags ), - rec( 63, 1, ObjectSecurity ), - rec( 64, 1, ObjectHasProperties ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xef01, 0xfc02, - 0xfe01, 0xff00]) - # 2222/1738, 23/56 - pkt = NCP(0x1738, "Change Bindery Object Security", 'bindery') - pkt.Request((14,61), [ - rec( 10, 1, ObjectSecurity ), - rec( 11, 2, ObjectType, BE ), - rec( 13, (1,48), ObjectName ), - ], info_str=(ObjectName, "Change Bindery Object Security: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xf000, 0xf101, 0xf501, 0xfc02, 0xfe01, 0xff00]) - # 2222/1739, 23/57 - pkt = NCP(0x1739, "Create Property", 'bindery') - pkt.Request((16,78), [ - rec( 10, 2, ObjectType, BE ), - rec( 12, (1,48), ObjectName ), - rec( -1, 1, PropertyType ), - rec( -1, 1, ObjectSecurity ), - rec( -1, (1,16), PropertyName ), - ], info_str=(PropertyName, "Create Property: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xed00, 0xef00, 0xf000, 0xf101, - 0xf200, 0xf600, 0xf700, 0xfb00, 0xfc02, 0xfe01, - 0xff00]) - # 2222/173A, 23/58 - pkt = NCP(0x173A, "Delete Property", 'bindery') - pkt.Request((14,76), [ - rec( 10, 2, ObjectType, BE ), - rec( 12, (1,48), ObjectName ), - rec( -1, (1,16), PropertyName ), - ], info_str=(PropertyName, "Delete Property: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xf000, 0xf101, 0xf600, 0xfb00, 0xfc02, - 0xfe01, 0xff00]) - # 2222/173B, 23/59 - pkt = NCP(0x173B, "Change Property Security", 'bindery') - pkt.Request((15,77), [ - rec( 10, 2, ObjectType, BE ), - rec( 12, (1,48), ObjectName ), - rec( -1, 1, ObjectSecurity ), - rec( -1, (1,16), PropertyName ), - ], info_str=(PropertyName, "Change Property Security: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xf000, 0xf101, 0xf200, 0xf600, 0xfb00, - 0xfc02, 0xfe01, 0xff00]) - # 2222/173C, 23/60 - pkt = NCP(0x173C, "Scan Property", 'bindery') - pkt.Request((18,80), [ - rec( 10, 2, ObjectType, BE ), - rec( 12, (1,48), ObjectName ), - rec( -1, 4, LastInstance, BE ), - rec( -1, (1,16), PropertyName ), - ], info_str=(PropertyName, "Scan Property: %s", ", %s")) - pkt.Reply( 32, [ - rec( 8, 16, PropertyName16 ), - rec( 24, 1, ObjectFlags ), - rec( 25, 1, ObjectSecurity ), - rec( 26, 4, SearchInstance, BE ), - rec( 30, 1, ValueAvailable ), - rec( 31, 1, MoreProperties ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xf000, 0xf101, 0xf200, 0xf600, 0xfb00, - 0xfc02, 0xfe01, 0xff00]) - # 2222/173D, 23/61 - pkt = NCP(0x173D, "Read Property Value", 'bindery') - pkt.Request((15,77), [ - rec( 10, 2, ObjectType, BE ), - rec( 12, (1,48), ObjectName ), - rec( -1, 1, PropertySegment ), - rec( -1, (1,16), PropertyName ), - ], info_str=(PropertyName, "Read Property Value: %s", ", %s")) - pkt.Reply(138, [ - rec( 8, 128, PropertyData ), - rec( 136, 1, PropertyHasMoreSegments ), - rec( 137, 1, PropertyType ), - ]) - pkt.CompletionCodes([0x0000, 0x8800, 0x9300, 0x9600, 0xec01, - 0xf000, 0xf100, 0xf900, 0xfb02, 0xfc02, - 0xfe01, 0xff00]) - # 2222/173E, 23/62 - pkt = NCP(0x173E, "Write Property Value", 'bindery') - pkt.Request((144,206), [ - rec( 10, 2, ObjectType, BE ), - rec( 12, (1,48), ObjectName ), - rec( -1, 1, PropertySegment ), - rec( -1, 1, MoreFlag ), - rec( -1, (1,16), PropertyName ), - # - # XXX - don't show this if MoreFlag isn't set? - # In at least some packages where it's not set, - # PropertyValue appears to be garbage. - # - rec( -1, 128, PropertyValue ), - ], info_str=(PropertyName, "Write Property Value: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xe800, 0xec01, 0xf000, 0xf800, - 0xfb02, 0xfc03, 0xfe01, 0xff00 ]) - # 2222/173F, 23/63 - pkt = NCP(0x173F, "Verify Bindery Object Password", 'bindery') - pkt.Request((14,92), [ - rec( 10, 2, ObjectType, BE ), - rec( 12, (1,48), ObjectName ), - rec( -1, (1,32), Password ), - ], info_str=(ObjectName, "Verify Bindery Object Password: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xe800, 0xec01, 0xf000, 0xf101, - 0xfb02, 0xfc03, 0xfe01, 0xff00 ]) - # 2222/1740, 23/64 - pkt = NCP(0x1740, "Change Bindery Object Password", 'bindery') - pkt.Request((15,124), [ - rec( 10, 2, ObjectType, BE ), - rec( 12, (1,48), ObjectName ), - rec( -1, (1,32), Password ), - rec( -1, (1,32), NewPassword ), - ], info_str=(ObjectName, "Change Bindery Object Password: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xc501, 0xd701, 0xe800, 0xec01, 0xf001, - 0xf100, 0xf800, 0xfb02, 0xfc03, 0xfe01, 0xff00]) - # 2222/1741, 23/65 - pkt = NCP(0x1741, "Add Bindery Object To Set", 'bindery') - pkt.Request((17,126), [ - rec( 10, 2, ObjectType, BE ), - rec( 12, (1,48), ObjectName ), - rec( -1, (1,16), PropertyName ), - rec( -1, 2, MemberType, BE ), - rec( -1, (1,48), MemberName ), - ], info_str=(MemberName, "Add Bindery Object to Set: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xe800, 0xe900, 0xea00, 0xeb00, - 0xec01, 0xf000, 0xf800, 0xfb02, 0xfc03, 0xfe01, - 0xff00]) - # 2222/1742, 23/66 - pkt = NCP(0x1742, "Delete Bindery Object From Set", 'bindery') - pkt.Request((17,126), [ - rec( 10, 2, ObjectType, BE ), - rec( 12, (1,48), ObjectName ), - rec( -1, (1,16), PropertyName ), - rec( -1, 2, MemberType, BE ), - rec( -1, (1,48), MemberName ), - ], info_str=(MemberName, "Delete Bindery Object from Set: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xeb00, 0xf000, 0xf800, 0xfb02, - 0xfc03, 0xfe01, 0xff00]) - # 2222/1743, 23/67 - pkt = NCP(0x1743, "Is Bindery Object In Set", 'bindery') - pkt.Request((17,126), [ - rec( 10, 2, ObjectType, BE ), - rec( 12, (1,48), ObjectName ), - rec( -1, (1,16), PropertyName ), - rec( -1, 2, MemberType, BE ), - rec( -1, (1,48), MemberName ), - ], info_str=(MemberName, "Is Bindery Object in Set: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xea00, 0xeb00, 0xec01, 0xf000, - 0xfb02, 0xfc03, 0xfe01, 0xff00]) - # 2222/1744, 23/68 - pkt = NCP(0x1744, "Close Bindery", 'bindery') - pkt.Request(10) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xff00]) - # 2222/1745, 23/69 - pkt = NCP(0x1745, "Open Bindery", 'bindery') - pkt.Request(10) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xff00]) - # 2222/1746, 23/70 - pkt = NCP(0x1746, "Get Bindery Access Level", 'bindery') - pkt.Request(10) - pkt.Reply(13, [ - rec( 8, 1, ObjectSecurity ), - rec( 9, 4, LoggedObjectID, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x9600]) - # 2222/1747, 23/71 - pkt = NCP(0x1747, "Scan Bindery Object Trustee Paths", 'bindery') - pkt.Request(17, [ - rec( 10, 1, VolumeNumber ), - rec( 11, 2, LastSequenceNumber, BE ), - rec( 13, 4, ObjectID, BE ), - ]) - pkt.Reply((16,270), [ - rec( 8, 2, LastSequenceNumber, BE), - rec( 10, 4, ObjectID, BE ), - rec( 14, 1, ObjectSecurity ), - rec( 15, (1,255), Path ), - ]) - pkt.CompletionCodes([0x0000, 0x9300, 0x9600, 0xa100, 0xf000, 0xf100, - 0xf200, 0xfc02, 0xfe01, 0xff00]) - # 2222/1748, 23/72 - pkt = NCP(0x1748, "Get Bindery Object Access Level", 'bindery') - pkt.Request(14, [ - rec( 10, 4, ObjectID, BE ), - ]) - pkt.Reply(9, [ - rec( 8, 1, ObjectSecurity ), - ]) - pkt.CompletionCodes([0x0000, 0x9600]) - # 2222/1749, 23/73 - pkt = NCP(0x1749, "Is Calling Station a Manager", 'bindery') - pkt.Request(10) - pkt.Reply(8) - pkt.CompletionCodes([0x0003, 0xff1e]) - # 2222/174A, 23/74 - pkt = NCP(0x174A, "Keyed Verify Password", 'bindery') - pkt.Request((21,68), [ - rec( 10, 8, LoginKey ), - rec( 18, 2, ObjectType, BE ), - rec( 20, (1,48), ObjectName ), - ], info_str=(ObjectName, "Keyed Verify Password: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xc500, 0xfe01, 0xff0c]) - # 2222/174B, 23/75 - pkt = NCP(0x174B, "Keyed Change Password", 'bindery') - pkt.Request((22,100), [ - rec( 10, 8, LoginKey ), - rec( 18, 2, ObjectType, BE ), - rec( 20, (1,48), ObjectName ), - rec( -1, (1,32), Password ), - ], info_str=(ObjectName, "Keyed Change Password: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xc500, 0xfe01, 0xff0c]) - # 2222/174C, 23/76 - pkt = NCP(0x174C, "List Relations Of an Object", 'bindery') - pkt.Request((18,80), [ - rec( 10, 4, LastSeen, BE ), - rec( 14, 2, ObjectType, BE ), - rec( 16, (1,48), ObjectName ), - rec( -1, (1,16), PropertyName ), - ], info_str=(ObjectName, "List Relations of an Object: %s", ", %s")) - pkt.Reply(14, [ - rec( 8, 2, RelationsCount, BE, var="x" ), - rec( 10, 4, ObjectID, BE, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0xf000, 0xf200, 0xfe01, 0xff00]) - # 2222/1764, 23/100 - pkt = NCP(0x1764, "Create Queue", 'qms') - pkt.Request((15,316), [ - rec( 10, 2, QueueType, BE ), - rec( 12, (1,48), QueueName ), - rec( -1, 1, PathBase ), - rec( -1, (1,255), Path ), - ], info_str=(QueueName, "Create Queue: %s", ", %s")) - pkt.Reply(12, [ - rec( 8, 4, QueueID ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0x9900, 0xd000, 0xd100, - 0xd200, 0xd300, 0xd400, 0xd500, 0xd601, - 0xd703, 0xd800, 0xd902, 0xda01, 0xdb02, - 0xee00, 0xff00]) - # 2222/1765, 23/101 - pkt = NCP(0x1765, "Destroy Queue", 'qms') - pkt.Request(14, [ - rec( 10, 4, QueueID ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) - # 2222/1766, 23/102 - pkt = NCP(0x1766, "Read Queue Current Status", 'qms') - pkt.Request(14, [ - rec( 10, 4, QueueID ), - ]) - pkt.Reply(20, [ - rec( 8, 4, QueueID ), - rec( 12, 1, QueueStatus ), - rec( 13, 1, CurrentEntries ), - rec( 14, 1, CurrentServers, var="x" ), - rec( 15, 4, ServerID, repeat="x" ), - rec( 19, 1, ServerStationList, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) - # 2222/1767, 23/103 - pkt = NCP(0x1767, "Set Queue Current Status", 'qms') - pkt.Request(15, [ - rec( 10, 4, QueueID ), - rec( 14, 1, QueueStatus ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc07, - 0xff00]) - # 2222/1768, 23/104 - pkt = NCP(0x1768, "Create Queue Job And File", 'qms') - pkt.Request(264, [ - rec( 10, 4, QueueID ), - rec( 14, 250, JobStruct ), - ]) - pkt.Reply(62, [ - rec( 8, 1, ClientStation ), - rec( 9, 1, ClientTaskNumber ), - rec( 10, 4, ClientIDNumber, BE ), - rec( 14, 4, TargetServerIDNumber, BE ), - rec( 18, 6, TargetExecutionTime ), - rec( 24, 6, JobEntryTime ), - rec( 30, 2, JobNumber, BE ), - rec( 32, 2, JobType, BE ), - rec( 34, 1, JobPosition ), - rec( 35, 1, JobControlFlags ), - rec( 36, 14, JobFileName ), - rec( 50, 6, JobFileHandle ), - rec( 56, 1, ServerStation ), - rec( 57, 1, ServerTaskNumber ), - rec( 58, 4, ServerID, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc07, - 0xff00]) - # 2222/1769, 23/105 - pkt = NCP(0x1769, "Close File And Start Queue Job", 'qms') - pkt.Request(16, [ - rec( 10, 4, QueueID ), - rec( 14, 2, JobNumber, BE ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) - # 2222/176A, 23/106 - pkt = NCP(0x176A, "Remove Job From Queue", 'qms') - pkt.Request(16, [ - rec( 10, 4, QueueID ), - rec( 14, 2, JobNumber, BE ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) - # 2222/176B, 23/107 - pkt = NCP(0x176B, "Get Queue Job List", 'qms') - pkt.Request(14, [ - rec( 10, 4, QueueID ), - ]) - pkt.Reply(12, [ - rec( 8, 2, JobCount, BE, var="x" ), - rec( 10, 2, JobNumber, BE, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) - # 2222/176C, 23/108 - pkt = NCP(0x176C, "Read Queue Job Entry", 'qms') - pkt.Request(16, [ - rec( 10, 4, QueueID ), - rec( 14, 2, JobNumber, BE ), - ]) - pkt.Reply(258, [ - rec( 8, 250, JobStruct ), - ]) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) - # 2222/176D, 23/109 - pkt = NCP(0x176D, "Change Queue Job Entry", 'qms') - pkt.Request(260, [ + ############################################################################## + # NCP Packets. Here I list functions and subfunctions in hexadecimal like the + # NCP book (and I believe LanAlyzer does this too). + # However, Novell lists these in decimal in their on-line documentation. + ############################################################################## + # 2222/01 + pkt = NCP(0x01, "File Set Lock", 'sync') + pkt.Request(7) + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + # 2222/02 + pkt = NCP(0x02, "File Release Lock", 'sync') + pkt.Request(7) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xff00]) + # 2222/03 + pkt = NCP(0x03, "Log File Exclusive", 'sync') + pkt.Request( (12, 267), [ + rec( 7, 1, DirHandle ), + rec( 8, 1, LockFlag ), + rec( 9, 2, TimeoutLimit, BE ), + rec( 11, (1, 256), FilePath ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8200, 0x9600, 0xfe0d, 0xff01]) + # 2222/04 + pkt = NCP(0x04, "Lock File Set", 'sync') + pkt.Request( 9, [ + rec( 7, 2, TimeoutLimit ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xfe0d, 0xff01]) + ## 2222/05 + pkt = NCP(0x05, "Release File", 'sync') + pkt.Request( (9, 264), [ + rec( 7, 1, DirHandle ), + rec( 8, (1, 256), FilePath ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9b00, 0x9c03, 0xff1a]) + # 2222/06 + pkt = NCP(0x06, "Release File Set", 'sync') + pkt.Request( 8, [ + rec( 7, 1, LockFlag ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + # 2222/07 + pkt = NCP(0x07, "Clear File", 'sync') + pkt.Request( (9, 264), [ + rec( 7, 1, DirHandle ), + rec( 8, (1, 256), FilePath ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9b03, 0x9c03, + 0xa100, 0xfd00, 0xff1a]) + # 2222/08 + pkt = NCP(0x08, "Clear File Set", 'sync') + pkt.Request( 8, [ + rec( 7, 1, LockFlag ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + # 2222/09 + pkt = NCP(0x09, "Log Logical Record", 'sync') + pkt.Request( (11, 138), [ + rec( 7, 1, LockFlag ), + rec( 8, 2, TimeoutLimit, BE ), + rec( 10, (1, 128), LogicalRecordName ), + ], info_str=(LogicalRecordName, "Log Logical Record: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xfe0d, 0xff1a]) + # 2222/0A, 10 + pkt = NCP(0x0A, "Lock Logical Record Set", 'sync') + pkt.Request( 10, [ + rec( 7, 1, LockFlag ), + rec( 8, 2, TimeoutLimit ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xfe0d, 0xff1a]) + # 2222/0B, 11 + pkt = NCP(0x0B, "Clear Logical Record", 'sync') + pkt.Request( (8, 135), [ + rec( 7, (1, 128), LogicalRecordName ), + ], info_str=(LogicalRecordName, "Clear Logical Record: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xff1a]) + # 2222/0C, 12 + pkt = NCP(0x0C, "Release Logical Record", 'sync') + pkt.Request( (8, 135), [ + rec( 7, (1, 128), LogicalRecordName ), + ], info_str=(LogicalRecordName, "Release Logical Record: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xff1a]) + # 2222/0D, 13 + pkt = NCP(0x0D, "Release Logical Record Set", 'sync') + pkt.Request( 8, [ + rec( 7, 1, LockFlag ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + # 2222/0E, 14 + pkt = NCP(0x0E, "Clear Logical Record Set", 'sync') + pkt.Request( 8, [ + rec( 7, 1, LockFlag ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + # 2222/1100, 17/00 + pkt = NCP(0x1100, "Write to Spool File", 'print') + pkt.Request( (11, 16), [ + rec( 10, ( 1, 6 ), Data ), + ], info_str=(Data, "Write to Spool File: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0104, 0x8000, 0x8101, 0x8701, 0x8800, + 0x8d00, 0x8e00, 0x8f00, 0x9001, 0x9400, 0x9500, + 0x9600, 0x9804, 0x9900, 0xa100, 0xa201, 0xff19]) + # 2222/1101, 17/01 + pkt = NCP(0x1101, "Close Spool File", 'print') + pkt.Request( 11, [ + rec( 10, 1, AbortQueueFlag ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8701, 0x8800, 0x8d00, + 0x8e00, 0x8f00, 0x9001, 0x9300, 0x9400, 0x9500, + 0x9600, 0x9804, 0x9900, 0x9b03, 0x9c03, 0x9d00, + 0xa100, 0xd000, 0xd100, 0xd202, 0xd300, 0xd400, + 0xda01, 0xe800, 0xea00, 0xeb00, 0xec00, 0xfc06, + 0xfd00, 0xfe07, 0xff06]) + # 2222/1102, 17/02 + pkt = NCP(0x1102, "Set Spool File Flags", 'print') + pkt.Request( 30, [ + rec( 10, 1, PrintFlags ), + rec( 11, 1, TabSize ), + rec( 12, 1, TargetPrinter ), + rec( 13, 1, Copies ), + rec( 14, 1, FormType ), + rec( 15, 1, Reserved ), + rec( 16, 14, BannerName ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xd202, 0xd300, 0xe800, 0xea00, + 0xeb00, 0xec00, 0xfc06, 0xfe07, 0xff06]) + + # 2222/1103, 17/03 + pkt = NCP(0x1103, "Spool A Disk File", 'print') + pkt.Request( (12, 23), [ + rec( 10, 1, DirHandle ), + rec( 11, (1, 12), Data ), + ], info_str=(Data, "Spool a Disk File: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8701, 0x8800, 0x8d00, + 0x8e00, 0x8f00, 0x9001, 0x9300, 0x9400, 0x9500, + 0x9600, 0x9804, 0x9900, 0x9b03, 0x9c03, 0x9d00, + 0xa100, 0xd000, 0xd100, 0xd202, 0xd300, 0xd400, + 0xda01, 0xe800, 0xea00, 0xeb00, 0xec00, 0xfc06, + 0xfd00, 0xfe07, 0xff06]) + + # 2222/1106, 17/06 + pkt = NCP(0x1106, "Get Printer Status", 'print') + pkt.Request( 11, [ + rec( 10, 1, TargetPrinter ), + ]) + pkt.Reply(12, [ + rec( 8, 1, PrinterHalted ), + rec( 9, 1, PrinterOffLine ), + rec( 10, 1, CurrentFormType ), + rec( 11, 1, RedirectedPrinter ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xfb05, 0xfd00, 0xff06]) + + # 2222/1109, 17/09 + pkt = NCP(0x1109, "Create Spool File", 'print') + pkt.Request( (12, 23), [ + rec( 10, 1, DirHandle ), + rec( 11, (1, 12), Data ), + ], info_str=(Data, "Create Spool File: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8400, 0x8701, 0x8d00, + 0x8f00, 0x9001, 0x9400, 0x9600, 0x9804, 0x9900, + 0x9b03, 0x9c03, 0xa100, 0xd000, 0xd100, 0xd202, + 0xd300, 0xd400, 0xda01, 0xe800, 0xea00, 0xeb00, + 0xec00, 0xfc06, 0xfd00, 0xfe07, 0xff06]) + + # 2222/110A, 17/10 + pkt = NCP(0x110A, "Get Printer's Queue", 'print') + pkt.Request( 11, [ + rec( 10, 1, TargetPrinter ), + ]) + pkt.Reply( 12, [ + rec( 8, 4, ObjectID, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xff06]) + + # 2222/12, 18 + pkt = NCP(0x12, "Get Volume Info with Number", 'file') + pkt.Request( 8, [ + rec( 7, 1, VolumeNumber ) + ],info_str=(VolumeNumber, "Get Volume Information for Volume %d", ", %d")) + pkt.Reply( 36, [ + rec( 8, 2, SectorsPerCluster, BE ), + rec( 10, 2, TotalVolumeClusters, BE ), + rec( 12, 2, AvailableClusters, BE ), + rec( 14, 2, TotalDirectorySlots, BE ), + rec( 16, 2, AvailableDirectorySlots, BE ), + rec( 18, 16, VolumeName ), + rec( 34, 2, RemovableFlag, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x9804]) + + # 2222/13, 19 + pkt = NCP(0x13, "Get Station Number", 'connection') + pkt.Request(7) + pkt.Reply(11, [ + rec( 8, 3, StationNumber ) + ]) + pkt.CompletionCodes([0x0000, 0xff00]) + + # 2222/14, 20 + pkt = NCP(0x14, "Get File Server Date And Time", 'fileserver') + pkt.Request(7) + pkt.Reply(15, [ + rec( 8, 1, Year ), + rec( 9, 1, Month ), + rec( 10, 1, Day ), + rec( 11, 1, Hour ), + rec( 12, 1, Minute ), + rec( 13, 1, Second ), + rec( 14, 1, DayOfWeek ), + ]) + pkt.CompletionCodes([0x0000]) + + # 2222/1500, 21/00 + pkt = NCP(0x1500, "Send Broadcast Message", 'message') + pkt.Request((13, 70), [ + rec( 10, 1, ClientListLen, var="x" ), + rec( 11, 1, TargetClientList, repeat="x" ), + rec( 12, (1, 58), TargetMessage ), + ], info_str=(TargetMessage, "Send Broadcast Message: %s", ", %s")) + pkt.Reply(10, [ + rec( 8, 1, ClientListLen, var="x" ), + rec( 9, 1, SendStatus, repeat="x" ) + ]) + pkt.CompletionCodes([0x0000, 0xfd00]) + + # 2222/1501, 21/01 + pkt = NCP(0x1501, "Get Broadcast Message", 'message') + pkt.Request(10) + pkt.Reply((9,66), [ + rec( 8, (1, 58), TargetMessage ) + ]) + pkt.CompletionCodes([0x0000, 0xfd00]) + + # 2222/1502, 21/02 + pkt = NCP(0x1502, "Disable Broadcasts", 'message') + pkt.Request(10) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xfb0a]) + + # 2222/1503, 21/03 + pkt = NCP(0x1503, "Enable Broadcasts", 'message') + pkt.Request(10) + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + + # 2222/1509, 21/09 + pkt = NCP(0x1509, "Broadcast To Console", 'message') + pkt.Request((11, 68), [ + rec( 10, (1, 58), TargetMessage ) + ], info_str=(TargetMessage, "Broadcast to Console: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + + # 2222/150A, 21/10 + pkt = NCP(0x150A, "Send Broadcast Message", 'message') + pkt.Request((17, 74), [ + rec( 10, 2, ClientListCount, LE, var="x" ), + rec( 12, 4, ClientList, LE, repeat="x" ), + rec( 16, (1, 58), TargetMessage ), + ], info_str=(TargetMessage, "Send Broadcast Message: %s", ", %s")) + pkt.Reply(14, [ + rec( 8, 2, ClientListCount, LE, var="x" ), + rec( 10, 4, ClientCompFlag, LE, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0xfd00]) + + # 2222/150B, 21/11 + pkt = NCP(0x150B, "Get Broadcast Message", 'message') + pkt.Request(10) + pkt.Reply((9,66), [ + rec( 8, (1, 58), TargetMessage ) + ]) + pkt.CompletionCodes([0x0000, 0xfd00]) + + # 2222/150C, 21/12 + pkt = NCP(0x150C, "Connection Message Control", 'message') + pkt.Request(22, [ + rec( 10, 1, ConnectionControlBits ), + rec( 11, 3, Reserved3 ), + rec( 14, 4, ConnectionListCount, LE, var="x" ), + rec( 18, 4, ConnectionList, LE, repeat="x" ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xff00]) + + # 2222/1600, 22/0 + pkt = NCP(0x1600, "Set Directory Handle", 'file') + pkt.Request((13,267), [ + rec( 10, 1, TargetDirHandle ), + rec( 11, 1, DirHandle ), + rec( 12, (1, 255), Path ), + ], info_str=(Path, "Set Directory Handle to: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9b03, 0x9c03, 0xa100, 0xfa00, + 0xfd00, 0xff00]) + + + # 2222/1601, 22/1 + pkt = NCP(0x1601, "Get Directory Path", 'file') + pkt.Request(11, [ + rec( 10, 1, DirHandle ), + ],info_str=(DirHandle, "Get Directory Path for Directory Handle %d", ", %d")) + pkt.Reply((9,263), [ + rec( 8, (1,255), Path ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0x9b00, 0x9c00, 0xa100]) + + # 2222/1602, 22/2 + pkt = NCP(0x1602, "Scan Directory Information", 'file') + pkt.Request((14,268), [ + rec( 10, 1, DirHandle ), + rec( 11, 2, StartingSearchNumber, BE ), + rec( 13, (1, 255), Path ), + ], info_str=(Path, "Scan Directory Information: %s", ", %s")) + pkt.Reply(36, [ + rec( 8, 16, DirectoryPath ), + rec( 24, 2, CreationDate, BE ), + rec( 26, 2, CreationTime, BE ), + rec( 28, 4, CreatorID, BE ), + rec( 32, 1, AccessRightsMask ), + rec( 33, 1, Reserved ), + rec( 34, 2, NextSearchNumber, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9b03, 0x9c03, 0xa100, 0xfa00, + 0xfd00, 0xff00]) + + # 2222/1603, 22/3 + pkt = NCP(0x1603, "Get Effective Directory Rights", 'file') + pkt.Request((12,266), [ + rec( 10, 1, DirHandle ), + rec( 11, (1, 255), Path ), + ], info_str=(Path, "Get Effective Directory Rights: %s", ", %s")) + pkt.Reply(9, [ + rec( 8, 1, AccessRightsMask ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9b03, 0x9c03, 0xa100, 0xfa00, + 0xfd00, 0xff00]) + + # 2222/1604, 22/4 + pkt = NCP(0x1604, "Modify Maximum Rights Mask", 'file') + pkt.Request((14,268), [ + rec( 10, 1, DirHandle ), + rec( 11, 1, RightsGrantMask ), + rec( 12, 1, RightsRevokeMask ), + rec( 13, (1, 255), Path ), + ], info_str=(Path, "Modify Maximum Rights Mask: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8c00, 0x9600, 0x9804, 0x9b03, 0x9c03, 0xa100, 0xfa00, + 0xfd00, 0xff00]) + + # 2222/1605, 22/5 + pkt = NCP(0x1605, "Get Volume Number", 'file') + pkt.Request((11, 265), [ + rec( 10, (1,255), VolumeNameLen ), + ], info_str=(VolumeNameLen, "Get Volume Number for: %s", ", %s")) + pkt.Reply(9, [ + rec( 8, 1, VolumeNumber ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0x9804]) + + # 2222/1606, 22/6 + pkt = NCP(0x1606, "Get Volume Name", 'file') + pkt.Request(11, [ + rec( 10, 1, VolumeNumber ), + ],info_str=(VolumeNumber, "Get Name for Volume %d", ", %d")) + pkt.Reply((9, 263), [ + rec( 8, (1,255), VolumeNameLen ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0xff00]) + + # 2222/160A, 22/10 + pkt = NCP(0x160A, "Create Directory", 'file') + pkt.Request((13,267), [ + rec( 10, 1, DirHandle ), + rec( 11, 1, AccessRightsMask ), + rec( 12, (1, 255), Path ), + ], info_str=(Path, "Create Directory: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8400, 0x9600, 0x9804, 0x9900, 0x9b03, 0x9c03, + 0x9e00, 0xa100, 0xfd00, 0xff00]) + + # 2222/160B, 22/11 + pkt = NCP(0x160B, "Delete Directory", 'file') + pkt.Request((13,267), [ + rec( 10, 1, DirHandle ), + rec( 11, 1, Reserved ), + rec( 12, (1, 255), Path ), + ], info_str=(Path, "Delete Directory: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8a00, 0x9600, 0x9804, 0x9b03, 0x9c03, + 0x9f00, 0xa000, 0xa100, 0xfd00, 0xff00]) + + # 2222/160C, 22/12 + pkt = NCP(0x160C, "Scan Directory for Trustees", 'file') + pkt.Request((13,267), [ + rec( 10, 1, DirHandle ), + rec( 11, 1, TrusteeSetNumber ), + rec( 12, (1, 255), Path ), + ], info_str=(Path, "Scan Directory for Trustees: %s", ", %s")) + pkt.Reply(57, [ + rec( 8, 16, DirectoryPath ), + rec( 24, 2, CreationDate, BE ), + rec( 26, 2, CreationTime, BE ), + rec( 28, 4, CreatorID ), + rec( 32, 4, TrusteeID, BE ), + rec( 36, 4, TrusteeID, BE ), + rec( 40, 4, TrusteeID, BE ), + rec( 44, 4, TrusteeID, BE ), + rec( 48, 4, TrusteeID, BE ), + rec( 52, 1, AccessRightsMask ), + rec( 53, 1, AccessRightsMask ), + rec( 54, 1, AccessRightsMask ), + rec( 55, 1, AccessRightsMask ), + rec( 56, 1, AccessRightsMask ), + ]) + pkt.CompletionCodes([0x0000, 0x8c00, 0x9600, 0x9804, 0x9b03, 0x9c03, + 0xa100, 0xfd00, 0xff00]) + + # 2222/160D, 22/13 + pkt = NCP(0x160D, "Add Trustee to Directory", 'file') + pkt.Request((17,271), [ + rec( 10, 1, DirHandle ), + rec( 11, 4, TrusteeID, BE ), + rec( 15, 1, AccessRightsMask ), + rec( 16, (1, 255), Path ), + ], info_str=(Path, "Add Trustee to Directory: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8c00, 0x9600, 0x9804, 0x9900, 0x9b03, 0x9c03, + 0xa100, 0xfc06, 0xfd00, 0xff00]) + + # 2222/160E, 22/14 + pkt = NCP(0x160E, "Delete Trustee from Directory", 'file') + pkt.Request((17,271), [ + rec( 10, 1, DirHandle ), + rec( 11, 4, TrusteeID, BE ), + rec( 15, 1, Reserved ), + rec( 16, (1, 255), Path ), + ], info_str=(Path, "Delete Trustee from Directory: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8c00, 0x9600, 0x9804, 0x9900, 0x9b03, 0x9c03, + 0xa100, 0xfc06, 0xfd00, 0xfe07, 0xff00]) + + # 2222/160F, 22/15 + pkt = NCP(0x160F, "Rename Directory", 'file') + pkt.Request((13, 521), [ + rec( 10, 1, DirHandle ), + rec( 11, (1, 255), Path ), + rec( -1, (1, 255), NewPath ), + ], info_str=(Path, "Rename Directory: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8b00, 0x9200, 0x9600, 0x9804, 0x9b03, 0x9c03, + 0x9e00, 0xa100, 0xef00, 0xfd00, 0xff00]) + + # 2222/1610, 22/16 + pkt = NCP(0x1610, "Purge Erased Files", 'file') + pkt.Request(10) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8100, 0x9600, 0x9804, 0xa100, 0xff00]) + + # 2222/1611, 22/17 + pkt = NCP(0x1611, "Recover Erased File", 'file') + pkt.Request(11, [ + rec( 10, 1, DirHandle ), + ],info_str=(DirHandle, "Recover Erased File from Directory Handle %d", ", %d")) + pkt.Reply(38, [ + rec( 8, 15, OldFileName ), + rec( 23, 15, NewFileName ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9b03, 0x9c03, + 0xa100, 0xfd00, 0xff00]) + # 2222/1612, 22/18 + pkt = NCP(0x1612, "Alloc Permanent Directory Handle", 'file') + pkt.Request((13, 267), [ + rec( 10, 1, DirHandle ), + rec( 11, 1, DirHandleName ), + rec( 12, (1,255), Path ), + ], info_str=(Path, "Allocate Permanent Directory Handle: %s", ", %s")) + pkt.Reply(10, [ + rec( 8, 1, DirHandle ), + rec( 9, 1, AccessRightsMask ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9900, 0x9b00, 0x9c03, 0x9d00, + 0xa100, 0xfd00, 0xff00]) + # 2222/1613, 22/19 + pkt = NCP(0x1613, "Alloc Temporary Directory Handle", 'file') + pkt.Request((13, 267), [ + rec( 10, 1, DirHandle ), + rec( 11, 1, DirHandleName ), + rec( 12, (1,255), Path ), + ], info_str=(Path, "Allocate Temporary Directory Handle: %s", ", %s")) + pkt.Reply(10, [ + rec( 8, 1, DirHandle ), + rec( 9, 1, AccessRightsMask ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9900, 0x9c03, 0x9d00, + 0xa100, 0xfd00, 0xff00]) + # 2222/1614, 22/20 + pkt = NCP(0x1614, "Deallocate Directory Handle", 'file') + pkt.Request(11, [ + rec( 10, 1, DirHandle ), + ],info_str=(DirHandle, "Deallocate Directory Handle %d", ", %d")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9b03]) + # 2222/1615, 22/21 + pkt = NCP(0x1615, "Get Volume Info with Handle", 'file') + pkt.Request( 11, [ + rec( 10, 1, DirHandle ) + ],info_str=(DirHandle, "Get Volume Information with Handle %d", ", %d")) + pkt.Reply( 36, [ + rec( 8, 2, SectorsPerCluster, BE ), + rec( 10, 2, TotalVolumeClusters, BE ), + rec( 12, 2, AvailableClusters, BE ), + rec( 14, 2, TotalDirectorySlots, BE ), + rec( 16, 2, AvailableDirectorySlots, BE ), + rec( 18, 16, VolumeName ), + rec( 34, 2, RemovableFlag, BE ), + ]) + pkt.CompletionCodes([0x0000, 0xff00]) + # 2222/1616, 22/22 + pkt = NCP(0x1616, "Alloc Special Temporary Directory Handle", 'file') + pkt.Request((13, 267), [ + rec( 10, 1, DirHandle ), + rec( 11, 1, DirHandleName ), + rec( 12, (1,255), Path ), + ], info_str=(Path, "Allocate Special Temporary Directory Handle: %s", ", %s")) + pkt.Reply(10, [ + rec( 8, 1, DirHandle ), + rec( 9, 1, AccessRightsMask ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9900, 0x9b00, 0x9c03, 0x9d00, + 0xa100, 0xfd00, 0xff00]) + # 2222/1617, 22/23 + pkt = NCP(0x1617, "Extract a Base Handle", 'file') + pkt.Request(11, [ + rec( 10, 1, DirHandle ), + ],info_str=(DirHandle, "Extract a Base Handle from Directory Handle %d", ", %d")) + pkt.Reply(22, [ + rec( 8, 10, ServerNetworkAddress ), + rec( 18, 4, DirHandleLong ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0x9b03]) + # 2222/1618, 22/24 + pkt = NCP(0x1618, "Restore an Extracted Base Handle", 'file') + pkt.Request(24, [ + rec( 10, 10, ServerNetworkAddress ), + rec( 20, 4, DirHandleLong ), + ]) + pkt.Reply(10, [ + rec( 8, 1, DirHandle ), + rec( 9, 1, AccessRightsMask ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9b03, 0x9c00, 0x9d00, 0xa100, + 0xfd00, 0xff00]) + # 2222/1619, 22/25 + pkt = NCP(0x1619, "Set Directory Information", 'file') + pkt.Request((21, 275), [ + rec( 10, 1, DirHandle ), + rec( 11, 2, CreationDate ), + rec( 13, 2, CreationTime ), + rec( 15, 4, CreatorID, BE ), + rec( 19, 1, AccessRightsMask ), + rec( 20, (1,255), Path ), + ], info_str=(Path, "Set Directory Information: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8c00, 0x9600, 0x9804, 0x9b03, 0x9c00, 0xa100, + 0xff16]) + # 2222/161A, 22/26 + pkt = NCP(0x161A, "Get Path Name of a Volume-Directory Number Pair", 'file') + pkt.Request(13, [ + rec( 10, 1, VolumeNumber ), + rec( 11, 2, DirectoryEntryNumberWord ), + ]) + pkt.Reply((9,263), [ + rec( 8, (1,255), Path ), + ]) + pkt.CompletionCodes([0x0000, 0x9804, 0x9c00, 0xa100]) + # 2222/161B, 22/27 + pkt = NCP(0x161B, "Scan Salvageable Files", 'file') + pkt.Request(15, [ + rec( 10, 1, DirHandle ), + rec( 11, 4, SequenceNumber ), + ]) + pkt.Reply(140, [ + rec( 8, 4, SequenceNumber ), + rec( 12, 2, Subdirectory ), + rec( 14, 2, Reserved2 ), + rec( 16, 4, AttributesDef32 ), + rec( 20, 1, UniqueID ), + rec( 21, 1, FlagsDef ), + rec( 22, 1, DestNameSpace ), + rec( 23, 1, FileNameLen ), + rec( 24, 12, FileName12 ), + rec( 36, 2, CreationTime ), + rec( 38, 2, CreationDate ), + rec( 40, 4, CreatorID, BE ), + rec( 44, 2, ArchivedTime ), + rec( 46, 2, ArchivedDate ), + rec( 48, 4, ArchiverID, BE ), + rec( 52, 2, UpdateTime ), + rec( 54, 2, UpdateDate ), + rec( 56, 4, UpdateID, BE ), + rec( 60, 4, FileSize, BE ), + rec( 64, 44, Reserved44 ), + rec( 108, 2, InheritedRightsMask ), + rec( 110, 2, LastAccessedDate ), + rec( 112, 4, DeletedFileTime ), + rec( 116, 2, DeletedTime ), + rec( 118, 2, DeletedDate ), + rec( 120, 4, DeletedID, BE ), + rec( 124, 16, Reserved16 ), + ]) + pkt.CompletionCodes([0x0000, 0xfb01, 0x9801, 0xff1d]) + # 2222/161C, 22/28 + pkt = NCP(0x161C, "Recover Salvageable File", 'file') + pkt.Request((17,525), [ + rec( 10, 1, DirHandle ), + rec( 11, 4, SequenceNumber ), + rec( 15, (1, 255), FileName ), + rec( -1, (1, 255), NewFileNameLen ), + ], info_str=(FileName, "Recover File: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8401, 0x9c03, 0xfe02]) + # 2222/161D, 22/29 + pkt = NCP(0x161D, "Purge Salvageable File", 'file') + pkt.Request(15, [ + rec( 10, 1, DirHandle ), + rec( 11, 4, SequenceNumber ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8500, 0x9c03]) + # 2222/161E, 22/30 + pkt = NCP(0x161E, "Scan a Directory", 'file') + pkt.Request((17, 271), [ + rec( 10, 1, DirHandle ), + rec( 11, 1, DOSFileAttributes ), + rec( 12, 4, SequenceNumber ), + rec( 16, (1, 255), SearchPattern ), + ], info_str=(SearchPattern, "Scan a Directory: %s", ", %s")) + pkt.Reply(140, [ + rec( 8, 4, SequenceNumber ), + rec( 12, 4, Subdirectory ), + rec( 16, 4, AttributesDef32 ), + rec( 20, 1, UniqueID, LE ), + rec( 21, 1, PurgeFlags ), + rec( 22, 1, DestNameSpace ), + rec( 23, 1, NameLen ), + rec( 24, 12, Name12 ), + rec( 36, 2, CreationTime ), + rec( 38, 2, CreationDate ), + rec( 40, 4, CreatorID, BE ), + rec( 44, 2, ArchivedTime ), + rec( 46, 2, ArchivedDate ), + rec( 48, 4, ArchiverID, BE ), + rec( 52, 2, UpdateTime ), + rec( 54, 2, UpdateDate ), + rec( 56, 4, UpdateID, BE ), + rec( 60, 4, FileSize, BE ), + rec( 64, 44, Reserved44 ), + rec( 108, 2, InheritedRightsMask ), + rec( 110, 2, LastAccessedDate ), + rec( 112, 28, Reserved28 ), + ]) + pkt.CompletionCodes([0x0000, 0x8500, 0x9c03]) + # 2222/161F, 22/31 + pkt = NCP(0x161F, "Get Directory Entry", 'file') + pkt.Request(11, [ + rec( 10, 1, DirHandle ), + ]) + pkt.Reply(136, [ + rec( 8, 4, Subdirectory ), + rec( 12, 4, AttributesDef32 ), + rec( 16, 1, UniqueID, LE ), + rec( 17, 1, PurgeFlags ), + rec( 18, 1, DestNameSpace ), + rec( 19, 1, NameLen ), + rec( 20, 12, Name12 ), + rec( 32, 2, CreationTime ), + rec( 34, 2, CreationDate ), + rec( 36, 4, CreatorID, BE ), + rec( 40, 2, ArchivedTime ), + rec( 42, 2, ArchivedDate ), + rec( 44, 4, ArchiverID, BE ), + rec( 48, 2, UpdateTime ), + rec( 50, 2, UpdateDate ), + rec( 52, 4, NextTrusteeEntry, BE ), + rec( 56, 48, Reserved48 ), + rec( 104, 2, MaximumSpace ), + rec( 106, 2, InheritedRightsMask ), + rec( 108, 28, Undefined28 ), + ]) + pkt.CompletionCodes([0x0000, 0x8900, 0xbf00, 0xfb00]) + # 2222/1620, 22/32 + pkt = NCP(0x1620, "Scan Volume's User Disk Restrictions", 'file') + pkt.Request(15, [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, SequenceNumber ), + ]) + pkt.Reply(17, [ + rec( 8, 1, NumberOfEntries, var="x" ), + rec( 9, 8, ObjectIDStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9800]) + # 2222/1621, 22/33 + pkt = NCP(0x1621, "Add User Disk Space Restriction", 'file') + pkt.Request(19, [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, ObjectID ), + rec( 15, 4, DiskSpaceLimit ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8c00, 0x9600, 0x9800]) + # 2222/1622, 22/34 + pkt = NCP(0x1622, "Remove User Disk Space Restrictions", 'file') + pkt.Request(15, [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, ObjectID ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8c00, 0xfe0e]) + # 2222/1623, 22/35 + pkt = NCP(0x1623, "Get Directory Disk Space Restriction", 'file') + pkt.Request(11, [ + rec( 10, 1, DirHandle ), + ]) + pkt.Reply(18, [ + rec( 8, 1, NumberOfEntries ), + rec( 9, 1, Level ), + rec( 10, 4, MaxSpace ), + rec( 14, 4, CurrentSpace ), + ]) + pkt.CompletionCodes([0x0000]) + # 2222/1624, 22/36 + pkt = NCP(0x1624, "Set Directory Disk Space Restriction", 'file') + pkt.Request(15, [ + rec( 10, 1, DirHandle ), + rec( 11, 4, DiskSpaceLimit ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0101, 0x8c00, 0xbf00]) + # 2222/1625, 22/37 + pkt = NCP(0x1625, "Set Directory Entry Information", 'file') + pkt.Request(NO_LENGTH_CHECK, [ + # + # XXX - this didn't match what was in the spec for 22/37 + # on the Novell Web site. + # + rec( 10, 1, DirHandle ), + rec( 11, 1, SearchAttributes ), + rec( 12, 4, SequenceNumber ), + rec( 16, 2, ChangeBits ), + rec( 18, 2, Reserved2 ), + rec( 20, 4, Subdirectory ), + #srec(DOSDirectoryEntryStruct, req_cond="ncp.search_att_sub == TRUE"), + srec(DOSFileEntryStruct, req_cond="ncp.search_att_sub == FALSE"), + ]) + pkt.Reply(8) + pkt.ReqCondSizeConstant() + pkt.CompletionCodes([0x0000, 0x0106, 0x8c00, 0xbf00]) + # 2222/1626, 22/38 + pkt = NCP(0x1626, "Scan File or Directory for Extended Trustees", 'file') + pkt.Request((13,267), [ + rec( 10, 1, DirHandle ), + rec( 11, 1, SequenceByte ), + rec( 12, (1, 255), Path ), + ], info_str=(Path, "Scan for Extended Trustees: %s", ", %s")) + pkt.Reply(91, [ + rec( 8, 1, NumberOfEntries, var="x" ), + rec( 9, 4, ObjectID ), + rec( 13, 4, ObjectID ), + rec( 17, 4, ObjectID ), + rec( 21, 4, ObjectID ), + rec( 25, 4, ObjectID ), + rec( 29, 4, ObjectID ), + rec( 33, 4, ObjectID ), + rec( 37, 4, ObjectID ), + rec( 41, 4, ObjectID ), + rec( 45, 4, ObjectID ), + rec( 49, 4, ObjectID ), + rec( 53, 4, ObjectID ), + rec( 57, 4, ObjectID ), + rec( 61, 4, ObjectID ), + rec( 65, 4, ObjectID ), + rec( 69, 4, ObjectID ), + rec( 73, 4, ObjectID ), + rec( 77, 4, ObjectID ), + rec( 81, 4, ObjectID ), + rec( 85, 4, ObjectID ), + rec( 89, 2, AccessRightsMaskWord, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9800, 0x9b00, 0x9c00]) + # 2222/1627, 22/39 + pkt = NCP(0x1627, "Add Extended Trustee to Directory or File", 'file') + pkt.Request((18,272), [ + rec( 10, 1, DirHandle ), + rec( 11, 4, ObjectID, BE ), + rec( 15, 2, TrusteeRights ), + rec( 17, (1, 255), Path ), + ], info_str=(Path, "Add Extended Trustee: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9000]) + # 2222/1628, 22/40 + pkt = NCP(0x1628, "Scan Directory Disk Space", 'file') + pkt.Request((17,271), [ + rec( 10, 1, DirHandle ), + rec( 11, 1, SearchAttributes ), + rec( 12, 4, SequenceNumber ), + rec( 16, (1, 255), SearchPattern ), + ], info_str=(SearchPattern, "Scan Directory Disk Space: %s", ", %s")) + pkt.Reply((148), [ + rec( 8, 4, SequenceNumber ), + rec( 12, 4, Subdirectory ), + rec( 16, 4, AttributesDef32 ), + rec( 20, 1, UniqueID ), + rec( 21, 1, PurgeFlags ), + rec( 22, 1, DestNameSpace ), + rec( 23, 1, NameLen ), + rec( 24, 12, Name12 ), + rec( 36, 2, CreationTime ), + rec( 38, 2, CreationDate ), + rec( 40, 4, CreatorID, BE ), + rec( 44, 2, ArchivedTime ), + rec( 46, 2, ArchivedDate ), + rec( 48, 4, ArchiverID, BE ), + rec( 52, 2, UpdateTime ), + rec( 54, 2, UpdateDate ), + rec( 56, 4, UpdateID, BE ), + rec( 60, 4, DataForkSize, BE ), + rec( 64, 4, DataForkFirstFAT, BE ), + rec( 68, 4, NextTrusteeEntry, BE ), + rec( 72, 36, Reserved36 ), + rec( 108, 2, InheritedRightsMask ), + rec( 110, 2, LastAccessedDate ), + rec( 112, 4, DeletedFileTime ), + rec( 116, 2, DeletedTime ), + rec( 118, 2, DeletedDate ), + rec( 120, 4, DeletedID, BE ), + rec( 124, 8, Undefined8 ), + rec( 132, 4, PrimaryEntry, LE ), + rec( 136, 4, NameList, LE ), + rec( 140, 4, OtherFileForkSize, BE ), + rec( 144, 4, OtherFileForkFAT, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x8900, 0x9c03, 0xfb01, 0xff00]) + # 2222/1629, 22/41 + pkt = NCP(0x1629, "Get Object Disk Usage and Restrictions", 'file') + pkt.Request(15, [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, ObjectID, LE ), + ]) + pkt.Reply(16, [ + rec( 8, 4, Restriction ), + rec( 12, 4, InUse ), + ]) + pkt.CompletionCodes([0x0000, 0x9802]) + # 2222/162A, 22/42 + pkt = NCP(0x162A, "Get Effective Rights for Directory Entry", 'file') + pkt.Request((12,266), [ + rec( 10, 1, DirHandle ), + rec( 11, (1, 255), Path ), + ], info_str=(Path, "Get Effective Rights: %s", ", %s")) + pkt.Reply(10, [ + rec( 8, 2, AccessRightsMaskWord ), + ]) + pkt.CompletionCodes([0x0000, 0x9804, 0x9c03]) + # 2222/162B, 22/43 + pkt = NCP(0x162B, "Remove Extended Trustee from Dir or File", 'file') + pkt.Request((17,271), [ + rec( 10, 1, DirHandle ), + rec( 11, 4, ObjectID, BE ), + rec( 15, 1, Unused ), + rec( 16, (1, 255), Path ), + ], info_str=(Path, "Remove Extended Trustee from %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9002, 0x9c03, 0xfe0f, 0xff09]) + # 2222/162C, 22/44 + pkt = NCP(0x162C, "Get Volume and Purge Information", 'file') + pkt.Request( 11, [ + rec( 10, 1, VolumeNumber ) + ],info_str=(VolumeNumber, "Get Volume and Purge Information for Volume %d", ", %d")) + pkt.Reply( (38,53), [ + rec( 8, 4, TotalBlocks ), + rec( 12, 4, FreeBlocks ), + rec( 16, 4, PurgeableBlocks ), + rec( 20, 4, NotYetPurgeableBlocks ), + rec( 24, 4, TotalDirectoryEntries ), + rec( 28, 4, AvailableDirEntries ), + rec( 32, 4, Reserved4 ), + rec( 36, 1, SectorsPerBlock ), + rec( 37, (1,16), VolumeNameLen ), + ]) + pkt.CompletionCodes([0x0000]) + # 2222/162D, 22/45 + pkt = NCP(0x162D, "Get Directory Information", 'file') + pkt.Request( 11, [ + rec( 10, 1, DirHandle ) + ]) + pkt.Reply( (30, 45), [ + rec( 8, 4, TotalBlocks ), + rec( 12, 4, AvailableBlocks ), + rec( 16, 4, TotalDirectoryEntries ), + rec( 20, 4, AvailableDirEntries ), + rec( 24, 4, Reserved4 ), + rec( 28, 1, SectorsPerBlock ), + rec( 29, (1,16), VolumeNameLen ), + ]) + pkt.CompletionCodes([0x0000, 0x9b03]) + # 2222/162E, 22/46 + pkt = NCP(0x162E, "Rename Or Move", 'file') + pkt.Request( (17,525), [ + rec( 10, 1, SourceDirHandle ), + rec( 11, 1, SearchAttributes ), + rec( 12, 1, SourcePathComponentCount ), + rec( 13, (1,255), SourcePath ), + rec( -1, 1, DestDirHandle ), + rec( -1, 1, DestPathComponentCount ), + rec( -1, (1,255), DestPath ), + ], info_str=(SourcePath, "Rename or Move: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0102, 0x8701, 0x8b00, 0x8d00, 0x8e00, + 0x8f00, 0x9001, 0x9101, 0x9201, 0x9a00, 0x9b03, + 0x9c03, 0xa400, 0xff17]) + # 2222/162F, 22/47 + pkt = NCP(0x162F, "Get Name Space Information", 'file') + pkt.Request( 11, [ + rec( 10, 1, VolumeNumber ) + ],info_str=(VolumeNumber, "Get Name Space Information for Volume %d", ", %d")) + pkt.Reply( (15,523), [ + # + # XXX - why does this not display anything at all + # if the stuff after the first IndexNumber is + # un-commented? That stuff really is there.... + # + rec( 8, 1, DefinedNameSpaces, var="v" ), + rec( 9, (1,255), NameSpaceName, repeat="v" ), + rec( -1, 1, DefinedDataStreams, var="w" ), + rec( -1, (2,256), DataStreamInfo, repeat="w" ), + rec( -1, 1, LoadedNameSpaces, var="x" ), + rec( -1, 1, IndexNumber, repeat="x" ), +# rec( -1, 1, VolumeNameSpaces, var="y" ), +# rec( -1, 1, IndexNumber, repeat="y" ), +# rec( -1, 1, VolumeDataStreams, var="z" ), +# rec( -1, 1, IndexNumber, repeat="z" ), + ]) + pkt.CompletionCodes([0x0000, 0x9802, 0xff00]) + # 2222/1630, 22/48 + pkt = NCP(0x1630, "Get Name Space Directory Entry", 'file') + pkt.Request( 16, [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, DOSSequence ), + rec( 15, 1, SrcNameSpace ), + ]) + pkt.Reply( 112, [ + rec( 8, 4, SequenceNumber ), + rec( 12, 4, Subdirectory ), + rec( 16, 4, AttributesDef32 ), + rec( 20, 1, UniqueID ), + rec( 21, 1, Flags ), + rec( 22, 1, SrcNameSpace ), + rec( 23, 1, NameLength ), + rec( 24, 12, Name12 ), + rec( 36, 2, CreationTime ), + rec( 38, 2, CreationDate ), + rec( 40, 4, CreatorID, BE ), + rec( 44, 2, ArchivedTime ), + rec( 46, 2, ArchivedDate ), + rec( 48, 4, ArchiverID ), + rec( 52, 2, UpdateTime ), + rec( 54, 2, UpdateDate ), + rec( 56, 4, UpdateID ), + rec( 60, 4, FileSize ), + rec( 64, 44, Reserved44 ), + rec( 108, 2, InheritedRightsMask ), + rec( 110, 2, LastAccessedDate ), + ]) + pkt.CompletionCodes([0x0000, 0x8900, 0x9802, 0xbf00]) + # 2222/1631, 22/49 + pkt = NCP(0x1631, "Open Data Stream", 'file') + pkt.Request( (15,269), [ + rec( 10, 1, DataStream ), + rec( 11, 1, DirHandle ), + rec( 12, 1, AttributesDef ), + rec( 13, 1, OpenRights ), + rec( 14, (1, 255), FileName ), + ], info_str=(FileName, "Open Data Stream: %s", ", %s")) + pkt.Reply( 12, [ + rec( 8, 4, CCFileHandle, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8200, 0x9002, 0xbe00, 0xff00]) + # 2222/1632, 22/50 + pkt = NCP(0x1632, "Get Object Effective Rights for Directory Entry", 'file') + pkt.Request( (16,270), [ + rec( 10, 4, ObjectID, BE ), + rec( 14, 1, DirHandle ), + rec( 15, (1, 255), Path ), + ], info_str=(Path, "Get Object Effective Rights: %s", ", %s")) + pkt.Reply( 10, [ + rec( 8, 2, TrusteeRights ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0x9b00, 0x9c03, 0xfc06]) + # 2222/1633, 22/51 + pkt = NCP(0x1633, "Get Extended Volume Information", 'file') + pkt.Request( 11, [ + rec( 10, 1, VolumeNumber ), + ],info_str=(VolumeNumber, "Get Extended Volume Information for Volume %d", ", %d")) + pkt.Reply( (139,266), [ + rec( 8, 2, VolInfoReplyLen ), + rec( 10, 128, VolInfoStructure), + rec( 138, (1,128), VolumeNameLen ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0x9804, 0xfb08, 0xff00]) + # 2222/1634, 22/52 + pkt = NCP(0x1634, "Get Mount Volume List", 'file') + pkt.Request( 22, [ + rec( 10, 4, StartVolumeNumber ), + rec( 14, 4, VolumeRequestFlags, LE ), + rec( 18, 4, SrcNameSpace ), + ]) + pkt.Reply( NO_LENGTH_CHECK, [ + rec( 8, 4, ItemsInPacket, var="x" ), + rec( 12, 4, NextVolumeNumber ), + srec( VolumeStruct, req_cond="ncp.volume_request_flags==0x0000", repeat="x" ), + srec( VolumeWithNameStruct, req_cond="ncp.volume_request_flags==0x0001", repeat="x" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x9802]) +# 2222/1635, 22/53 + pkt = NCP(0x1635, "Get Volume Capabilities", 'file') + pkt.Request( 18, [ + rec( 10, 4, VolumeNumberLong ), + rec( 14, 4, VersionNumberLong ), + ]) + pkt.Reply( 744, [ + rec( 8, 4, VolumeCapabilities ), + rec( 12, 28, Reserved28 ), + rec( 40, 64, VolumeNameStringz ), + rec( 104, 128, VolumeGUID ), + rec( 232, 256, PoolName ), + rec( 488, 256, VolumeMountPoint ), + ]) + pkt.CompletionCodes([0x0000]) + # 2222/1700, 23/00 + pkt = NCP(0x1700, "Login User", 'connection') + pkt.Request( (12, 58), [ + rec( 10, (1,16), UserName ), + rec( -1, (1,32), Password ), + ], info_str=(UserName, "Login User: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9602, 0xc101, 0xc200, 0xc501, 0xd700, + 0xd900, 0xda00, 0xdb00, 0xde00, 0xdf00, 0xe800, + 0xec00, 0xed00, 0xef00, 0xf001, 0xf100, 0xf200, + 0xf600, 0xfb00, 0xfc06, 0xfe07, 0xff00]) + # 2222/1701, 23/01 + pkt = NCP(0x1701, "Change User Password", 'bindery') + pkt.Request( (13, 90), [ + rec( 10, (1,16), UserName ), + rec( -1, (1,32), Password ), + rec( -1, (1,32), NewPassword ), + ], info_str=(UserName, "Change Password for User: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xd600, 0xf001, 0xf101, 0xf501, + 0xfc06, 0xfe07, 0xff00]) + # 2222/1702, 23/02 + pkt = NCP(0x1702, "Get User Connection List", 'connection') + pkt.Request( (11, 26), [ + rec( 10, (1,16), UserName ), + ], info_str=(UserName, "Get User Connection: %s", ", %s")) + pkt.Reply( (9, 136), [ + rec( 8, (1, 128), ConnectionNumberList ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xf001, 0xfc06, 0xfe07, 0xff00]) + # 2222/1703, 23/03 + pkt = NCP(0x1703, "Get User Number", 'bindery') + pkt.Request( (11, 26), [ + rec( 10, (1,16), UserName ), + ], info_str=(UserName, "Get User Number: %s", ", %s")) + pkt.Reply( 12, [ + rec( 8, 4, ObjectID, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xf001, 0xfc06, 0xfe07, 0xff00]) + # 2222/1705, 23/05 + pkt = NCP(0x1705, "Get Station's Logged Info", 'connection') + pkt.Request( 11, [ + rec( 10, 1, TargetConnectionNumber ), + ],info_str=(TargetConnectionNumber, "Get Station's Logged Information on Connection %d", ", %d")) + pkt.Reply( 266, [ + rec( 8, 16, UserName16 ), + rec( 24, 7, LoginTime ), + rec( 31, 39, FullName ), + rec( 70, 4, UserID, BE ), + rec( 74, 128, SecurityEquivalentList ), + rec( 202, 64, Reserved64 ), + ]) + pkt.CompletionCodes([0x0000, 0x9602, 0xfc06, 0xfd00, 0xfe07, 0xff00]) + # 2222/1707, 23/07 + pkt = NCP(0x1707, "Get Group Number", 'bindery') + pkt.Request( 14, [ + rec( 10, 4, ObjectID, BE ), + ]) + pkt.Reply( 62, [ + rec( 8, 4, ObjectID, BE ), + rec( 12, 2, ObjectType, BE ), + rec( 14, 48, ObjectNameLen ), + ]) + pkt.CompletionCodes([0x0000, 0x9602, 0xf101, 0xfc06, 0xfe07, 0xff00]) + # 2222/170C, 23/12 + pkt = NCP(0x170C, "Verify Serialization", 'fileserver') + pkt.Request( 14, [ + rec( 10, 4, ServerSerialNumber ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xff00]) + # 2222/170D, 23/13 + pkt = NCP(0x170D, "Log Network Message", 'file') + pkt.Request( (11, 68), [ + rec( 10, (1, 58), TargetMessage ), + ], info_str=(TargetMessage, "Log Network Message: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8000, 0x8100, 0x8800, 0x8d00, 0x8e00, 0x8f00, + 0x9001, 0x9400, 0x9600, 0x9804, 0x9900, 0x9b00, 0xa100, + 0xa201, 0xff00]) + # 2222/170E, 23/14 + pkt = NCP(0x170E, "Get Disk Utilization", 'fileserver') + pkt.Request( 15, [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, TrusteeID, BE ), + ]) + pkt.Reply( 19, [ + rec( 8, 1, VolumeNumber ), + rec( 9, 4, TrusteeID, BE ), + rec( 13, 2, DirectoryCount, BE ), + rec( 15, 2, FileCount, BE ), + rec( 17, 2, ClusterCount, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0xa100, 0xf200]) + # 2222/170F, 23/15 + pkt = NCP(0x170F, "Scan File Information", 'file') + pkt.Request((15,269), [ + rec( 10, 2, LastSearchIndex ), + rec( 12, 1, DirHandle ), + rec( 13, 1, SearchAttributes ), + rec( 14, (1, 255), FileName ), + ], info_str=(FileName, "Scan File Information: %s", ", %s")) + pkt.Reply( 102, [ + rec( 8, 2, NextSearchIndex ), + rec( 10, 14, FileName14 ), + rec( 24, 2, AttributesDef16 ), + rec( 26, 4, FileSize, BE ), + rec( 30, 2, CreationDate, BE ), + rec( 32, 2, LastAccessedDate, BE ), + rec( 34, 2, ModifiedDate, BE ), + rec( 36, 2, ModifiedTime, BE ), + rec( 38, 4, CreatorID, BE ), + rec( 42, 2, ArchivedDate, BE ), + rec( 44, 2, ArchivedTime, BE ), + rec( 46, 56, Reserved56 ), + ]) + pkt.CompletionCodes([0x0000, 0x8800, 0x8900, 0x9300, 0x9400, 0x9804, 0x9b00, 0x9c00, + 0xa100, 0xfd00, 0xff17]) + # 2222/1710, 23/16 + pkt = NCP(0x1710, "Set File Information", 'file') + pkt.Request((91,345), [ + rec( 10, 2, AttributesDef16 ), + rec( 12, 4, FileSize, BE ), + rec( 16, 2, CreationDate, BE ), + rec( 18, 2, LastAccessedDate, BE ), + rec( 20, 2, ModifiedDate, BE ), + rec( 22, 2, ModifiedTime, BE ), + rec( 24, 4, CreatorID, BE ), + rec( 28, 2, ArchivedDate, BE ), + rec( 30, 2, ArchivedTime, BE ), + rec( 32, 56, Reserved56 ), + rec( 88, 1, DirHandle ), + rec( 89, 1, SearchAttributes ), + rec( 90, (1, 255), FileName ), + ], info_str=(FileName, "Set Information for File: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8800, 0x8c00, 0x8e00, 0x9400, 0x9600, 0x9804, + 0x9b03, 0x9c00, 0xa100, 0xa201, 0xfc06, 0xfd00, 0xfe07, + 0xff17]) + # 2222/1711, 23/17 + pkt = NCP(0x1711, "Get File Server Information", 'fileserver') + pkt.Request(10) + pkt.Reply(136, [ + rec( 8, 48, ServerName ), + rec( 56, 1, OSMajorVersion ), + rec( 57, 1, OSMinorVersion ), + rec( 58, 2, ConnectionsSupportedMax, BE ), + rec( 60, 2, ConnectionsInUse, BE ), + rec( 62, 2, VolumesSupportedMax, BE ), + rec( 64, 1, OSRevision ), + rec( 65, 1, SFTSupportLevel ), + rec( 66, 1, TTSLevel ), + rec( 67, 2, ConnectionsMaxUsed, BE ), + rec( 69, 1, AccountVersion ), + rec( 70, 1, VAPVersion ), + rec( 71, 1, QueueingVersion ), + rec( 72, 1, PrintServerVersion ), + rec( 73, 1, VirtualConsoleVersion ), + rec( 74, 1, SecurityRestrictionVersion ), + rec( 75, 1, InternetBridgeVersion ), + rec( 76, 1, MixedModePathFlag ), + rec( 77, 1, LocalLoginInfoCcode ), + rec( 78, 2, ProductMajorVersion, BE ), + rec( 80, 2, ProductMinorVersion, BE ), + rec( 82, 2, ProductRevisionVersion, BE ), + rec( 84, 1, OSLanguageID, LE ), + rec( 85, 1, SixtyFourBitOffsetsSupportedFlag ), + rec( 86, 1, OESServer ), + rec( 87, 1, OESLinuxOrNetWare ), + rec( 88, 48, Reserved48 ), + ]) + pkt.CompletionCodes([0x0000, 0x9600]) + # 2222/1712, 23/18 + pkt = NCP(0x1712, "Get Network Serial Number", 'fileserver') + pkt.Request(10) + pkt.Reply(14, [ + rec( 8, 4, ServerSerialNumber ), + rec( 12, 2, ApplicationNumber ), + ]) + pkt.CompletionCodes([0x0000, 0x9600]) + # 2222/1713, 23/19 + pkt = NCP(0x1713, "Get Internet Address", 'connection') + pkt.Request(11, [ + rec( 10, 1, TargetConnectionNumber ), + ],info_str=(TargetConnectionNumber, "Get Internet Address for Connection %d", ", %d")) + pkt.Reply(20, [ + rec( 8, 4, NetworkAddress, BE ), + rec( 12, 6, NetworkNodeAddress ), + rec( 18, 2, NetworkSocket, BE ), + ]) + pkt.CompletionCodes([0x0000, 0xff00]) + # 2222/1714, 23/20 + pkt = NCP(0x1714, "Login Object", 'connection') + pkt.Request( (14, 60), [ + rec( 10, 2, ObjectType, BE ), + rec( 12, (1,16), ClientName ), + rec( -1, (1,32), Password ), + ], info_str=(UserName, "Login Object: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9602, 0xc101, 0xc200, 0xc501, 0xd600, 0xd700, + 0xd900, 0xda00, 0xdb00, 0xde00, 0xdf00, 0xe800, 0xec00, + 0xed00, 0xef00, 0xf001, 0xf100, 0xf200, 0xf600, 0xfb00, + 0xfc06, 0xfe07, 0xff00]) + # 2222/1715, 23/21 + pkt = NCP(0x1715, "Get Object Connection List", 'connection') + pkt.Request( (13, 28), [ + rec( 10, 2, ObjectType, BE ), + rec( 12, (1,16), ObjectName ), + ], info_str=(UserName, "Get Object Connection List: %s", ", %s")) + pkt.Reply( (9, 136), [ + rec( 8, (1, 128), ConnectionNumberList ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xf001, 0xfc06, 0xfe07, 0xff00]) + # 2222/1716, 23/22 + pkt = NCP(0x1716, "Get Station's Logged Info", 'connection') + pkt.Request( 11, [ + rec( 10, 1, TargetConnectionNumber ), + ]) + pkt.Reply( 70, [ + rec( 8, 4, UserID, BE ), + rec( 12, 2, ObjectType, BE ), + rec( 14, 48, ObjectNameLen ), + rec( 62, 7, LoginTime ), + rec( 69, 1, Reserved ), + ]) + pkt.CompletionCodes([0x0000, 0x9602, 0xfb0a, 0xfc06, 0xfd00, 0xfe07, 0xff00]) + # 2222/1717, 23/23 + pkt = NCP(0x1717, "Get Login Key", 'connection') + pkt.Request(10) + pkt.Reply( 16, [ + rec( 8, 8, LoginKey ), + ]) + pkt.CompletionCodes([0x0000, 0x9602]) + # 2222/1718, 23/24 + pkt = NCP(0x1718, "Keyed Object Login", 'connection') + pkt.Request( (21, 68), [ + rec( 10, 8, LoginKey ), + rec( 18, 2, ObjectType, BE ), + rec( 20, (1,48), ObjectName ), + ], info_str=(ObjectName, "Keyed Object Login: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9602, 0xc101, 0xc200, 0xc500, 0xd904, 0xda00, + 0xdb00, 0xdc00, 0xde00, 0xff00]) + # 2222/171A, 23/26 + pkt = NCP(0x171A, "Get Internet Address", 'connection') + pkt.Request(12, [ + rec( 10, 2, TargetConnectionNumber ), + ]) +# Dissect reply in packet-ncp2222.inc + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + # 2222/171B, 23/27 + pkt = NCP(0x171B, "Get Object Connection List", 'connection') + pkt.Request( (17,64), [ + rec( 10, 4, SearchConnNumber ), + rec( 14, 2, ObjectType, BE ), + rec( 16, (1,48), ObjectName ), + ], info_str=(ObjectName, "Get Object Connection List: %s", ", %s")) + pkt.Reply( (13), [ + rec( 8, 1, ConnListLen, var="x" ), + rec( 9, 4, ConnectionNumber, LE, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xf001, 0xfc06, 0xfe07, 0xff00]) + # 2222/171C, 23/28 + pkt = NCP(0x171C, "Get Station's Logged Info", 'connection') + pkt.Request( 14, [ + rec( 10, 4, TargetConnectionNumber ), + ]) + pkt.Reply( 70, [ + rec( 8, 4, UserID, BE ), + rec( 12, 2, ObjectType, BE ), + rec( 14, 48, ObjectNameLen ), + rec( 62, 7, LoginTime ), + rec( 69, 1, Reserved ), + ]) + pkt.CompletionCodes([0x0000, 0x7d00, 0x9602, 0xfb02, 0xfc06, 0xfd00, 0xfe07, 0xff00]) + # 2222/171D, 23/29 + pkt = NCP(0x171D, "Change Connection State", 'connection') + pkt.Request( 11, [ + rec( 10, 1, RequestCode ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0109, 0x7a00, 0x7b00, 0x7c00, 0xe000, 0xfb06, 0xfd00]) + # 2222/171E, 23/30 + pkt = NCP(0x171E, "Set Watchdog Delay Interval", 'connection') + pkt.Request( 14, [ + rec( 10, 4, NumberOfMinutesToDelay ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0107]) + # 2222/171F, 23/31 + pkt = NCP(0x171F, "Get Connection List From Object", 'connection') + pkt.Request( 18, [ + rec( 10, 4, ObjectID, BE ), + rec( 14, 4, ConnectionNumber ), + ]) + pkt.Reply( (9, 136), [ + rec( 8, (1, 128), ConnectionNumberList ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xf001, 0xfc06, 0xfe07, 0xff00]) + # 2222/1720, 23/32 + pkt = NCP(0x1720, "Scan Bindery Object (List)", 'bindery') + pkt.Request((23,70), [ + rec( 10, 4, NextObjectID, BE ), + rec( 14, 2, ObjectType, BE ), + rec( 16, 2, Reserved2 ), + rec( 18, 4, InfoFlags ), + rec( 22, (1,48), ObjectName ), + ], info_str=(ObjectName, "Scan Bindery Object: %s", ", %s")) + pkt.Reply(NO_LENGTH_CHECK, [ + rec( 8, 4, ObjectInfoReturnCount ), + rec( 12, 4, NextObjectID, BE ), + rec( 16, 4, ObjectID ), + srec(ObjectTypeStruct, req_cond="ncp.info_flags_type == TRUE"), + srec(ObjectSecurityStruct, req_cond="ncp.info_flags_security == TRUE"), + srec(ObjectFlagsStruct, req_cond="ncp.info_flags_flags == TRUE"), + srec(ObjectNameStruct, req_cond="ncp.info_flags_name == TRUE"), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x9600, 0xef01, 0xfc02, 0xfe01, 0xff00]) + # 2222/1721, 23/33 + pkt = NCP(0x1721, "Generate GUIDs", 'connection') + pkt.Request( 14, [ + rec( 10, 4, ReturnInfoCount ), + ]) + pkt.Reply(28, [ + rec( 8, 4, ReturnInfoCount, var="x" ), + rec( 12, 16, GUID, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01]) +# 2222/1722, 23/34 + pkt = NCP(0x1722, "Set Connection Language Encoding", 'connection') + pkt.Request( 22, [ + rec( 10, 4, SetMask ), + rec( 14, 4, NCPEncodedStringsBits ), + rec( 18, 4, CodePage ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + # 2222/1732, 23/50 + pkt = NCP(0x1732, "Create Bindery Object", 'bindery') + pkt.Request( (15,62), [ + rec( 10, 1, ObjectFlags ), + rec( 11, 1, ObjectSecurity ), + rec( 12, 2, ObjectType, BE ), + rec( 14, (1,48), ObjectName ), + ], info_str=(ObjectName, "Create Bindery Object: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xe700, 0xee00, 0xef00, 0xf101, 0xf501, + 0xfc06, 0xfe07, 0xff00]) + # 2222/1733, 23/51 + pkt = NCP(0x1733, "Delete Bindery Object", 'bindery') + pkt.Request( (13,60), [ + rec( 10, 2, ObjectType, BE ), + rec( 12, (1,48), ObjectName ), + ], info_str=(ObjectName, "Delete Bindery Object: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xf000, 0xf200, 0xf400, 0xf600, 0xfb00, + 0xfc06, 0xfe07, 0xff00]) + # 2222/1734, 23/52 + pkt = NCP(0x1734, "Rename Bindery Object", 'bindery') + pkt.Request( (14,108), [ + rec( 10, 2, ObjectType, BE ), + rec( 12, (1,48), ObjectName ), + rec( -1, (1,48), NewObjectName ), + ], info_str=(ObjectName, "Rename Bindery Object: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xee00, 0xf000, 0xf300, 0xfc06, 0xfe07, 0xff00]) + # 2222/1735, 23/53 + pkt = NCP(0x1735, "Get Bindery Object ID", 'bindery') + pkt.Request((13,60), [ + rec( 10, 2, ObjectType, BE ), + rec( 12, (1,48), ObjectName ), + ], info_str=(ObjectName, "Get Bindery Object: %s", ", %s")) + pkt.Reply(62, [ + rec( 8, 4, ObjectID, BE ), + rec( 12, 2, ObjectType, BE ), + rec( 14, 48, ObjectNameLen ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xef01, 0xf000, 0xfc02, 0xfe01, 0xff00]) + # 2222/1736, 23/54 + pkt = NCP(0x1736, "Get Bindery Object Name", 'bindery') + pkt.Request( 14, [ + rec( 10, 4, ObjectID, BE ), + ]) + pkt.Reply( 62, [ + rec( 8, 4, ObjectID, BE ), + rec( 12, 2, ObjectType, BE ), + rec( 14, 48, ObjectNameLen ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xf101, 0xfc02, 0xfe01, 0xff00]) + # 2222/1737, 23/55 + pkt = NCP(0x1737, "Scan Bindery Object", 'bindery') + pkt.Request((17,64), [ + rec( 10, 4, ObjectID, BE ), + rec( 14, 2, ObjectType, BE ), + rec( 16, (1,48), ObjectName ), + ], info_str=(ObjectName, "Scan Bindery Object: %s", ", %s")) + pkt.Reply(65, [ + rec( 8, 4, ObjectID, BE ), + rec( 12, 2, ObjectType, BE ), + rec( 14, 48, ObjectNameLen ), + rec( 62, 1, ObjectFlags ), + rec( 63, 1, ObjectSecurity ), + rec( 64, 1, ObjectHasProperties ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xef01, 0xfc02, + 0xfe01, 0xff00]) + # 2222/1738, 23/56 + pkt = NCP(0x1738, "Change Bindery Object Security", 'bindery') + pkt.Request((14,61), [ + rec( 10, 1, ObjectSecurity ), + rec( 11, 2, ObjectType, BE ), + rec( 13, (1,48), ObjectName ), + ], info_str=(ObjectName, "Change Bindery Object Security: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xf000, 0xf101, 0xf501, 0xfc02, 0xfe01, 0xff00]) + # 2222/1739, 23/57 + pkt = NCP(0x1739, "Create Property", 'bindery') + pkt.Request((16,78), [ + rec( 10, 2, ObjectType, BE ), + rec( 12, (1,48), ObjectName ), + rec( -1, 1, PropertyType ), + rec( -1, 1, ObjectSecurity ), + rec( -1, (1,16), PropertyName ), + ], info_str=(PropertyName, "Create Property: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xed00, 0xef00, 0xf000, 0xf101, + 0xf200, 0xf600, 0xf700, 0xfb00, 0xfc02, 0xfe01, + 0xff00]) + # 2222/173A, 23/58 + pkt = NCP(0x173A, "Delete Property", 'bindery') + pkt.Request((14,76), [ + rec( 10, 2, ObjectType, BE ), + rec( 12, (1,48), ObjectName ), + rec( -1, (1,16), PropertyName ), + ], info_str=(PropertyName, "Delete Property: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xf000, 0xf101, 0xf600, 0xfb00, 0xfc02, + 0xfe01, 0xff00]) + # 2222/173B, 23/59 + pkt = NCP(0x173B, "Change Property Security", 'bindery') + pkt.Request((15,77), [ + rec( 10, 2, ObjectType, BE ), + rec( 12, (1,48), ObjectName ), + rec( -1, 1, ObjectSecurity ), + rec( -1, (1,16), PropertyName ), + ], info_str=(PropertyName, "Change Property Security: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xf000, 0xf101, 0xf200, 0xf600, 0xfb00, + 0xfc02, 0xfe01, 0xff00]) + # 2222/173C, 23/60 + pkt = NCP(0x173C, "Scan Property", 'bindery') + pkt.Request((18,80), [ + rec( 10, 2, ObjectType, BE ), + rec( 12, (1,48), ObjectName ), + rec( -1, 4, LastInstance, BE ), + rec( -1, (1,16), PropertyName ), + ], info_str=(PropertyName, "Scan Property: %s", ", %s")) + pkt.Reply( 32, [ + rec( 8, 16, PropertyName16 ), + rec( 24, 1, ObjectFlags ), + rec( 25, 1, ObjectSecurity ), + rec( 26, 4, SearchInstance, BE ), + rec( 30, 1, ValueAvailable ), + rec( 31, 1, MoreProperties ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xf000, 0xf101, 0xf200, 0xf600, 0xfb00, + 0xfc02, 0xfe01, 0xff00]) + # 2222/173D, 23/61 + pkt = NCP(0x173D, "Read Property Value", 'bindery') + pkt.Request((15,77), [ + rec( 10, 2, ObjectType, BE ), + rec( 12, (1,48), ObjectName ), + rec( -1, 1, PropertySegment ), + rec( -1, (1,16), PropertyName ), + ], info_str=(PropertyName, "Read Property Value: %s", ", %s")) + pkt.Reply(138, [ + rec( 8, 128, PropertyData ), + rec( 136, 1, PropertyHasMoreSegments ), + rec( 137, 1, PropertyType ), + ]) + pkt.CompletionCodes([0x0000, 0x8800, 0x9300, 0x9600, 0xec01, + 0xf000, 0xf100, 0xf900, 0xfb02, 0xfc02, + 0xfe01, 0xff00]) + # 2222/173E, 23/62 + pkt = NCP(0x173E, "Write Property Value", 'bindery') + pkt.Request((144,206), [ + rec( 10, 2, ObjectType, BE ), + rec( 12, (1,48), ObjectName ), + rec( -1, 1, PropertySegment ), + rec( -1, 1, MoreFlag ), + rec( -1, (1,16), PropertyName ), + # + # XXX - don't show this if MoreFlag isn't set? + # In at least some packages where it's not set, + # PropertyValue appears to be garbage. + # + rec( -1, 128, PropertyValue ), + ], info_str=(PropertyName, "Write Property Value: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xe800, 0xec01, 0xf000, 0xf800, + 0xfb02, 0xfc03, 0xfe01, 0xff00 ]) + # 2222/173F, 23/63 + pkt = NCP(0x173F, "Verify Bindery Object Password", 'bindery') + pkt.Request((14,92), [ + rec( 10, 2, ObjectType, BE ), + rec( 12, (1,48), ObjectName ), + rec( -1, (1,32), Password ), + ], info_str=(ObjectName, "Verify Bindery Object Password: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xe800, 0xec01, 0xf000, 0xf101, + 0xfb02, 0xfc03, 0xfe01, 0xff00 ]) + # 2222/1740, 23/64 + pkt = NCP(0x1740, "Change Bindery Object Password", 'bindery') + pkt.Request((15,124), [ + rec( 10, 2, ObjectType, BE ), + rec( 12, (1,48), ObjectName ), + rec( -1, (1,32), Password ), + rec( -1, (1,32), NewPassword ), + ], info_str=(ObjectName, "Change Bindery Object Password: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xc501, 0xd701, 0xe800, 0xec01, 0xf001, + 0xf100, 0xf800, 0xfb02, 0xfc03, 0xfe01, 0xff00]) + # 2222/1741, 23/65 + pkt = NCP(0x1741, "Add Bindery Object To Set", 'bindery') + pkt.Request((17,126), [ + rec( 10, 2, ObjectType, BE ), + rec( 12, (1,48), ObjectName ), + rec( -1, (1,16), PropertyName ), + rec( -1, 2, MemberType, BE ), + rec( -1, (1,48), MemberName ), + ], info_str=(MemberName, "Add Bindery Object to Set: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xe800, 0xe900, 0xea00, 0xeb00, + 0xec01, 0xf000, 0xf800, 0xfb02, 0xfc03, 0xfe01, + 0xff00]) + # 2222/1742, 23/66 + pkt = NCP(0x1742, "Delete Bindery Object From Set", 'bindery') + pkt.Request((17,126), [ + rec( 10, 2, ObjectType, BE ), + rec( 12, (1,48), ObjectName ), + rec( -1, (1,16), PropertyName ), + rec( -1, 2, MemberType, BE ), + rec( -1, (1,48), MemberName ), + ], info_str=(MemberName, "Delete Bindery Object from Set: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xeb00, 0xf000, 0xf800, 0xfb02, + 0xfc03, 0xfe01, 0xff00]) + # 2222/1743, 23/67 + pkt = NCP(0x1743, "Is Bindery Object In Set", 'bindery') + pkt.Request((17,126), [ + rec( 10, 2, ObjectType, BE ), + rec( 12, (1,48), ObjectName ), + rec( -1, (1,16), PropertyName ), + rec( -1, 2, MemberType, BE ), + rec( -1, (1,48), MemberName ), + ], info_str=(MemberName, "Is Bindery Object in Set: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xea00, 0xeb00, 0xec01, 0xf000, + 0xfb02, 0xfc03, 0xfe01, 0xff00]) + # 2222/1744, 23/68 + pkt = NCP(0x1744, "Close Bindery", 'bindery') + pkt.Request(10) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xff00]) + # 2222/1745, 23/69 + pkt = NCP(0x1745, "Open Bindery", 'bindery') + pkt.Request(10) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xff00]) + # 2222/1746, 23/70 + pkt = NCP(0x1746, "Get Bindery Access Level", 'bindery') + pkt.Request(10) + pkt.Reply(13, [ + rec( 8, 1, ObjectSecurity ), + rec( 9, 4, LoggedObjectID, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x9600]) + # 2222/1747, 23/71 + pkt = NCP(0x1747, "Scan Bindery Object Trustee Paths", 'bindery') + pkt.Request(17, [ + rec( 10, 1, VolumeNumber ), + rec( 11, 2, LastSequenceNumber, BE ), + rec( 13, 4, ObjectID, BE ), + ]) + pkt.Reply((16,270), [ + rec( 8, 2, LastSequenceNumber, BE), + rec( 10, 4, ObjectID, BE ), + rec( 14, 1, ObjectSecurity ), + rec( 15, (1,255), Path ), + ]) + pkt.CompletionCodes([0x0000, 0x9300, 0x9600, 0xa100, 0xf000, 0xf100, + 0xf200, 0xfc02, 0xfe01, 0xff00]) + # 2222/1748, 23/72 + pkt = NCP(0x1748, "Get Bindery Object Access Level", 'bindery') + pkt.Request(14, [ + rec( 10, 4, ObjectID, BE ), + ]) + pkt.Reply(9, [ + rec( 8, 1, ObjectSecurity ), + ]) + pkt.CompletionCodes([0x0000, 0x9600]) + # 2222/1749, 23/73 + pkt = NCP(0x1749, "Is Calling Station a Manager", 'bindery') + pkt.Request(10) + pkt.Reply(8) + pkt.CompletionCodes([0x0003, 0xff1e]) + # 2222/174A, 23/74 + pkt = NCP(0x174A, "Keyed Verify Password", 'bindery') + pkt.Request((21,68), [ + rec( 10, 8, LoginKey ), + rec( 18, 2, ObjectType, BE ), + rec( 20, (1,48), ObjectName ), + ], info_str=(ObjectName, "Keyed Verify Password: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xc500, 0xfe01, 0xff0c]) + # 2222/174B, 23/75 + pkt = NCP(0x174B, "Keyed Change Password", 'bindery') + pkt.Request((22,100), [ + rec( 10, 8, LoginKey ), + rec( 18, 2, ObjectType, BE ), + rec( 20, (1,48), ObjectName ), + rec( -1, (1,32), Password ), + ], info_str=(ObjectName, "Keyed Change Password: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xc500, 0xfe01, 0xff0c]) + # 2222/174C, 23/76 + pkt = NCP(0x174C, "List Relations Of an Object", 'bindery') + pkt.Request((18,80), [ + rec( 10, 4, LastSeen, BE ), + rec( 14, 2, ObjectType, BE ), + rec( 16, (1,48), ObjectName ), + rec( -1, (1,16), PropertyName ), + ], info_str=(ObjectName, "List Relations of an Object: %s", ", %s")) + pkt.Reply(14, [ + rec( 8, 2, RelationsCount, BE, var="x" ), + rec( 10, 4, ObjectID, BE, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0xf000, 0xf200, 0xfe01, 0xff00]) + # 2222/1764, 23/100 + pkt = NCP(0x1764, "Create Queue", 'qms') + pkt.Request((15,316), [ + rec( 10, 2, QueueType, BE ), + rec( 12, (1,48), QueueName ), + rec( -1, 1, PathBase ), + rec( -1, (1,255), Path ), + ], info_str=(QueueName, "Create Queue: %s", ", %s")) + pkt.Reply(12, [ + rec( 8, 4, QueueID ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0x9900, 0xd000, 0xd100, + 0xd200, 0xd300, 0xd400, 0xd500, 0xd601, + 0xd703, 0xd800, 0xd902, 0xda01, 0xdb02, + 0xee00, 0xff00]) + # 2222/1765, 23/101 + pkt = NCP(0x1765, "Destroy Queue", 'qms') + pkt.Request(14, [ + rec( 10, 4, QueueID ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) + # 2222/1766, 23/102 + pkt = NCP(0x1766, "Read Queue Current Status", 'qms') + pkt.Request(14, [ + rec( 10, 4, QueueID ), + ]) + pkt.Reply(20, [ + rec( 8, 4, QueueID ), + rec( 12, 1, QueueStatus ), + rec( 13, 1, CurrentEntries ), + rec( 14, 1, CurrentServers, var="x" ), + rec( 15, 4, ServerID, repeat="x" ), + rec( 19, 1, ServerStationList, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) + # 2222/1767, 23/103 + pkt = NCP(0x1767, "Set Queue Current Status", 'qms') + pkt.Request(15, [ + rec( 10, 4, QueueID ), + rec( 14, 1, QueueStatus ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc07, + 0xff00]) + # 2222/1768, 23/104 + pkt = NCP(0x1768, "Create Queue Job And File", 'qms') + pkt.Request(264, [ + rec( 10, 4, QueueID ), rec( 14, 250, JobStruct ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff18]) - # 2222/176E, 23/110 - pkt = NCP(0x176E, "Change Queue Job Position", 'qms') - pkt.Request(17, [ - rec( 10, 4, QueueID ), - rec( 14, 2, JobNumber, BE ), - rec( 16, 1, NewPosition ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xd000, 0xd100, 0xd300, 0xd500, - 0xd601, 0xfe07, 0xff1f]) - # 2222/176F, 23/111 - pkt = NCP(0x176F, "Attach Queue Server To Queue", 'qms') - pkt.Request(14, [ - rec( 10, 4, QueueID ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xea00, - 0xfc06, 0xff00]) - # 2222/1770, 23/112 - pkt = NCP(0x1770, "Detach Queue Server From Queue", 'qms') - pkt.Request(14, [ - rec( 10, 4, QueueID ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) - # 2222/1771, 23/113 - pkt = NCP(0x1771, "Service Queue Job", 'qms') - pkt.Request(16, [ - rec( 10, 4, QueueID ), - rec( 14, 2, ServiceType, BE ), - ]) - pkt.Reply(62, [ - rec( 8, 1, ClientStation ), - rec( 9, 1, ClientTaskNumber ), - rec( 10, 4, ClientIDNumber, BE ), - rec( 14, 4, TargetServerIDNumber, BE ), - rec( 18, 6, TargetExecutionTime ), - rec( 24, 6, JobEntryTime ), - rec( 30, 2, JobNumber, BE ), - rec( 32, 2, JobType, BE ), - rec( 34, 1, JobPosition ), - rec( 35, 1, JobControlFlags ), - rec( 36, 14, JobFileName ), - rec( 50, 6, JobFileHandle ), - rec( 56, 1, ServerStation ), - rec( 57, 1, ServerTaskNumber ), - rec( 58, 4, ServerID, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) - # 2222/1772, 23/114 - pkt = NCP(0x1772, "Finish Servicing Queue Job", 'qms') - pkt.Request(18, [ - rec( 10, 4, QueueID ), - rec( 14, 2, JobNumber, BE ), - rec( 16, 2, ChargeInformation, BE ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc07, 0xff00]) - # 2222/1773, 23/115 - pkt = NCP(0x1773, "Abort Servicing Queue Job", 'qms') - pkt.Request(16, [ - rec( 10, 4, QueueID ), - rec( 14, 2, JobNumber, BE ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc07, 0xff18]) - # 2222/1774, 23/116 - pkt = NCP(0x1774, "Change To Client Rights", 'qms') - pkt.Request(16, [ - rec( 10, 4, QueueID ), - rec( 14, 2, JobNumber, BE ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff18]) - # 2222/1775, 23/117 - pkt = NCP(0x1775, "Restore Queue Server Rights", 'qms') - pkt.Request(10) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) - # 2222/1776, 23/118 - pkt = NCP(0x1776, "Read Queue Server Current Status", 'qms') - pkt.Request(19, [ - rec( 10, 4, QueueID ), - rec( 14, 4, ServerID, BE ), - rec( 18, 1, ServerStation ), - ]) - pkt.Reply(72, [ - rec( 8, 64, ServerStatusRecord ), - ]) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) - # 2222/1777, 23/119 - pkt = NCP(0x1777, "Set Queue Server Current Status", 'qms') - pkt.Request(78, [ - rec( 10, 4, QueueID ), - rec( 14, 64, ServerStatusRecord ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) - # 2222/1778, 23/120 - pkt = NCP(0x1778, "Get Queue Job File Size", 'qms') - pkt.Request(16, [ - rec( 10, 4, QueueID ), - rec( 14, 2, JobNumber, BE ), - ]) - pkt.Reply(18, [ - rec( 8, 4, QueueID ), - rec( 12, 2, JobNumber, BE ), - rec( 14, 4, FileSize, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc07, 0xff00]) - # 2222/1779, 23/121 - pkt = NCP(0x1779, "Create Queue Job And File", 'qms') - pkt.Request(264, [ - rec( 10, 4, QueueID ), - rec( 14, 250, JobStruct3x ), - ]) - pkt.Reply(94, [ - rec( 8, 86, JobStructNew ), - ]) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc07, 0xff00]) - # 2222/177A, 23/122 - pkt = NCP(0x177A, "Read Queue Job Entry", 'qms') - pkt.Request(18, [ - rec( 10, 4, QueueID ), - rec( 14, 4, JobNumberLong ), - ]) - pkt.Reply(258, [ - rec( 8, 250, JobStruct3x ), - ]) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) - # 2222/177B, 23/123 - pkt = NCP(0x177B, "Change Queue Job Entry", 'qms') - pkt.Request(264, [ - rec( 10, 4, QueueID ), - rec( 14, 250, JobStruct ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xea02, 0xfc07, 0xff00]) - # 2222/177C, 23/124 - pkt = NCP(0x177C, "Service Queue Job", 'qms') - pkt.Request(16, [ - rec( 10, 4, QueueID ), - rec( 14, 2, ServiceType ), - ]) - pkt.Reply(94, [ + ]) + pkt.Reply(62, [ + rec( 8, 1, ClientStation ), + rec( 9, 1, ClientTaskNumber ), + rec( 10, 4, ClientIDNumber, BE ), + rec( 14, 4, TargetServerIDNumber, BE ), + rec( 18, 6, TargetExecutionTime ), + rec( 24, 6, JobEntryTime ), + rec( 30, 2, JobNumber, BE ), + rec( 32, 2, JobType, BE ), + rec( 34, 1, JobPosition ), + rec( 35, 1, JobControlFlags ), + rec( 36, 14, JobFileName ), + rec( 50, 6, JobFileHandle ), + rec( 56, 1, ServerStation ), + rec( 57, 1, ServerTaskNumber ), + rec( 58, 4, ServerID, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc07, + 0xff00]) + # 2222/1769, 23/105 + pkt = NCP(0x1769, "Close File And Start Queue Job", 'qms') + pkt.Request(16, [ + rec( 10, 4, QueueID ), + rec( 14, 2, JobNumber, BE ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) + # 2222/176A, 23/106 + pkt = NCP(0x176A, "Remove Job From Queue", 'qms') + pkt.Request(16, [ + rec( 10, 4, QueueID ), + rec( 14, 2, JobNumber, BE ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) + # 2222/176B, 23/107 + pkt = NCP(0x176B, "Get Queue Job List", 'qms') + pkt.Request(14, [ + rec( 10, 4, QueueID ), + ]) + pkt.Reply(12, [ + rec( 8, 2, JobCount, BE, var="x" ), + rec( 10, 2, JobNumber, BE, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) + # 2222/176C, 23/108 + pkt = NCP(0x176C, "Read Queue Job Entry", 'qms') + pkt.Request(16, [ + rec( 10, 4, QueueID ), + rec( 14, 2, JobNumber, BE ), + ]) + pkt.Reply(258, [ + rec( 8, 250, JobStruct ), + ]) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) + # 2222/176D, 23/109 + pkt = NCP(0x176D, "Change Queue Job Entry", 'qms') + pkt.Request(260, [ + rec( 14, 250, JobStruct ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff18]) + # 2222/176E, 23/110 + pkt = NCP(0x176E, "Change Queue Job Position", 'qms') + pkt.Request(17, [ + rec( 10, 4, QueueID ), + rec( 14, 2, JobNumber, BE ), + rec( 16, 1, NewPosition ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xd000, 0xd100, 0xd300, 0xd500, + 0xd601, 0xfe07, 0xff1f]) + # 2222/176F, 23/111 + pkt = NCP(0x176F, "Attach Queue Server To Queue", 'qms') + pkt.Request(14, [ + rec( 10, 4, QueueID ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xea00, + 0xfc06, 0xff00]) + # 2222/1770, 23/112 + pkt = NCP(0x1770, "Detach Queue Server From Queue", 'qms') + pkt.Request(14, [ + rec( 10, 4, QueueID ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) + # 2222/1771, 23/113 + pkt = NCP(0x1771, "Service Queue Job", 'qms') + pkt.Request(16, [ + rec( 10, 4, QueueID ), + rec( 14, 2, ServiceType, BE ), + ]) + pkt.Reply(62, [ + rec( 8, 1, ClientStation ), + rec( 9, 1, ClientTaskNumber ), + rec( 10, 4, ClientIDNumber, BE ), + rec( 14, 4, TargetServerIDNumber, BE ), + rec( 18, 6, TargetExecutionTime ), + rec( 24, 6, JobEntryTime ), + rec( 30, 2, JobNumber, BE ), + rec( 32, 2, JobType, BE ), + rec( 34, 1, JobPosition ), + rec( 35, 1, JobControlFlags ), + rec( 36, 14, JobFileName ), + rec( 50, 6, JobFileHandle ), + rec( 56, 1, ServerStation ), + rec( 57, 1, ServerTaskNumber ), + rec( 58, 4, ServerID, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) + # 2222/1772, 23/114 + pkt = NCP(0x1772, "Finish Servicing Queue Job", 'qms') + pkt.Request(18, [ + rec( 10, 4, QueueID ), + rec( 14, 2, JobNumber, BE ), + rec( 16, 2, ChargeInformation, BE ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc07, 0xff00]) + # 2222/1773, 23/115 + pkt = NCP(0x1773, "Abort Servicing Queue Job", 'qms') + pkt.Request(16, [ + rec( 10, 4, QueueID ), + rec( 14, 2, JobNumber, BE ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc07, 0xff18]) + # 2222/1774, 23/116 + pkt = NCP(0x1774, "Change To Client Rights", 'qms') + pkt.Request(16, [ + rec( 10, 4, QueueID ), + rec( 14, 2, JobNumber, BE ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff18]) + # 2222/1775, 23/117 + pkt = NCP(0x1775, "Restore Queue Server Rights", 'qms') + pkt.Request(10) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) + # 2222/1776, 23/118 + pkt = NCP(0x1776, "Read Queue Server Current Status", 'qms') + pkt.Request(19, [ + rec( 10, 4, QueueID ), + rec( 14, 4, ServerID, BE ), + rec( 18, 1, ServerStation ), + ]) + pkt.Reply(72, [ + rec( 8, 64, ServerStatusRecord ), + ]) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) + # 2222/1777, 23/119 + pkt = NCP(0x1777, "Set Queue Server Current Status", 'qms') + pkt.Request(78, [ + rec( 10, 4, QueueID ), + rec( 14, 64, ServerStatusRecord ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) + # 2222/1778, 23/120 + pkt = NCP(0x1778, "Get Queue Job File Size", 'qms') + pkt.Request(16, [ + rec( 10, 4, QueueID ), + rec( 14, 2, JobNumber, BE ), + ]) + pkt.Reply(18, [ + rec( 8, 4, QueueID ), + rec( 12, 2, JobNumber, BE ), + rec( 14, 4, FileSize, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc07, 0xff00]) + # 2222/1779, 23/121 + pkt = NCP(0x1779, "Create Queue Job And File", 'qms') + pkt.Request(264, [ + rec( 10, 4, QueueID ), + rec( 14, 250, JobStruct3x ), + ]) + pkt.Reply(94, [ rec( 8, 86, JobStructNew ), - ]) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc05, 0xff00]) - # 2222/177D, 23/125 - pkt = NCP(0x177D, "Read Queue Current Status", 'qms') - pkt.Request(14, [ - rec( 10, 4, QueueID ), - ]) - pkt.Reply(32, [ - rec( 8, 4, QueueID ), - rec( 12, 1, QueueStatus ), - rec( 13, 3, Reserved3 ), - rec( 16, 4, CurrentEntries ), - rec( 20, 4, CurrentServers, var="x" ), - rec( 24, 4, ServerID, repeat="x" ), - rec( 28, 4, ServerStationLong, LE, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) - # 2222/177E, 23/126 - pkt = NCP(0x177E, "Set Queue Current Status", 'qms') - pkt.Request(15, [ - rec( 10, 4, QueueID ), - rec( 14, 1, QueueStatus ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) - # 2222/177F, 23/127 - pkt = NCP(0x177F, "Close File And Start Queue Job", 'qms') - pkt.Request(18, [ - rec( 10, 4, QueueID ), - rec( 14, 4, JobNumberLong ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc07, 0xff00]) - # 2222/1780, 23/128 - pkt = NCP(0x1780, "Remove Job From Queue", 'qms') - pkt.Request(18, [ - rec( 10, 4, QueueID ), - rec( 14, 4, JobNumberLong ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) - # 2222/1781, 23/129 - pkt = NCP(0x1781, "Get Queue Job List", 'qms') - pkt.Request(18, [ - rec( 10, 4, QueueID ), - rec( 14, 4, JobNumberLong ), - ]) - pkt.Reply(20, [ - rec( 8, 4, TotalQueueJobs ), - rec( 12, 4, ReplyQueueJobNumbers, var="x" ), - rec( 16, 4, JobNumberLong, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) - # 2222/1782, 23/130 - pkt = NCP(0x1782, "Change Job Priority", 'qms') - pkt.Request(22, [ - rec( 10, 4, QueueID ), - rec( 14, 4, JobNumberLong ), - rec( 18, 4, Priority ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) - # 2222/1783, 23/131 - pkt = NCP(0x1783, "Finish Servicing Queue Job", 'qms') - pkt.Request(22, [ - rec( 10, 4, QueueID ), - rec( 14, 4, JobNumberLong ), - rec( 18, 4, ChargeInformation ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc05, 0xff00]) - # 2222/1784, 23/132 - pkt = NCP(0x1784, "Abort Servicing Queue Job", 'qms') - pkt.Request(18, [ - rec( 10, 4, QueueID ), - rec( 14, 4, JobNumberLong ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc05, 0xff18]) - # 2222/1785, 23/133 - pkt = NCP(0x1785, "Change To Client Rights", 'qms') - pkt.Request(18, [ - rec( 10, 4, QueueID ), - rec( 14, 4, JobNumberLong ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff18]) - # 2222/1786, 23/134 - pkt = NCP(0x1786, "Read Queue Server Current Status", 'qms') - pkt.Request(22, [ - rec( 10, 4, QueueID ), - rec( 14, 4, ServerID, BE ), - rec( 18, 4, ServerStation ), - ]) - pkt.Reply(72, [ - rec( 8, 64, ServerStatusRecord ), - ]) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) - # 2222/1787, 23/135 - pkt = NCP(0x1787, "Get Queue Job File Size", 'qms') - pkt.Request(18, [ - rec( 10, 4, QueueID ), - rec( 14, 4, JobNumberLong ), - ]) - pkt.Reply(20, [ - rec( 8, 4, QueueID ), - rec( 12, 4, JobNumberLong ), - rec( 16, 4, FileSize, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, - 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, - 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc05, 0xff00]) - # 2222/1788, 23/136 - pkt = NCP(0x1788, "Move Queue Job From Src Q to Dst Q", 'qms') - pkt.Request(22, [ - rec( 10, 4, QueueID ), - rec( 14, 4, JobNumberLong ), - rec( 18, 4, DstQueueID ), - ]) - pkt.Reply(12, [ - rec( 8, 4, JobNumberLong ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0xfc06]) - # 2222/1789, 23/137 - pkt = NCP(0x1789, "Get Queue Jobs From Form List", 'qms') - pkt.Request(24, [ - rec( 10, 4, QueueID ), - rec( 14, 4, QueueStartPosition ), - rec( 18, 4, FormTypeCnt, LE, var="x" ), - rec( 22, 2, FormType, repeat="x" ), - ]) - pkt.Reply(20, [ - rec( 8, 4, TotalQueueJobs ), - rec( 12, 4, JobCount, var="x" ), - rec( 16, 4, JobNumberLong, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0xd300, 0xfc06]) - # 2222/178A, 23/138 - pkt = NCP(0x178A, "Service Queue Job By Form List", 'qms') - pkt.Request(24, [ - rec( 10, 4, QueueID ), - rec( 14, 4, QueueStartPosition ), - rec( 18, 4, FormTypeCnt, LE, var= "x" ), - rec( 22, 2, FormType, repeat="x" ), - ]) - pkt.Reply(94, [ - rec( 8, 86, JobStructNew ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0xd902, 0xfc06, 0xff00]) - # 2222/1796, 23/150 - pkt = NCP(0x1796, "Get Current Account Status", 'accounting') - pkt.Request((13,60), [ - rec( 10, 2, ObjectType, BE ), - rec( 12, (1,48), ObjectName ), - ], info_str=(ObjectName, "Get Current Account Status: %s", ", %s")) - pkt.Reply(264, [ - rec( 8, 4, AccountBalance, BE ), - rec( 12, 4, CreditLimit, BE ), - rec( 16, 120, Reserved120 ), - rec( 136, 4, HolderID, BE ), - rec( 140, 4, HoldAmount, BE ), - rec( 144, 4, HolderID, BE ), - rec( 148, 4, HoldAmount, BE ), - rec( 152, 4, HolderID, BE ), - rec( 156, 4, HoldAmount, BE ), - rec( 160, 4, HolderID, BE ), - rec( 164, 4, HoldAmount, BE ), - rec( 168, 4, HolderID, BE ), - rec( 172, 4, HoldAmount, BE ), - rec( 176, 4, HolderID, BE ), - rec( 180, 4, HoldAmount, BE ), - rec( 184, 4, HolderID, BE ), - rec( 188, 4, HoldAmount, BE ), - rec( 192, 4, HolderID, BE ), - rec( 196, 4, HoldAmount, BE ), - rec( 200, 4, HolderID, BE ), - rec( 204, 4, HoldAmount, BE ), - rec( 208, 4, HolderID, BE ), - rec( 212, 4, HoldAmount, BE ), - rec( 216, 4, HolderID, BE ), - rec( 220, 4, HoldAmount, BE ), - rec( 224, 4, HolderID, BE ), - rec( 228, 4, HoldAmount, BE ), - rec( 232, 4, HolderID, BE ), - rec( 236, 4, HoldAmount, BE ), - rec( 240, 4, HolderID, BE ), - rec( 244, 4, HoldAmount, BE ), - rec( 248, 4, HolderID, BE ), - rec( 252, 4, HoldAmount, BE ), - rec( 256, 4, HolderID, BE ), - rec( 260, 4, HoldAmount, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc000, 0xc101, 0xc400, 0xe800, - 0xea00, 0xeb00, 0xec00, 0xfc06, 0xfe07, 0xff00]) - # 2222/1797, 23/151 - pkt = NCP(0x1797, "Submit Account Charge", 'accounting') - pkt.Request((26,327), [ - rec( 10, 2, ServiceType, BE ), - rec( 12, 4, ChargeAmount, BE ), - rec( 16, 4, HoldCancelAmount, BE ), - rec( 20, 2, ObjectType, BE ), - rec( 22, 2, CommentType, BE ), - rec( 24, (1,48), ObjectName ), - rec( -1, (1,255), Comment ), - ], info_str=(ObjectName, "Submit Account Charge: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0102, 0x8800, 0x9400, 0x9600, 0xa201, - 0xc000, 0xc101, 0xc200, 0xc400, 0xe800, 0xea00, - 0xeb00, 0xec00, 0xfe07, 0xff00]) - # 2222/1798, 23/152 - pkt = NCP(0x1798, "Submit Account Hold", 'accounting') - pkt.Request((17,64), [ - rec( 10, 4, HoldCancelAmount, BE ), - rec( 14, 2, ObjectType, BE ), - rec( 16, (1,48), ObjectName ), - ], info_str=(ObjectName, "Submit Account Hold: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0102, 0x8800, 0x9400, 0x9600, 0xa201, - 0xc000, 0xc101, 0xc200, 0xc400, 0xe800, 0xea00, - 0xeb00, 0xec00, 0xfe07, 0xff00]) - # 2222/1799, 23/153 - pkt = NCP(0x1799, "Submit Account Note", 'accounting') - pkt.Request((18,319), [ - rec( 10, 2, ServiceType, BE ), - rec( 12, 2, ObjectType, BE ), - rec( 14, 2, CommentType, BE ), - rec( 16, (1,48), ObjectName ), - rec( -1, (1,255), Comment ), - ], info_str=(ObjectName, "Submit Account Note: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0102, 0x9600, 0xc000, 0xc101, 0xc400, - 0xe800, 0xea00, 0xeb00, 0xec00, 0xf000, 0xfc06, - 0xff00]) - # 2222/17c8, 23/200 - pkt = NCP(0x17c8, "Check Console Privileges", 'fileserver') - pkt.Request(10) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xc601]) - # 2222/17c9, 23/201 - pkt = NCP(0x17c9, "Get File Server Description Strings", 'fileserver') - pkt.Request(10) - pkt.Reply(108, [ - rec( 8, 100, DescriptionStrings ), - ]) - pkt.CompletionCodes([0x0000, 0x9600]) - # 2222/17CA, 23/202 - pkt = NCP(0x17CA, "Set File Server Date And Time", 'fileserver') - pkt.Request(16, [ - rec( 10, 1, Year ), - rec( 11, 1, Month ), - rec( 12, 1, Day ), - rec( 13, 1, Hour ), - rec( 14, 1, Minute ), - rec( 15, 1, Second ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xc601]) - # 2222/17CB, 23/203 - pkt = NCP(0x17CB, "Disable File Server Login", 'fileserver') - pkt.Request(10) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xc601]) - # 2222/17CC, 23/204 - pkt = NCP(0x17CC, "Enable File Server Login", 'fileserver') - pkt.Request(10) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xc601]) - # 2222/17CD, 23/205 - pkt = NCP(0x17CD, "Get File Server Login Status", 'fileserver') - pkt.Request(10) - pkt.Reply(9, [ - rec( 8, 1, UserLoginAllowed ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xfb01]) - # 2222/17CF, 23/207 - pkt = NCP(0x17CF, "Disable Transaction Tracking", 'fileserver') - pkt.Request(10) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xc601]) - # 2222/17D0, 23/208 - pkt = NCP(0x17D0, "Enable Transaction Tracking", 'fileserver') - pkt.Request(10) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xc601]) - # 2222/17D1, 23/209 - pkt = NCP(0x17D1, "Send Console Broadcast", 'fileserver') - pkt.Request((13,267), [ - rec( 10, 1, NumberOfStations, var="x" ), - rec( 11, 1, StationList, repeat="x" ), - rec( 12, (1, 255), TargetMessage ), - ], info_str=(TargetMessage, "Send Console Broadcast: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xc601, 0xfd00]) - # 2222/17D2, 23/210 - pkt = NCP(0x17D2, "Clear Connection Number", 'fileserver') - pkt.Request(11, [ - rec( 10, 1, ConnectionNumber ), - ],info_str=(ConnectionNumber, "Clear Connection Number %d", ", %d")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xc601, 0xfd00]) - # 2222/17D3, 23/211 - pkt = NCP(0x17D3, "Down File Server", 'fileserver') - pkt.Request(11, [ - rec( 10, 1, ForceFlag ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xc601, 0xff00]) - # 2222/17D4, 23/212 - pkt = NCP(0x17D4, "Get File System Statistics", 'fileserver') - pkt.Request(10) - pkt.Reply(50, [ - rec( 8, 4, SystemIntervalMarker, BE ), - rec( 12, 2, ConfiguredMaxOpenFiles ), - rec( 14, 2, ActualMaxOpenFiles ), - rec( 16, 2, CurrentOpenFiles ), - rec( 18, 4, TotalFilesOpened ), - rec( 22, 4, TotalReadRequests ), - rec( 26, 4, TotalWriteRequests ), - rec( 30, 2, CurrentChangedFATs ), - rec( 32, 4, TotalChangedFATs ), - rec( 36, 2, FATWriteErrors ), - rec( 38, 2, FatalFATWriteErrors ), - rec( 40, 2, FATScanErrors ), - rec( 42, 2, ActualMaxIndexedFiles ), - rec( 44, 2, ActiveIndexedFiles ), - rec( 46, 2, AttachedIndexedFiles ), - rec( 48, 2, AvailableIndexedFiles ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) - # 2222/17D5, 23/213 - pkt = NCP(0x17D5, "Get Transaction Tracking Statistics", 'fileserver') - pkt.Request((13,267), [ - rec( 10, 2, LastRecordSeen ), - rec( 12, (1,255), SemaphoreName ), - ]) - pkt.Reply(53, [ - rec( 8, 4, SystemIntervalMarker, BE ), - rec( 12, 1, TransactionTrackingSupported ), - rec( 13, 1, TransactionTrackingEnabled ), - rec( 14, 2, TransactionVolumeNumber ), - rec( 16, 2, ConfiguredMaxSimultaneousTransactions ), - rec( 18, 2, ActualMaxSimultaneousTransactions ), - rec( 20, 2, CurrentTransactionCount ), - rec( 22, 4, TotalTransactionsPerformed ), - rec( 26, 4, TotalWriteTransactionsPerformed ), - rec( 30, 4, TotalTransactionsBackedOut ), - rec( 34, 2, TotalUnfilledBackoutRequests ), - rec( 36, 2, TransactionDiskSpace ), - rec( 38, 4, TransactionFATAllocations ), - rec( 42, 4, TransactionFileSizeChanges ), - rec( 46, 4, TransactionFilesTruncated ), - rec( 50, 1, NumberOfEntries, var="x" ), - rec( 51, 2, ConnTaskStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) - # 2222/17D6, 23/214 - pkt = NCP(0x17D6, "Read Disk Cache Statistics", 'fileserver') - pkt.Request(10) - pkt.Reply(86, [ - rec( 8, 4, SystemIntervalMarker, BE ), - rec( 12, 2, CacheBufferCount ), - rec( 14, 2, CacheBufferSize ), - rec( 16, 2, DirtyCacheBuffers ), - rec( 18, 4, CacheReadRequests ), - rec( 22, 4, CacheWriteRequests ), - rec( 26, 4, CacheHits ), - rec( 30, 4, CacheMisses ), - rec( 34, 4, PhysicalReadRequests ), - rec( 38, 4, PhysicalWriteRequests ), - rec( 42, 2, PhysicalReadErrors ), - rec( 44, 2, PhysicalWriteErrors ), - rec( 46, 4, CacheGetRequests ), - rec( 50, 4, CacheFullWriteRequests ), - rec( 54, 4, CachePartialWriteRequests ), - rec( 58, 4, BackgroundDirtyWrites ), - rec( 62, 4, BackgroundAgedWrites ), - rec( 66, 4, TotalCacheWrites ), - rec( 70, 4, CacheAllocations ), - rec( 74, 2, ThrashingCount ), - rec( 76, 2, LRUBlockWasDirty ), - rec( 78, 2, ReadBeyondWrite ), - rec( 80, 2, FragmentWriteOccurred ), - rec( 82, 2, CacheHitOnUnavailableBlock ), - rec( 84, 2, CacheBlockScrapped ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) - # 2222/17D7, 23/215 - pkt = NCP(0x17D7, "Get Drive Mapping Table", 'fileserver') - pkt.Request(10) - pkt.Reply(184, [ - rec( 8, 4, SystemIntervalMarker, BE ), - rec( 12, 1, SFTSupportLevel ), - rec( 13, 1, LogicalDriveCount ), - rec( 14, 1, PhysicalDriveCount ), - rec( 15, 1, DiskChannelTable ), - rec( 16, 4, Reserved4 ), - rec( 20, 2, PendingIOCommands, BE ), - rec( 22, 32, DriveMappingTable ), - rec( 54, 32, DriveMirrorTable ), - rec( 86, 32, DeadMirrorTable ), - rec( 118, 1, ReMirrorDriveNumber ), - rec( 119, 1, Filler ), - rec( 120, 4, ReMirrorCurrentOffset, BE ), - rec( 124, 60, SFTErrorTable ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) - # 2222/17D8, 23/216 - pkt = NCP(0x17D8, "Read Physical Disk Statistics", 'fileserver') - pkt.Request(11, [ - rec( 10, 1, PhysicalDiskNumber ), - ]) - pkt.Reply(101, [ - rec( 8, 4, SystemIntervalMarker, BE ), - rec( 12, 1, PhysicalDiskChannel ), - rec( 13, 1, DriveRemovableFlag ), - rec( 14, 1, PhysicalDriveType ), - rec( 15, 1, ControllerDriveNumber ), - rec( 16, 1, ControllerNumber ), - rec( 17, 1, ControllerType ), - rec( 18, 4, DriveSize ), - rec( 22, 2, DriveCylinders ), - rec( 24, 1, DriveHeads ), - rec( 25, 1, SectorsPerTrack ), - rec( 26, 64, DriveDefinitionString ), - rec( 90, 2, IOErrorCount ), - rec( 92, 4, HotFixTableStart ), - rec( 96, 2, HotFixTableSize ), - rec( 98, 2, HotFixBlocksAvailable ), - rec( 100, 1, HotFixDisabled ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) - # 2222/17D9, 23/217 - pkt = NCP(0x17D9, "Get Disk Channel Statistics", 'fileserver') - pkt.Request(11, [ - rec( 10, 1, DiskChannelNumber ), - ]) - pkt.Reply(192, [ - rec( 8, 4, SystemIntervalMarker, BE ), - rec( 12, 2, ChannelState, BE ), - rec( 14, 2, ChannelSynchronizationState, BE ), - rec( 16, 1, SoftwareDriverType ), - rec( 17, 1, SoftwareMajorVersionNumber ), - rec( 18, 1, SoftwareMinorVersionNumber ), - rec( 19, 65, SoftwareDescription ), - rec( 84, 8, IOAddressesUsed ), - rec( 92, 10, SharedMemoryAddresses ), - rec( 102, 4, InterruptNumbersUsed ), - rec( 106, 4, DMAChannelsUsed ), - rec( 110, 1, FlagBits ), - rec( 111, 1, Reserved ), - rec( 112, 80, ConfigurationDescription ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) - # 2222/17DB, 23/219 - pkt = NCP(0x17DB, "Get Connection's Open Files", 'fileserver') - pkt.Request(14, [ - rec( 10, 2, ConnectionNumber ), - rec( 12, 2, LastRecordSeen, BE ), - ]) - pkt.Reply(32, [ - rec( 8, 2, NextRequestRecord ), - rec( 10, 1, NumberOfRecords, var="x" ), - rec( 11, 21, ConnStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) - # 2222/17DC, 23/220 - pkt = NCP(0x17DC, "Get Connection Using A File", 'fileserver') - pkt.Request((14,268), [ - rec( 10, 2, LastRecordSeen, BE ), - rec( 12, 1, DirHandle ), - rec( 13, (1,255), Path ), - ], info_str=(Path, "Get Connection Using File: %s", ", %s")) - pkt.Reply(30, [ - rec( 8, 2, UseCount, BE ), - rec( 10, 2, OpenCount, BE ), - rec( 12, 2, OpenForReadCount, BE ), - rec( 14, 2, OpenForWriteCount, BE ), - rec( 16, 2, DenyReadCount, BE ), - rec( 18, 2, DenyWriteCount, BE ), - rec( 20, 2, NextRequestRecord, BE ), - rec( 22, 1, Locked ), - rec( 23, 1, NumberOfRecords, var="x" ), - rec( 24, 6, ConnFileStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) - # 2222/17DD, 23/221 - pkt = NCP(0x17DD, "Get Physical Record Locks By Connection And File", 'fileserver') - pkt.Request(31, [ - rec( 10, 2, TargetConnectionNumber ), - rec( 12, 2, LastRecordSeen, BE ), - rec( 14, 1, VolumeNumber ), - rec( 15, 2, DirectoryID ), - rec( 17, 14, FileName14 ), - ], info_str=(FileName14, "Get Physical Record Locks by Connection and File: %s", ", %s")) - pkt.Reply(22, [ - rec( 8, 2, NextRequestRecord ), - rec( 10, 1, NumberOfLocks, var="x" ), - rec( 11, 1, Reserved ), - rec( 12, 10, LockStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17DE, 23/222 - pkt = NCP(0x17DE, "Get Physical Record Locks By File", 'fileserver') - pkt.Request((14,268), [ - rec( 10, 2, TargetConnectionNumber ), - rec( 12, 1, DirHandle ), - rec( 13, (1,255), Path ), - ], info_str=(Path, "Get Physical Record Locks by File: %s", ", %s")) - pkt.Reply(28, [ - rec( 8, 2, NextRequestRecord ), - rec( 10, 1, NumberOfLocks, var="x" ), - rec( 11, 1, Reserved ), - rec( 12, 16, PhyLockStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17DF, 23/223 - pkt = NCP(0x17DF, "Get Logical Records By Connection", 'fileserver') - pkt.Request(14, [ - rec( 10, 2, TargetConnectionNumber ), - rec( 12, 2, LastRecordSeen, BE ), - ]) - pkt.Reply((14,268), [ - rec( 8, 2, NextRequestRecord ), - rec( 10, 1, NumberOfRecords, var="x" ), - rec( 11, (3, 257), LogLockStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17E0, 23/224 - pkt = NCP(0x17E0, "Get Logical Record Information", 'fileserver') - pkt.Request((13,267), [ - rec( 10, 2, LastRecordSeen ), - rec( 12, (1,255), LogicalRecordName ), - ], info_str=(LogicalRecordName, "Get Logical Record Information: %s", ", %s")) - pkt.Reply(20, [ - rec( 8, 2, UseCount, BE ), - rec( 10, 2, ShareableLockCount, BE ), - rec( 12, 2, NextRequestRecord ), - rec( 14, 1, Locked ), - rec( 15, 1, NumberOfRecords, var="x" ), - rec( 16, 4, LogRecStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17E1, 23/225 - pkt = NCP(0x17E1, "Get Connection's Semaphores", 'fileserver') - pkt.Request(14, [ - rec( 10, 2, ConnectionNumber ), - rec( 12, 2, LastRecordSeen ), - ]) - pkt.Reply((18,272), [ - rec( 8, 2, NextRequestRecord ), - rec( 10, 2, NumberOfSemaphores, var="x" ), - rec( 12, (6,260), SemaStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17E2, 23/226 - pkt = NCP(0x17E2, "Get Semaphore Information", 'fileserver') - pkt.Request((13,267), [ - rec( 10, 2, LastRecordSeen ), - rec( 12, (1,255), SemaphoreName ), - ], info_str=(SemaphoreName, "Get Semaphore Information: %s", ", %s")) - pkt.Reply(17, [ - rec( 8, 2, NextRequestRecord, BE ), - rec( 10, 2, OpenCount, BE ), - rec( 12, 1, SemaphoreValue ), - rec( 13, 1, NumberOfRecords, var="x" ), - rec( 14, 3, SemaInfoStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17E3, 23/227 - pkt = NCP(0x17E3, "Get LAN Driver Configuration Information", 'fileserver') - pkt.Request(11, [ - rec( 10, 1, LANDriverNumber ), - ]) - pkt.Reply(180, [ - rec( 8, 4, NetworkAddress, BE ), - rec( 12, 6, HostAddress ), - rec( 18, 1, BoardInstalled ), - rec( 19, 1, OptionNumber ), - rec( 20, 160, ConfigurationText ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17E5, 23/229 - pkt = NCP(0x17E5, "Get Connection Usage Statistics", 'fileserver') - pkt.Request(12, [ - rec( 10, 2, ConnectionNumber ), - ]) - pkt.Reply(26, [ - rec( 8, 2, NextRequestRecord ), - rec( 10, 6, BytesRead ), - rec( 16, 6, BytesWritten ), - rec( 22, 4, TotalRequestPackets ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17E6, 23/230 - pkt = NCP(0x17E6, "Get Object's Remaining Disk Space", 'fileserver') - pkt.Request(14, [ - rec( 10, 4, ObjectID, BE ), - ]) - pkt.Reply(21, [ - rec( 8, 4, SystemIntervalMarker, BE ), - rec( 12, 4, ObjectID ), - rec( 16, 4, UnusedDiskBlocks, BE ), - rec( 20, 1, RestrictionsEnforced ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17E7, 23/231 - pkt = NCP(0x17E7, "Get File Server LAN I/O Statistics", 'fileserver') - pkt.Request(10) - pkt.Reply(74, [ - rec( 8, 4, SystemIntervalMarker, BE ), - rec( 12, 2, ConfiguredMaxRoutingBuffers ), - rec( 14, 2, ActualMaxUsedRoutingBuffers ), - rec( 16, 2, CurrentlyUsedRoutingBuffers ), - rec( 18, 4, TotalFileServicePackets ), - rec( 22, 2, TurboUsedForFileService ), - rec( 24, 2, PacketsFromInvalidConnection ), - rec( 26, 2, BadLogicalConnectionCount ), - rec( 28, 2, PacketsReceivedDuringProcessing ), - rec( 30, 2, RequestsReprocessed ), - rec( 32, 2, PacketsWithBadSequenceNumber ), - rec( 34, 2, DuplicateRepliesSent ), - rec( 36, 2, PositiveAcknowledgesSent ), - rec( 38, 2, PacketsWithBadRequestType ), - rec( 40, 2, AttachDuringProcessing ), - rec( 42, 2, AttachWhileProcessingAttach ), - rec( 44, 2, ForgedDetachedRequests ), - rec( 46, 2, DetachForBadConnectionNumber ), - rec( 48, 2, DetachDuringProcessing ), - rec( 50, 2, RepliesCancelled ), - rec( 52, 2, PacketsDiscardedByHopCount ), - rec( 54, 2, PacketsDiscardedUnknownNet ), - rec( 56, 2, IncomingPacketDiscardedNoDGroup ), - rec( 58, 2, OutgoingPacketDiscardedNoTurboBuffer ), - rec( 60, 2, IPXNotMyNetwork ), - rec( 62, 4, NetBIOSBroadcastWasPropogated ), - rec( 66, 4, TotalOtherPackets ), - rec( 70, 4, TotalRoutedPackets ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17E8, 23/232 - pkt = NCP(0x17E8, "Get File Server Misc Information", 'fileserver') - pkt.Request(10) - pkt.Reply(40, [ - rec( 8, 4, SystemIntervalMarker, BE ), - rec( 12, 1, ProcessorType ), - rec( 13, 1, Reserved ), - rec( 14, 1, NumberOfServiceProcesses ), - rec( 15, 1, ServerUtilizationPercentage ), - rec( 16, 2, ConfiguredMaxBinderyObjects ), - rec( 18, 2, ActualMaxBinderyObjects ), - rec( 20, 2, CurrentUsedBinderyObjects ), - rec( 22, 2, TotalServerMemory ), - rec( 24, 2, WastedServerMemory ), - rec( 26, 2, NumberOfDynamicMemoryAreas, var="x" ), - rec( 28, 12, DynMemStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17E9, 23/233 - pkt = NCP(0x17E9, "Get Volume Information", 'fileserver') - pkt.Request(11, [ - rec( 10, 1, VolumeNumber ), - ],info_str=(VolumeNumber, "Get Information on Volume %d", ", %d")) - pkt.Reply(48, [ - rec( 8, 4, SystemIntervalMarker, BE ), - rec( 12, 1, VolumeNumber ), - rec( 13, 1, LogicalDriveNumber ), - rec( 14, 2, BlockSize ), - rec( 16, 2, StartingBlock ), - rec( 18, 2, TotalBlocks ), - rec( 20, 2, FreeBlocks ), - rec( 22, 2, TotalDirectoryEntries ), - rec( 24, 2, FreeDirectoryEntries ), - rec( 26, 2, ActualMaxUsedDirectoryEntries ), - rec( 28, 1, VolumeHashedFlag ), - rec( 29, 1, VolumeCachedFlag ), - rec( 30, 1, VolumeRemovableFlag ), - rec( 31, 1, VolumeMountedFlag ), - rec( 32, 16, VolumeName ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17EA, 23/234 - pkt = NCP(0x17EA, "Get Connection's Task Information", 'fileserver') - pkt.Request(12, [ - rec( 10, 2, ConnectionNumber ), - ]) - pkt.Reply(13, [ - rec( 8, 1, ConnLockStatus ), - rec( 9, 1, NumberOfActiveTasks, var="x" ), - rec( 10, 3, TaskStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17EB, 23/235 - pkt = NCP(0x17EB, "Get Connection's Open Files", 'fileserver') - pkt.Request(14, [ - rec( 10, 2, ConnectionNumber ), - rec( 12, 2, LastRecordSeen ), - ]) - pkt.Reply((29,283), [ - rec( 8, 2, NextRequestRecord ), - rec( 10, 2, NumberOfRecords, var="x" ), - rec( 12, (17, 271), OpnFilesStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) - # 2222/17EC, 23/236 - pkt = NCP(0x17EC, "Get Connection Using A File", 'fileserver') - pkt.Request(18, [ - rec( 10, 1, DataStreamNumber ), - rec( 11, 1, VolumeNumber ), - rec( 12, 4, DirectoryBase, LE ), - rec( 16, 2, LastRecordSeen ), - ]) - pkt.Reply(33, [ - rec( 8, 2, NextRequestRecord ), - rec( 10, 2, FileUseCount ), - rec( 12, 2, OpenCount ), - rec( 14, 2, OpenForReadCount ), - rec( 16, 2, OpenForWriteCount ), - rec( 18, 2, DenyReadCount ), - rec( 20, 2, DenyWriteCount ), - rec( 22, 1, Locked ), - rec( 23, 1, ForkCount ), - rec( 24, 2, NumberOfRecords, var="x" ), - rec( 26, 7, ConnFileStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) - # 2222/17ED, 23/237 - pkt = NCP(0x17ED, "Get Physical Record Locks By Connection And File", 'fileserver') - pkt.Request(20, [ - rec( 10, 2, TargetConnectionNumber ), - rec( 12, 1, DataStreamNumber ), - rec( 13, 1, VolumeNumber ), - rec( 14, 4, DirectoryBase, LE ), - rec( 18, 2, LastRecordSeen ), - ]) - pkt.Reply(23, [ - rec( 8, 2, NextRequestRecord ), - rec( 10, 2, NumberOfLocks, LE, var="x" ), - rec( 12, 11, LockStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17EE, 23/238 - pkt = NCP(0x17EE, "Get Physical Record Locks By File", 'fileserver') - pkt.Request(18, [ - rec( 10, 1, DataStreamNumber ), - rec( 11, 1, VolumeNumber ), - rec( 12, 4, DirectoryBase ), - rec( 16, 2, LastRecordSeen ), - ]) - pkt.Reply(30, [ - rec( 8, 2, NextRequestRecord ), - rec( 10, 2, NumberOfLocks, LE, var="x" ), - rec( 12, 18, PhyLockStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17EF, 23/239 - pkt = NCP(0x17EF, "Get Logical Records By Connection", 'fileserver') - pkt.Request(14, [ - rec( 10, 2, TargetConnectionNumber ), - rec( 12, 2, LastRecordSeen ), - ]) - pkt.Reply((16,270), [ - rec( 8, 2, NextRequestRecord ), - rec( 10, 2, NumberOfRecords, var="x" ), - rec( 12, (4, 258), LogLockStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17F0, 23/240 - pkt = NCP(0x17F0, "Get Logical Record Information (old)", 'fileserver') - pkt.Request((13,267), [ - rec( 10, 2, LastRecordSeen ), - rec( 12, (1,255), LogicalRecordName ), - ]) - pkt.Reply(22, [ - rec( 8, 2, ShareableLockCount ), - rec( 10, 2, UseCount ), - rec( 12, 1, Locked ), - rec( 13, 2, NextRequestRecord ), - rec( 15, 2, NumberOfRecords, var="x" ), - rec( 17, 5, LogRecStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17F1, 23/241 - pkt = NCP(0x17F1, "Get Connection's Semaphores", 'fileserver') - pkt.Request(14, [ - rec( 10, 2, ConnectionNumber ), - rec( 12, 2, LastRecordSeen ), - ]) - pkt.Reply((19,273), [ - rec( 8, 2, NextRequestRecord ), - rec( 10, 2, NumberOfSemaphores, var="x" ), - rec( 12, (7, 261), SemaStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17F2, 23/242 - pkt = NCP(0x17F2, "Get Semaphore Information", 'fileserver') - pkt.Request((13,267), [ - rec( 10, 2, LastRecordSeen ), - rec( 12, (1,255), SemaphoreName ), - ], info_str=(SemaphoreName, "Get Semaphore Information: %s", ", %s")) - pkt.Reply(20, [ - rec( 8, 2, NextRequestRecord ), - rec( 10, 2, OpenCount ), - rec( 12, 2, SemaphoreValue ), - rec( 14, 2, NumberOfRecords, var="x" ), - rec( 16, 4, SemaInfoStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17F3, 23/243 - pkt = NCP(0x17F3, "Map Directory Number to Path", 'file') - pkt.Request(16, [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, DirectoryNumber ), - rec( 15, 1, NameSpace ), - ]) - pkt.Reply((9,263), [ - rec( 8, (1,255), Path ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0x9c00, 0xc601, 0xfd00, 0xff00]) - # 2222/17F4, 23/244 - pkt = NCP(0x17F4, "Convert Path to Dir Entry", 'file') - pkt.Request((12,266), [ - rec( 10, 1, DirHandle ), - rec( 11, (1,255), Path ), - ], info_str=(Path, "Convert Path to Directory Entry: %s", ", %s")) - pkt.Reply(13, [ - rec( 8, 1, VolumeNumber ), - rec( 9, 4, DirectoryNumber ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) - # 2222/17FD, 23/253 - pkt = NCP(0x17FD, "Send Console Broadcast", 'fileserver') - pkt.Request((16, 270), [ - rec( 10, 1, NumberOfStations, var="x" ), - rec( 11, 4, StationList, repeat="x" ), - rec( 15, (1, 255), TargetMessage ), - ], info_str=(TargetMessage, "Send Console Broadcast: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xc601, 0xfd00]) - # 2222/17FE, 23/254 - pkt = NCP(0x17FE, "Clear Connection Number", 'fileserver') - pkt.Request(14, [ - rec( 10, 4, ConnectionNumber ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xc601, 0xfd00]) - # 2222/18, 24 - pkt = NCP(0x18, "End of Job", 'connection') - pkt.Request(7) - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - # 2222/19, 25 - pkt = NCP(0x19, "Logout", 'connection') - pkt.Request(7) - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - # 2222/1A, 26 - pkt = NCP(0x1A, "Log Physical Record", 'sync') - pkt.Request(24, [ - rec( 7, 1, LockFlag ), - rec( 8, 6, FileHandle ), - rec( 14, 4, LockAreasStartOffset, BE ), - rec( 18, 4, LockAreaLen, BE ), - rec( 22, 2, LockTimeout ), - ], info_str=(LockAreaLen, "Lock Record - Length of %d", "%d")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8800, 0x9600, 0xfd02, 0xfe04, 0xff01]) - # 2222/1B, 27 - pkt = NCP(0x1B, "Lock Physical Record Set", 'sync') - pkt.Request(10, [ - rec( 7, 1, LockFlag ), - rec( 8, 2, LockTimeout ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8800, 0x9600, 0xfd02, 0xfe04, 0xff01]) - # 2222/1C, 28 - pkt = NCP(0x1C, "Release Physical Record", 'sync') - pkt.Request(22, [ - rec( 7, 1, Reserved ), - rec( 8, 6, FileHandle ), - rec( 14, 4, LockAreasStartOffset ), - rec( 18, 4, LockAreaLen ), - ], info_str=(LockAreaLen, "Release Lock Record - Length of %d", "%d")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8800, 0x9600, 0xfd02, 0xfe04, 0xff03]) - # 2222/1D, 29 - pkt = NCP(0x1D, "Release Physical Record Set", 'sync') - pkt.Request(8, [ - rec( 7, 1, LockFlag ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8800, 0x9600, 0xfd02, 0xfe04, 0xff03]) - # 2222/1E, 30 #Tested and fixed 6-14-02 GM - pkt = NCP(0x1E, "Clear Physical Record", 'sync') - pkt.Request(22, [ - rec( 7, 1, Reserved ), - rec( 8, 6, FileHandle ), - rec( 14, 4, LockAreasStartOffset, BE ), - rec( 18, 4, LockAreaLen, BE ), - ], info_str=(LockAreaLen, "Clear Lock Record - Length of %d", "%d")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8000, 0x8800, 0x9600, 0xfd02, 0xfe04, 0xff03]) - # 2222/1F, 31 - pkt = NCP(0x1F, "Clear Physical Record Set", 'sync') - pkt.Request(8, [ - rec( 7, 1, LockFlag ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8800, 0x9600, 0xfd02, 0xfe04, 0xff03]) - # 2222/2000, 32/00 - pkt = NCP(0x2000, "Open Semaphore", 'sync', has_length=0) - pkt.Request((10,264), [ - rec( 8, 1, InitialSemaphoreValue ), - rec( 9, (1,255), SemaphoreName ), - ], info_str=(SemaphoreName, "Open Semaphore: %s", ", %s")) - pkt.Reply(13, [ - rec( 8, 4, SemaphoreHandle, BE ), - rec( 12, 1, SemaphoreOpenCount ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xff01]) - # 2222/2001, 32/01 - pkt = NCP(0x2001, "Examine Semaphore", 'sync', has_length=0) - pkt.Request(12, [ - rec( 8, 4, SemaphoreHandle, BE ), - ]) - pkt.Reply(10, [ - rec( 8, 1, SemaphoreValue ), - rec( 9, 1, SemaphoreOpenCount ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xff01]) - # 2222/2002, 32/02 - pkt = NCP(0x2002, "Wait On Semaphore", 'sync', has_length=0) - pkt.Request(14, [ - rec( 8, 4, SemaphoreHandle, BE ), - rec( 12, 2, SemaphoreTimeOut, BE ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xff01]) - # 2222/2003, 32/03 - pkt = NCP(0x2003, "Signal Semaphore", 'sync', has_length=0) - pkt.Request(12, [ - rec( 8, 4, SemaphoreHandle, BE ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xff01]) - # 2222/2004, 32/04 - pkt = NCP(0x2004, "Close Semaphore", 'sync', has_length=0) - pkt.Request(12, [ - rec( 8, 4, SemaphoreHandle, BE ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xff01]) - # 2222/21, 33 - pkt = NCP(0x21, "Negotiate Buffer Size", 'connection') - pkt.Request(9, [ - rec( 7, 2, BufferSize, BE ), - ]) - pkt.Reply(10, [ - rec( 8, 2, BufferSize, BE ), - ]) - pkt.CompletionCodes([0x0000]) - # 2222/2200, 34/00 - pkt = NCP(0x2200, "TTS Is Available", 'tts', has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0001, 0xfd03, 0xff12]) - # 2222/2201, 34/01 - pkt = NCP(0x2201, "TTS Begin Transaction", 'tts', has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - # 2222/2202, 34/02 - pkt = NCP(0x2202, "TTS End Transaction", 'tts', has_length=0) - pkt.Request(8) - pkt.Reply(12, [ - rec( 8, 4, TransactionNumber, BE ), - ]) - pkt.CompletionCodes([0x0000, 0xff01]) - # 2222/2203, 34/03 - pkt = NCP(0x2203, "TTS Abort Transaction", 'tts', has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xfd03, 0xfe0b, 0xff01]) - # 2222/2204, 34/04 - pkt = NCP(0x2204, "TTS Transaction Status", 'tts', has_length=0) - pkt.Request(12, [ - rec( 8, 4, TransactionNumber, BE ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - # 2222/2205, 34/05 - pkt = NCP(0x2205, "TTS Get Application Thresholds", 'tts', has_length=0) - pkt.Request(8) - pkt.Reply(10, [ - rec( 8, 1, LogicalLockThreshold ), - rec( 9, 1, PhysicalLockThreshold ), - ]) - pkt.CompletionCodes([0x0000]) - # 2222/2206, 34/06 - pkt = NCP(0x2206, "TTS Set Application Thresholds", 'tts', has_length=0) - pkt.Request(10, [ - rec( 8, 1, LogicalLockThreshold ), - rec( 9, 1, PhysicalLockThreshold ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600]) - # 2222/2207, 34/07 - pkt = NCP(0x2207, "TTS Get Workstation Thresholds", 'tts', has_length=0) - pkt.Request(8) - pkt.Reply(10, [ - rec( 8, 1, LogicalLockThreshold ), - rec( 9, 1, PhysicalLockThreshold ), - ]) - pkt.CompletionCodes([0x0000]) - # 2222/2208, 34/08 - pkt = NCP(0x2208, "TTS Set Workstation Thresholds", 'tts', has_length=0) - pkt.Request(10, [ - rec( 8, 1, LogicalLockThreshold ), - rec( 9, 1, PhysicalLockThreshold ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - # 2222/2209, 34/09 - pkt = NCP(0x2209, "TTS Get Transaction Bits", 'tts', has_length=0) - pkt.Request(8) - pkt.Reply(9, [ - rec( 8, 1, ControlFlags ), - ]) - pkt.CompletionCodes([0x0000]) - # 2222/220A, 34/10 - pkt = NCP(0x220A, "TTS Set Transaction Bits", 'tts', has_length=0) - pkt.Request(9, [ - rec( 8, 1, ControlFlags ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - # 2222/2301, 35/01 - pkt = NCP(0x2301, "AFP Create Directory", 'afp') - pkt.Request((49, 303), [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, BaseDirectoryID ), - rec( 15, 1, Reserved ), - rec( 16, 4, CreatorID ), - rec( 20, 4, Reserved4 ), - rec( 24, 2, FinderAttr ), - rec( 26, 2, HorizLocation ), - rec( 28, 2, VertLocation ), - rec( 30, 2, FileDirWindow ), - rec( 32, 16, Reserved16 ), - rec( 48, (1,255), Path ), - ], info_str=(Path, "AFP Create Directory: %s", ", %s")) - pkt.Reply(12, [ - rec( 8, 4, NewDirectoryID ), - ]) - pkt.CompletionCodes([0x0000, 0x8301, 0x8400, 0x8800, 0x9300, 0x9600, 0x9804, - 0x9900, 0x9c03, 0x9e02, 0xa100, 0xa201, 0xfd00, 0xff18]) - # 2222/2302, 35/02 - pkt = NCP(0x2302, "AFP Create File", 'afp') - pkt.Request((49, 303), [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, BaseDirectoryID ), - rec( 15, 1, DeleteExistingFileFlag ), - rec( 16, 4, CreatorID, BE ), - rec( 20, 4, Reserved4 ), - rec( 24, 2, FinderAttr ), - rec( 26, 2, HorizLocation, BE ), - rec( 28, 2, VertLocation, BE ), - rec( 30, 2, FileDirWindow, BE ), - rec( 32, 16, Reserved16 ), - rec( 48, (1,255), Path ), - ], info_str=(Path, "AFP Create File: %s", ", %s")) - pkt.Reply(12, [ - rec( 8, 4, NewDirectoryID ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8301, 0x8400, 0x8701, 0x8800, - 0x8a00, 0x8d00, 0x8e00, 0x8f00, 0x9300, 0x9600, 0x9804, - 0x9900, 0x9b03, 0x9c03, 0x9e02, 0xa100, 0xa201, 0xfd00, - 0xff18]) - # 2222/2303, 35/03 - pkt = NCP(0x2303, "AFP Delete", 'afp') - pkt.Request((16,270), [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, BaseDirectoryID ), - rec( 15, (1,255), Path ), - ], info_str=(Path, "AFP Delete: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8301, 0x8800, 0x8a00, 0x8d00, 0x8e00, 0x8f00, - 0x9000, 0x9300, 0x9600, 0x9804, 0x9b03, 0x9c03, 0x9e02, - 0xa000, 0xa100, 0xa201, 0xfd00, 0xff19]) - # 2222/2304, 35/04 - pkt = NCP(0x2304, "AFP Get Entry ID From Name", 'afp') - pkt.Request((16,270), [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, BaseDirectoryID ), - rec( 15, (1,255), Path ), - ], info_str=(Path, "AFP Get Entry from Name: %s", ", %s")) - pkt.Reply(12, [ - rec( 8, 4, TargetEntryID, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x8301, 0x8800, 0x9300, 0x9600, 0x9804, 0x9c03, - 0xa100, 0xa201, 0xfd00, 0xff19]) - # 2222/2305, 35/05 - pkt = NCP(0x2305, "AFP Get File Information", 'afp') - pkt.Request((18,272), [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, BaseDirectoryID ), - rec( 15, 2, RequestBitMap, BE ), - rec( 17, (1,255), Path ), - ], info_str=(Path, "AFP Get File Information: %s", ", %s")) - pkt.Reply(121, [ - rec( 8, 4, AFPEntryID, BE ), - rec( 12, 4, ParentID, BE ), - rec( 16, 2, AttributesDef16, LE ), - rec( 18, 4, DataForkLen, BE ), - rec( 22, 4, ResourceForkLen, BE ), - rec( 26, 2, TotalOffspring, BE ), - rec( 28, 2, CreationDate, BE ), - rec( 30, 2, LastAccessedDate, BE ), - rec( 32, 2, ModifiedDate, BE ), - rec( 34, 2, ModifiedTime, BE ), - rec( 36, 2, ArchivedDate, BE ), - rec( 38, 2, ArchivedTime, BE ), - rec( 40, 4, CreatorID, BE ), - rec( 44, 4, Reserved4 ), - rec( 48, 2, FinderAttr ), - rec( 50, 2, HorizLocation ), - rec( 52, 2, VertLocation ), - rec( 54, 2, FileDirWindow ), - rec( 56, 16, Reserved16 ), - rec( 72, 32, LongName ), - rec( 104, 4, CreatorID, BE ), - rec( 108, 12, ShortName ), - rec( 120, 1, AccessPrivileges ), - ]) - pkt.CompletionCodes([0x0000, 0x8301, 0x8800, 0x9300, 0x9600, 0x9804, 0x9c03, - 0xa100, 0xa201, 0xfd00, 0xff19]) - # 2222/2306, 35/06 - pkt = NCP(0x2306, "AFP Get Entry ID From NetWare Handle", 'afp') - pkt.Request(16, [ - rec( 10, 6, FileHandle ), - ]) - pkt.Reply(14, [ - rec( 8, 1, VolumeID ), - rec( 9, 4, TargetEntryID, BE ), - rec( 13, 1, ForkIndicator ), - ]) - pkt.CompletionCodes([0x0000, 0x8301, 0x8800, 0x9300, 0x9600, 0xa201]) - # 2222/2307, 35/07 - pkt = NCP(0x2307, "AFP Rename", 'afp') - pkt.Request((21, 529), [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, MacSourceBaseID, BE ), - rec( 15, 4, MacDestinationBaseID, BE ), - rec( 19, (1,255), Path ), - rec( -1, (1,255), NewFileNameLen ), - ], info_str=(Path, "AFP Rename: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8301, 0x8401, 0x8800, 0x8b00, 0x8e00, - 0x9001, 0x9201, 0x9300, 0x9600, 0x9804, 0x9900, - 0x9c03, 0x9e00, 0xa100, 0xa201, 0xfd00, 0xff0a]) - # 2222/2308, 35/08 - pkt = NCP(0x2308, "AFP Open File Fork", 'afp') - pkt.Request((18, 272), [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, MacBaseDirectoryID ), - rec( 15, 1, ForkIndicator ), - rec( 16, 1, AccessMode ), - rec( 17, (1,255), Path ), - ], info_str=(Path, "AFP Open File Fork: %s", ", %s")) - pkt.Reply(22, [ - rec( 8, 4, AFPEntryID, BE ), - rec( 12, 4, DataForkLen, BE ), - rec( 16, 6, NetWareAccessHandle ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8301, 0x8800, 0x9300, - 0x9400, 0x9600, 0x9804, 0x9900, 0x9c03, 0xa100, - 0xa201, 0xfd00, 0xff16]) - # 2222/2309, 35/09 - pkt = NCP(0x2309, "AFP Set File Information", 'afp') - pkt.Request((64, 318), [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, MacBaseDirectoryID ), - rec( 15, 2, RequestBitMap, BE ), - rec( 17, 2, MacAttr, BE ), - rec( 19, 2, CreationDate, BE ), - rec( 21, 2, LastAccessedDate, BE ), - rec( 23, 2, ModifiedDate, BE ), - rec( 25, 2, ModifiedTime, BE ), - rec( 27, 2, ArchivedDate, BE ), - rec( 29, 2, ArchivedTime, BE ), - rec( 31, 4, CreatorID, BE ), - rec( 35, 4, Reserved4 ), - rec( 39, 2, FinderAttr ), - rec( 41, 2, HorizLocation ), - rec( 43, 2, VertLocation ), - rec( 45, 2, FileDirWindow ), - rec( 47, 16, Reserved16 ), - rec( 63, (1,255), Path ), - ], info_str=(Path, "AFP Set File Information: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0104, 0x8301, 0x8800, 0x9300, 0x9400, - 0x9500, 0x9600, 0x9804, 0x9c03, 0xa100, 0xa201, - 0xfd00, 0xff16]) - # 2222/230A, 35/10 - pkt = NCP(0x230A, "AFP Scan File Information", 'afp') - pkt.Request((26, 280), [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, MacBaseDirectoryID ), - rec( 15, 4, MacLastSeenID, BE ), - rec( 19, 2, DesiredResponseCount, BE ), - rec( 21, 2, SearchBitMap, BE ), - rec( 23, 2, RequestBitMap, BE ), - rec( 25, (1,255), Path ), - ], info_str=(Path, "AFP Scan File Information: %s", ", %s")) - pkt.Reply(123, [ - rec( 8, 2, ActualResponseCount, BE, var="x" ), - rec( 10, 113, AFP10Struct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x8301, 0x8800, 0x9300, 0x9600, 0x9804, - 0x9c03, 0xa100, 0xa201, 0xfd00, 0xff16]) - # 2222/230B, 35/11 - pkt = NCP(0x230B, "AFP Alloc Temporary Directory Handle", 'afp') - pkt.Request((16,270), [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, MacBaseDirectoryID ), - rec( 15, (1,255), Path ), - ], info_str=(Path, "AFP Allocate Temporary Directory Handle: %s", ", %s")) - pkt.Reply(10, [ - rec( 8, 1, DirHandle ), - rec( 9, 1, AccessRightsMask ), - ]) - pkt.CompletionCodes([0x0000, 0x8301, 0x8800, 0x9300, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0x9d00, 0xa100, - 0xa201, 0xfd00, 0xff00]) - # 2222/230C, 35/12 - pkt = NCP(0x230C, "AFP Get Entry ID From Path Name", 'afp') - pkt.Request((12,266), [ - rec( 10, 1, DirHandle ), - rec( 11, (1,255), Path ), - ], info_str=(Path, "AFP Get Entry ID from Path Name: %s", ", %s")) - pkt.Reply(12, [ - rec( 8, 4, AFPEntryID, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x8301, 0x8800, 0x9300, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa100, 0xa201, - 0xfd00, 0xff00]) - # 2222/230D, 35/13 - pkt = NCP(0x230D, "AFP 2.0 Create Directory", 'afp') - pkt.Request((55,309), [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, BaseDirectoryID ), - rec( 15, 1, Reserved ), - rec( 16, 4, CreatorID, BE ), - rec( 20, 4, Reserved4 ), - rec( 24, 2, FinderAttr ), - rec( 26, 2, HorizLocation ), - rec( 28, 2, VertLocation ), - rec( 30, 2, FileDirWindow ), - rec( 32, 16, Reserved16 ), - rec( 48, 6, ProDOSInfo ), - rec( 54, (1,255), Path ), - ], info_str=(Path, "AFP 2.0 Create Directory: %s", ", %s")) - pkt.Reply(12, [ - rec( 8, 4, NewDirectoryID ), - ]) - pkt.CompletionCodes([0x0000, 0x8301, 0x8400, 0x8800, 0x9300, - 0x9600, 0x9804, 0x9900, 0x9c03, 0x9e00, - 0xa100, 0xa201, 0xfd00, 0xff00]) - # 2222/230E, 35/14 - pkt = NCP(0x230E, "AFP 2.0 Create File", 'afp') - pkt.Request((55,309), [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, BaseDirectoryID ), - rec( 15, 1, DeleteExistingFileFlag ), - rec( 16, 4, CreatorID, BE ), - rec( 20, 4, Reserved4 ), - rec( 24, 2, FinderAttr ), - rec( 26, 2, HorizLocation ), - rec( 28, 2, VertLocation ), - rec( 30, 2, FileDirWindow ), - rec( 32, 16, Reserved16 ), - rec( 48, 6, ProDOSInfo ), - rec( 54, (1,255), Path ), - ], info_str=(Path, "AFP 2.0 Create File: %s", ", %s")) - pkt.Reply(12, [ - rec( 8, 4, NewDirectoryID ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8301, 0x8400, - 0x8701, 0x8800, 0x8a00, 0x8d00, 0x8e00, - 0x8f00, 0x9001, 0x9300, 0x9600, 0x9804, - 0x9900, 0x9b03, 0x9c03, 0x9e00, 0xa100, - 0xa201, 0xfd00, 0xff00]) - # 2222/230F, 35/15 - pkt = NCP(0x230F, "AFP 2.0 Get File Or Directory Information", 'afp') - pkt.Request((18,272), [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, BaseDirectoryID ), - rec( 15, 2, RequestBitMap, BE ), - rec( 17, (1,255), Path ), - ], info_str=(Path, "AFP 2.0 Get Information: %s", ", %s")) - pkt.Reply(128, [ - rec( 8, 4, AFPEntryID, BE ), - rec( 12, 4, ParentID, BE ), - rec( 16, 2, AttributesDef16 ), - rec( 18, 4, DataForkLen, BE ), - rec( 22, 4, ResourceForkLen, BE ), - rec( 26, 2, TotalOffspring, BE ), - rec( 28, 2, CreationDate, BE ), - rec( 30, 2, LastAccessedDate, BE ), - rec( 32, 2, ModifiedDate, BE ), - rec( 34, 2, ModifiedTime, BE ), - rec( 36, 2, ArchivedDate, BE ), - rec( 38, 2, ArchivedTime, BE ), - rec( 40, 4, CreatorID, BE ), - rec( 44, 4, Reserved4 ), - rec( 48, 2, FinderAttr ), - rec( 50, 2, HorizLocation ), - rec( 52, 2, VertLocation ), - rec( 54, 2, FileDirWindow ), - rec( 56, 16, Reserved16 ), - rec( 72, 32, LongName ), - rec( 104, 4, CreatorID, BE ), - rec( 108, 12, ShortName ), - rec( 120, 1, AccessPrivileges ), - rec( 121, 1, Reserved ), - rec( 122, 6, ProDOSInfo ), - ]) - pkt.CompletionCodes([0x0000, 0x8301, 0x8800, 0x9300, 0x9600, 0x9804, 0x9c03, - 0xa100, 0xa201, 0xfd00, 0xff19]) - # 2222/2310, 35/16 - pkt = NCP(0x2310, "AFP 2.0 Set File Information", 'afp') - pkt.Request((70, 324), [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, MacBaseDirectoryID ), - rec( 15, 2, RequestBitMap, BE ), - rec( 17, 2, AttributesDef16 ), - rec( 19, 2, CreationDate, BE ), - rec( 21, 2, LastAccessedDate, BE ), - rec( 23, 2, ModifiedDate, BE ), - rec( 25, 2, ModifiedTime, BE ), - rec( 27, 2, ArchivedDate, BE ), - rec( 29, 2, ArchivedTime, BE ), - rec( 31, 4, CreatorID, BE ), - rec( 35, 4, Reserved4 ), - rec( 39, 2, FinderAttr ), - rec( 41, 2, HorizLocation ), - rec( 43, 2, VertLocation ), - rec( 45, 2, FileDirWindow ), - rec( 47, 16, Reserved16 ), - rec( 63, 6, ProDOSInfo ), - rec( 69, (1,255), Path ), - ], info_str=(Path, "AFP 2.0 Set File Information: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0104, 0x8301, 0x8800, 0x9300, 0x9400, - 0x9500, 0x9600, 0x9804, 0x9c03, 0xa100, 0xa201, - 0xfd00, 0xff16]) - # 2222/2311, 35/17 - pkt = NCP(0x2311, "AFP 2.0 Scan File Information", 'afp') - pkt.Request((26, 280), [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, MacBaseDirectoryID ), - rec( 15, 4, MacLastSeenID, BE ), - rec( 19, 2, DesiredResponseCount, BE ), - rec( 21, 2, SearchBitMap, BE ), - rec( 23, 2, RequestBitMap, BE ), - rec( 25, (1,255), Path ), - ], info_str=(Path, "AFP 2.0 Scan File Information: %s", ", %s")) - pkt.Reply(14, [ - rec( 8, 2, ActualResponseCount, var="x" ), - rec( 10, 4, AFP20Struct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x8301, 0x8800, 0x9300, 0x9600, 0x9804, - 0x9c03, 0xa100, 0xa201, 0xfd00, 0xff16]) - # 2222/2312, 35/18 - pkt = NCP(0x2312, "AFP Get DOS Name From Entry ID", 'afp') - pkt.Request(15, [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, AFPEntryID, BE ), - ]) - pkt.Reply((9,263), [ - rec( 8, (1,255), Path ), - ]) - pkt.CompletionCodes([0x0000, 0x8900, 0x9600, 0xbf00]) - # 2222/2313, 35/19 - pkt = NCP(0x2313, "AFP Get Macintosh Info On Deleted File", 'afp') - pkt.Request(15, [ - rec( 10, 1, VolumeNumber ), - rec( 11, 4, DirectoryNumber, BE ), - ]) - pkt.Reply((51,305), [ - rec( 8, 4, CreatorID, BE ), - rec( 12, 4, Reserved4 ), - rec( 16, 2, FinderAttr ), - rec( 18, 2, HorizLocation ), - rec( 20, 2, VertLocation ), - rec( 22, 2, FileDirWindow ), - rec( 24, 16, Reserved16 ), - rec( 40, 6, ProDOSInfo ), - rec( 46, 4, ResourceForkSize, BE ), - rec( 50, (1,255), FileName ), - ]) - pkt.CompletionCodes([0x0000, 0x9c03, 0xbf00]) - # 2222/2400, 36/00 - pkt = NCP(0x2400, "Get NCP Extension Information", 'extension') - pkt.Request(14, [ - rec( 10, 4, NCPextensionNumber, LE ), - ]) - pkt.Reply((16,270), [ - rec( 8, 4, NCPextensionNumber ), - rec( 12, 1, NCPextensionMajorVersion ), - rec( 13, 1, NCPextensionMinorVersion ), - rec( 14, 1, NCPextensionRevisionNumber ), - rec( 15, (1, 255), NCPextensionName ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0xfe00, 0xff20]) - # 2222/2401, 36/01 - pkt = NCP(0x2401, "Get NCP Extension Maximum Data Size", 'extension') - pkt.Request(10) - pkt.Reply(10, [ - rec( 8, 2, NCPdataSize ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0xfe00, 0xff20]) - # 2222/2402, 36/02 - pkt = NCP(0x2402, "Get NCP Extension Information by Name", 'extension') - pkt.Request((11, 265), [ - rec( 10, (1,255), NCPextensionName ), - ], info_str=(NCPextensionName, "Get NCP Extension Information by Name: %s", ", %s")) - pkt.Reply((16,270), [ - rec( 8, 4, NCPextensionNumber ), - rec( 12, 1, NCPextensionMajorVersion ), - rec( 13, 1, NCPextensionMinorVersion ), - rec( 14, 1, NCPextensionRevisionNumber ), - rec( 15, (1, 255), NCPextensionName ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0xfe00, 0xff20]) - # 2222/2403, 36/03 - pkt = NCP(0x2403, "Get Number of Registered NCP Extensions", 'extension') - pkt.Request(10) - pkt.Reply(12, [ - rec( 8, 4, NumberOfNCPExtensions ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0xfe00, 0xff20]) - # 2222/2404, 36/04 - pkt = NCP(0x2404, "Get NCP Extension Registered Verbs List", 'extension') - pkt.Request(14, [ - rec( 10, 4, StartingNumber ), - ]) - pkt.Reply(20, [ - rec( 8, 4, ReturnedListCount, var="x" ), - rec( 12, 4, nextStartingNumber ), - rec( 16, 4, NCPExtensionNumbers, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0xfe00, 0xff20]) - # 2222/2405, 36/05 - pkt = NCP(0x2405, "Return NCP Extension Information", 'extension') - pkt.Request(14, [ - rec( 10, 4, NCPextensionNumber ), - ]) - pkt.Reply((16,270), [ - rec( 8, 4, NCPextensionNumber ), - rec( 12, 1, NCPextensionMajorVersion ), - rec( 13, 1, NCPextensionMinorVersion ), - rec( 14, 1, NCPextensionRevisionNumber ), - rec( 15, (1, 255), NCPextensionName ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0xfe00, 0xff20]) - # 2222/2406, 36/06 - pkt = NCP(0x2406, "Return NCP Extension Maximum Data Size", 'extension') - pkt.Request(10) - pkt.Reply(12, [ - rec( 8, 4, NCPdataSize ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0xfe00, 0xff20]) - # 2222/25, 37 - pkt = NCP(0x25, "Execute NCP Extension", 'extension') - pkt.Request(11, [ - rec( 7, 4, NCPextensionNumber ), - # The following value is Unicode - #rec[ 13, (1,255), RequestData ], - ]) - pkt.Reply(8) - # The following value is Unicode - #[ 8, (1, 255), ReplyBuffer ], - pkt.CompletionCodes([0x0000, 0x7e01, 0xf000, 0x9c00, 0xd504, 0xee00, 0xfe00, 0xff20]) - # 2222/3B, 59 - pkt = NCP(0x3B, "Commit File", 'file', has_length=0 ) - pkt.Request(14, [ - rec( 7, 1, Reserved ), - rec( 8, 6, FileHandle ), - ], info_str=(FileHandle, "Commit File - 0x%s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8800, 0x9804, 0xff00]) - # 2222/3D, 61 - pkt = NCP(0x3D, "Commit File", 'file', has_length=0 ) - pkt.Request(14, [ - rec( 7, 1, Reserved ), - rec( 8, 6, FileHandle ), - ], info_str=(FileHandle, "Commit File - 0x%s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8800, 0x9804, 0xff00]) - # 2222/3E, 62 - pkt = NCP(0x3E, "File Search Initialize", 'file', has_length=0 ) - pkt.Request((9, 263), [ - rec( 7, 1, DirHandle ), - rec( 8, (1,255), Path ), - ], info_str=(Path, "Initialize File Search: %s", ", %s")) - pkt.Reply(14, [ - rec( 8, 1, VolumeNumber ), - rec( 9, 2, DirectoryID ), - rec( 11, 2, SequenceNumber, BE ), - rec( 13, 1, AccessRightsMask ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9b03, 0x9c03, 0xa100, - 0xfd00, 0xff16]) - # 2222/3F, 63 - pkt = NCP(0x3F, "File Search Continue", 'file', has_length=0 ) - pkt.Request((14, 268), [ - rec( 7, 1, VolumeNumber ), - rec( 8, 2, DirectoryID ), - rec( 10, 2, SequenceNumber, BE ), - rec( 12, 1, SearchAttributes ), - rec( 13, (1,255), Path ), - ], info_str=(Path, "File Search Continue: %s", ", %s")) - pkt.Reply( NO_LENGTH_CHECK, [ - # - # XXX - don't show this if we got back a non-zero - # completion code? For example, 255 means "No - # matching files or directories were found", so - # presumably it can't show you a matching file or - # directory instance - it appears to just leave crap - # there. - # - srec( DirectoryInstance, req_cond="ncp.sattr_sub==TRUE"), - srec( FileInstance, req_cond="ncp.sattr_sub!=TRUE"), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0xff16]) - # 2222/40, 64 - pkt = NCP(0x40, "Search for a File", 'file') - pkt.Request((12, 266), [ - rec( 7, 2, SequenceNumber, BE ), - rec( 9, 1, DirHandle ), - rec( 10, 1, SearchAttributes ), - rec( 11, (1,255), FileName ), - ], info_str=(FileName, "Search for File: %s", ", %s")) - pkt.Reply(40, [ - rec( 8, 2, SequenceNumber, BE ), - rec( 10, 2, Reserved2 ), - rec( 12, 14, FileName14 ), - rec( 26, 1, AttributesDef ), - rec( 27, 1, FileExecuteType ), - rec( 28, 4, FileSize ), - rec( 32, 2, CreationDate, BE ), - rec( 34, 2, LastAccessedDate, BE ), - rec( 36, 2, ModifiedDate, BE ), - rec( 38, 2, ModifiedTime, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x8900, 0x9600, 0x9804, 0x9b03, - 0x9c03, 0xa100, 0xfd00, 0xff16]) - # 2222/41, 65 - pkt = NCP(0x41, "Open File", 'file') - pkt.Request((10, 264), [ - rec( 7, 1, DirHandle ), - rec( 8, 1, SearchAttributes ), - rec( 9, (1,255), FileName ), - ], info_str=(FileName, "Open File: %s", ", %s")) - pkt.Reply(44, [ - rec( 8, 6, FileHandle ), - rec( 14, 2, Reserved2 ), - rec( 16, 14, FileName14 ), - rec( 30, 1, AttributesDef ), - rec( 31, 1, FileExecuteType ), - rec( 32, 4, FileSize, BE ), - rec( 36, 2, CreationDate, BE ), - rec( 38, 2, LastAccessedDate, BE ), - rec( 40, 2, ModifiedDate, BE ), - rec( 42, 2, ModifiedTime, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8200, 0x9400, - 0x9600, 0x9804, 0x9c03, 0xa100, 0xfd00, - 0xff16]) - # 2222/42, 66 - pkt = NCP(0x42, "Close File", 'file') - pkt.Request(14, [ - rec( 7, 1, Reserved ), - rec( 8, 6, FileHandle ), - ], info_str=(FileHandle, "Close File - 0x%s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8800, 0xff1a]) - # 2222/43, 67 - pkt = NCP(0x43, "Create File", 'file') - pkt.Request((10, 264), [ - rec( 7, 1, DirHandle ), - rec( 8, 1, AttributesDef ), - rec( 9, (1,255), FileName ), - ], info_str=(FileName, "Create File: %s", ", %s")) - pkt.Reply(44, [ - rec( 8, 6, FileHandle ), - rec( 14, 2, Reserved2 ), - rec( 16, 14, FileName14 ), - rec( 30, 1, AttributesDef ), - rec( 31, 1, FileExecuteType ), - rec( 32, 4, FileSize, BE ), - rec( 36, 2, CreationDate, BE ), - rec( 38, 2, LastAccessedDate, BE ), - rec( 40, 2, ModifiedDate, BE ), - rec( 42, 2, ModifiedTime, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9900, 0x9b03, 0x9c03, 0xfd00, - 0xff00]) - # 2222/44, 68 - pkt = NCP(0x44, "Erase File", 'file') - pkt.Request((10, 264), [ - rec( 7, 1, DirHandle ), - rec( 8, 1, SearchAttributes ), - rec( 9, (1,255), FileName ), - ], info_str=(FileName, "Erase File: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8a00, 0x8d00, 0x8e00, 0x8f00, - 0x9001, 0x9600, 0x9804, 0x9b03, 0x9c03, - 0xa100, 0xfd00, 0xff00]) - # 2222/45, 69 - pkt = NCP(0x45, "Rename File", 'file') - pkt.Request((12, 520), [ - rec( 7, 1, DirHandle ), - rec( 8, 1, SearchAttributes ), - rec( 9, (1,255), FileName ), - rec( -1, 1, TargetDirHandle ), - rec( -1, (1, 255), NewFileNameLen ), - ], info_str=(FileName, "Rename File: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8701, 0x8b00, 0x8d00, 0x8e00, - 0x8f00, 0x9001, 0x9101, 0x9201, 0x9600, - 0x9804, 0x9a00, 0x9b03, 0x9c03, 0xa100, - 0xfd00, 0xff16]) - # 2222/46, 70 - pkt = NCP(0x46, "Set File Attributes", 'file') - pkt.Request((11, 265), [ - rec( 7, 1, AttributesDef ), - rec( 8, 1, DirHandle ), - rec( 9, 1, SearchAttributes ), - rec( 10, (1,255), FileName ), - ], info_str=(FileName, "Set File Attributes: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8c00, 0x8d00, 0x8e00, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa100, 0xfd00, - 0xff16]) - # 2222/47, 71 - pkt = NCP(0x47, "Get Current Size of File", 'file') - pkt.Request(14, [ - rec(7, 1, Reserved ), - rec( 8, 6, FileHandle ), - ], info_str=(FileHandle, "Get Current Size of File - 0x%s", ", %s")) - pkt.Reply(12, [ - rec( 8, 4, FileSize, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x8800]) - # 2222/48, 72 - pkt = NCP(0x48, "Read From A File", 'file') - pkt.Request(20, [ - rec( 7, 1, Reserved ), - rec( 8, 6, FileHandle ), - rec( 14, 4, FileOffset, BE ), - rec( 18, 2, MaxBytes, BE ), - ], info_str=(FileHandle, "Read From File - 0x%s", ", %s")) - pkt.Reply(10, [ - rec( 8, 2, NumBytes, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x8300, 0x8800, 0x9300, 0xff1b]) - # 2222/49, 73 - pkt = NCP(0x49, "Write to a File", 'file') - pkt.Request(20, [ - rec( 7, 1, Reserved ), - rec( 8, 6, FileHandle ), - rec( 14, 4, FileOffset, BE ), - rec( 18, 2, MaxBytes, BE ), - ], info_str=(FileHandle, "Write to a File - 0x%s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0104, 0x8300, 0x8800, 0x9400, 0x9500, 0xa201, 0xff1b]) - # 2222/4A, 74 - pkt = NCP(0x4A, "Copy from One File to Another", 'file') - pkt.Request(30, [ - rec( 7, 1, Reserved ), - rec( 8, 6, FileHandle ), - rec( 14, 6, TargetFileHandle ), - rec( 20, 4, FileOffset, BE ), - rec( 24, 4, TargetFileOffset, BE ), - rec( 28, 2, BytesToCopy, BE ), - ]) - pkt.Reply(12, [ - rec( 8, 4, BytesActuallyTransferred, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x0104, 0x8300, 0x8800, 0x9300, 0x9400, - 0x9500, 0x9600, 0xa201, 0xff1b]) - # 2222/4B, 75 - pkt = NCP(0x4B, "Set File Time Date Stamp", 'file') - pkt.Request(18, [ - rec( 7, 1, Reserved ), - rec( 8, 6, FileHandle ), - rec( 14, 2, FileTime, BE ), - rec( 16, 2, FileDate, BE ), - ], info_str=(FileHandle, "Set Time and Date Stamp for File - 0x%s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8800, 0x9400, 0x9600, 0xfb08]) - # 2222/4C, 76 - pkt = NCP(0x4C, "Open File", 'file') - pkt.Request((11, 265), [ - rec( 7, 1, DirHandle ), - rec( 8, 1, SearchAttributes ), - rec( 9, 1, AccessRightsMask ), - rec( 10, (1,255), FileName ), - ], info_str=(FileName, "Open File: %s", ", %s")) - pkt.Reply(44, [ - rec( 8, 6, FileHandle ), - rec( 14, 2, Reserved2 ), - rec( 16, 14, FileName14 ), - rec( 30, 1, AttributesDef ), - rec( 31, 1, FileExecuteType ), - rec( 32, 4, FileSize, BE ), - rec( 36, 2, CreationDate, BE ), - rec( 38, 2, LastAccessedDate, BE ), - rec( 40, 2, ModifiedDate, BE ), - rec( 42, 2, ModifiedTime, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8200, 0x9400, - 0x9600, 0x9804, 0x9c03, 0xa100, 0xfd00, - 0xff16]) - # 2222/4D, 77 - pkt = NCP(0x4D, "Create File", 'file') - pkt.Request((10, 264), [ - rec( 7, 1, DirHandle ), - rec( 8, 1, AttributesDef ), - rec( 9, (1,255), FileName ), - ], info_str=(FileName, "Create File: %s", ", %s")) - pkt.Reply(44, [ - rec( 8, 6, FileHandle ), - rec( 14, 2, Reserved2 ), - rec( 16, 14, FileName14 ), - rec( 30, 1, AttributesDef ), - rec( 31, 1, FileExecuteType ), - rec( 32, 4, FileSize, BE ), - rec( 36, 2, CreationDate, BE ), - rec( 38, 2, LastAccessedDate, BE ), - rec( 40, 2, ModifiedDate, BE ), - rec( 42, 2, ModifiedTime, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9900, 0x9b03, 0x9c03, 0xfd00, - 0xff00]) - # 2222/4F, 79 - pkt = NCP(0x4F, "Set File Extended Attributes", 'file') - pkt.Request((11, 265), [ - rec( 7, 1, AttributesDef ), - rec( 8, 1, DirHandle ), - rec( 9, 1, AccessRightsMask ), - rec( 10, (1,255), FileName ), - ], info_str=(FileName, "Set File Extended Attributes: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8c00, 0x8d00, 0x8e00, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa100, 0xfd00, - 0xff16]) - # 2222/54, 84 - pkt = NCP(0x54, "Open/Create File", 'file') - pkt.Request((12, 266), [ - rec( 7, 1, DirHandle ), - rec( 8, 1, AttributesDef ), - rec( 9, 1, AccessRightsMask ), - rec( 10, 1, ActionFlag ), - rec( 11, (1,255), FileName ), - ], info_str=(FileName, "Open/Create File: %s", ", %s")) - pkt.Reply(44, [ - rec( 8, 6, FileHandle ), - rec( 14, 2, Reserved2 ), - rec( 16, 14, FileName14 ), - rec( 30, 1, AttributesDef ), - rec( 31, 1, FileExecuteType ), - rec( 32, 4, FileSize, BE ), - rec( 36, 2, CreationDate, BE ), - rec( 38, 2, LastAccessedDate, BE ), - rec( 40, 2, ModifiedDate, BE ), - rec( 42, 2, ModifiedTime, BE ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xfd00, 0xff16]) - # 2222/55, 85 - pkt = NCP(0x55, "Get Sparse File Data Block Bit Map", 'file') - pkt.Request(17, [ - rec( 7, 6, FileHandle ), - rec( 13, 4, FileOffset ), - ], info_str=(FileHandle, "Get Sparse File Data Block Bitmap for File - 0x%s", ", %s")) - pkt.Reply(528, [ - rec( 8, 4, AllocationBlockSize ), - rec( 12, 4, Reserved4 ), - rec( 16, 512, BitMap ), - ]) - pkt.CompletionCodes([0x0000, 0x8800]) - # 2222/5601, 86/01 - pkt = NCP(0x5601, "Close Extended Attribute Handle", 'extended', has_length=0 ) - pkt.Request(14, [ - rec( 8, 2, Reserved2 ), - rec( 10, 4, EAHandle ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xcf00, 0xd301]) - # 2222/5602, 86/02 - pkt = NCP(0x5602, "Write Extended Attribute", 'extended', has_length=0 ) - pkt.Request((35,97), [ - rec( 8, 2, EAFlags ), - rec( 10, 4, EAHandleOrNetWareHandleOrVolume, BE ), - rec( 14, 4, ReservedOrDirectoryNumber ), - rec( 18, 4, TtlWriteDataSize ), - rec( 22, 4, FileOffset ), - rec( 26, 4, EAAccessFlag ), - rec( 30, 2, EAValueLength, var='x' ), - rec( 32, (2,64), EAKey ), - rec( -1, 1, EAValueRep, repeat='x' ), - ], info_str=(EAKey, "Write Extended Attribute: %s", ", %s")) - pkt.Reply(20, [ - rec( 8, 4, EAErrorCodes ), - rec( 12, 4, EABytesWritten ), - rec( 16, 4, NewEAHandle ), - ]) - pkt.CompletionCodes([0x0000, 0xc800, 0xc900, 0xcb00, 0xce00, 0xcf00, 0xd101, - 0xd203, 0xd301, 0xd402, 0xda02, 0xdc01, 0xef00, 0xff00]) - # 2222/5603, 86/03 - pkt = NCP(0x5603, "Read Extended Attribute", 'extended', has_length=0 ) - pkt.Request((28,538), [ - rec( 8, 2, EAFlags ), - rec( 10, 4, EAHandleOrNetWareHandleOrVolume ), - rec( 14, 4, ReservedOrDirectoryNumber ), - rec( 18, 4, FileOffset ), - rec( 22, 4, InspectSize ), - rec( 26, (2,512), EAKey ), - ], info_str=(EAKey, "Read Extended Attribute: %s", ", %s")) - pkt.Reply((26,536), [ - rec( 8, 4, EAErrorCodes ), - rec( 12, 4, TtlValuesLength ), - rec( 16, 4, NewEAHandle ), - rec( 20, 4, EAAccessFlag ), - rec( 24, (2,512), EAValue ), - ]) - pkt.CompletionCodes([0x0000, 0x8800, 0x9c03, 0xc900, 0xce00, 0xcf00, 0xd101, - 0xd301, 0xd503]) - # 2222/5604, 86/04 - pkt = NCP(0x5604, "Enumerate Extended Attribute", 'extended', has_length=0 ) - pkt.Request((26,536), [ - rec( 8, 2, EAFlags ), - rec( 10, 4, EAHandleOrNetWareHandleOrVolume ), - rec( 14, 4, ReservedOrDirectoryNumber ), - rec( 18, 4, InspectSize ), - rec( 22, 2, SequenceNumber ), - rec( 24, (2,512), EAKey ), - ], info_str=(EAKey, "Enumerate Extended Attribute: %s", ", %s")) - pkt.Reply(28, [ - rec( 8, 4, EAErrorCodes ), - rec( 12, 4, TtlEAs ), - rec( 16, 4, TtlEAsDataSize ), - rec( 20, 4, TtlEAsKeySize ), - rec( 24, 4, NewEAHandle ), - ]) - pkt.CompletionCodes([0x0000, 0x8800, 0x8c01, 0xc800, 0xc900, 0xce00, 0xcf00, 0xd101, - 0xd301, 0xd503, 0xfb08, 0xff00]) - # 2222/5605, 86/05 - pkt = NCP(0x5605, "Duplicate Extended Attributes", 'extended', has_length=0 ) - pkt.Request(28, [ - rec( 8, 2, EAFlags ), - rec( 10, 2, DstEAFlags ), - rec( 12, 4, EAHandleOrNetWareHandleOrVolume ), - rec( 16, 4, ReservedOrDirectoryNumber ), - rec( 20, 4, EAHandleOrNetWareHandleOrVolume ), - rec( 24, 4, ReservedOrDirectoryNumber ), - ]) - pkt.Reply(20, [ - rec( 8, 4, EADuplicateCount ), - rec( 12, 4, EADataSizeDuplicated ), - rec( 16, 4, EAKeySizeDuplicated ), - ]) - pkt.CompletionCodes([0x0000, 0x8800, 0xd101]) - # 2222/5701, 87/01 - pkt = NCP(0x5701, "Open/Create File or Subdirectory", 'file', has_length=0) - pkt.Request((30, 284), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, OpenCreateMode ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, ReturnInfoMask ), - rec( 14, 2, ExtendedInfo ), - rec( 16, 4, AttributesDef32 ), - rec( 20, 2, DesiredAccessRights ), - rec( 22, 1, VolumeNumber ), - rec( 23, 4, DirectoryBase ), - rec( 27, 1, HandleFlag ), - rec( 28, 1, PathCount, var="x" ), - rec( 29, (1,255), Path, repeat="x" ), - ], info_str=(Path, "Open or Create: %s", "/%s")) - pkt.Reply( NO_LENGTH_CHECK, [ - rec( 8, 4, FileHandle ), - rec( 12, 1, OpenCreateAction ), - rec( 13, 1, Reserved ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), - srec( PadDSSpaceAllocate, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), - srec( AttributesStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), - srec( PadAttributes, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), - srec( PadDataStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), - srec( PadTotalStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), - srec( CreationInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), - srec( PadCreationInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), - srec( PadModifyInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), - srec( PadArchiveInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), - srec( RightsInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), - srec( PadRightsInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), - srec( DirEntryStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), - srec( PadDirEntry, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), - srec( EAInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), - srec( PadEAInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), - srec( NSInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), - srec( PadNSInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), - srec( ReferenceIDStruct, req_cond="ncp.ret_info_mask_id == 1" ), - srec( NSAttributeStruct, req_cond="ncp.ret_info_mask_ns_attr == 1" ), - srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1" ), - srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1" ), - srec( LastUpdatedInSecondsStruct, req_cond="ncp.ext_info_update == 1" ), - srec( DOSNameStruct, req_cond="ncp.ext_info_dos_name == 1" ), - srec( FlushTimeStruct, req_cond="ncp.ext_info_flush == 1" ), - srec( ParentBaseIDStruct, req_cond="ncp.ext_info_parental == 1" ), - srec( MacFinderInfoStruct, req_cond="ncp.ext_info_mac_finder == 1" ), - srec( SiblingCountStruct, req_cond="ncp.ext_info_sibling == 1" ), - srec( EffectiveRightsStruct, req_cond="ncp.ext_info_effective == 1" ), - srec( MacTimeStruct, req_cond="ncp.ext_info_mac_date == 1" ), - srec( LastAccessedTimeStruct, req_cond="ncp.ext_info_access == 1" ), - srec( FileNameStruct, req_cond="ncp.ret_info_mask_fname == 1" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x0102, 0x7f00, 0x8001, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8900, 0x8d00, 0x8f00, 0x9001, 0x9400, 0x9600, - 0x9804, 0x9900, 0x9b03, 0x9c03, 0xa500, 0xa802, 0xa901, 0xbf00, 0xfd00, 0xff16]) - # 2222/5702, 87/02 - pkt = NCP(0x5702, "Initialize Search", 'file', has_length=0) - pkt.Request( (18,272), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 1, VolumeNumber ), - rec( 11, 4, DirectoryBase ), - rec( 15, 1, HandleFlag ), - rec( 16, 1, PathCount, var="x" ), - rec( 17, (1,255), Path, repeat="x" ), - ], info_str=(Path, "Set Search Pointer to: %s", "/%s")) - pkt.Reply(17, [ - rec( 8, 1, VolumeNumber ), - rec( 9, 4, DirectoryNumber ), - rec( 13, 4, DirectoryEntryNumber ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xbf00, 0xfd00, 0xff16]) - # 2222/5703, 87/03 - pkt = NCP(0x5703, "Search for File or Subdirectory", 'file', has_length=0) - pkt.Request((26, 280), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, DataStream ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, ReturnInfoMask ), - rec( 14, 2, ExtendedInfo ), - rec( 16, 9, SeachSequenceStruct ), - rec( 25, (1,255), SearchPattern ), - ], info_str=(SearchPattern, "Search for: %s", "/%s")) - pkt.Reply( NO_LENGTH_CHECK, [ - rec( 8, 9, SeachSequenceStruct ), - rec( 17, 1, Reserved ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), - srec( PadDSSpaceAllocate, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), - srec( AttributesStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), - srec( PadAttributes, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), - srec( PadDataStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), - srec( PadTotalStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), - srec( CreationInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), - srec( PadCreationInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), - srec( PadModifyInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), - srec( PadArchiveInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), - srec( RightsInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), - srec( PadRightsInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), - srec( DirEntryStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), - srec( PadDirEntry, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), - srec( EAInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), - srec( PadEAInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), - srec( NSInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), - srec( PadNSInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), - srec( ReferenceIDStruct, req_cond="ncp.ret_info_mask_id == 1" ), - srec( NSAttributeStruct, req_cond="ncp.ret_info_mask_ns_attr == 1" ), - srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1" ), - srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1" ), - srec( LastUpdatedInSecondsStruct, req_cond="ncp.ext_info_update == 1" ), - srec( DOSNameStruct, req_cond="ncp.ext_info_dos_name == 1" ), - srec( FlushTimeStruct, req_cond="ncp.ext_info_flush == 1" ), - srec( ParentBaseIDStruct, req_cond="ncp.ext_info_parental == 1" ), - srec( MacFinderInfoStruct, req_cond="ncp.ext_info_mac_finder == 1" ), - srec( SiblingCountStruct, req_cond="ncp.ext_info_sibling == 1" ), - srec( EffectiveRightsStruct, req_cond="ncp.ext_info_effective == 1" ), - srec( MacTimeStruct, req_cond="ncp.ext_info_mac_date == 1" ), - srec( LastAccessedTimeStruct, req_cond="ncp.ext_info_access == 1" ), - srec( FileNameStruct, req_cond="ncp.ret_info_mask_fname == 1" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xbf00, 0xfd00, 0xff16]) - # 2222/5704, 87/04 - pkt = NCP(0x5704, "Rename Or Move a File or Subdirectory", 'file', has_length=0) - pkt.Request((28, 536), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, RenameFlag ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 1, VolumeNumber ), - rec( 13, 4, DirectoryBase ), - rec( 17, 1, HandleFlag ), - rec( 18, 1, PathCount, var="x" ), - rec( 19, 1, VolumeNumber ), - rec( 20, 4, DirectoryBase ), - rec( 24, 1, HandleFlag ), - rec( 25, 1, PathCount, var="y" ), - rec( 26, (1, 255), Path, repeat="x" ), - rec( -1, (1,255), DestPath, repeat="y" ), - ], info_str=(Path, "Rename or Move: %s", "/%s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8e00, 0x8f00, 0x9001, 0x9100, 0x9200, 0x9600, - 0x9804, 0x9a00, 0x9b03, 0x9c03, 0x9e00, 0xa901, 0xbf00, 0xfd00, 0xff16]) - # 2222/5705, 87/05 - pkt = NCP(0x5705, "Scan File or Subdirectory for Trustees", 'file', has_length=0) - pkt.Request((24, 278), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 4, SequenceNumber ), - rec( 16, 1, VolumeNumber ), - rec( 17, 4, DirectoryBase ), - rec( 21, 1, HandleFlag ), - rec( 22, 1, PathCount, var="x" ), - rec( 23, (1, 255), Path, repeat="x" ), - ], info_str=(Path, "Scan Trustees for: %s", "/%s")) - pkt.Reply(20, [ - rec( 8, 4, SequenceNumber ), - rec( 12, 2, ObjectIDCount, var="x" ), - rec( 14, 6, TrusteeStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c04, 0xa901, 0xbf00, 0xfd00, 0xff16]) - # 2222/5706, 87/06 - pkt = NCP(0x5706, "Obtain File or SubDirectory Information", 'file', has_length=0) - pkt.Request((24,278), [ - rec( 10, 1, SrcNameSpace ), - rec( 11, 1, DestNameSpace ), - rec( 12, 2, SearchAttributesLow ), - rec( 14, 2, ReturnInfoMask, LE ), - rec( 16, 2, ExtendedInfo ), - rec( 18, 1, VolumeNumber ), - rec( 19, 4, DirectoryBase ), - rec( 23, 1, HandleFlag ), - rec( 24, 1, PathCount, var="x" ), - rec( 25, (1,255), Path, repeat="x",), - ], info_str=(Path, "Obtain Info for: %s", "/%s")) - pkt.Reply(NO_LENGTH_CHECK, [ - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), - srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), - srec( PadAttributes, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), - srec( PadDataStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), - srec( PadTotalStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), - srec( PadCreationInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), - srec( PadModifyInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), - srec( PadArchiveInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), - srec( PadRightsInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), - srec( PadDirEntry, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), - srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), - srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), + ]) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc07, 0xff00]) + # 2222/177A, 23/122 + pkt = NCP(0x177A, "Read Queue Job Entry", 'qms') + pkt.Request(18, [ + rec( 10, 4, QueueID ), + rec( 14, 4, JobNumberLong ), + ]) + pkt.Reply(258, [ + rec( 8, 250, JobStruct3x ), + ]) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) + # 2222/177B, 23/123 + pkt = NCP(0x177B, "Change Queue Job Entry", 'qms') + pkt.Request(264, [ + rec( 10, 4, QueueID ), + rec( 14, 250, JobStruct ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xea02, 0xfc07, 0xff00]) + # 2222/177C, 23/124 + pkt = NCP(0x177C, "Service Queue Job", 'qms') + pkt.Request(16, [ + rec( 10, 4, QueueID ), + rec( 14, 2, ServiceType ), + ]) + pkt.Reply(94, [ + rec( 8, 86, JobStructNew ), + ]) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc05, 0xff00]) + # 2222/177D, 23/125 + pkt = NCP(0x177D, "Read Queue Current Status", 'qms') + pkt.Request(14, [ + rec( 10, 4, QueueID ), + ]) + pkt.Reply(32, [ + rec( 8, 4, QueueID ), + rec( 12, 1, QueueStatus ), + rec( 13, 3, Reserved3 ), + rec( 16, 4, CurrentEntries ), + rec( 20, 4, CurrentServers, var="x" ), + rec( 24, 4, ServerID, repeat="x" ), + rec( 28, 4, ServerStationLong, LE, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) + # 2222/177E, 23/126 + pkt = NCP(0x177E, "Set Queue Current Status", 'qms') + pkt.Request(15, [ + rec( 10, 4, QueueID ), + rec( 14, 1, QueueStatus ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) + # 2222/177F, 23/127 + pkt = NCP(0x177F, "Close File And Start Queue Job", 'qms') + pkt.Request(18, [ + rec( 10, 4, QueueID ), + rec( 14, 4, JobNumberLong ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc07, 0xff00]) + # 2222/1780, 23/128 + pkt = NCP(0x1780, "Remove Job From Queue", 'qms') + pkt.Request(18, [ + rec( 10, 4, QueueID ), + rec( 14, 4, JobNumberLong ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) + # 2222/1781, 23/129 + pkt = NCP(0x1781, "Get Queue Job List", 'qms') + pkt.Request(18, [ + rec( 10, 4, QueueID ), + rec( 14, 4, JobNumberLong ), + ]) + pkt.Reply(20, [ + rec( 8, 4, TotalQueueJobs ), + rec( 12, 4, ReplyQueueJobNumbers, var="x" ), + rec( 16, 4, JobNumberLong, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) + # 2222/1782, 23/130 + pkt = NCP(0x1782, "Change Job Priority", 'qms') + pkt.Request(22, [ + rec( 10, 4, QueueID ), + rec( 14, 4, JobNumberLong ), + rec( 18, 4, Priority ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) + # 2222/1783, 23/131 + pkt = NCP(0x1783, "Finish Servicing Queue Job", 'qms') + pkt.Request(22, [ + rec( 10, 4, QueueID ), + rec( 14, 4, JobNumberLong ), + rec( 18, 4, ChargeInformation ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc05, 0xff00]) + # 2222/1784, 23/132 + pkt = NCP(0x1784, "Abort Servicing Queue Job", 'qms') + pkt.Request(18, [ + rec( 10, 4, QueueID ), + rec( 14, 4, JobNumberLong ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc05, 0xff18]) + # 2222/1785, 23/133 + pkt = NCP(0x1785, "Change To Client Rights", 'qms') + pkt.Request(18, [ + rec( 10, 4, QueueID ), + rec( 14, 4, JobNumberLong ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff18]) + # 2222/1786, 23/134 + pkt = NCP(0x1786, "Read Queue Server Current Status", 'qms') + pkt.Request(22, [ + rec( 10, 4, QueueID ), + rec( 14, 4, ServerID, BE ), + rec( 18, 4, ServerStation ), + ]) + pkt.Reply(72, [ + rec( 8, 64, ServerStatusRecord ), + ]) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xff00]) + # 2222/1787, 23/135 + pkt = NCP(0x1787, "Get Queue Job File Size", 'qms') + pkt.Request(18, [ + rec( 10, 4, QueueID ), + rec( 14, 4, JobNumberLong ), + ]) + pkt.Reply(20, [ + rec( 8, 4, QueueID ), + rec( 12, 4, JobNumberLong ), + rec( 16, 4, FileSize, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x9900, 0xd000, 0xd100, 0xd200, + 0xd300, 0xd400, 0xd500, 0xd601, 0xd703, + 0xd800, 0xd902, 0xda01, 0xdb02, 0xfc05, 0xff00]) + # 2222/1788, 23/136 + pkt = NCP(0x1788, "Move Queue Job From Src Q to Dst Q", 'qms') + pkt.Request(22, [ + rec( 10, 4, QueueID ), + rec( 14, 4, JobNumberLong ), + rec( 18, 4, DstQueueID ), + ]) + pkt.Reply(12, [ + rec( 8, 4, JobNumberLong ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0xfc06]) + # 2222/1789, 23/137 + pkt = NCP(0x1789, "Get Queue Jobs From Form List", 'qms') + pkt.Request(24, [ + rec( 10, 4, QueueID ), + rec( 14, 4, QueueStartPosition ), + rec( 18, 4, FormTypeCnt, LE, var="x" ), + rec( 22, 2, FormType, repeat="x" ), + ]) + pkt.Reply(20, [ + rec( 8, 4, TotalQueueJobs ), + rec( 12, 4, JobCount, var="x" ), + rec( 16, 4, JobNumberLong, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0xd300, 0xfc06]) + # 2222/178A, 23/138 + pkt = NCP(0x178A, "Service Queue Job By Form List", 'qms') + pkt.Request(24, [ + rec( 10, 4, QueueID ), + rec( 14, 4, QueueStartPosition ), + rec( 18, 4, FormTypeCnt, LE, var= "x" ), + rec( 22, 2, FormType, repeat="x" ), + ]) + pkt.Reply(94, [ + rec( 8, 86, JobStructNew ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0xd902, 0xfc06, 0xff00]) + # 2222/1796, 23/150 + pkt = NCP(0x1796, "Get Current Account Status", 'accounting') + pkt.Request((13,60), [ + rec( 10, 2, ObjectType, BE ), + rec( 12, (1,48), ObjectName ), + ], info_str=(ObjectName, "Get Current Account Status: %s", ", %s")) + pkt.Reply(264, [ + rec( 8, 4, AccountBalance, BE ), + rec( 12, 4, CreditLimit, BE ), + rec( 16, 120, Reserved120 ), + rec( 136, 4, HolderID, BE ), + rec( 140, 4, HoldAmount, BE ), + rec( 144, 4, HolderID, BE ), + rec( 148, 4, HoldAmount, BE ), + rec( 152, 4, HolderID, BE ), + rec( 156, 4, HoldAmount, BE ), + rec( 160, 4, HolderID, BE ), + rec( 164, 4, HoldAmount, BE ), + rec( 168, 4, HolderID, BE ), + rec( 172, 4, HoldAmount, BE ), + rec( 176, 4, HolderID, BE ), + rec( 180, 4, HoldAmount, BE ), + rec( 184, 4, HolderID, BE ), + rec( 188, 4, HoldAmount, BE ), + rec( 192, 4, HolderID, BE ), + rec( 196, 4, HoldAmount, BE ), + rec( 200, 4, HolderID, BE ), + rec( 204, 4, HoldAmount, BE ), + rec( 208, 4, HolderID, BE ), + rec( 212, 4, HoldAmount, BE ), + rec( 216, 4, HolderID, BE ), + rec( 220, 4, HoldAmount, BE ), + rec( 224, 4, HolderID, BE ), + rec( 228, 4, HoldAmount, BE ), + rec( 232, 4, HolderID, BE ), + rec( 236, 4, HoldAmount, BE ), + rec( 240, 4, HolderID, BE ), + rec( 244, 4, HoldAmount, BE ), + rec( 248, 4, HolderID, BE ), + rec( 252, 4, HoldAmount, BE ), + rec( 256, 4, HolderID, BE ), + rec( 260, 4, HoldAmount, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc000, 0xc101, 0xc400, 0xe800, + 0xea00, 0xeb00, 0xec00, 0xfc06, 0xfe07, 0xff00]) + # 2222/1797, 23/151 + pkt = NCP(0x1797, "Submit Account Charge", 'accounting') + pkt.Request((26,327), [ + rec( 10, 2, ServiceType, BE ), + rec( 12, 4, ChargeAmount, BE ), + rec( 16, 4, HoldCancelAmount, BE ), + rec( 20, 2, ObjectType, BE ), + rec( 22, 2, CommentType, BE ), + rec( 24, (1,48), ObjectName ), + rec( -1, (1,255), Comment ), + ], info_str=(ObjectName, "Submit Account Charge: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0102, 0x8800, 0x9400, 0x9600, 0xa201, + 0xc000, 0xc101, 0xc200, 0xc400, 0xe800, 0xea00, + 0xeb00, 0xec00, 0xfe07, 0xff00]) + # 2222/1798, 23/152 + pkt = NCP(0x1798, "Submit Account Hold", 'accounting') + pkt.Request((17,64), [ + rec( 10, 4, HoldCancelAmount, BE ), + rec( 14, 2, ObjectType, BE ), + rec( 16, (1,48), ObjectName ), + ], info_str=(ObjectName, "Submit Account Hold: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0102, 0x8800, 0x9400, 0x9600, 0xa201, + 0xc000, 0xc101, 0xc200, 0xc400, 0xe800, 0xea00, + 0xeb00, 0xec00, 0xfe07, 0xff00]) + # 2222/1799, 23/153 + pkt = NCP(0x1799, "Submit Account Note", 'accounting') + pkt.Request((18,319), [ + rec( 10, 2, ServiceType, BE ), + rec( 12, 2, ObjectType, BE ), + rec( 14, 2, CommentType, BE ), + rec( 16, (1,48), ObjectName ), + rec( -1, (1,255), Comment ), + ], info_str=(ObjectName, "Submit Account Note: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0102, 0x9600, 0xc000, 0xc101, 0xc400, + 0xe800, 0xea00, 0xeb00, 0xec00, 0xf000, 0xfc06, + 0xff00]) + # 2222/17c8, 23/200 + pkt = NCP(0x17c8, "Check Console Privileges", 'fileserver') + pkt.Request(10) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xc601]) + # 2222/17c9, 23/201 + pkt = NCP(0x17c9, "Get File Server Description Strings", 'fileserver') + pkt.Request(10) + pkt.Reply(108, [ + rec( 8, 100, DescriptionStrings ), + ]) + pkt.CompletionCodes([0x0000, 0x9600]) + # 2222/17CA, 23/202 + pkt = NCP(0x17CA, "Set File Server Date And Time", 'fileserver') + pkt.Request(16, [ + rec( 10, 1, Year ), + rec( 11, 1, Month ), + rec( 12, 1, Day ), + rec( 13, 1, Hour ), + rec( 14, 1, Minute ), + rec( 15, 1, Second ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xc601]) + # 2222/17CB, 23/203 + pkt = NCP(0x17CB, "Disable File Server Login", 'fileserver') + pkt.Request(10) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xc601]) + # 2222/17CC, 23/204 + pkt = NCP(0x17CC, "Enable File Server Login", 'fileserver') + pkt.Request(10) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xc601]) + # 2222/17CD, 23/205 + pkt = NCP(0x17CD, "Get File Server Login Status", 'fileserver') + pkt.Request(10) + pkt.Reply(9, [ + rec( 8, 1, UserLoginAllowed ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xfb01]) + # 2222/17CF, 23/207 + pkt = NCP(0x17CF, "Disable Transaction Tracking", 'fileserver') + pkt.Request(10) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xc601]) + # 2222/17D0, 23/208 + pkt = NCP(0x17D0, "Enable Transaction Tracking", 'fileserver') + pkt.Request(10) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xc601]) + # 2222/17D1, 23/209 + pkt = NCP(0x17D1, "Send Console Broadcast", 'fileserver') + pkt.Request((13,267), [ + rec( 10, 1, NumberOfStations, var="x" ), + rec( 11, 1, StationList, repeat="x" ), + rec( 12, (1, 255), TargetMessage ), + ], info_str=(TargetMessage, "Send Console Broadcast: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xc601, 0xfd00]) + # 2222/17D2, 23/210 + pkt = NCP(0x17D2, "Clear Connection Number", 'fileserver') + pkt.Request(11, [ + rec( 10, 1, ConnectionNumber ), + ],info_str=(ConnectionNumber, "Clear Connection Number %d", ", %d")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xc601, 0xfd00]) + # 2222/17D3, 23/211 + pkt = NCP(0x17D3, "Down File Server", 'fileserver') + pkt.Request(11, [ + rec( 10, 1, ForceFlag ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xc601, 0xff00]) + # 2222/17D4, 23/212 + pkt = NCP(0x17D4, "Get File System Statistics", 'fileserver') + pkt.Request(10) + pkt.Reply(50, [ + rec( 8, 4, SystemIntervalMarker, BE ), + rec( 12, 2, ConfiguredMaxOpenFiles ), + rec( 14, 2, ActualMaxOpenFiles ), + rec( 16, 2, CurrentOpenFiles ), + rec( 18, 4, TotalFilesOpened ), + rec( 22, 4, TotalReadRequests ), + rec( 26, 4, TotalWriteRequests ), + rec( 30, 2, CurrentChangedFATs ), + rec( 32, 4, TotalChangedFATs ), + rec( 36, 2, FATWriteErrors ), + rec( 38, 2, FatalFATWriteErrors ), + rec( 40, 2, FATScanErrors ), + rec( 42, 2, ActualMaxIndexedFiles ), + rec( 44, 2, ActiveIndexedFiles ), + rec( 46, 2, AttachedIndexedFiles ), + rec( 48, 2, AvailableIndexedFiles ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) + # 2222/17D5, 23/213 + pkt = NCP(0x17D5, "Get Transaction Tracking Statistics", 'fileserver') + pkt.Request((13,267), [ + rec( 10, 2, LastRecordSeen ), + rec( 12, (1,255), SemaphoreName ), + ]) + pkt.Reply(53, [ + rec( 8, 4, SystemIntervalMarker, BE ), + rec( 12, 1, TransactionTrackingSupported ), + rec( 13, 1, TransactionTrackingEnabled ), + rec( 14, 2, TransactionVolumeNumber ), + rec( 16, 2, ConfiguredMaxSimultaneousTransactions ), + rec( 18, 2, ActualMaxSimultaneousTransactions ), + rec( 20, 2, CurrentTransactionCount ), + rec( 22, 4, TotalTransactionsPerformed ), + rec( 26, 4, TotalWriteTransactionsPerformed ), + rec( 30, 4, TotalTransactionsBackedOut ), + rec( 34, 2, TotalUnfilledBackoutRequests ), + rec( 36, 2, TransactionDiskSpace ), + rec( 38, 4, TransactionFATAllocations ), + rec( 42, 4, TransactionFileSizeChanges ), + rec( 46, 4, TransactionFilesTruncated ), + rec( 50, 1, NumberOfEntries, var="x" ), + rec( 51, 2, ConnTaskStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) + # 2222/17D6, 23/214 + pkt = NCP(0x17D6, "Read Disk Cache Statistics", 'fileserver') + pkt.Request(10) + pkt.Reply(86, [ + rec( 8, 4, SystemIntervalMarker, BE ), + rec( 12, 2, CacheBufferCount ), + rec( 14, 2, CacheBufferSize ), + rec( 16, 2, DirtyCacheBuffers ), + rec( 18, 4, CacheReadRequests ), + rec( 22, 4, CacheWriteRequests ), + rec( 26, 4, CacheHits ), + rec( 30, 4, CacheMisses ), + rec( 34, 4, PhysicalReadRequests ), + rec( 38, 4, PhysicalWriteRequests ), + rec( 42, 2, PhysicalReadErrors ), + rec( 44, 2, PhysicalWriteErrors ), + rec( 46, 4, CacheGetRequests ), + rec( 50, 4, CacheFullWriteRequests ), + rec( 54, 4, CachePartialWriteRequests ), + rec( 58, 4, BackgroundDirtyWrites ), + rec( 62, 4, BackgroundAgedWrites ), + rec( 66, 4, TotalCacheWrites ), + rec( 70, 4, CacheAllocations ), + rec( 74, 2, ThrashingCount ), + rec( 76, 2, LRUBlockWasDirty ), + rec( 78, 2, ReadBeyondWrite ), + rec( 80, 2, FragmentWriteOccurred ), + rec( 82, 2, CacheHitOnUnavailableBlock ), + rec( 84, 2, CacheBlockScrapped ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) + # 2222/17D7, 23/215 + pkt = NCP(0x17D7, "Get Drive Mapping Table", 'fileserver') + pkt.Request(10) + pkt.Reply(184, [ + rec( 8, 4, SystemIntervalMarker, BE ), + rec( 12, 1, SFTSupportLevel ), + rec( 13, 1, LogicalDriveCount ), + rec( 14, 1, PhysicalDriveCount ), + rec( 15, 1, DiskChannelTable ), + rec( 16, 4, Reserved4 ), + rec( 20, 2, PendingIOCommands, BE ), + rec( 22, 32, DriveMappingTable ), + rec( 54, 32, DriveMirrorTable ), + rec( 86, 32, DeadMirrorTable ), + rec( 118, 1, ReMirrorDriveNumber ), + rec( 119, 1, Filler ), + rec( 120, 4, ReMirrorCurrentOffset, BE ), + rec( 124, 60, SFTErrorTable ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) + # 2222/17D8, 23/216 + pkt = NCP(0x17D8, "Read Physical Disk Statistics", 'fileserver') + pkt.Request(11, [ + rec( 10, 1, PhysicalDiskNumber ), + ]) + pkt.Reply(101, [ + rec( 8, 4, SystemIntervalMarker, BE ), + rec( 12, 1, PhysicalDiskChannel ), + rec( 13, 1, DriveRemovableFlag ), + rec( 14, 1, PhysicalDriveType ), + rec( 15, 1, ControllerDriveNumber ), + rec( 16, 1, ControllerNumber ), + rec( 17, 1, ControllerType ), + rec( 18, 4, DriveSize ), + rec( 22, 2, DriveCylinders ), + rec( 24, 1, DriveHeads ), + rec( 25, 1, SectorsPerTrack ), + rec( 26, 64, DriveDefinitionString ), + rec( 90, 2, IOErrorCount ), + rec( 92, 4, HotFixTableStart ), + rec( 96, 2, HotFixTableSize ), + rec( 98, 2, HotFixBlocksAvailable ), + rec( 100, 1, HotFixDisabled ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) + # 2222/17D9, 23/217 + pkt = NCP(0x17D9, "Get Disk Channel Statistics", 'fileserver') + pkt.Request(11, [ + rec( 10, 1, DiskChannelNumber ), + ]) + pkt.Reply(192, [ + rec( 8, 4, SystemIntervalMarker, BE ), + rec( 12, 2, ChannelState, BE ), + rec( 14, 2, ChannelSynchronizationState, BE ), + rec( 16, 1, SoftwareDriverType ), + rec( 17, 1, SoftwareMajorVersionNumber ), + rec( 18, 1, SoftwareMinorVersionNumber ), + rec( 19, 65, SoftwareDescription ), + rec( 84, 8, IOAddressesUsed ), + rec( 92, 10, SharedMemoryAddresses ), + rec( 102, 4, InterruptNumbersUsed ), + rec( 106, 4, DMAChannelsUsed ), + rec( 110, 1, FlagBits ), + rec( 111, 1, Reserved ), + rec( 112, 80, ConfigurationDescription ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) + # 2222/17DB, 23/219 + pkt = NCP(0x17DB, "Get Connection's Open Files", 'fileserver') + pkt.Request(14, [ + rec( 10, 2, ConnectionNumber ), + rec( 12, 2, LastRecordSeen, BE ), + ]) + pkt.Reply(32, [ + rec( 8, 2, NextRequestRecord ), + rec( 10, 1, NumberOfRecords, var="x" ), + rec( 11, 21, ConnStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) + # 2222/17DC, 23/220 + pkt = NCP(0x17DC, "Get Connection Using A File", 'fileserver') + pkt.Request((14,268), [ + rec( 10, 2, LastRecordSeen, BE ), + rec( 12, 1, DirHandle ), + rec( 13, (1,255), Path ), + ], info_str=(Path, "Get Connection Using File: %s", ", %s")) + pkt.Reply(30, [ + rec( 8, 2, UseCount, BE ), + rec( 10, 2, OpenCount, BE ), + rec( 12, 2, OpenForReadCount, BE ), + rec( 14, 2, OpenForWriteCount, BE ), + rec( 16, 2, DenyReadCount, BE ), + rec( 18, 2, DenyWriteCount, BE ), + rec( 20, 2, NextRequestRecord, BE ), + rec( 22, 1, Locked ), + rec( 23, 1, NumberOfRecords, var="x" ), + rec( 24, 6, ConnFileStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) + # 2222/17DD, 23/221 + pkt = NCP(0x17DD, "Get Physical Record Locks By Connection And File", 'fileserver') + pkt.Request(31, [ + rec( 10, 2, TargetConnectionNumber ), + rec( 12, 2, LastRecordSeen, BE ), + rec( 14, 1, VolumeNumber ), + rec( 15, 2, DirectoryID ), + rec( 17, 14, FileName14 ), + ], info_str=(FileName14, "Get Physical Record Locks by Connection and File: %s", ", %s")) + pkt.Reply(22, [ + rec( 8, 2, NextRequestRecord ), + rec( 10, 1, NumberOfLocks, var="x" ), + rec( 11, 1, Reserved ), + rec( 12, 10, LockStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17DE, 23/222 + pkt = NCP(0x17DE, "Get Physical Record Locks By File", 'fileserver') + pkt.Request((14,268), [ + rec( 10, 2, TargetConnectionNumber ), + rec( 12, 1, DirHandle ), + rec( 13, (1,255), Path ), + ], info_str=(Path, "Get Physical Record Locks by File: %s", ", %s")) + pkt.Reply(28, [ + rec( 8, 2, NextRequestRecord ), + rec( 10, 1, NumberOfLocks, var="x" ), + rec( 11, 1, Reserved ), + rec( 12, 16, PhyLockStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17DF, 23/223 + pkt = NCP(0x17DF, "Get Logical Records By Connection", 'fileserver') + pkt.Request(14, [ + rec( 10, 2, TargetConnectionNumber ), + rec( 12, 2, LastRecordSeen, BE ), + ]) + pkt.Reply((14,268), [ + rec( 8, 2, NextRequestRecord ), + rec( 10, 1, NumberOfRecords, var="x" ), + rec( 11, (3, 257), LogLockStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17E0, 23/224 + pkt = NCP(0x17E0, "Get Logical Record Information", 'fileserver') + pkt.Request((13,267), [ + rec( 10, 2, LastRecordSeen ), + rec( 12, (1,255), LogicalRecordName ), + ], info_str=(LogicalRecordName, "Get Logical Record Information: %s", ", %s")) + pkt.Reply(20, [ + rec( 8, 2, UseCount, BE ), + rec( 10, 2, ShareableLockCount, BE ), + rec( 12, 2, NextRequestRecord ), + rec( 14, 1, Locked ), + rec( 15, 1, NumberOfRecords, var="x" ), + rec( 16, 4, LogRecStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17E1, 23/225 + pkt = NCP(0x17E1, "Get Connection's Semaphores", 'fileserver') + pkt.Request(14, [ + rec( 10, 2, ConnectionNumber ), + rec( 12, 2, LastRecordSeen ), + ]) + pkt.Reply((18,272), [ + rec( 8, 2, NextRequestRecord ), + rec( 10, 2, NumberOfSemaphores, var="x" ), + rec( 12, (6,260), SemaStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17E2, 23/226 + pkt = NCP(0x17E2, "Get Semaphore Information", 'fileserver') + pkt.Request((13,267), [ + rec( 10, 2, LastRecordSeen ), + rec( 12, (1,255), SemaphoreName ), + ], info_str=(SemaphoreName, "Get Semaphore Information: %s", ", %s")) + pkt.Reply(17, [ + rec( 8, 2, NextRequestRecord, BE ), + rec( 10, 2, OpenCount, BE ), + rec( 12, 1, SemaphoreValue ), + rec( 13, 1, NumberOfRecords, var="x" ), + rec( 14, 3, SemaInfoStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17E3, 23/227 + pkt = NCP(0x17E3, "Get LAN Driver Configuration Information", 'fileserver') + pkt.Request(11, [ + rec( 10, 1, LANDriverNumber ), + ]) + pkt.Reply(180, [ + rec( 8, 4, NetworkAddress, BE ), + rec( 12, 6, HostAddress ), + rec( 18, 1, BoardInstalled ), + rec( 19, 1, OptionNumber ), + rec( 20, 160, ConfigurationText ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17E5, 23/229 + pkt = NCP(0x17E5, "Get Connection Usage Statistics", 'fileserver') + pkt.Request(12, [ + rec( 10, 2, ConnectionNumber ), + ]) + pkt.Reply(26, [ + rec( 8, 2, NextRequestRecord ), + rec( 10, 6, BytesRead ), + rec( 16, 6, BytesWritten ), + rec( 22, 4, TotalRequestPackets ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17E6, 23/230 + pkt = NCP(0x17E6, "Get Object's Remaining Disk Space", 'fileserver') + pkt.Request(14, [ + rec( 10, 4, ObjectID, BE ), + ]) + pkt.Reply(21, [ + rec( 8, 4, SystemIntervalMarker, BE ), + rec( 12, 4, ObjectID ), + rec( 16, 4, UnusedDiskBlocks, BE ), + rec( 20, 1, RestrictionsEnforced ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17E7, 23/231 + pkt = NCP(0x17E7, "Get File Server LAN I/O Statistics", 'fileserver') + pkt.Request(10) + pkt.Reply(74, [ + rec( 8, 4, SystemIntervalMarker, BE ), + rec( 12, 2, ConfiguredMaxRoutingBuffers ), + rec( 14, 2, ActualMaxUsedRoutingBuffers ), + rec( 16, 2, CurrentlyUsedRoutingBuffers ), + rec( 18, 4, TotalFileServicePackets ), + rec( 22, 2, TurboUsedForFileService ), + rec( 24, 2, PacketsFromInvalidConnection ), + rec( 26, 2, BadLogicalConnectionCount ), + rec( 28, 2, PacketsReceivedDuringProcessing ), + rec( 30, 2, RequestsReprocessed ), + rec( 32, 2, PacketsWithBadSequenceNumber ), + rec( 34, 2, DuplicateRepliesSent ), + rec( 36, 2, PositiveAcknowledgesSent ), + rec( 38, 2, PacketsWithBadRequestType ), + rec( 40, 2, AttachDuringProcessing ), + rec( 42, 2, AttachWhileProcessingAttach ), + rec( 44, 2, ForgedDetachedRequests ), + rec( 46, 2, DetachForBadConnectionNumber ), + rec( 48, 2, DetachDuringProcessing ), + rec( 50, 2, RepliesCancelled ), + rec( 52, 2, PacketsDiscardedByHopCount ), + rec( 54, 2, PacketsDiscardedUnknownNet ), + rec( 56, 2, IncomingPacketDiscardedNoDGroup ), + rec( 58, 2, OutgoingPacketDiscardedNoTurboBuffer ), + rec( 60, 2, IPXNotMyNetwork ), + rec( 62, 4, NetBIOSBroadcastWasPropogated ), + rec( 66, 4, TotalOtherPackets ), + rec( 70, 4, TotalRoutedPackets ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17E8, 23/232 + pkt = NCP(0x17E8, "Get File Server Misc Information", 'fileserver') + pkt.Request(10) + pkt.Reply(40, [ + rec( 8, 4, SystemIntervalMarker, BE ), + rec( 12, 1, ProcessorType ), + rec( 13, 1, Reserved ), + rec( 14, 1, NumberOfServiceProcesses ), + rec( 15, 1, ServerUtilizationPercentage ), + rec( 16, 2, ConfiguredMaxBinderyObjects ), + rec( 18, 2, ActualMaxBinderyObjects ), + rec( 20, 2, CurrentUsedBinderyObjects ), + rec( 22, 2, TotalServerMemory ), + rec( 24, 2, WastedServerMemory ), + rec( 26, 2, NumberOfDynamicMemoryAreas, var="x" ), + rec( 28, 12, DynMemStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17E9, 23/233 + pkt = NCP(0x17E9, "Get Volume Information", 'fileserver') + pkt.Request(11, [ + rec( 10, 1, VolumeNumber ), + ],info_str=(VolumeNumber, "Get Information on Volume %d", ", %d")) + pkt.Reply(48, [ + rec( 8, 4, SystemIntervalMarker, BE ), + rec( 12, 1, VolumeNumber ), + rec( 13, 1, LogicalDriveNumber ), + rec( 14, 2, BlockSize ), + rec( 16, 2, StartingBlock ), + rec( 18, 2, TotalBlocks ), + rec( 20, 2, FreeBlocks ), + rec( 22, 2, TotalDirectoryEntries ), + rec( 24, 2, FreeDirectoryEntries ), + rec( 26, 2, ActualMaxUsedDirectoryEntries ), + rec( 28, 1, VolumeHashedFlag ), + rec( 29, 1, VolumeCachedFlag ), + rec( 30, 1, VolumeRemovableFlag ), + rec( 31, 1, VolumeMountedFlag ), + rec( 32, 16, VolumeName ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17EA, 23/234 + pkt = NCP(0x17EA, "Get Connection's Task Information", 'fileserver') + pkt.Request(12, [ + rec( 10, 2, ConnectionNumber ), + ]) + pkt.Reply(13, [ + rec( 8, 1, ConnLockStatus ), + rec( 9, 1, NumberOfActiveTasks, var="x" ), + rec( 10, 3, TaskStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17EB, 23/235 + pkt = NCP(0x17EB, "Get Connection's Open Files", 'fileserver') + pkt.Request(14, [ + rec( 10, 2, ConnectionNumber ), + rec( 12, 2, LastRecordSeen ), + ]) + pkt.Reply((29,283), [ + rec( 8, 2, NextRequestRecord ), + rec( 10, 2, NumberOfRecords, var="x" ), + rec( 12, (17, 271), OpnFilesStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) + # 2222/17EC, 23/236 + pkt = NCP(0x17EC, "Get Connection Using A File", 'fileserver') + pkt.Request(18, [ + rec( 10, 1, DataStreamNumber ), + rec( 11, 1, VolumeNumber ), + rec( 12, 4, DirectoryBase, LE ), + rec( 16, 2, LastRecordSeen ), + ]) + pkt.Reply(33, [ + rec( 8, 2, NextRequestRecord ), + rec( 10, 2, FileUseCount ), + rec( 12, 2, OpenCount ), + rec( 14, 2, OpenForReadCount ), + rec( 16, 2, OpenForWriteCount ), + rec( 18, 2, DenyReadCount ), + rec( 20, 2, DenyWriteCount ), + rec( 22, 1, Locked ), + rec( 23, 1, ForkCount ), + rec( 24, 2, NumberOfRecords, var="x" ), + rec( 26, 7, ConnFileStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xff00]) + # 2222/17ED, 23/237 + pkt = NCP(0x17ED, "Get Physical Record Locks By Connection And File", 'fileserver') + pkt.Request(20, [ + rec( 10, 2, TargetConnectionNumber ), + rec( 12, 1, DataStreamNumber ), + rec( 13, 1, VolumeNumber ), + rec( 14, 4, DirectoryBase, LE ), + rec( 18, 2, LastRecordSeen ), + ]) + pkt.Reply(23, [ + rec( 8, 2, NextRequestRecord ), + rec( 10, 2, NumberOfLocks, LE, var="x" ), + rec( 12, 11, LockStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17EE, 23/238 + pkt = NCP(0x17EE, "Get Physical Record Locks By File", 'fileserver') + pkt.Request(18, [ + rec( 10, 1, DataStreamNumber ), + rec( 11, 1, VolumeNumber ), + rec( 12, 4, DirectoryBase ), + rec( 16, 2, LastRecordSeen ), + ]) + pkt.Reply(30, [ + rec( 8, 2, NextRequestRecord ), + rec( 10, 2, NumberOfLocks, LE, var="x" ), + rec( 12, 18, PhyLockStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17EF, 23/239 + pkt = NCP(0x17EF, "Get Logical Records By Connection", 'fileserver') + pkt.Request(14, [ + rec( 10, 2, TargetConnectionNumber ), + rec( 12, 2, LastRecordSeen ), + ]) + pkt.Reply((16,270), [ + rec( 8, 2, NextRequestRecord ), + rec( 10, 2, NumberOfRecords, var="x" ), + rec( 12, (4, 258), LogLockStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17F0, 23/240 + pkt = NCP(0x17F0, "Get Logical Record Information (old)", 'fileserver') + pkt.Request((13,267), [ + rec( 10, 2, LastRecordSeen ), + rec( 12, (1,255), LogicalRecordName ), + ]) + pkt.Reply(22, [ + rec( 8, 2, ShareableLockCount ), + rec( 10, 2, UseCount ), + rec( 12, 1, Locked ), + rec( 13, 2, NextRequestRecord ), + rec( 15, 2, NumberOfRecords, var="x" ), + rec( 17, 5, LogRecStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17F1, 23/241 + pkt = NCP(0x17F1, "Get Connection's Semaphores", 'fileserver') + pkt.Request(14, [ + rec( 10, 2, ConnectionNumber ), + rec( 12, 2, LastRecordSeen ), + ]) + pkt.Reply((19,273), [ + rec( 8, 2, NextRequestRecord ), + rec( 10, 2, NumberOfSemaphores, var="x" ), + rec( 12, (7, 261), SemaStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17F2, 23/242 + pkt = NCP(0x17F2, "Get Semaphore Information", 'fileserver') + pkt.Request((13,267), [ + rec( 10, 2, LastRecordSeen ), + rec( 12, (1,255), SemaphoreName ), + ], info_str=(SemaphoreName, "Get Semaphore Information: %s", ", %s")) + pkt.Reply(20, [ + rec( 8, 2, NextRequestRecord ), + rec( 10, 2, OpenCount ), + rec( 12, 2, SemaphoreValue ), + rec( 14, 2, NumberOfRecords, var="x" ), + rec( 16, 4, SemaInfoStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17F3, 23/243 + pkt = NCP(0x17F3, "Map Directory Number to Path", 'file') + pkt.Request(16, [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, DirectoryNumber ), + rec( 15, 1, NameSpace ), + ]) + pkt.Reply((9,263), [ + rec( 8, (1,255), Path ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0x9c00, 0xc601, 0xfd00, 0xff00]) + # 2222/17F4, 23/244 + pkt = NCP(0x17F4, "Convert Path to Dir Entry", 'file') + pkt.Request((12,266), [ + rec( 10, 1, DirHandle ), + rec( 11, (1,255), Path ), + ], info_str=(Path, "Convert Path to Directory Entry: %s", ", %s")) + pkt.Reply(13, [ + rec( 8, 1, VolumeNumber ), + rec( 9, 4, DirectoryNumber ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xc601, 0xfd00, 0xff00]) + # 2222/17FD, 23/253 + pkt = NCP(0x17FD, "Send Console Broadcast", 'fileserver') + pkt.Request((16, 270), [ + rec( 10, 1, NumberOfStations, var="x" ), + rec( 11, 4, StationList, repeat="x" ), + rec( 15, (1, 255), TargetMessage ), + ], info_str=(TargetMessage, "Send Console Broadcast: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xc601, 0xfd00]) + # 2222/17FE, 23/254 + pkt = NCP(0x17FE, "Clear Connection Number", 'fileserver') + pkt.Request(14, [ + rec( 10, 4, ConnectionNumber ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xc601, 0xfd00]) + # 2222/18, 24 + pkt = NCP(0x18, "End of Job", 'connection') + pkt.Request(7) + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + # 2222/19, 25 + pkt = NCP(0x19, "Logout", 'connection') + pkt.Request(7) + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + # 2222/1A, 26 + pkt = NCP(0x1A, "Log Physical Record", 'sync') + pkt.Request(24, [ + rec( 7, 1, LockFlag ), + rec( 8, 6, FileHandle ), + rec( 14, 4, LockAreasStartOffset, BE ), + rec( 18, 4, LockAreaLen, BE ), + rec( 22, 2, LockTimeout ), + ], info_str=(LockAreaLen, "Lock Record - Length of %d", "%d")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8800, 0x9600, 0xfd02, 0xfe04, 0xff01]) + # 2222/1B, 27 + pkt = NCP(0x1B, "Lock Physical Record Set", 'sync') + pkt.Request(10, [ + rec( 7, 1, LockFlag ), + rec( 8, 2, LockTimeout ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8800, 0x9600, 0xfd02, 0xfe04, 0xff01]) + # 2222/1C, 28 + pkt = NCP(0x1C, "Release Physical Record", 'sync') + pkt.Request(22, [ + rec( 7, 1, Reserved ), + rec( 8, 6, FileHandle ), + rec( 14, 4, LockAreasStartOffset ), + rec( 18, 4, LockAreaLen ), + ], info_str=(LockAreaLen, "Release Lock Record - Length of %d", "%d")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8800, 0x9600, 0xfd02, 0xfe04, 0xff03]) + # 2222/1D, 29 + pkt = NCP(0x1D, "Release Physical Record Set", 'sync') + pkt.Request(8, [ + rec( 7, 1, LockFlag ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8800, 0x9600, 0xfd02, 0xfe04, 0xff03]) + # 2222/1E, 30 #Tested and fixed 6-14-02 GM + pkt = NCP(0x1E, "Clear Physical Record", 'sync') + pkt.Request(22, [ + rec( 7, 1, Reserved ), + rec( 8, 6, FileHandle ), + rec( 14, 4, LockAreasStartOffset, BE ), + rec( 18, 4, LockAreaLen, BE ), + ], info_str=(LockAreaLen, "Clear Lock Record - Length of %d", "%d")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8000, 0x8800, 0x9600, 0xfd02, 0xfe04, 0xff03]) + # 2222/1F, 31 + pkt = NCP(0x1F, "Clear Physical Record Set", 'sync') + pkt.Request(8, [ + rec( 7, 1, LockFlag ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8800, 0x9600, 0xfd02, 0xfe04, 0xff03]) + # 2222/2000, 32/00 + pkt = NCP(0x2000, "Open Semaphore", 'sync', has_length=0) + pkt.Request((10,264), [ + rec( 8, 1, InitialSemaphoreValue ), + rec( 9, (1,255), SemaphoreName ), + ], info_str=(SemaphoreName, "Open Semaphore: %s", ", %s")) + pkt.Reply(13, [ + rec( 8, 4, SemaphoreHandle, BE ), + rec( 12, 1, SemaphoreOpenCount ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xff01]) + # 2222/2001, 32/01 + pkt = NCP(0x2001, "Examine Semaphore", 'sync', has_length=0) + pkt.Request(12, [ + rec( 8, 4, SemaphoreHandle, BE ), + ]) + pkt.Reply(10, [ + rec( 8, 1, SemaphoreValue ), + rec( 9, 1, SemaphoreOpenCount ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xff01]) + # 2222/2002, 32/02 + pkt = NCP(0x2002, "Wait On Semaphore", 'sync', has_length=0) + pkt.Request(14, [ + rec( 8, 4, SemaphoreHandle, BE ), + rec( 12, 2, SemaphoreTimeOut, BE ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xff01]) + # 2222/2003, 32/03 + pkt = NCP(0x2003, "Signal Semaphore", 'sync', has_length=0) + pkt.Request(12, [ + rec( 8, 4, SemaphoreHandle, BE ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xff01]) + # 2222/2004, 32/04 + pkt = NCP(0x2004, "Close Semaphore", 'sync', has_length=0) + pkt.Request(12, [ + rec( 8, 4, SemaphoreHandle, BE ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xff01]) + # 2222/21, 33 + pkt = NCP(0x21, "Negotiate Buffer Size", 'connection') + pkt.Request(9, [ + rec( 7, 2, BufferSize, BE ), + ]) + pkt.Reply(10, [ + rec( 8, 2, BufferSize, BE ), + ]) + pkt.CompletionCodes([0x0000]) + # 2222/2200, 34/00 + pkt = NCP(0x2200, "TTS Is Available", 'tts', has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0001, 0xfd03, 0xff12]) + # 2222/2201, 34/01 + pkt = NCP(0x2201, "TTS Begin Transaction", 'tts', has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + # 2222/2202, 34/02 + pkt = NCP(0x2202, "TTS End Transaction", 'tts', has_length=0) + pkt.Request(8) + pkt.Reply(12, [ + rec( 8, 4, TransactionNumber, BE ), + ]) + pkt.CompletionCodes([0x0000, 0xff01]) + # 2222/2203, 34/03 + pkt = NCP(0x2203, "TTS Abort Transaction", 'tts', has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xfd03, 0xfe0b, 0xff01]) + # 2222/2204, 34/04 + pkt = NCP(0x2204, "TTS Transaction Status", 'tts', has_length=0) + pkt.Request(12, [ + rec( 8, 4, TransactionNumber, BE ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + # 2222/2205, 34/05 + pkt = NCP(0x2205, "TTS Get Application Thresholds", 'tts', has_length=0) + pkt.Request(8) + pkt.Reply(10, [ + rec( 8, 1, LogicalLockThreshold ), + rec( 9, 1, PhysicalLockThreshold ), + ]) + pkt.CompletionCodes([0x0000]) + # 2222/2206, 34/06 + pkt = NCP(0x2206, "TTS Set Application Thresholds", 'tts', has_length=0) + pkt.Request(10, [ + rec( 8, 1, LogicalLockThreshold ), + rec( 9, 1, PhysicalLockThreshold ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600]) + # 2222/2207, 34/07 + pkt = NCP(0x2207, "TTS Get Workstation Thresholds", 'tts', has_length=0) + pkt.Request(8) + pkt.Reply(10, [ + rec( 8, 1, LogicalLockThreshold ), + rec( 9, 1, PhysicalLockThreshold ), + ]) + pkt.CompletionCodes([0x0000]) + # 2222/2208, 34/08 + pkt = NCP(0x2208, "TTS Set Workstation Thresholds", 'tts', has_length=0) + pkt.Request(10, [ + rec( 8, 1, LogicalLockThreshold ), + rec( 9, 1, PhysicalLockThreshold ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + # 2222/2209, 34/09 + pkt = NCP(0x2209, "TTS Get Transaction Bits", 'tts', has_length=0) + pkt.Request(8) + pkt.Reply(9, [ + rec( 8, 1, ControlFlags ), + ]) + pkt.CompletionCodes([0x0000]) + # 2222/220A, 34/10 + pkt = NCP(0x220A, "TTS Set Transaction Bits", 'tts', has_length=0) + pkt.Request(9, [ + rec( 8, 1, ControlFlags ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + # 2222/2301, 35/01 + pkt = NCP(0x2301, "AFP Create Directory", 'afp') + pkt.Request((49, 303), [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, BaseDirectoryID ), + rec( 15, 1, Reserved ), + rec( 16, 4, CreatorID ), + rec( 20, 4, Reserved4 ), + rec( 24, 2, FinderAttr ), + rec( 26, 2, HorizLocation ), + rec( 28, 2, VertLocation ), + rec( 30, 2, FileDirWindow ), + rec( 32, 16, Reserved16 ), + rec( 48, (1,255), Path ), + ], info_str=(Path, "AFP Create Directory: %s", ", %s")) + pkt.Reply(12, [ + rec( 8, 4, NewDirectoryID ), + ]) + pkt.CompletionCodes([0x0000, 0x8301, 0x8400, 0x8800, 0x9300, 0x9600, 0x9804, + 0x9900, 0x9c03, 0x9e02, 0xa100, 0xa201, 0xfd00, 0xff18]) + # 2222/2302, 35/02 + pkt = NCP(0x2302, "AFP Create File", 'afp') + pkt.Request((49, 303), [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, BaseDirectoryID ), + rec( 15, 1, DeleteExistingFileFlag ), + rec( 16, 4, CreatorID, BE ), + rec( 20, 4, Reserved4 ), + rec( 24, 2, FinderAttr ), + rec( 26, 2, HorizLocation, BE ), + rec( 28, 2, VertLocation, BE ), + rec( 30, 2, FileDirWindow, BE ), + rec( 32, 16, Reserved16 ), + rec( 48, (1,255), Path ), + ], info_str=(Path, "AFP Create File: %s", ", %s")) + pkt.Reply(12, [ + rec( 8, 4, NewDirectoryID ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8301, 0x8400, 0x8701, 0x8800, + 0x8a00, 0x8d00, 0x8e00, 0x8f00, 0x9300, 0x9600, 0x9804, + 0x9900, 0x9b03, 0x9c03, 0x9e02, 0xa100, 0xa201, 0xfd00, + 0xff18]) + # 2222/2303, 35/03 + pkt = NCP(0x2303, "AFP Delete", 'afp') + pkt.Request((16,270), [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, BaseDirectoryID ), + rec( 15, (1,255), Path ), + ], info_str=(Path, "AFP Delete: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8301, 0x8800, 0x8a00, 0x8d00, 0x8e00, 0x8f00, + 0x9000, 0x9300, 0x9600, 0x9804, 0x9b03, 0x9c03, 0x9e02, + 0xa000, 0xa100, 0xa201, 0xfd00, 0xff19]) + # 2222/2304, 35/04 + pkt = NCP(0x2304, "AFP Get Entry ID From Name", 'afp') + pkt.Request((16,270), [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, BaseDirectoryID ), + rec( 15, (1,255), Path ), + ], info_str=(Path, "AFP Get Entry from Name: %s", ", %s")) + pkt.Reply(12, [ + rec( 8, 4, TargetEntryID, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x8301, 0x8800, 0x9300, 0x9600, 0x9804, 0x9c03, + 0xa100, 0xa201, 0xfd00, 0xff19]) + # 2222/2305, 35/05 + pkt = NCP(0x2305, "AFP Get File Information", 'afp') + pkt.Request((18,272), [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, BaseDirectoryID ), + rec( 15, 2, RequestBitMap, BE ), + rec( 17, (1,255), Path ), + ], info_str=(Path, "AFP Get File Information: %s", ", %s")) + pkt.Reply(121, [ + rec( 8, 4, AFPEntryID, BE ), + rec( 12, 4, ParentID, BE ), + rec( 16, 2, AttributesDef16, LE ), + rec( 18, 4, DataForkLen, BE ), + rec( 22, 4, ResourceForkLen, BE ), + rec( 26, 2, TotalOffspring, BE ), + rec( 28, 2, CreationDate, BE ), + rec( 30, 2, LastAccessedDate, BE ), + rec( 32, 2, ModifiedDate, BE ), + rec( 34, 2, ModifiedTime, BE ), + rec( 36, 2, ArchivedDate, BE ), + rec( 38, 2, ArchivedTime, BE ), + rec( 40, 4, CreatorID, BE ), + rec( 44, 4, Reserved4 ), + rec( 48, 2, FinderAttr ), + rec( 50, 2, HorizLocation ), + rec( 52, 2, VertLocation ), + rec( 54, 2, FileDirWindow ), + rec( 56, 16, Reserved16 ), + rec( 72, 32, LongName ), + rec( 104, 4, CreatorID, BE ), + rec( 108, 12, ShortName ), + rec( 120, 1, AccessPrivileges ), + ]) + pkt.CompletionCodes([0x0000, 0x8301, 0x8800, 0x9300, 0x9600, 0x9804, 0x9c03, + 0xa100, 0xa201, 0xfd00, 0xff19]) + # 2222/2306, 35/06 + pkt = NCP(0x2306, "AFP Get Entry ID From NetWare Handle", 'afp') + pkt.Request(16, [ + rec( 10, 6, FileHandle ), + ]) + pkt.Reply(14, [ + rec( 8, 1, VolumeID ), + rec( 9, 4, TargetEntryID, BE ), + rec( 13, 1, ForkIndicator ), + ]) + pkt.CompletionCodes([0x0000, 0x8301, 0x8800, 0x9300, 0x9600, 0xa201]) + # 2222/2307, 35/07 + pkt = NCP(0x2307, "AFP Rename", 'afp') + pkt.Request((21, 529), [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, MacSourceBaseID, BE ), + rec( 15, 4, MacDestinationBaseID, BE ), + rec( 19, (1,255), Path ), + rec( -1, (1,255), NewFileNameLen ), + ], info_str=(Path, "AFP Rename: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8301, 0x8401, 0x8800, 0x8b00, 0x8e00, + 0x9001, 0x9201, 0x9300, 0x9600, 0x9804, 0x9900, + 0x9c03, 0x9e00, 0xa100, 0xa201, 0xfd00, 0xff0a]) + # 2222/2308, 35/08 + pkt = NCP(0x2308, "AFP Open File Fork", 'afp') + pkt.Request((18, 272), [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, MacBaseDirectoryID ), + rec( 15, 1, ForkIndicator ), + rec( 16, 1, AccessMode ), + rec( 17, (1,255), Path ), + ], info_str=(Path, "AFP Open File Fork: %s", ", %s")) + pkt.Reply(22, [ + rec( 8, 4, AFPEntryID, BE ), + rec( 12, 4, DataForkLen, BE ), + rec( 16, 6, NetWareAccessHandle ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8301, 0x8800, 0x9300, + 0x9400, 0x9600, 0x9804, 0x9900, 0x9c03, 0xa100, + 0xa201, 0xfd00, 0xff16]) + # 2222/2309, 35/09 + pkt = NCP(0x2309, "AFP Set File Information", 'afp') + pkt.Request((64, 318), [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, MacBaseDirectoryID ), + rec( 15, 2, RequestBitMap, BE ), + rec( 17, 2, MacAttr, BE ), + rec( 19, 2, CreationDate, BE ), + rec( 21, 2, LastAccessedDate, BE ), + rec( 23, 2, ModifiedDate, BE ), + rec( 25, 2, ModifiedTime, BE ), + rec( 27, 2, ArchivedDate, BE ), + rec( 29, 2, ArchivedTime, BE ), + rec( 31, 4, CreatorID, BE ), + rec( 35, 4, Reserved4 ), + rec( 39, 2, FinderAttr ), + rec( 41, 2, HorizLocation ), + rec( 43, 2, VertLocation ), + rec( 45, 2, FileDirWindow ), + rec( 47, 16, Reserved16 ), + rec( 63, (1,255), Path ), + ], info_str=(Path, "AFP Set File Information: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0104, 0x8301, 0x8800, 0x9300, 0x9400, + 0x9500, 0x9600, 0x9804, 0x9c03, 0xa100, 0xa201, + 0xfd00, 0xff16]) + # 2222/230A, 35/10 + pkt = NCP(0x230A, "AFP Scan File Information", 'afp') + pkt.Request((26, 280), [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, MacBaseDirectoryID ), + rec( 15, 4, MacLastSeenID, BE ), + rec( 19, 2, DesiredResponseCount, BE ), + rec( 21, 2, SearchBitMap, BE ), + rec( 23, 2, RequestBitMap, BE ), + rec( 25, (1,255), Path ), + ], info_str=(Path, "AFP Scan File Information: %s", ", %s")) + pkt.Reply(123, [ + rec( 8, 2, ActualResponseCount, BE, var="x" ), + rec( 10, 113, AFP10Struct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x8301, 0x8800, 0x9300, 0x9600, 0x9804, + 0x9c03, 0xa100, 0xa201, 0xfd00, 0xff16]) + # 2222/230B, 35/11 + pkt = NCP(0x230B, "AFP Alloc Temporary Directory Handle", 'afp') + pkt.Request((16,270), [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, MacBaseDirectoryID ), + rec( 15, (1,255), Path ), + ], info_str=(Path, "AFP Allocate Temporary Directory Handle: %s", ", %s")) + pkt.Reply(10, [ + rec( 8, 1, DirHandle ), + rec( 9, 1, AccessRightsMask ), + ]) + pkt.CompletionCodes([0x0000, 0x8301, 0x8800, 0x9300, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0x9d00, 0xa100, + 0xa201, 0xfd00, 0xff00]) + # 2222/230C, 35/12 + pkt = NCP(0x230C, "AFP Get Entry ID From Path Name", 'afp') + pkt.Request((12,266), [ + rec( 10, 1, DirHandle ), + rec( 11, (1,255), Path ), + ], info_str=(Path, "AFP Get Entry ID from Path Name: %s", ", %s")) + pkt.Reply(12, [ + rec( 8, 4, AFPEntryID, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x8301, 0x8800, 0x9300, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa100, 0xa201, + 0xfd00, 0xff00]) + # 2222/230D, 35/13 + pkt = NCP(0x230D, "AFP 2.0 Create Directory", 'afp') + pkt.Request((55,309), [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, BaseDirectoryID ), + rec( 15, 1, Reserved ), + rec( 16, 4, CreatorID, BE ), + rec( 20, 4, Reserved4 ), + rec( 24, 2, FinderAttr ), + rec( 26, 2, HorizLocation ), + rec( 28, 2, VertLocation ), + rec( 30, 2, FileDirWindow ), + rec( 32, 16, Reserved16 ), + rec( 48, 6, ProDOSInfo ), + rec( 54, (1,255), Path ), + ], info_str=(Path, "AFP 2.0 Create Directory: %s", ", %s")) + pkt.Reply(12, [ + rec( 8, 4, NewDirectoryID ), + ]) + pkt.CompletionCodes([0x0000, 0x8301, 0x8400, 0x8800, 0x9300, + 0x9600, 0x9804, 0x9900, 0x9c03, 0x9e00, + 0xa100, 0xa201, 0xfd00, 0xff00]) + # 2222/230E, 35/14 + pkt = NCP(0x230E, "AFP 2.0 Create File", 'afp') + pkt.Request((55,309), [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, BaseDirectoryID ), + rec( 15, 1, DeleteExistingFileFlag ), + rec( 16, 4, CreatorID, BE ), + rec( 20, 4, Reserved4 ), + rec( 24, 2, FinderAttr ), + rec( 26, 2, HorizLocation ), + rec( 28, 2, VertLocation ), + rec( 30, 2, FileDirWindow ), + rec( 32, 16, Reserved16 ), + rec( 48, 6, ProDOSInfo ), + rec( 54, (1,255), Path ), + ], info_str=(Path, "AFP 2.0 Create File: %s", ", %s")) + pkt.Reply(12, [ + rec( 8, 4, NewDirectoryID ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8301, 0x8400, + 0x8701, 0x8800, 0x8a00, 0x8d00, 0x8e00, + 0x8f00, 0x9001, 0x9300, 0x9600, 0x9804, + 0x9900, 0x9b03, 0x9c03, 0x9e00, 0xa100, + 0xa201, 0xfd00, 0xff00]) + # 2222/230F, 35/15 + pkt = NCP(0x230F, "AFP 2.0 Get File Or Directory Information", 'afp') + pkt.Request((18,272), [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, BaseDirectoryID ), + rec( 15, 2, RequestBitMap, BE ), + rec( 17, (1,255), Path ), + ], info_str=(Path, "AFP 2.0 Get Information: %s", ", %s")) + pkt.Reply(128, [ + rec( 8, 4, AFPEntryID, BE ), + rec( 12, 4, ParentID, BE ), + rec( 16, 2, AttributesDef16 ), + rec( 18, 4, DataForkLen, BE ), + rec( 22, 4, ResourceForkLen, BE ), + rec( 26, 2, TotalOffspring, BE ), + rec( 28, 2, CreationDate, BE ), + rec( 30, 2, LastAccessedDate, BE ), + rec( 32, 2, ModifiedDate, BE ), + rec( 34, 2, ModifiedTime, BE ), + rec( 36, 2, ArchivedDate, BE ), + rec( 38, 2, ArchivedTime, BE ), + rec( 40, 4, CreatorID, BE ), + rec( 44, 4, Reserved4 ), + rec( 48, 2, FinderAttr ), + rec( 50, 2, HorizLocation ), + rec( 52, 2, VertLocation ), + rec( 54, 2, FileDirWindow ), + rec( 56, 16, Reserved16 ), + rec( 72, 32, LongName ), + rec( 104, 4, CreatorID, BE ), + rec( 108, 12, ShortName ), + rec( 120, 1, AccessPrivileges ), + rec( 121, 1, Reserved ), + rec( 122, 6, ProDOSInfo ), + ]) + pkt.CompletionCodes([0x0000, 0x8301, 0x8800, 0x9300, 0x9600, 0x9804, 0x9c03, + 0xa100, 0xa201, 0xfd00, 0xff19]) + # 2222/2310, 35/16 + pkt = NCP(0x2310, "AFP 2.0 Set File Information", 'afp') + pkt.Request((70, 324), [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, MacBaseDirectoryID ), + rec( 15, 2, RequestBitMap, BE ), + rec( 17, 2, AttributesDef16 ), + rec( 19, 2, CreationDate, BE ), + rec( 21, 2, LastAccessedDate, BE ), + rec( 23, 2, ModifiedDate, BE ), + rec( 25, 2, ModifiedTime, BE ), + rec( 27, 2, ArchivedDate, BE ), + rec( 29, 2, ArchivedTime, BE ), + rec( 31, 4, CreatorID, BE ), + rec( 35, 4, Reserved4 ), + rec( 39, 2, FinderAttr ), + rec( 41, 2, HorizLocation ), + rec( 43, 2, VertLocation ), + rec( 45, 2, FileDirWindow ), + rec( 47, 16, Reserved16 ), + rec( 63, 6, ProDOSInfo ), + rec( 69, (1,255), Path ), + ], info_str=(Path, "AFP 2.0 Set File Information: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0104, 0x8301, 0x8800, 0x9300, 0x9400, + 0x9500, 0x9600, 0x9804, 0x9c03, 0xa100, 0xa201, + 0xfd00, 0xff16]) + # 2222/2311, 35/17 + pkt = NCP(0x2311, "AFP 2.0 Scan File Information", 'afp') + pkt.Request((26, 280), [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, MacBaseDirectoryID ), + rec( 15, 4, MacLastSeenID, BE ), + rec( 19, 2, DesiredResponseCount, BE ), + rec( 21, 2, SearchBitMap, BE ), + rec( 23, 2, RequestBitMap, BE ), + rec( 25, (1,255), Path ), + ], info_str=(Path, "AFP 2.0 Scan File Information: %s", ", %s")) + pkt.Reply(14, [ + rec( 8, 2, ActualResponseCount, var="x" ), + rec( 10, 4, AFP20Struct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x8301, 0x8800, 0x9300, 0x9600, 0x9804, + 0x9c03, 0xa100, 0xa201, 0xfd00, 0xff16]) + # 2222/2312, 35/18 + pkt = NCP(0x2312, "AFP Get DOS Name From Entry ID", 'afp') + pkt.Request(15, [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, AFPEntryID, BE ), + ]) + pkt.Reply((9,263), [ + rec( 8, (1,255), Path ), + ]) + pkt.CompletionCodes([0x0000, 0x8900, 0x9600, 0xbf00]) + # 2222/2313, 35/19 + pkt = NCP(0x2313, "AFP Get Macintosh Info On Deleted File", 'afp') + pkt.Request(15, [ + rec( 10, 1, VolumeNumber ), + rec( 11, 4, DirectoryNumber, BE ), + ]) + pkt.Reply((51,305), [ + rec( 8, 4, CreatorID, BE ), + rec( 12, 4, Reserved4 ), + rec( 16, 2, FinderAttr ), + rec( 18, 2, HorizLocation ), + rec( 20, 2, VertLocation ), + rec( 22, 2, FileDirWindow ), + rec( 24, 16, Reserved16 ), + rec( 40, 6, ProDOSInfo ), + rec( 46, 4, ResourceForkSize, BE ), + rec( 50, (1,255), FileName ), + ]) + pkt.CompletionCodes([0x0000, 0x9c03, 0xbf00]) + # 2222/2400, 36/00 + pkt = NCP(0x2400, "Get NCP Extension Information", 'extension') + pkt.Request(14, [ + rec( 10, 4, NCPextensionNumber, LE ), + ]) + pkt.Reply((16,270), [ + rec( 8, 4, NCPextensionNumber ), + rec( 12, 1, NCPextensionMajorVersion ), + rec( 13, 1, NCPextensionMinorVersion ), + rec( 14, 1, NCPextensionRevisionNumber ), + rec( 15, (1, 255), NCPextensionName ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0xfe00, 0xff20]) + # 2222/2401, 36/01 + pkt = NCP(0x2401, "Get NCP Extension Maximum Data Size", 'extension') + pkt.Request(10) + pkt.Reply(10, [ + rec( 8, 2, NCPdataSize ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0xfe00, 0xff20]) + # 2222/2402, 36/02 + pkt = NCP(0x2402, "Get NCP Extension Information by Name", 'extension') + pkt.Request((11, 265), [ + rec( 10, (1,255), NCPextensionName ), + ], info_str=(NCPextensionName, "Get NCP Extension Information by Name: %s", ", %s")) + pkt.Reply((16,270), [ + rec( 8, 4, NCPextensionNumber ), + rec( 12, 1, NCPextensionMajorVersion ), + rec( 13, 1, NCPextensionMinorVersion ), + rec( 14, 1, NCPextensionRevisionNumber ), + rec( 15, (1, 255), NCPextensionName ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0xfe00, 0xff20]) + # 2222/2403, 36/03 + pkt = NCP(0x2403, "Get Number of Registered NCP Extensions", 'extension') + pkt.Request(10) + pkt.Reply(12, [ + rec( 8, 4, NumberOfNCPExtensions ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0xfe00, 0xff20]) + # 2222/2404, 36/04 + pkt = NCP(0x2404, "Get NCP Extension Registered Verbs List", 'extension') + pkt.Request(14, [ + rec( 10, 4, StartingNumber ), + ]) + pkt.Reply(20, [ + rec( 8, 4, ReturnedListCount, var="x" ), + rec( 12, 4, nextStartingNumber ), + rec( 16, 4, NCPExtensionNumbers, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0xfe00, 0xff20]) + # 2222/2405, 36/05 + pkt = NCP(0x2405, "Return NCP Extension Information", 'extension') + pkt.Request(14, [ + rec( 10, 4, NCPextensionNumber ), + ]) + pkt.Reply((16,270), [ + rec( 8, 4, NCPextensionNumber ), + rec( 12, 1, NCPextensionMajorVersion ), + rec( 13, 1, NCPextensionMinorVersion ), + rec( 14, 1, NCPextensionRevisionNumber ), + rec( 15, (1, 255), NCPextensionName ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0xfe00, 0xff20]) + # 2222/2406, 36/06 + pkt = NCP(0x2406, "Return NCP Extension Maximum Data Size", 'extension') + pkt.Request(10) + pkt.Reply(12, [ + rec( 8, 4, NCPdataSize ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0xfe00, 0xff20]) + # 2222/25, 37 + pkt = NCP(0x25, "Execute NCP Extension", 'extension') + pkt.Request(11, [ + rec( 7, 4, NCPextensionNumber ), + # The following value is Unicode + #rec[ 13, (1,255), RequestData ], + ]) + pkt.Reply(8) + # The following value is Unicode + #[ 8, (1, 255), ReplyBuffer ], + pkt.CompletionCodes([0x0000, 0x7e01, 0xf000, 0x9c00, 0xd504, 0xee00, 0xfe00, 0xff20]) + # 2222/3B, 59 + pkt = NCP(0x3B, "Commit File", 'file', has_length=0 ) + pkt.Request(14, [ + rec( 7, 1, Reserved ), + rec( 8, 6, FileHandle ), + ], info_str=(FileHandle, "Commit File - 0x%s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8800, 0x9804, 0xff00]) + # 2222/3D, 61 + pkt = NCP(0x3D, "Commit File", 'file', has_length=0 ) + pkt.Request(14, [ + rec( 7, 1, Reserved ), + rec( 8, 6, FileHandle ), + ], info_str=(FileHandle, "Commit File - 0x%s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8800, 0x9804, 0xff00]) + # 2222/3E, 62 + pkt = NCP(0x3E, "File Search Initialize", 'file', has_length=0 ) + pkt.Request((9, 263), [ + rec( 7, 1, DirHandle ), + rec( 8, (1,255), Path ), + ], info_str=(Path, "Initialize File Search: %s", ", %s")) + pkt.Reply(14, [ + rec( 8, 1, VolumeNumber ), + rec( 9, 2, DirectoryID ), + rec( 11, 2, SequenceNumber, BE ), + rec( 13, 1, AccessRightsMask ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0x9804, 0x9b03, 0x9c03, 0xa100, + 0xfd00, 0xff16]) + # 2222/3F, 63 + pkt = NCP(0x3F, "File Search Continue", 'file', has_length=0 ) + pkt.Request((14, 268), [ + rec( 7, 1, VolumeNumber ), + rec( 8, 2, DirectoryID ), + rec( 10, 2, SequenceNumber, BE ), + rec( 12, 1, SearchAttributes ), + rec( 13, (1,255), Path ), + ], info_str=(Path, "File Search Continue: %s", ", %s")) + pkt.Reply( NO_LENGTH_CHECK, [ + # + # XXX - don't show this if we got back a non-zero + # completion code? For example, 255 means "No + # matching files or directories were found", so + # presumably it can't show you a matching file or + # directory instance - it appears to just leave crap + # there. + # + srec( DirectoryInstance, req_cond="ncp.sattr_sub==TRUE"), + srec( FileInstance, req_cond="ncp.sattr_sub!=TRUE"), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0xff16]) + # 2222/40, 64 + pkt = NCP(0x40, "Search for a File", 'file') + pkt.Request((12, 266), [ + rec( 7, 2, SequenceNumber, BE ), + rec( 9, 1, DirHandle ), + rec( 10, 1, SearchAttributes ), + rec( 11, (1,255), FileName ), + ], info_str=(FileName, "Search for File: %s", ", %s")) + pkt.Reply(40, [ + rec( 8, 2, SequenceNumber, BE ), + rec( 10, 2, Reserved2 ), + rec( 12, 14, FileName14 ), + rec( 26, 1, AttributesDef ), + rec( 27, 1, FileExecuteType ), + rec( 28, 4, FileSize ), + rec( 32, 2, CreationDate, BE ), + rec( 34, 2, LastAccessedDate, BE ), + rec( 36, 2, ModifiedDate, BE ), + rec( 38, 2, ModifiedTime, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x8900, 0x9600, 0x9804, 0x9b03, + 0x9c03, 0xa100, 0xfd00, 0xff16]) + # 2222/41, 65 + pkt = NCP(0x41, "Open File", 'file') + pkt.Request((10, 264), [ + rec( 7, 1, DirHandle ), + rec( 8, 1, SearchAttributes ), + rec( 9, (1,255), FileName ), + ], info_str=(FileName, "Open File: %s", ", %s")) + pkt.Reply(44, [ + rec( 8, 6, FileHandle ), + rec( 14, 2, Reserved2 ), + rec( 16, 14, FileName14 ), + rec( 30, 1, AttributesDef ), + rec( 31, 1, FileExecuteType ), + rec( 32, 4, FileSize, BE ), + rec( 36, 2, CreationDate, BE ), + rec( 38, 2, LastAccessedDate, BE ), + rec( 40, 2, ModifiedDate, BE ), + rec( 42, 2, ModifiedTime, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8200, 0x9400, + 0x9600, 0x9804, 0x9c03, 0xa100, 0xfd00, + 0xff16]) + # 2222/42, 66 + pkt = NCP(0x42, "Close File", 'file') + pkt.Request(14, [ + rec( 7, 1, Reserved ), + rec( 8, 6, FileHandle ), + ], info_str=(FileHandle, "Close File - 0x%s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8800, 0xff1a]) + # 2222/43, 67 + pkt = NCP(0x43, "Create File", 'file') + pkt.Request((10, 264), [ + rec( 7, 1, DirHandle ), + rec( 8, 1, AttributesDef ), + rec( 9, (1,255), FileName ), + ], info_str=(FileName, "Create File: %s", ", %s")) + pkt.Reply(44, [ + rec( 8, 6, FileHandle ), + rec( 14, 2, Reserved2 ), + rec( 16, 14, FileName14 ), + rec( 30, 1, AttributesDef ), + rec( 31, 1, FileExecuteType ), + rec( 32, 4, FileSize, BE ), + rec( 36, 2, CreationDate, BE ), + rec( 38, 2, LastAccessedDate, BE ), + rec( 40, 2, ModifiedDate, BE ), + rec( 42, 2, ModifiedTime, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9900, 0x9b03, 0x9c03, 0xfd00, + 0xff00]) + # 2222/44, 68 + pkt = NCP(0x44, "Erase File", 'file') + pkt.Request((10, 264), [ + rec( 7, 1, DirHandle ), + rec( 8, 1, SearchAttributes ), + rec( 9, (1,255), FileName ), + ], info_str=(FileName, "Erase File: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8a00, 0x8d00, 0x8e00, 0x8f00, + 0x9001, 0x9600, 0x9804, 0x9b03, 0x9c03, + 0xa100, 0xfd00, 0xff00]) + # 2222/45, 69 + pkt = NCP(0x45, "Rename File", 'file') + pkt.Request((12, 520), [ + rec( 7, 1, DirHandle ), + rec( 8, 1, SearchAttributes ), + rec( 9, (1,255), FileName ), + rec( -1, 1, TargetDirHandle ), + rec( -1, (1, 255), NewFileNameLen ), + ], info_str=(FileName, "Rename File: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8701, 0x8b00, 0x8d00, 0x8e00, + 0x8f00, 0x9001, 0x9101, 0x9201, 0x9600, + 0x9804, 0x9a00, 0x9b03, 0x9c03, 0xa100, + 0xfd00, 0xff16]) + # 2222/46, 70 + pkt = NCP(0x46, "Set File Attributes", 'file') + pkt.Request((11, 265), [ + rec( 7, 1, AttributesDef ), + rec( 8, 1, DirHandle ), + rec( 9, 1, SearchAttributes ), + rec( 10, (1,255), FileName ), + ], info_str=(FileName, "Set File Attributes: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8c00, 0x8d00, 0x8e00, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa100, 0xfd00, + 0xff16]) + # 2222/47, 71 + pkt = NCP(0x47, "Get Current Size of File", 'file') + pkt.Request(14, [ + rec(7, 1, Reserved ), + rec( 8, 6, FileHandle ), + ], info_str=(FileHandle, "Get Current Size of File - 0x%s", ", %s")) + pkt.Reply(12, [ + rec( 8, 4, FileSize, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x8800]) + # 2222/48, 72 + pkt = NCP(0x48, "Read From A File", 'file') + pkt.Request(20, [ + rec( 7, 1, Reserved ), + rec( 8, 6, FileHandle ), + rec( 14, 4, FileOffset, BE ), + rec( 18, 2, MaxBytes, BE ), + ], info_str=(FileHandle, "Read From File - 0x%s", ", %s")) + pkt.Reply(10, [ + rec( 8, 2, NumBytes, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x8300, 0x8800, 0x9300, 0xff1b]) + # 2222/49, 73 + pkt = NCP(0x49, "Write to a File", 'file') + pkt.Request(20, [ + rec( 7, 1, Reserved ), + rec( 8, 6, FileHandle ), + rec( 14, 4, FileOffset, BE ), + rec( 18, 2, MaxBytes, BE ), + ], info_str=(FileHandle, "Write to a File - 0x%s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0104, 0x8300, 0x8800, 0x9400, 0x9500, 0xa201, 0xff1b]) + # 2222/4A, 74 + pkt = NCP(0x4A, "Copy from One File to Another", 'file') + pkt.Request(30, [ + rec( 7, 1, Reserved ), + rec( 8, 6, FileHandle ), + rec( 14, 6, TargetFileHandle ), + rec( 20, 4, FileOffset, BE ), + rec( 24, 4, TargetFileOffset, BE ), + rec( 28, 2, BytesToCopy, BE ), + ]) + pkt.Reply(12, [ + rec( 8, 4, BytesActuallyTransferred, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x0104, 0x8300, 0x8800, 0x9300, 0x9400, + 0x9500, 0x9600, 0xa201, 0xff1b]) + # 2222/4B, 75 + pkt = NCP(0x4B, "Set File Time Date Stamp", 'file') + pkt.Request(18, [ + rec( 7, 1, Reserved ), + rec( 8, 6, FileHandle ), + rec( 14, 2, FileTime, BE ), + rec( 16, 2, FileDate, BE ), + ], info_str=(FileHandle, "Set Time and Date Stamp for File - 0x%s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8800, 0x9400, 0x9600, 0xfb08]) + # 2222/4C, 76 + pkt = NCP(0x4C, "Open File", 'file') + pkt.Request((11, 265), [ + rec( 7, 1, DirHandle ), + rec( 8, 1, SearchAttributes ), + rec( 9, 1, AccessRightsMask ), + rec( 10, (1,255), FileName ), + ], info_str=(FileName, "Open File: %s", ", %s")) + pkt.Reply(44, [ + rec( 8, 6, FileHandle ), + rec( 14, 2, Reserved2 ), + rec( 16, 14, FileName14 ), + rec( 30, 1, AttributesDef ), + rec( 31, 1, FileExecuteType ), + rec( 32, 4, FileSize, BE ), + rec( 36, 2, CreationDate, BE ), + rec( 38, 2, LastAccessedDate, BE ), + rec( 40, 2, ModifiedDate, BE ), + rec( 42, 2, ModifiedTime, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8200, 0x9400, + 0x9600, 0x9804, 0x9c03, 0xa100, 0xfd00, + 0xff16]) + # 2222/4D, 77 + pkt = NCP(0x4D, "Create File", 'file') + pkt.Request((10, 264), [ + rec( 7, 1, DirHandle ), + rec( 8, 1, AttributesDef ), + rec( 9, (1,255), FileName ), + ], info_str=(FileName, "Create File: %s", ", %s")) + pkt.Reply(44, [ + rec( 8, 6, FileHandle ), + rec( 14, 2, Reserved2 ), + rec( 16, 14, FileName14 ), + rec( 30, 1, AttributesDef ), + rec( 31, 1, FileExecuteType ), + rec( 32, 4, FileSize, BE ), + rec( 36, 2, CreationDate, BE ), + rec( 38, 2, LastAccessedDate, BE ), + rec( 40, 2, ModifiedDate, BE ), + rec( 42, 2, ModifiedTime, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9900, 0x9b03, 0x9c03, 0xfd00, + 0xff00]) + # 2222/4F, 79 + pkt = NCP(0x4F, "Set File Extended Attributes", 'file') + pkt.Request((11, 265), [ + rec( 7, 1, AttributesDef ), + rec( 8, 1, DirHandle ), + rec( 9, 1, AccessRightsMask ), + rec( 10, (1,255), FileName ), + ], info_str=(FileName, "Set File Extended Attributes: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8c00, 0x8d00, 0x8e00, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa100, 0xfd00, + 0xff16]) + # 2222/54, 84 + pkt = NCP(0x54, "Open/Create File", 'file') + pkt.Request((12, 266), [ + rec( 7, 1, DirHandle ), + rec( 8, 1, AttributesDef ), + rec( 9, 1, AccessRightsMask ), + rec( 10, 1, ActionFlag ), + rec( 11, (1,255), FileName ), + ], info_str=(FileName, "Open/Create File: %s", ", %s")) + pkt.Reply(44, [ + rec( 8, 6, FileHandle ), + rec( 14, 2, Reserved2 ), + rec( 16, 14, FileName14 ), + rec( 30, 1, AttributesDef ), + rec( 31, 1, FileExecuteType ), + rec( 32, 4, FileSize, BE ), + rec( 36, 2, CreationDate, BE ), + rec( 38, 2, LastAccessedDate, BE ), + rec( 40, 2, ModifiedDate, BE ), + rec( 42, 2, ModifiedTime, BE ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xfd00, 0xff16]) + # 2222/55, 85 + pkt = NCP(0x55, "Get Sparse File Data Block Bit Map", 'file') + pkt.Request(17, [ + rec( 7, 6, FileHandle ), + rec( 13, 4, FileOffset ), + ], info_str=(FileHandle, "Get Sparse File Data Block Bitmap for File - 0x%s", ", %s")) + pkt.Reply(528, [ + rec( 8, 4, AllocationBlockSize ), + rec( 12, 4, Reserved4 ), + rec( 16, 512, BitMap ), + ]) + pkt.CompletionCodes([0x0000, 0x8800]) + # 2222/5601, 86/01 + pkt = NCP(0x5601, "Close Extended Attribute Handle", 'extended', has_length=0 ) + pkt.Request(14, [ + rec( 8, 2, Reserved2 ), + rec( 10, 4, EAHandle ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xcf00, 0xd301]) + # 2222/5602, 86/02 + pkt = NCP(0x5602, "Write Extended Attribute", 'extended', has_length=0 ) + pkt.Request((35,97), [ + rec( 8, 2, EAFlags ), + rec( 10, 4, EAHandleOrNetWareHandleOrVolume, BE ), + rec( 14, 4, ReservedOrDirectoryNumber ), + rec( 18, 4, TtlWriteDataSize ), + rec( 22, 4, FileOffset ), + rec( 26, 4, EAAccessFlag ), + rec( 30, 2, EAValueLength, var='x' ), + rec( 32, (2,64), EAKey ), + rec( -1, 1, EAValueRep, repeat='x' ), + ], info_str=(EAKey, "Write Extended Attribute: %s", ", %s")) + pkt.Reply(20, [ + rec( 8, 4, EAErrorCodes ), + rec( 12, 4, EABytesWritten ), + rec( 16, 4, NewEAHandle ), + ]) + pkt.CompletionCodes([0x0000, 0xc800, 0xc900, 0xcb00, 0xce00, 0xcf00, 0xd101, + 0xd203, 0xd301, 0xd402, 0xda02, 0xdc01, 0xef00, 0xff00]) + # 2222/5603, 86/03 + pkt = NCP(0x5603, "Read Extended Attribute", 'extended', has_length=0 ) + pkt.Request((28,538), [ + rec( 8, 2, EAFlags ), + rec( 10, 4, EAHandleOrNetWareHandleOrVolume ), + rec( 14, 4, ReservedOrDirectoryNumber ), + rec( 18, 4, FileOffset ), + rec( 22, 4, InspectSize ), + rec( 26, (2,512), EAKey ), + ], info_str=(EAKey, "Read Extended Attribute: %s", ", %s")) + pkt.Reply((26,536), [ + rec( 8, 4, EAErrorCodes ), + rec( 12, 4, TtlValuesLength ), + rec( 16, 4, NewEAHandle ), + rec( 20, 4, EAAccessFlag ), + rec( 24, (2,512), EAValue ), + ]) + pkt.CompletionCodes([0x0000, 0x8800, 0x9c03, 0xc900, 0xce00, 0xcf00, 0xd101, + 0xd301, 0xd503]) + # 2222/5604, 86/04 + pkt = NCP(0x5604, "Enumerate Extended Attribute", 'extended', has_length=0 ) + pkt.Request((26,536), [ + rec( 8, 2, EAFlags ), + rec( 10, 4, EAHandleOrNetWareHandleOrVolume ), + rec( 14, 4, ReservedOrDirectoryNumber ), + rec( 18, 4, InspectSize ), + rec( 22, 2, SequenceNumber ), + rec( 24, (2,512), EAKey ), + ], info_str=(EAKey, "Enumerate Extended Attribute: %s", ", %s")) + pkt.Reply(28, [ + rec( 8, 4, EAErrorCodes ), + rec( 12, 4, TtlEAs ), + rec( 16, 4, TtlEAsDataSize ), + rec( 20, 4, TtlEAsKeySize ), + rec( 24, 4, NewEAHandle ), + ]) + pkt.CompletionCodes([0x0000, 0x8800, 0x8c01, 0xc800, 0xc900, 0xce00, 0xcf00, 0xd101, + 0xd301, 0xd503, 0xfb08, 0xff00]) + # 2222/5605, 86/05 + pkt = NCP(0x5605, "Duplicate Extended Attributes", 'extended', has_length=0 ) + pkt.Request(28, [ + rec( 8, 2, EAFlags ), + rec( 10, 2, DstEAFlags ), + rec( 12, 4, EAHandleOrNetWareHandleOrVolume ), + rec( 16, 4, ReservedOrDirectoryNumber ), + rec( 20, 4, EAHandleOrNetWareHandleOrVolume ), + rec( 24, 4, ReservedOrDirectoryNumber ), + ]) + pkt.Reply(20, [ + rec( 8, 4, EADuplicateCount ), + rec( 12, 4, EADataSizeDuplicated ), + rec( 16, 4, EAKeySizeDuplicated ), + ]) + pkt.CompletionCodes([0x0000, 0x8800, 0xd101]) + # 2222/5701, 87/01 + pkt = NCP(0x5701, "Open/Create File or Subdirectory", 'file', has_length=0) + pkt.Request((30, 284), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, OpenCreateMode ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, ReturnInfoMask ), + rec( 14, 2, ExtendedInfo ), + rec( 16, 4, AttributesDef32 ), + rec( 20, 2, DesiredAccessRights ), + rec( 22, 1, VolumeNumber ), + rec( 23, 4, DirectoryBase ), + rec( 27, 1, HandleFlag ), + rec( 28, 1, PathCount, var="x" ), + rec( 29, (1,255), Path, repeat="x" ), + ], info_str=(Path, "Open or Create: %s", "/%s")) + pkt.Reply( NO_LENGTH_CHECK, [ + rec( 8, 4, FileHandle ), + rec( 12, 1, OpenCreateAction ), + rec( 13, 1, Reserved ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), + srec( PadDSSpaceAllocate, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), + srec( AttributesStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), + srec( PadAttributes, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), + srec( PadDataStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), + srec( PadTotalStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), + srec( CreationInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), + srec( PadCreationInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), + srec( PadModifyInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), + srec( PadArchiveInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), + srec( RightsInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), + srec( PadRightsInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), + srec( DirEntryStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), + srec( PadDirEntry, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), + srec( EAInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), + srec( PadEAInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), + srec( NSInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), + srec( PadNSInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), + srec( ReferenceIDStruct, req_cond="ncp.ret_info_mask_id == 1" ), + srec( NSAttributeStruct, req_cond="ncp.ret_info_mask_ns_attr == 1" ), + srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1" ), + srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1" ), + srec( LastUpdatedInSecondsStruct, req_cond="ncp.ext_info_update == 1" ), + srec( DOSNameStruct, req_cond="ncp.ext_info_dos_name == 1" ), + srec( FlushTimeStruct, req_cond="ncp.ext_info_flush == 1" ), + srec( ParentBaseIDStruct, req_cond="ncp.ext_info_parental == 1" ), + srec( MacFinderInfoStruct, req_cond="ncp.ext_info_mac_finder == 1" ), + srec( SiblingCountStruct, req_cond="ncp.ext_info_sibling == 1" ), + srec( EffectiveRightsStruct, req_cond="ncp.ext_info_effective == 1" ), + srec( MacTimeStruct, req_cond="ncp.ext_info_mac_date == 1" ), + srec( LastAccessedTimeStruct, req_cond="ncp.ext_info_access == 1" ), + srec( FileNameStruct, req_cond="ncp.ret_info_mask_fname == 1" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x0102, 0x7f00, 0x8001, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8900, 0x8d00, 0x8f00, 0x9001, 0x9400, 0x9600, + 0x9804, 0x9900, 0x9b03, 0x9c03, 0xa500, 0xa802, 0xa901, 0xbf00, 0xfd00, 0xff16]) + # 2222/5702, 87/02 + pkt = NCP(0x5702, "Initialize Search", 'file', has_length=0) + pkt.Request( (18,272), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 1, VolumeNumber ), + rec( 11, 4, DirectoryBase ), + rec( 15, 1, HandleFlag ), + rec( 16, 1, PathCount, var="x" ), + rec( 17, (1,255), Path, repeat="x" ), + ], info_str=(Path, "Set Search Pointer to: %s", "/%s")) + pkt.Reply(17, [ + rec( 8, 1, VolumeNumber ), + rec( 9, 4, DirectoryNumber ), + rec( 13, 4, DirectoryEntryNumber ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xbf00, 0xfd00, 0xff16]) + # 2222/5703, 87/03 + pkt = NCP(0x5703, "Search for File or Subdirectory", 'file', has_length=0) + pkt.Request((26, 280), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, DataStream ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, ReturnInfoMask ), + rec( 14, 2, ExtendedInfo ), + rec( 16, 9, SeachSequenceStruct ), + rec( 25, (1,255), SearchPattern ), + ], info_str=(SearchPattern, "Search for: %s", "/%s")) + pkt.Reply( NO_LENGTH_CHECK, [ + rec( 8, 9, SeachSequenceStruct ), + rec( 17, 1, Reserved ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), + srec( PadDSSpaceAllocate, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), + srec( AttributesStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), + srec( PadAttributes, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), + srec( PadDataStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), + srec( PadTotalStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), + srec( CreationInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), + srec( PadCreationInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), + srec( PadModifyInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), + srec( PadArchiveInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), + srec( RightsInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), + srec( PadRightsInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), + srec( DirEntryStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), + srec( PadDirEntry, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), + srec( EAInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), + srec( PadEAInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), + srec( NSInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), + srec( PadNSInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), srec( ReferenceIDStruct, req_cond="ncp.ret_info_mask_id == 1" ), srec( NSAttributeStruct, req_cond="ncp.ret_info_mask_ns_attr == 1" ), - srec( DataStreamsStruct, req_cond="ncp.ret_info_mask_actual == 1" ), - srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1 && ncp.number_of_data_streams_long > 0" ), # , repeat="x" - srec( DataStreamsStruct, req_cond="ncp.ret_info_mask_logical == 1" ), # , var="y" - srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1 && ncp.number_of_data_streams_long > 0" ), # , repeat="y" + srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1" ), + srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1" ), srec( LastUpdatedInSecondsStruct, req_cond="ncp.ext_info_update == 1" ), srec( DOSNameStruct, req_cond="ncp.ext_info_dos_name == 1" ), srec( FlushTimeStruct, req_cond="ncp.ext_info_flush == 1" ), @@ -12549,683 +12443,108 @@ srec( EffectiveRightsStruct, req_cond="ncp.ext_info_effective == 1" ), srec( MacTimeStruct, req_cond="ncp.ext_info_mac_date == 1" ), srec( LastAccessedTimeStruct, req_cond="ncp.ext_info_access == 1" ), - srec( FileSize64bitStruct, req_cond="ncp.ext_info_64_bit_fs == 1" ), srec( FileNameStruct, req_cond="ncp.ret_info_mask_fname == 1" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8700, 0x8900, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9802, 0x9b03, 0x9c03, 0xa802, 0xa901, 0xbf00, 0xfd00, 0xff16]) - # 2222/5707, 87/07 - pkt = NCP(0x5707, "Modify File or Subdirectory DOS Information", 'file', has_length=0) - pkt.Request((62,316), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, ModifyDOSInfoMask ), - rec( 14, 2, Reserved2 ), - rec( 16, 2, AttributesDef16 ), - rec( 18, 1, FileMode ), - rec( 19, 1, FileExtendedAttributes ), - rec( 20, 2, CreationDate ), - rec( 22, 2, CreationTime ), - rec( 24, 4, CreatorID, BE ), - rec( 28, 2, ModifiedDate ), - rec( 30, 2, ModifiedTime ), - rec( 32, 4, ModifierID, BE ), - rec( 36, 2, ArchivedDate ), - rec( 38, 2, ArchivedTime ), - rec( 40, 4, ArchiverID, BE ), - rec( 44, 2, LastAccessedDate ), - rec( 46, 2, InheritedRightsMask ), - rec( 48, 2, InheritanceRevokeMask ), - rec( 50, 4, MaxSpace ), - rec( 54, 1, VolumeNumber ), - rec( 55, 4, DirectoryBase ), - rec( 59, 1, HandleFlag ), - rec( 60, 1, PathCount, var="x" ), - rec( 61, (1,255), Path, repeat="x" ), - ], info_str=(Path, "Modify DOS Information for: %s", "/%s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8c01, 0x8d00, 0x8e00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xbf00, 0xfd00, 0xff16]) - # 2222/5708, 87/08 - pkt = NCP(0x5708, "Delete a File or Subdirectory", 'file', has_length=0) - pkt.Request((20,274), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 1, VolumeNumber ), - rec( 13, 4, DirectoryBase ), - rec( 17, 1, HandleFlag ), - rec( 18, 1, PathCount, var="x" ), - rec( 19, (1,255), Path, repeat="x" ), - ], info_str=(Path, "Delete a File or Subdirectory: %s", "/%s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8900, 0x8a00, 0x8d00, 0x8e00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xbf00, 0xfd00, 0xff16]) - # 2222/5709, 87/09 - pkt = NCP(0x5709, "Set Short Directory Handle", 'file', has_length=0) - pkt.Request((20,274), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, DataStream ), - rec( 10, 1, DestDirHandle ), - rec( 11, 1, Reserved ), - rec( 12, 1, VolumeNumber ), - rec( 13, 4, DirectoryBase ), - rec( 17, 1, HandleFlag ), - rec( 18, 1, PathCount, var="x" ), - rec( 19, (1,255), Path, repeat="x" ), - ], info_str=(Path, "Set Short Directory Handle to: %s", "/%s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xbf00, 0xfd00, 0xff16]) - # 2222/570A, 87/10 - pkt = NCP(0x570A, "Add Trustee Set to File or Subdirectory", 'file', has_length=0) - pkt.Request((31,285), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, AccessRightsMaskWord ), - rec( 14, 2, ObjectIDCount, var="y" ), - rec( 16, 1, VolumeNumber ), - rec( 17, 4, DirectoryBase ), - rec( 21, 1, HandleFlag ), - rec( 22, 1, PathCount, var="x" ), - rec( 23, (1,255), Path, repeat="x" ), - rec( -1, 7, TrusteeStruct, repeat="y" ), - ], info_str=(Path, "Add Trustee Set to: %s", "/%s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8c01, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa802, 0xa901, 0xbf00, 0xfc01, 0xfd00, 0xff16]) - # 2222/570B, 87/11 - pkt = NCP(0x570B, "Delete Trustee Set from File or SubDirectory", 'file', has_length=0) - pkt.Request((27,281), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 2, ObjectIDCount, var="y" ), - rec( 12, 1, VolumeNumber ), - rec( 13, 4, DirectoryBase ), - rec( 17, 1, HandleFlag ), - rec( 18, 1, PathCount, var="x" ), - rec( 19, (1,255), Path, repeat="x" ), - rec( -1, 7, TrusteeStruct, repeat="y" ), - ], info_str=(Path, "Delete Trustee Set from: %s", "/%s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8c01, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/570C, 87/12 - pkt = NCP(0x570C, "Allocate Short Directory Handle", 'file', has_length=0) - pkt.Request((20,274), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 2, AllocateMode ), - rec( 12, 1, VolumeNumber ), - rec( 13, 4, DirectoryBase ), - rec( 17, 1, HandleFlag ), - rec( 18, 1, PathCount, var="x" ), - rec( 19, (1,255), Path, repeat="x" ), - ], info_str=(Path, "Allocate Short Directory Handle to: %s", "/%s")) - pkt.Reply(NO_LENGTH_CHECK, [ - srec( ReplyLevel2Struct, req_cond="ncp.alloc_reply_lvl2 == TRUE" ), - srec( ReplyLevel1Struct, req_cond="ncp.alloc_reply_lvl2 == FALSE" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8900, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0x9d00, 0xa901, 0xbf00, 0xfd00, 0xff16]) - # 2222/5710, 87/16 - pkt = NCP(0x5710, "Scan Salvageable Files", 'file', has_length=0) - pkt.Request((26,280), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, DataStream ), - rec( 10, 2, ReturnInfoMask ), - rec( 12, 2, ExtendedInfo ), - rec( 14, 4, SequenceNumber ), - rec( 18, 1, VolumeNumber ), - rec( 19, 4, DirectoryBase ), - rec( 23, 1, HandleFlag ), - rec( 24, 1, PathCount, var="x" ), - rec( 25, (1,255), Path, repeat="x" ), - ], info_str=(Path, "Scan for Deleted Files in: %s", "/%s")) - pkt.Reply(NO_LENGTH_CHECK, [ - rec( 8, 4, SequenceNumber ), - rec( 12, 2, DeletedTime ), - rec( 14, 2, DeletedDate ), - rec( 16, 4, DeletedID, BE ), - rec( 20, 4, VolumeID ), - rec( 24, 4, DirectoryBase ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), - srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), - srec( PadAttributes, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), - srec( PadDataStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), - srec( PadTotalStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), - srec( PadCreationInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), - srec( PadModifyInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), - srec( PadArchiveInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), - srec( PadRightsInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), - srec( PadDirEntry, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), - srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), - srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), - srec( FileNameStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_fname == 1)" ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), - srec( FileNameStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_fname == 1)" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/5711, 87/17 - pkt = NCP(0x5711, "Recover Salvageable File", 'file', has_length=0) - pkt.Request((23,277), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 4, SequenceNumber ), - rec( 14, 4, VolumeID ), - rec( 18, 4, DirectoryBase ), - rec( 22, (1,255), FileName ), - ], info_str=(FileName, "Recover Deleted File: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa802, 0xbf00, 0xfe02, 0xfd00, 0xff16]) - # 2222/5712, 87/18 - pkt = NCP(0x5712, "Purge Salvageable Files", 'file', has_length=0) - pkt.Request(22, [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 4, SequenceNumber ), - rec( 14, 4, VolumeID ), - rec( 18, 4, DirectoryBase ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x010a, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/5713, 87/19 - pkt = NCP(0x5713, "Get Name Space Information", 'file', has_length=0) - pkt.Request(18, [ - rec( 8, 1, SrcNameSpace ), - rec( 9, 1, DestNameSpace ), - rec( 10, 1, Reserved ), - rec( 11, 1, VolumeNumber ), - rec( 12, 4, DirectoryBase ), - rec( 16, 2, NamesSpaceInfoMask ), - ]) - pkt.Reply(NO_LENGTH_CHECK, [ - srec( FileNameStruct, req_cond="ncp.ns_info_mask_modify == TRUE" ), - srec( FileAttributesStruct, req_cond="ncp.ns_info_mask_fatt == TRUE" ), - srec( CreationDateStruct, req_cond="ncp.ns_info_mask_cdate == TRUE" ), - srec( CreationTimeStruct, req_cond="ncp.ns_info_mask_ctime == TRUE" ), - srec( OwnerIDStruct, req_cond="ncp.ns_info_mask_owner == TRUE" ), - srec( ArchiveDateStruct, req_cond="ncp.ns_info_mask_adate == TRUE" ), - srec( ArchiveTimeStruct, req_cond="ncp.ns_info_mask_atime == TRUE" ), - srec( ArchiveIdStruct, req_cond="ncp.ns_info_mask_aid == TRUE" ), - srec( UpdateDateStruct, req_cond="ncp.ns_info_mask_udate == TRUE" ), - srec( UpdateTimeStruct, req_cond="ncp.ns_info_mask_utime == TRUE" ), - srec( UpdateIDStruct, req_cond="ncp.ns_info_mask_uid == TRUE" ), - srec( LastAccessStruct, req_cond="ncp.ns_info_mask_acc_date == TRUE" ), - srec( RightsInfoStruct, req_cond="ncp.ns_info_mask_max_acc_mask == TRUE" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/5714, 87/20 - pkt = NCP(0x5714, "Search for File or Subdirectory Set", 'file', has_length=0) - pkt.Request((28, 282), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, DataStream ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, ReturnInfoMask ), - rec( 14, 2, ExtendedInfo ), - rec( 16, 2, ReturnInfoCount ), - rec( 18, 9, SeachSequenceStruct ), - rec( 27, (1,255), SearchPattern ), - ]) - # The reply packet is dissected in packet-ncp2222.inc - pkt.Reply(NO_LENGTH_CHECK, [ - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xbf00, 0xfd00, 0xff16]) - # 2222/5715, 87/21 - pkt = NCP(0x5715, "Get Path String from Short Directory Handle", 'file', has_length=0) - pkt.Request(10, [ - rec( 8, 1, NameSpace ), - rec( 9, 1, DirHandle ), - ]) - pkt.Reply((9,263), [ - rec( 8, (1,255), Path ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xfd00, 0xff16]) - # 2222/5716, 87/22 - pkt = NCP(0x5716, "Generate Directory Base and Volume Number", 'file', has_length=0) - pkt.Request((20,274), [ - rec( 8, 1, SrcNameSpace ), - rec( 9, 1, DestNameSpace ), - rec( 10, 2, dstNSIndicator ), - rec( 12, 1, VolumeNumber ), - rec( 13, 4, DirectoryBase ), - rec( 17, 1, HandleFlag ), - rec( 18, 1, PathCount, var="x" ), - rec( 19, (1,255), Path, repeat="x" ), - ], info_str=(Path, "Get Volume and Directory Base from: %s", "/%s")) - pkt.Reply(17, [ - rec( 8, 4, DirectoryBase ), - rec( 12, 4, DOSDirectoryBase ), - rec( 16, 1, VolumeNumber ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/5717, 87/23 - pkt = NCP(0x5717, "Query Name Space Information Format", 'file', has_length=0) - pkt.Request(10, [ - rec( 8, 1, NameSpace ), - rec( 9, 1, VolumeNumber ), - ]) - pkt.Reply(58, [ - rec( 8, 4, FixedBitMask ), - rec( 12, 4, VariableBitMask ), - rec( 16, 4, HugeBitMask ), - rec( 20, 2, FixedBitsDefined ), - rec( 22, 2, VariableBitsDefined ), - rec( 24, 2, HugeBitsDefined ), - rec( 26, 32, FieldsLenTable ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/5718, 87/24 - pkt = NCP(0x5718, "Get Name Spaces Loaded List from Volume Number", 'file', has_length=0) - pkt.Request(11, [ - rec( 8, 2, Reserved2 ), - rec( 10, 1, VolumeNumber ), - ], info_str=(VolumeNumber, "Get Name Spaces Loaded List from Vol: %d", "/%d")) - pkt.Reply(11, [ - rec( 8, 2, NumberOfNSLoaded, var="x" ), - rec( 10, 1, NameSpace, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/5719, 87/25 - pkt = NCP(0x5719, "Set Name Space Information", 'file', has_length=0) - pkt.Request(531, [ - rec( 8, 1, SrcNameSpace ), - rec( 9, 1, DestNameSpace ), - rec( 10, 1, VolumeNumber ), - rec( 11, 4, DirectoryBase ), - rec( 15, 2, NamesSpaceInfoMask ), - rec( 17, 2, Reserved2 ), - rec( 19, 512, NSSpecificInfo ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8b00, 0x8d00, 0x8f00, 0x9001, - 0x9600, 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, - 0xff16]) - # 2222/571A, 87/26 - pkt = NCP(0x571A, "Get Huge Name Space Information", 'file', has_length=0) - pkt.Request(34, [ - rec( 8, 1, NameSpace ), - rec( 9, 1, VolumeNumber ), - rec( 10, 4, DirectoryBase ), - rec( 14, 4, HugeBitMask ), - rec( 18, 16, HugeStateInfo ), - ]) - pkt.Reply((25,279), [ - rec( 8, 16, NextHugeStateInfo ), - rec( 24, (1,255), HugeData ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8b00, 0x8d00, 0x8f00, 0x9001, - 0x9600, 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, - 0xff16]) - # 2222/571B, 87/27 - pkt = NCP(0x571B, "Set Huge Name Space Information", 'file', has_length=0) - pkt.Request((35,289), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, VolumeNumber ), - rec( 10, 4, DirectoryBase ), - rec( 14, 4, HugeBitMask ), - rec( 18, 16, HugeStateInfo ), - rec( 34, (1,255), HugeData ), - ]) - pkt.Reply(28, [ - rec( 8, 16, NextHugeStateInfo ), - rec( 24, 4, HugeDataUsed ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8b00, 0x8d00, 0x8f00, 0x9001, - 0x9600, 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, - 0xff16]) - # 2222/571C, 87/28 - pkt = NCP(0x571C, "Get Full Path String", 'file', has_length=0) - pkt.Request((28,282), [ - rec( 8, 1, SrcNameSpace ), - rec( 9, 1, DestNameSpace ), - rec( 10, 2, PathCookieFlags ), - rec( 12, 4, Cookie1 ), - rec( 16, 4, Cookie2 ), - rec( 20, 1, VolumeNumber ), - rec( 21, 4, DirectoryBase ), - rec( 25, 1, HandleFlag ), - rec( 26, 1, PathCount, var="x" ), - rec( 27, (1,255), Path, repeat="x" ), - ], info_str=(Path, "Get Full Path from: %s", "/%s")) - pkt.Reply((23,277), [ - rec( 8, 2, PathCookieFlags ), - rec( 10, 4, Cookie1 ), - rec( 14, 4, Cookie2 ), - rec( 18, 2, PathComponentSize ), - rec( 20, 2, PathComponentCount, var='x' ), - rec( 22, (1,255), Path, repeat='x' ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8b00, 0x8d00, 0x8f00, 0x9001, - 0x9600, 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, - 0xff16]) - # 2222/571D, 87/29 - pkt = NCP(0x571D, "Get Effective Directory Rights", 'file', has_length=0) - pkt.Request((24, 278), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, DestNameSpace ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, ReturnInfoMask ), - rec( 14, 2, ExtendedInfo ), - rec( 16, 1, VolumeNumber ), - rec( 17, 4, DirectoryBase ), - rec( 21, 1, HandleFlag ), - rec( 22, 1, PathCount, var="x" ), - rec( 23, (1,255), Path, repeat="x" ), - ], info_str=(Path, "Get Effective Rights for: %s", "/%s")) - pkt.Reply(NO_LENGTH_CHECK, [ - rec( 8, 2, EffectiveRights ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), - srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), - srec( PadAttributes, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), - srec( PadDataStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), - srec( PadTotalStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), - srec( PadCreationInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), - srec( PadModifyInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), - srec( PadArchiveInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), - srec( PadRightsInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), - srec( PadDirEntry, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), - srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), - srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), - srec( FileNameStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_fname == 1)" ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), - srec( FileNameStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_fname == 1)" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/571E, 87/30 - pkt = NCP(0x571E, "Open/Create File or Subdirectory", 'file', has_length=0) - pkt.Request((34, 288), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, DataStream ), - rec( 10, 1, OpenCreateMode ), - rec( 11, 1, Reserved ), - rec( 12, 2, SearchAttributesLow ), - rec( 14, 2, Reserved2 ), - rec( 16, 2, ReturnInfoMask ), - rec( 18, 2, ExtendedInfo ), - rec( 20, 4, AttributesDef32 ), - rec( 24, 2, DesiredAccessRights ), - rec( 26, 1, VolumeNumber ), - rec( 27, 4, DirectoryBase ), - rec( 31, 1, HandleFlag ), - rec( 32, 1, PathCount, var="x" ), - rec( 33, (1,255), Path, repeat="x" ), - ], info_str=(Path, "Open or Create File: %s", "/%s")) - pkt.Reply(NO_LENGTH_CHECK, [ - rec( 8, 4, FileHandle, BE ), - rec( 12, 1, OpenCreateAction ), - rec( 13, 1, Reserved ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), - srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), - srec( PadAttributes, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), - srec( PadDataStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), - srec( PadTotalStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), - srec( PadCreationInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), - srec( PadModifyInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), - srec( PadArchiveInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), - srec( PadRightsInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), - srec( PadDirEntry, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), - srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), - srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), - srec( FileNameStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_fname == 1)" ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), - srec( FileNameStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_fname == 1)" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbe00, 0xbf00, 0xfd00, 0xff16]) - # 2222/571F, 87/31 - pkt = NCP(0x571F, "Get File Information", 'file', has_length=0) - pkt.Request(15, [ - rec( 8, 6, FileHandle ), - rec( 14, 1, HandleInfoLevel ), - ], info_str=(FileHandle, "Get File Information - 0x%s", ", %s")) - pkt.Reply(NO_LENGTH_CHECK, [ - rec( 8, 4, VolumeNumberLong ), - rec( 12, 4, DirectoryBase ), - srec(HandleInfoLevel0, req_cond="ncp.handle_info_level==0x00" ), - srec(HandleInfoLevel1, req_cond="ncp.handle_info_level==0x01" ), - srec(HandleInfoLevel2, req_cond="ncp.handle_info_level==0x02" ), - srec(HandleInfoLevel3, req_cond="ncp.handle_info_level==0x03" ), - srec(HandleInfoLevel4, req_cond="ncp.handle_info_level==0x04" ), - srec(HandleInfoLevel5, req_cond="ncp.handle_info_level==0x05" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/5720, 87/32 - pkt = NCP(0x5720, "Open/Create File or Subdirectory with Callback", 'file', has_length=0) - pkt.Request((30, 284), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, OpenCreateMode ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, ReturnInfoMask ), - rec( 14, 2, ExtendedInfo ), - rec( 16, 4, AttributesDef32 ), - rec( 20, 2, DesiredAccessRights ), - rec( 22, 1, VolumeNumber ), - rec( 23, 4, DirectoryBase ), - rec( 27, 1, HandleFlag ), - rec( 28, 1, PathCount, var="x" ), - rec( 29, (1,255), Path, repeat="x" ), - ], info_str=(Path, "Open or Create with Op-Lock: %s", "/%s")) - pkt.Reply( NO_LENGTH_CHECK, [ - rec( 8, 4, FileHandle, BE ), - rec( 12, 1, OpenCreateAction ), - rec( 13, 1, OCRetFlags ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), - srec( PadDSSpaceAllocate, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), - srec( AttributesStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), - srec( PadAttributes, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), - srec( PadDataStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), - srec( PadTotalStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), - srec( CreationInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), - srec( PadCreationInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), - srec( PadModifyInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), - srec( PadArchiveInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), - srec( RightsInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), - srec( PadRightsInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), - srec( DirEntryStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), - srec( PadDirEntry, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), - srec( EAInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), - srec( PadEAInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), - srec( NSInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), - srec( PadNSInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), - srec( ReferenceIDStruct, req_cond="ncp.ret_info_mask_id == 1" ), - srec( NSAttributeStruct, req_cond="ncp.ret_info_mask_ns_attr == 1" ), - srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1" ), - srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1" ), - srec( LastUpdatedInSecondsStruct, req_cond="ncp.ext_info_update == 1" ), - srec( DOSNameStruct, req_cond="ncp.ext_info_dos_name == 1" ), - srec( FlushTimeStruct, req_cond="ncp.ext_info_flush == 1" ), - srec( ParentBaseIDStruct, req_cond="ncp.ext_info_parental == 1" ), - srec( MacFinderInfoStruct, req_cond="ncp.ext_info_mac_finder == 1" ), - srec( SiblingCountStruct, req_cond="ncp.ext_info_sibling == 1" ), - srec( EffectiveRightsStruct, req_cond="ncp.ext_info_effective == 1" ), - srec( MacTimeStruct, req_cond="ncp.ext_info_mac_date == 1" ), - srec( LastAccessedTimeStruct, req_cond="ncp.ext_info_access == 1" ), - srec( FileNameStruct, req_cond="ncp.ret_info_mask_fname == 1" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x0102, 0x7f00, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/5721, 87/33 - pkt = NCP(0x5721, "Open/Create File or Subdirectory II with Callback", 'file', has_length=0) - pkt.Request((34, 288), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, DataStream ), - rec( 10, 1, OpenCreateMode ), - rec( 11, 1, Reserved ), - rec( 12, 2, SearchAttributesLow ), - rec( 14, 2, Reserved2 ), - rec( 16, 2, ReturnInfoMask ), - rec( 18, 2, ExtendedInfo ), - rec( 20, 4, AttributesDef32 ), - rec( 24, 2, DesiredAccessRights ), - rec( 26, 1, VolumeNumber ), - rec( 27, 4, DirectoryBase ), - rec( 31, 1, HandleFlag ), - rec( 32, 1, PathCount, var="x" ), - rec( 33, (1,255), Path, repeat="x" ), - ], info_str=(FilePath, "Open or Create II with Op-Lock: %s", "/%s")) - pkt.Reply(NO_LENGTH_CHECK, [ - rec( 8, 4, FileHandle ), - rec( 12, 1, OpenCreateAction ), - rec( 13, 1, OCRetFlags ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), - srec( PadDSSpaceAllocate, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), - srec( AttributesStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), - srec( PadAttributes, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), - srec( PadDataStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), - srec( PadTotalStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), - srec( CreationInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), - srec( PadCreationInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), - srec( PadModifyInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), - srec( PadArchiveInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), - srec( RightsInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), - srec( PadRightsInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), - srec( DirEntryStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), - srec( PadDirEntry, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), - srec( EAInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), - srec( PadEAInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), - srec( NSInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), - srec( PadNSInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xbf00, 0xfd00, 0xff16]) + # 2222/5704, 87/04 + pkt = NCP(0x5704, "Rename Or Move a File or Subdirectory", 'file', has_length=0) + pkt.Request((28, 536), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, RenameFlag ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 1, VolumeNumber ), + rec( 13, 4, DirectoryBase ), + rec( 17, 1, HandleFlag ), + rec( 18, 1, PathCount, var="x" ), + rec( 19, 1, VolumeNumber ), + rec( 20, 4, DirectoryBase ), + rec( 24, 1, HandleFlag ), + rec( 25, 1, PathCount, var="y" ), + rec( 26, (1, 255), Path, repeat="x" ), + rec( -1, (1,255), DestPath, repeat="y" ), + ], info_str=(Path, "Rename or Move: %s", "/%s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8e00, 0x8f00, 0x9001, 0x9100, 0x9200, 0x9600, + 0x9804, 0x9a00, 0x9b03, 0x9c03, 0x9e00, 0xa901, 0xbf00, 0xfd00, 0xff16]) + # 2222/5705, 87/05 + pkt = NCP(0x5705, "Scan File or Subdirectory for Trustees", 'file', has_length=0) + pkt.Request((24, 278), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 4, SequenceNumber ), + rec( 16, 1, VolumeNumber ), + rec( 17, 4, DirectoryBase ), + rec( 21, 1, HandleFlag ), + rec( 22, 1, PathCount, var="x" ), + rec( 23, (1, 255), Path, repeat="x" ), + ], info_str=(Path, "Scan Trustees for: %s", "/%s")) + pkt.Reply(20, [ + rec( 8, 4, SequenceNumber ), + rec( 12, 2, ObjectIDCount, var="x" ), + rec( 14, 6, TrusteeStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c04, 0xa901, 0xbf00, 0xfd00, 0xff16]) + # 2222/5706, 87/06 + pkt = NCP(0x5706, "Obtain File or SubDirectory Information", 'file', has_length=0) + pkt.Request((24,278), [ + rec( 10, 1, SrcNameSpace ), + rec( 11, 1, DestNameSpace ), + rec( 12, 2, SearchAttributesLow ), + rec( 14, 2, ReturnInfoMask, LE ), + rec( 16, 2, ExtendedInfo ), + rec( 18, 1, VolumeNumber ), + rec( 19, 4, DirectoryBase ), + rec( 23, 1, HandleFlag ), + rec( 24, 1, PathCount, var="x" ), + rec( 25, (1,255), Path, repeat="x",), + ], info_str=(Path, "Obtain Info for: %s", "/%s")) + pkt.Reply(NO_LENGTH_CHECK, [ + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), + srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), + srec( PadAttributes, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), + srec( PadDataStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), + srec( PadTotalStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), + srec( PadCreationInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), + srec( PadModifyInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), + srec( PadArchiveInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), + srec( PadRightsInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), + srec( PadDirEntry, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), + srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), + srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), srec( ReferenceIDStruct, req_cond="ncp.ret_info_mask_id == 1" ), srec( NSAttributeStruct, req_cond="ncp.ret_info_mask_ns_attr == 1" ), - srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1" ), - srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1" ), + srec( DataStreamsStruct, req_cond="ncp.ret_info_mask_actual == 1" ), + srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1 && ncp.number_of_data_streams_long > 0" ), # , repeat="x" + srec( DataStreamsStruct, req_cond="ncp.ret_info_mask_logical == 1" ), # , var="y" + srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1 && ncp.number_of_data_streams_long > 0" ), # , repeat="y" srec( LastUpdatedInSecondsStruct, req_cond="ncp.ext_info_update == 1" ), srec( DOSNameStruct, req_cond="ncp.ext_info_dos_name == 1" ), srec( FlushTimeStruct, req_cond="ncp.ext_info_flush == 1" ), @@ -13235,727 +12554,157 @@ srec( EffectiveRightsStruct, req_cond="ncp.ext_info_effective == 1" ), srec( MacTimeStruct, req_cond="ncp.ext_info_mac_date == 1" ), srec( LastAccessedTimeStruct, req_cond="ncp.ext_info_access == 1" ), + srec( FileSize64bitStruct, req_cond="ncp.ext_info_64_bit_fs == 1" ), srec( FileNameStruct, req_cond="ncp.ret_info_mask_fname == 1" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbe00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5722, 87/34 - pkt = NCP(0x5722, "Open CallBack Control (Op-Lock)", 'file', has_length=0) - pkt.Request(13, [ - rec( 10, 4, CCFileHandle, BE ), - rec( 14, 1, CCFunction ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8000, 0x8800, 0xff16]) - # 2222/5723, 87/35 - pkt = NCP(0x5723, "Modify DOS Attributes on a File or Subdirectory", 'file', has_length=0) - pkt.Request((28, 282), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Flags ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, ReturnInfoMask ), - rec( 14, 2, ExtendedInfo ), - rec( 16, 4, AttributesDef32 ), - rec( 20, 1, VolumeNumber ), - rec( 21, 4, DirectoryBase ), - rec( 25, 1, HandleFlag ), - rec( 26, 1, PathCount, var="x" ), - rec( 27, (1,255), Path, repeat="x" ), - ], info_str=(Path, "Modify DOS Attributes for: %s", "/%s")) - pkt.Reply(24, [ - rec( 8, 4, ItemsChecked ), - rec( 12, 4, ItemsChanged ), - rec( 16, 4, AttributeValidFlag ), - rec( 20, 4, AttributesDef32 ), - ]) - pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/5724, 87/36 - pkt = NCP(0x5724, "Log File", 'sync', has_length=0) - pkt.Request((28, 282), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 2, Reserved2 ), - rec( 12, 1, LogFileFlagLow ), - rec( 13, 1, LogFileFlagHigh ), - rec( 14, 2, Reserved2 ), - rec( 16, 4, WaitTime ), - rec( 20, 1, VolumeNumber ), - rec( 21, 4, DirectoryBase ), - rec( 25, 1, HandleFlag ), - rec( 26, 1, PathCount, var="x" ), - rec( 27, (1,255), Path, repeat="x" ), - ], info_str=(Path, "Lock File: %s", "/%s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/5725, 87/37 - pkt = NCP(0x5725, "Release File", 'sync', has_length=0) - pkt.Request((20, 274), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 2, Reserved2 ), - rec( 12, 1, VolumeNumber ), - rec( 13, 4, DirectoryBase ), - rec( 17, 1, HandleFlag ), - rec( 18, 1, PathCount, var="x" ), - rec( 19, (1,255), Path, repeat="x" ), - ], info_str=(Path, "Release Lock on: %s", "/%s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/5726, 87/38 - pkt = NCP(0x5726, "Clear File", 'sync', has_length=0) - pkt.Request((20, 274), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 2, Reserved2 ), - rec( 12, 1, VolumeNumber ), - rec( 13, 4, DirectoryBase ), - rec( 17, 1, HandleFlag ), - rec( 18, 1, PathCount, var="x" ), - rec( 19, (1,255), Path, repeat="x" ), - ], info_str=(Path, "Clear File: %s", "/%s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/5727, 87/39 - pkt = NCP(0x5727, "Get Directory Disk Space Restriction", 'file', has_length=0) - pkt.Request((19, 273), [ - rec( 8, 1, NameSpace ), - rec( 9, 2, Reserved2 ), - rec( 11, 1, VolumeNumber ), - rec( 12, 4, DirectoryBase ), - rec( 16, 1, HandleFlag ), - rec( 17, 1, PathCount, var="x" ), - rec( 18, (1,255), Path, repeat="x" ), - ], info_str=(Path, "Get Disk Space Restriction for: %s", "/%s")) - pkt.Reply(18, [ - rec( 8, 1, NumberOfEntries, var="x" ), - rec( 9, 9, SpaceStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, - 0xff16]) - # 2222/5728, 87/40 - pkt = NCP(0x5728, "Search for File or Subdirectory Set (Extended Errors)", 'file', has_length=0) - pkt.Request((28, 282), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, DataStream ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, ReturnInfoMask ), - rec( 14, 2, ExtendedInfo ), - rec( 16, 2, ReturnInfoCount ), - rec( 18, 9, SeachSequenceStruct ), - rec( 27, (1,255), SearchPattern ), - ], info_str=(SearchPattern, "Search for: %s", ", %s")) - pkt.Reply(NO_LENGTH_CHECK, [ - rec( 8, 9, SeachSequenceStruct ), - rec( 17, 1, MoreFlag ), - rec( 18, 2, InfoCount ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), - srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), - srec( PadAttributes, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), - srec( PadDataStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), - srec( PadTotalStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), - srec( PadCreationInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), - srec( PadModifyInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), - srec( PadArchiveInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), - srec( PadRightsInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), - srec( PadDirEntry, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), - srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), - srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), - srec( FileNameStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_fname == 1)" ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), - srec( FileNameStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_fname == 1)" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/5729, 87/41 - pkt = NCP(0x5729, "Scan Salvageable Files", 'file', has_length=0) - pkt.Request((24,278), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 2, CtrlFlags, LE ), - rec( 12, 4, SequenceNumber ), - rec( 16, 1, VolumeNumber ), - rec( 17, 4, DirectoryBase ), - rec( 21, 1, HandleFlag ), - rec( 22, 1, PathCount, var="x" ), - rec( 23, (1,255), Path, repeat="x" ), - ], info_str=(Path, "Scan Deleted Files: %s", "/%s")) - pkt.Reply(NO_LENGTH_CHECK, [ - rec( 8, 4, SequenceNumber ), - rec( 12, 4, DirectoryBase ), - rec( 16, 4, ScanItems, var="x" ), - srec(ScanInfoFileName, req_cond="ncp.ctrl_flags==0x0001", repeat="x" ), - srec(ScanInfoFileNoName, req_cond="ncp.ctrl_flags==0x0000", repeat="x" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/572A, 87/42 - pkt = NCP(0x572A, "Purge Salvageable File List", 'file', has_length=0) - pkt.Request(28, [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 2, PurgeFlags ), - rec( 12, 4, VolumeNumberLong ), - rec( 16, 4, DirectoryBase ), - rec( 20, 4, PurgeCount, var="x" ), - rec( 24, 4, PurgeList, repeat="x" ), - ]) - pkt.Reply(16, [ - rec( 8, 4, PurgeCount, var="x" ), - rec( 12, 4, PurgeCcode, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/572B, 87/43 - pkt = NCP(0x572B, "Revoke File Handle Rights", 'file', has_length=0) - pkt.Request(17, [ - rec( 8, 3, Reserved3 ), - rec( 11, 1, RevQueryFlag ), - rec( 12, 4, FileHandle ), - rec( 16, 1, RemoveOpenRights ), - ]) - pkt.Reply(13, [ - rec( 8, 4, FileHandle ), - rec( 12, 1, OpenRights ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/572C, 87/44 - pkt = NCP(0x572C, "Update File Handle Rights", 'file', has_length=0) - pkt.Request(24, [ - rec( 8, 2, Reserved2 ), - rec( 10, 1, VolumeNumber ), - rec( 11, 1, NameSpace ), - rec( 12, 4, DirectoryNumber ), - rec( 16, 2, AccessRightsMaskWord ), - rec( 18, 2, NewAccessRights ), - rec( 20, 4, FileHandle, BE ), - ]) - pkt.Reply(16, [ - rec( 8, 4, FileHandle, BE ), - rec( 12, 4, EffectiveRights, LE ), - ]) - pkt.CompletionCodes([0x0000, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) - # 2222/5740, 87/64 - pkt = NCP(0x5740, "Read from File", 'file', has_length=0) - pkt.Request(22, [ - rec( 8, 4, FileHandle, BE ), - rec( 12, 8, StartOffset64bit, BE ), - rec( 20, 2, NumBytes, BE ), - ]) - pkt.Reply(10, [ - rec( 8, 2, NumBytes, BE), - ]) - pkt.CompletionCodes([0x0000, 0x8300, 0x8800, 0x9300, 0x9500, 0xa201, 0xfd00, 0xff1b]) - # 2222/5741, 87/65 - pkt = NCP(0x5741, "Write to File", 'file', has_length=0) - pkt.Request(22, [ - rec( 8, 4, FileHandle, BE ), - rec( 12, 8, StartOffset64bit, BE ), - rec( 20, 2, NumBytes, BE ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0102, 0x8300, 0x8800, 0x9400, 0x9500, 0xa201, 0xfd00, 0xff1b]) - # 2222/5742, 87/66 - pkt = NCP(0x5742, "Get Current Size of File", 'file', has_length=0) - pkt.Request(12, [ - rec( 8, 4, FileHandle, BE ), - ]) - pkt.Reply(16, [ - rec( 8, 8, FileSize64bit), - ]) - pkt.CompletionCodes([0x0000, 0x7f00, 0x8800, 0x9600, 0xfd02, 0xff01]) - # 2222/5743, 87/67 - pkt = NCP(0x5743, "Log Physical Record", 'file', has_length=0) - pkt.Request(36, [ - rec( 8, 4, LockFlag, BE ), - rec(12, 4, FileHandle, BE ), - rec(16, 8, StartOffset64bit, BE ), - rec(24, 8, Length64bit, BE ), - rec(32, 4, LockTimeout, BE), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7f00, 0x8800, 0x9600, 0xfb08, 0xfd02, 0xff01]) - # 2222/5744, 87/68 - pkt = NCP(0x5744, "Release Physical Record", 'file', has_length=0) - pkt.Request(28, [ - rec(8, 4, FileHandle, BE ), - rec(12, 8, StartOffset64bit, BE ), - rec(20, 8, Length64bit, BE ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff1a]) - # 2222/5745, 87/69 - pkt = NCP(0x5745, "Clear Physical Record", 'file', has_length=0) - pkt.Request(28, [ - rec(8, 4, FileHandle, BE ), - rec(12, 8, StartOffset64bit, BE ), - rec(20, 8, Length64bit, BE ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff1a]) - # 2222/5801, 8801 - pkt = NCP(0x5801, "Query Volume Audit Status", "auditing", has_length=0) - pkt.Request(12, [ - rec( 8, 4, ConnectionNumber ), - ]) - pkt.Reply(40, [ - rec(8, 32, NWAuditStatus ), - ]) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/5802, 8802 - pkt = NCP(0x5802, "Add User Audit Property", "auditing", has_length=0) - pkt.Request(25, [ - rec(8, 4, AuditIDType ), - rec(12, 4, AuditID ), - rec(16, 4, AuditHandle ), - rec(20, 4, ObjectID ), - rec(24, 1, AuditFlag ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/5803, 8803 - pkt = NCP(0x5803, "Add Auditor Access", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xde00, 0xfd00, 0xff16]) - # 2222/5804, 8804 - pkt = NCP(0x5804, "Change Auditor Volume Password", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/5805, 8805 - pkt = NCP(0x5805, "Check Auditor Access", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/5806, 8806 - pkt = NCP(0x5806, "Delete User Audit Property", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff21]) - # 2222/5807, 8807 - pkt = NCP(0x5807, "Disable Auditing On A Volume", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/5808, 8808 - pkt = NCP(0x5808, "Enable Auditing On A Volume", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xde00, 0xfd00, 0xff16]) - # 2222/5809, 8809 - pkt = NCP(0x5809, "Query User Being Audited", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/580A, 88,10 - pkt = NCP(0x580A, "Read Audit Bit Map", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/580B, 88,11 - pkt = NCP(0x580B, "Read Audit File Configuration Header", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/580D, 88,13 - pkt = NCP(0x580D, "Remove Auditor Access", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/580E, 88,14 - pkt = NCP(0x580E, "Reset Audit File", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - - # 2222/580F, 88,15 - pkt = NCP(0x580F, "Auditing NCP", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfb00, 0xfd00, 0xff16]) - # 2222/5810, 88,16 - pkt = NCP(0x5810, "Write Audit Bit Map", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/5811, 88,17 - pkt = NCP(0x5811, "Write Audit File Configuration Header", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/5812, 88,18 - pkt = NCP(0x5812, "Change Auditor Volume Password2", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/5813, 88,19 - pkt = NCP(0x5813, "Return Audit Flags", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/5814, 88,20 - pkt = NCP(0x5814, "Close Old Audit File", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/5816, 88,22 - pkt = NCP(0x5816, "Check Level Two Access", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xde00, 0xfd00, 0xff16]) - # 2222/5817, 88,23 - pkt = NCP(0x5817, "Return Old Audit File List", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/5818, 88,24 - pkt = NCP(0x5818, "Init Audit File Reads", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/5819, 88,25 - pkt = NCP(0x5819, "Read Auditing File", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/581A, 88,26 - pkt = NCP(0x581A, "Delete Old Audit File", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/581E, 88,30 - pkt = NCP(0x581E, "Restart Volume auditing", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/581F, 88,31 - pkt = NCP(0x581F, "Set Volume Password", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) - # 2222/5901, 89,01 - pkt = NCP(0x5901, "Open/Create File or Subdirectory", "enhanced", has_length=0) - pkt.Request((37,290), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, OpenCreateMode ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, ReturnInfoMask ), - rec( 14, 2, ExtendedInfo ), - rec( 16, 4, AttributesDef32 ), - rec( 20, 2, DesiredAccessRights ), - rec( 22, 4, DirectoryBase ), - rec( 26, 1, VolumeNumber ), - rec( 27, 1, HandleFlag ), - rec( 28, 1, DataTypeFlag ), - rec( 29, 5, Reserved5 ), - rec( 34, 1, PathCount, var="x" ), - rec( 35, (2,255), Path16, repeat="x" ), - ], info_str=(Path16, "Open or Create File or Subdirectory: %s", "/%s")) - pkt.Reply( NO_LENGTH_CHECK, [ - rec( 8, 4, FileHandle, BE ), - rec( 12, 1, OpenCreateAction ), - rec( 13, 1, Reserved ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), - srec( PadDSSpaceAllocate, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), - srec( AttributesStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), - srec( PadAttributes, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), - srec( PadDataStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), - srec( PadTotalStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), - srec( CreationInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), - srec( PadCreationInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), - srec( PadModifyInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), - srec( PadArchiveInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), - srec( RightsInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), - srec( PadRightsInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), - srec( DirEntryStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), - srec( PadDirEntry, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), - srec( EAInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), - srec( PadEAInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), - srec( NSInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), - srec( PadNSInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), - srec( ReferenceIDStruct, req_cond="ncp.ret_info_mask_id == 1" ), - srec( NSAttributeStruct, req_cond="ncp.ret_info_mask_ns_attr == 1" ), - srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1" ), - srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1" ), - srec( LastUpdatedInSecondsStruct, req_cond="ncp.ext_info_update == 1" ), - srec( DOSName16Struct, req_cond="ncp.ext_info_dos_name == 1" ), - srec( FlushTimeStruct, req_cond="ncp.ext_info_flush == 1" ), - srec( ParentBaseIDStruct, req_cond="ncp.ext_info_parental == 1" ), - srec( MacFinderInfoStruct, req_cond="ncp.ext_info_mac_finder == 1" ), - srec( SiblingCountStruct, req_cond="ncp.ext_info_sibling == 1" ), - srec( EffectiveRightsStruct, req_cond="ncp.ext_info_effective == 1" ), - srec( MacTimeStruct, req_cond="ncp.ext_info_mac_date == 1" ), - srec( LastAccessedTimeStruct, req_cond="ncp.ext_info_access == 1" ), - srec( FileSize64bitStruct, req_cond="ncp.ext_info_64_bit_fs == 1" ), - srec( FileName16Struct, req_cond="ncp.ret_info_mask_fname == 1" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x0102, 0x7f00, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9900, 0x9b03, 0x9c03, 0xa901, 0xa500, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5902, 89/02 - pkt = NCP(0x5902, "Initialize Search", 'enhanced', has_length=0) - pkt.Request( (25,278), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 4, DirectoryBase ), - rec( 14, 1, VolumeNumber ), - rec( 15, 1, HandleFlag ), - rec( 16, 1, DataTypeFlag ), - rec( 17, 5, Reserved5 ), - rec( 22, 1, PathCount, var="x" ), - rec( 23, (2,255), Path16, repeat="x" ), - ], info_str=(Path16, "Set Search Pointer to: %s", "/%s")) - pkt.Reply(17, [ - rec( 8, 1, VolumeNumber ), - rec( 9, 4, DirectoryNumber ), - rec( 13, 4, DirectoryEntryNumber ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5903, 89/03 - pkt = NCP(0x5903, "Search for File or Subdirectory", 'enhanced', has_length=0) - pkt.Request((28, 281), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, DataStream ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, ReturnInfoMask ), - rec( 14, 2, ExtendedInfo ), - rec( 16, 9, SeachSequenceStruct ), - rec( 25, 1, DataTypeFlag ), - rec( 26, (2,255), SearchPattern16 ), - ], info_str=(SearchPattern16, "Search for: %s", "/%s")) - pkt.Reply( NO_LENGTH_CHECK, [ - rec( 8, 9, SeachSequenceStruct ), - rec( 17, 1, Reserved ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), - srec( PadDSSpaceAllocate, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), - srec( AttributesStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), - srec( PadAttributes, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), - srec( PadDataStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), - srec( PadTotalStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), - srec( CreationInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), - srec( PadCreationInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), - srec( PadModifyInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), - srec( PadArchiveInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), - srec( RightsInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), - srec( PadRightsInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), - srec( DirEntryStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), - srec( PadDirEntry, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), - srec( EAInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), - srec( PadEAInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), - srec( NSInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), - srec( PadNSInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), - srec( ReferenceIDStruct, req_cond="ncp.ret_info_mask_id == 1" ), - srec( NSAttributeStruct, req_cond="ncp.ret_info_mask_ns_attr == 1" ), - srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1" ), - srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1" ), - srec( LastUpdatedInSecondsStruct, req_cond="ncp.ext_info_update == 1" ), - srec( DOSName16Struct, req_cond="ncp.ext_info_dos_name == 1" ), - srec( FlushTimeStruct, req_cond="ncp.ext_info_flush == 1" ), - srec( ParentBaseIDStruct, req_cond="ncp.ext_info_parental == 1" ), - srec( MacFinderInfoStruct, req_cond="ncp.ext_info_mac_finder == 1" ), - srec( SiblingCountStruct, req_cond="ncp.ext_info_sibling == 1" ), - srec( EffectiveRightsStruct, req_cond="ncp.ext_info_effective == 1" ), - srec( MacTimeStruct, req_cond="ncp.ext_info_mac_date == 1" ), - srec( LastAccessedTimeStruct, req_cond="ncp.ext_info_access == 1" ), - srec( FileSize64bitStruct, req_cond="ncp.ext_info_64_bit_fs == 1" ), - srec( FileName16Struct, req_cond="ncp.ret_info_mask_fname == 1" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5904, 89/04 - pkt = NCP(0x5904, "Rename Or Move a File or Subdirectory", 'enhanced', has_length=0) - pkt.Request((42, 548), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, RenameFlag ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 12, SrcEnhNWHandlePathS1 ), - rec( 24, 1, PathCount, var="x" ), - rec( 25, 12, DstEnhNWHandlePathS1 ), - rec( 37, 1, PathCount, var="y" ), - rec( 38, (2, 255), Path16, repeat="x" ), - rec( -1, (2,255), DestPath16, repeat="y" ), - ], info_str=(Path16, "Rename or Move: %s", "/%s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8e00, 0x8f00, 0x9001, 0x9200, 0x9600, - 0x9804, 0x9a00, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5905, 89/05 - pkt = NCP(0x5905, "Scan File or Subdirectory for Trustees", 'enhanced', has_length=0) - pkt.Request((31, 284), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, MaxReplyObjectIDCount ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 4, SequenceNumber ), - rec( 16, 4, DirectoryBase ), - rec( 20, 1, VolumeNumber ), - rec( 21, 1, HandleFlag ), - rec( 22, 1, DataTypeFlag ), - rec( 23, 5, Reserved5 ), - rec( 28, 1, PathCount, var="x" ), - rec( 29, (2, 255), Path16, repeat="x" ), - ], info_str=(Path16, "Scan Trustees for: %s", "/%s")) - pkt.Reply(20, [ - rec( 8, 4, SequenceNumber ), - rec( 12, 2, ObjectIDCount, var="x" ), - rec( 14, 6, TrusteeStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5906, 89/06 - pkt = NCP(0x5906, "Obtain File or SubDirectory Information", 'enhanced', has_length=0) - pkt.Request((22), [ - rec( 8, 1, SrcNameSpace ), - rec( 9, 1, DestNameSpace ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, ReturnInfoMask, LE ), - rec( 14, 2, ExtendedInfo ), - rec( 16, 4, DirectoryBase ), - rec( 20, 1, VolumeNumber ), - rec( 21, 1, HandleFlag ), - # - # Move to packet-ncp2222.inc - # The datatype flag indicates if the path is represented as ASCII or UTF8 - # ASCII has a 1 byte count field whereas UTF8 has a two byte count field. - # - #rec( 22, 1, DataTypeFlag ), - #rec( 23, 5, Reserved5 ), - #rec( 28, 1, PathCount, var="x" ), - #rec( 29, (2,255), Path16, repeat="x",), - ], info_str=(Path16, "Obtain Info for: %s", "/%s")) - pkt.Reply(NO_LENGTH_CHECK, [ + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8700, 0x8900, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9802, 0x9b03, 0x9c03, 0xa802, 0xa901, 0xbf00, 0xfd00, 0xff16]) + # 2222/5707, 87/07 + pkt = NCP(0x5707, "Modify File or Subdirectory DOS Information", 'file', has_length=0) + pkt.Request((62,316), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, ModifyDOSInfoMask ), + rec( 14, 2, Reserved2 ), + rec( 16, 2, AttributesDef16 ), + rec( 18, 1, FileMode ), + rec( 19, 1, FileExtendedAttributes ), + rec( 20, 2, CreationDate ), + rec( 22, 2, CreationTime ), + rec( 24, 4, CreatorID, BE ), + rec( 28, 2, ModifiedDate ), + rec( 30, 2, ModifiedTime ), + rec( 32, 4, ModifierID, BE ), + rec( 36, 2, ArchivedDate ), + rec( 38, 2, ArchivedTime ), + rec( 40, 4, ArchiverID, BE ), + rec( 44, 2, LastAccessedDate ), + rec( 46, 2, InheritedRightsMask ), + rec( 48, 2, InheritanceRevokeMask ), + rec( 50, 4, MaxSpace ), + rec( 54, 1, VolumeNumber ), + rec( 55, 4, DirectoryBase ), + rec( 59, 1, HandleFlag ), + rec( 60, 1, PathCount, var="x" ), + rec( 61, (1,255), Path, repeat="x" ), + ], info_str=(Path, "Modify DOS Information for: %s", "/%s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8c01, 0x8d00, 0x8e00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xbf00, 0xfd00, 0xff16]) + # 2222/5708, 87/08 + pkt = NCP(0x5708, "Delete a File or Subdirectory", 'file', has_length=0) + pkt.Request((20,274), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 1, VolumeNumber ), + rec( 13, 4, DirectoryBase ), + rec( 17, 1, HandleFlag ), + rec( 18, 1, PathCount, var="x" ), + rec( 19, (1,255), Path, repeat="x" ), + ], info_str=(Path, "Delete a File or Subdirectory: %s", "/%s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8900, 0x8a00, 0x8d00, 0x8e00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xbf00, 0xfd00, 0xff16]) + # 2222/5709, 87/09 + pkt = NCP(0x5709, "Set Short Directory Handle", 'file', has_length=0) + pkt.Request((20,274), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, DataStream ), + rec( 10, 1, DestDirHandle ), + rec( 11, 1, Reserved ), + rec( 12, 1, VolumeNumber ), + rec( 13, 4, DirectoryBase ), + rec( 17, 1, HandleFlag ), + rec( 18, 1, PathCount, var="x" ), + rec( 19, (1,255), Path, repeat="x" ), + ], info_str=(Path, "Set Short Directory Handle to: %s", "/%s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xbf00, 0xfd00, 0xff16]) + # 2222/570A, 87/10 + pkt = NCP(0x570A, "Add Trustee Set to File or Subdirectory", 'file', has_length=0) + pkt.Request((31,285), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, AccessRightsMaskWord ), + rec( 14, 2, ObjectIDCount, var="y" ), + rec( 16, 1, VolumeNumber ), + rec( 17, 4, DirectoryBase ), + rec( 21, 1, HandleFlag ), + rec( 22, 1, PathCount, var="x" ), + rec( 23, (1,255), Path, repeat="x" ), + rec( -1, 7, TrusteeStruct, repeat="y" ), + ], info_str=(Path, "Add Trustee Set to: %s", "/%s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8c01, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa802, 0xa901, 0xbf00, 0xfc01, 0xfd00, 0xff16]) + # 2222/570B, 87/11 + pkt = NCP(0x570B, "Delete Trustee Set from File or SubDirectory", 'file', has_length=0) + pkt.Request((27,281), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 2, ObjectIDCount, var="y" ), + rec( 12, 1, VolumeNumber ), + rec( 13, 4, DirectoryBase ), + rec( 17, 1, HandleFlag ), + rec( 18, 1, PathCount, var="x" ), + rec( 19, (1,255), Path, repeat="x" ), + rec( -1, 7, TrusteeStruct, repeat="y" ), + ], info_str=(Path, "Delete Trustee Set from: %s", "/%s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8c01, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/570C, 87/12 + pkt = NCP(0x570C, "Allocate Short Directory Handle", 'file', has_length=0) + pkt.Request((20,274), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 2, AllocateMode ), + rec( 12, 1, VolumeNumber ), + rec( 13, 4, DirectoryBase ), + rec( 17, 1, HandleFlag ), + rec( 18, 1, PathCount, var="x" ), + rec( 19, (1,255), Path, repeat="x" ), + ], info_str=(Path, "Allocate Short Directory Handle to: %s", "/%s")) + pkt.Reply(NO_LENGTH_CHECK, [ + srec( ReplyLevel2Struct, req_cond="ncp.alloc_reply_lvl2 == TRUE" ), + srec( ReplyLevel1Struct, req_cond="ncp.alloc_reply_lvl2 == FALSE" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8900, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0x9d00, 0xa901, 0xbf00, 0xfd00, 0xff16]) + # 2222/5710, 87/16 + pkt = NCP(0x5710, "Scan Salvageable Files", 'file', has_length=0) + pkt.Request((26,280), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, DataStream ), + rec( 10, 2, ReturnInfoMask ), + rec( 12, 2, ExtendedInfo ), + rec( 14, 4, SequenceNumber ), + rec( 18, 1, VolumeNumber ), + rec( 19, 4, DirectoryBase ), + rec( 23, 1, HandleFlag ), + rec( 24, 1, PathCount, var="x" ), + rec( 25, (1,255), Path, repeat="x" ), + ], info_str=(Path, "Scan for Deleted Files in: %s", "/%s")) + pkt.Reply(NO_LENGTH_CHECK, [ + rec( 8, 4, SequenceNumber ), + rec( 12, 2, DeletedTime ), + rec( 14, 2, DeletedDate ), + rec( 16, 4, DeletedID, BE ), + rec( 20, 4, VolumeID ), + rec( 24, 4, DirectoryBase ), srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), @@ -13978,6 +12727,7 @@ srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), + srec( FileNameStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_fname == 1)" ), srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), @@ -13989,2436 +12739,3691 @@ srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), - srec( ReferenceIDStruct, req_cond="ncp.ret_info_mask_id == 1" ), - srec( NSAttributeStruct, req_cond="ncp.ret_info_mask_ns_attr == 1" ), - srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1" ), - srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1" ), - srec( LastUpdatedInSecondsStruct, req_cond="ncp.ext_info_update == 1" ), - srec( DOSName16Struct, req_cond="ncp.ext_info_dos_name == 1" ), - srec( FlushTimeStruct, req_cond="ncp.ext_info_flush == 1" ), - srec( ParentBaseIDStruct, req_cond="ncp.ext_info_parental == 1" ), - srec( MacFinderInfoStruct, req_cond="ncp.ext_info_mac_finder == 1" ), - srec( SiblingCountStruct, req_cond="ncp.ext_info_sibling == 1" ), - srec( EffectiveRightsStruct, req_cond="ncp.ext_info_effective == 1" ), - srec( MacTimeStruct, req_cond="ncp.ext_info_mac_date == 1" ), - srec( LastAccessedTimeStruct, req_cond="ncp.ext_info_access == 1" ), - srec( FileSize64bitStruct, req_cond="ncp.ext_info_64_bit_fs == 1" ), - srec( FileName16Struct, req_cond="ncp.ret_info_mask_fname == 1" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8700, 0x8900, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa802, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5907, 89/07 - pkt = NCP(0x5907, "Modify File or Subdirectory DOS Information", 'enhanced', has_length=0) - pkt.Request((69,322), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, ModifyDOSInfoMask ), - rec( 14, 2, Reserved2 ), - rec( 16, 2, AttributesDef16 ), - rec( 18, 1, FileMode ), - rec( 19, 1, FileExtendedAttributes ), - rec( 20, 2, CreationDate ), - rec( 22, 2, CreationTime ), - rec( 24, 4, CreatorID, BE ), - rec( 28, 2, ModifiedDate ), - rec( 30, 2, ModifiedTime ), - rec( 32, 4, ModifierID, BE ), - rec( 36, 2, ArchivedDate ), - rec( 38, 2, ArchivedTime ), - rec( 40, 4, ArchiverID, BE ), - rec( 44, 2, LastAccessedDate ), - rec( 46, 2, InheritedRightsMask ), - rec( 48, 2, InheritanceRevokeMask ), - rec( 50, 4, MaxSpace ), - rec( 54, 4, DirectoryBase ), - rec( 58, 1, VolumeNumber ), - rec( 59, 1, HandleFlag ), - rec( 60, 1, DataTypeFlag ), - rec( 61, 5, Reserved5 ), - rec( 66, 1, PathCount, var="x" ), - rec( 67, (2,255), Path16, repeat="x" ), - ], info_str=(Path16, "Modify DOS Information for: %s", "/%s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8c01, 0x8d00, 0x8e00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5908, 89/08 - pkt = NCP(0x5908, "Delete a File or Subdirectory", 'enhanced', has_length=0) - pkt.Request((27,280), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 4, DirectoryBase ), - rec( 16, 1, VolumeNumber ), - rec( 17, 1, HandleFlag ), - rec( 18, 1, DataTypeFlag ), - rec( 19, 5, Reserved5 ), - rec( 24, 1, PathCount, var="x" ), - rec( 25, (2,255), Path16, repeat="x" ), - ], info_str=(Path16, "Delete a File or Subdirectory: %s", "/%s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8900, 0x8a00, 0x8d00, 0x8e00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5909, 89/09 - pkt = NCP(0x5909, "Set Short Directory Handle", 'enhanced', has_length=0) - pkt.Request((27,280), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, DataStream ), - rec( 10, 1, DestDirHandle ), - rec( 11, 1, Reserved ), - rec( 12, 4, DirectoryBase ), - rec( 16, 1, VolumeNumber ), - rec( 17, 1, HandleFlag ), - rec( 18, 1, DataTypeFlag ), - rec( 19, 5, Reserved5 ), - rec( 24, 1, PathCount, var="x" ), - rec( 25, (2,255), Path16, repeat="x" ), - ], info_str=(Path16, "Set Short Directory Handle to: %s", "/%s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/590A, 89/10 - pkt = NCP(0x590A, "Add Trustee Set to File or Subdirectory", 'enhanced', has_length=0) - pkt.Request((37,290), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, AccessRightsMaskWord ), - rec( 14, 2, ObjectIDCount, var="y" ), - rec( -1, 6, TrusteeStruct, repeat="y" ), - rec( -1, 4, DirectoryBase ), - rec( -1, 1, VolumeNumber ), - rec( -1, 1, HandleFlag ), - rec( -1, 1, DataTypeFlag ), - rec( -1, 5, Reserved5 ), - rec( -1, 1, PathCount, var="x" ), - rec( -1, (2,255), Path16, repeat="x" ), - ], info_str=(Path16, "Add Trustee Set to: %s", "/%s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8c01, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfc01, 0xfd00, 0xff16]) - # 2222/590B, 89/11 - pkt = NCP(0x590B, "Delete Trustee Set from File or SubDirectory", 'enhanced', has_length=0) - pkt.Request((34,287), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 2, ObjectIDCount, var="y" ), - rec( 12, 7, TrusteeStruct, repeat="y" ), - rec( 19, 4, DirectoryBase ), - rec( 23, 1, VolumeNumber ), - rec( 24, 1, HandleFlag ), - rec( 25, 1, DataTypeFlag ), - rec( 26, 5, Reserved5 ), - rec( 31, 1, PathCount, var="x" ), - rec( 32, (2,255), Path16, repeat="x" ), - ], info_str=(Path16, "Delete Trustee Set from: %s", "/%s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8c01, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/590C, 89/12 - pkt = NCP(0x590C, "Allocate Short Directory Handle", 'enhanced', has_length=0) - pkt.Request((27,280), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, DestNameSpace ), - rec( 10, 2, AllocateMode ), - rec( 12, 4, DirectoryBase ), - rec( 16, 1, VolumeNumber ), - rec( 17, 1, HandleFlag ), - rec( 18, 1, DataTypeFlag ), - rec( 19, 5, Reserved5 ), - rec( 24, 1, PathCount, var="x" ), - rec( 25, (2,255), Path16, repeat="x" ), - ], info_str=(Path16, "Allocate Short Directory Handle to: %s", "/%s")) - pkt.Reply(NO_LENGTH_CHECK, [ - srec( ReplyLevel2Struct, req_cond="ncp.alloc_reply_lvl2 == TRUE" ), - srec( ReplyLevel1Struct, req_cond="ncp.alloc_reply_lvl2 == FALSE" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5910, 89/16 - pkt = NCP(0x5910, "Scan Salvageable Files", 'enhanced', has_length=0) - pkt.Request((33,286), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, DataStream ), - rec( 10, 2, ReturnInfoMask ), - rec( 12, 2, ExtendedInfo ), - rec( 14, 4, SequenceNumber ), - rec( 18, 4, DirectoryBase ), - rec( 22, 1, VolumeNumber ), - rec( 23, 1, HandleFlag ), - rec( 24, 1, DataTypeFlag ), - rec( 25, 5, Reserved5 ), - rec( 30, 1, PathCount, var="x" ), - rec( 31, (2,255), Path16, repeat="x" ), - ], info_str=(Path16, "Scan for Deleted Files in: %s", "/%s")) - pkt.Reply(NO_LENGTH_CHECK, [ - rec( 8, 4, SequenceNumber ), - rec( 12, 2, DeletedTime ), - rec( 14, 2, DeletedDate ), - rec( 16, 4, DeletedID, BE ), - rec( 20, 4, VolumeID ), - rec( 24, 4, DirectoryBase ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), - srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), - srec( PadAttributes, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), - srec( PadDataStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), - srec( PadTotalStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), - srec( PadCreationInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), - srec( PadModifyInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), - srec( PadArchiveInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), - srec( PadRightsInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), - srec( PadDirEntry, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), - srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), - srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), - srec( FileName16Struct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_fname == 1)" ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), - srec( FileSize64bitStruct, req_cond="ncp.ext_info_64_bit_fs == 1" ), - srec( FileName16Struct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_fname == 1)" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5911, 89/17 - pkt = NCP(0x5911, "Recover Salvageable File", 'enhanced', has_length=0) - pkt.Request((24,278), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Reserved ), - rec( 10, 4, SequenceNumber ), - rec( 14, 4, VolumeID ), - rec( 18, 4, DirectoryBase ), - rec( 22, 1, DataTypeFlag ), - rec( 23, (1,255), FileName ), - ], info_str=(FileName, "Recover Deleted File: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5913, 89/19 - pkt = NCP(0x5913, "Get Name Space Information", 'enhanced', has_length=0) - pkt.Request(18, [ - rec( 8, 1, SrcNameSpace ), - rec( 9, 1, DestNameSpace ), - rec( 10, 1, DataTypeFlag ), - rec( 11, 1, VolumeNumber ), - rec( 12, 4, DirectoryBase ), - rec( 16, 2, NamesSpaceInfoMask ), - ]) - pkt.Reply(NO_LENGTH_CHECK, [ - srec( FileName16Struct, req_cond="ncp.ns_info_mask_modify == TRUE" ), - srec( FileAttributesStruct, req_cond="ncp.ns_info_mask_fatt == TRUE" ), - srec( CreationDateStruct, req_cond="ncp.ns_info_mask_cdate == TRUE" ), - srec( CreationTimeStruct, req_cond="ncp.ns_info_mask_ctime == TRUE" ), - srec( OwnerIDStruct, req_cond="ncp.ns_info_mask_owner == TRUE" ), - srec( ArchiveDateStruct, req_cond="ncp.ns_info_mask_adate == TRUE" ), - srec( ArchiveTimeStruct, req_cond="ncp.ns_info_mask_atime == TRUE" ), - srec( ArchiveIdStruct, req_cond="ncp.ns_info_mask_aid == TRUE" ), - srec( UpdateDateStruct, req_cond="ncp.ns_info_mask_udate == TRUE" ), - srec( UpdateTimeStruct, req_cond="ncp.ns_info_mask_utime == TRUE" ), - srec( UpdateIDStruct, req_cond="ncp.ns_info_mask_uid == TRUE" ), - srec( LastAccessStruct, req_cond="ncp.ns_info_mask_acc_date == TRUE" ), - srec( RightsInfoStruct, req_cond="ncp.ns_info_mask_max_acc_mask == TRUE" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5914, 89/20 - pkt = NCP(0x5914, "Search for File or Subdirectory Set", 'enhanced', has_length=0) - pkt.Request((30, 283), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, DataStream ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, ReturnInfoMask ), - rec( 14, 2, ExtendedInfo ), - rec( 16, 2, ReturnInfoCount ), - rec( 18, 9, SeachSequenceStruct ), - rec( 27, 1, DataTypeFlag ), - rec( 28, (2,255), SearchPattern16 ), - ]) - # The reply packet is dissected in packet-ncp2222.inc - pkt.Reply(NO_LENGTH_CHECK, [ - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5916, 89/22 - pkt = NCP(0x5916, "Generate Directory Base and Volume Number", 'enhanced', has_length=0) - pkt.Request((27,280), [ - rec( 8, 1, SrcNameSpace ), - rec( 9, 1, DestNameSpace ), - rec( 10, 2, dstNSIndicator ), - rec( 12, 4, DirectoryBase ), - rec( 16, 1, VolumeNumber ), - rec( 17, 1, HandleFlag ), - rec( 18, 1, DataTypeFlag ), - rec( 19, 5, Reserved5 ), - rec( 24, 1, PathCount, var="x" ), - rec( 25, (2,255), Path16, repeat="x" ), - ], info_str=(Path16, "Get Volume and Directory Base from: %s", "/%s")) - pkt.Reply(17, [ - rec( 8, 4, DirectoryBase ), - rec( 12, 4, DOSDirectoryBase ), - rec( 16, 1, VolumeNumber ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5919, 89/25 - pkt = NCP(0x5919, "Set Name Space Information", 'enhanced', has_length=0) - pkt.Request(530, [ - rec( 8, 1, SrcNameSpace ), - rec( 9, 1, DestNameSpace ), - rec( 10, 1, VolumeNumber ), - rec( 11, 4, DirectoryBase ), - rec( 15, 2, NamesSpaceInfoMask ), - rec( 17, 1, DataTypeFlag ), - rec( 18, 512, NSSpecificInfo ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8b00, 0x8d00, 0x8f00, 0x9001, - 0x9600, 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, - 0xff16]) - # 2222/591C, 89/28 - pkt = NCP(0x591C, "Get Full Path String", 'enhanced', has_length=0) - pkt.Request((35,288), [ - rec( 8, 1, SrcNameSpace ), - rec( 9, 1, DestNameSpace ), - rec( 10, 2, PathCookieFlags ), - rec( 12, 4, Cookie1 ), - rec( 16, 4, Cookie2 ), - rec( 20, 4, DirectoryBase ), - rec( 24, 1, VolumeNumber ), - rec( 25, 1, HandleFlag ), - rec( 26, 1, DataTypeFlag ), - rec( 27, 5, Reserved5 ), - rec( 32, 1, PathCount, var="x" ), - rec( 33, (2,255), Path16, repeat="x" ), - ], info_str=(Path16, "Get Full Path from: %s", "/%s")) - pkt.Reply((24,277), [ - rec( 8, 2, PathCookieFlags ), - rec( 10, 4, Cookie1 ), - rec( 14, 4, Cookie2 ), - rec( 18, 2, PathComponentSize ), - rec( 20, 2, PathComponentCount, var='x' ), - rec( 22, (2,255), Path16, repeat='x' ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8b00, 0x8d00, 0x8f00, 0x9001, - 0x9600, 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, - 0xff16]) - # 2222/591D, 89/29 - pkt = NCP(0x591D, "Get Effective Directory Rights", 'enhanced', has_length=0) - pkt.Request((31, 284), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, DestNameSpace ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, ReturnInfoMask ), - rec( 14, 2, ExtendedInfo ), - rec( 16, 4, DirectoryBase ), - rec( 20, 1, VolumeNumber ), - rec( 21, 1, HandleFlag ), - rec( 22, 1, DataTypeFlag ), - rec( 23, 5, Reserved5 ), - rec( 28, 1, PathCount, var="x" ), - rec( 29, (2,255), Path16, repeat="x" ), - ], info_str=(Path16, "Get Effective Rights for: %s", "/%s")) - pkt.Reply(NO_LENGTH_CHECK, [ - rec( 8, 2, EffectiveRights, LE ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), - srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), - srec( PadAttributes, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), - srec( PadDataStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), - srec( PadTotalStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), - srec( PadCreationInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), - srec( PadModifyInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), - srec( PadArchiveInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), - srec( PadRightsInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), - srec( PadDirEntry, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), - srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), - srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), - srec( FileName16Struct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_fname == 1)" ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), - srec( FileSize64bitStruct, req_cond="(ncp.ext_info_64_bit_fs == 1) && (ncp.ret_info_mask_fname == 1)" ), - srec( FileName16Struct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_fname == 1)" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/591E, 89/30 - pkt = NCP(0x591E, "Open/Create File or Subdirectory", 'enhanced', has_length=0) - pkt.Request((41, 294), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, DataStream ), - rec( 10, 1, OpenCreateMode ), - rec( 11, 1, Reserved ), - rec( 12, 2, SearchAttributesLow ), - rec( 14, 2, Reserved2 ), - rec( 16, 2, ReturnInfoMask ), - rec( 18, 2, ExtendedInfo ), - rec( 20, 4, AttributesDef32 ), - rec( 24, 2, DesiredAccessRights ), - rec( 26, 4, DirectoryBase ), - rec( 30, 1, VolumeNumber ), - rec( 31, 1, HandleFlag ), - rec( 32, 1, DataTypeFlag ), - rec( 33, 5, Reserved5 ), - rec( 38, 1, PathCount, var="x" ), - rec( 39, (2,255), Path16, repeat="x" ), - ], info_str=(Path16, "Open or Create File: %s", "/%s")) - pkt.Reply(NO_LENGTH_CHECK, [ - rec( 8, 4, FileHandle, BE ), - rec( 12, 1, OpenCreateAction ), - rec( 13, 1, Reserved ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), - srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), - srec( PadAttributes, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), - srec( PadDataStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), - srec( PadTotalStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), - srec( PadCreationInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), - srec( PadModifyInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), - srec( PadArchiveInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), - srec( PadRightsInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), - srec( PadDirEntry, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), - srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), - srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), - srec( FileName16Struct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_fname == 1)" ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), - srec( FileSize64bitStruct, req_cond="(ncp.ext_info_64_bit_fs == 1) && (ncp.ret_info_mask_fname == 1)" ), - srec( FileName16Struct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_fname == 1)" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5920, 89/32 - pkt = NCP(0x5920, "Open/Create File or Subdirectory with Callback", 'enhanced', has_length=0) - pkt.Request((37, 290), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, OpenCreateMode ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, ReturnInfoMask ), - rec( 14, 2, ExtendedInfo ), - rec( 16, 4, AttributesDef32 ), - rec( 20, 2, DesiredAccessRights ), - rec( 22, 4, DirectoryBase ), - rec( 26, 1, VolumeNumber ), - rec( 27, 1, HandleFlag ), - rec( 28, 1, DataTypeFlag ), - rec( 29, 5, Reserved5 ), - rec( 34, 1, PathCount, var="x" ), - rec( 35, (2,255), Path16, repeat="x" ), - ], info_str=(Path16, "Open or Create with Op-Lock: %s", "/%s")) - pkt.Reply( NO_LENGTH_CHECK, [ - rec( 8, 4, FileHandle, BE ), - rec( 12, 1, OpenCreateAction ), - rec( 13, 1, OCRetFlags ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), - srec( PadDSSpaceAllocate, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), - srec( AttributesStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), - srec( PadAttributes, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), - srec( PadDataStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), - srec( PadTotalStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), - srec( CreationInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), - srec( PadCreationInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), - srec( PadModifyInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), - srec( PadArchiveInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), - srec( RightsInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), - srec( PadRightsInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), - srec( DirEntryStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), - srec( PadDirEntry, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), - srec( EAInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), - srec( PadEAInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), - srec( NSInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), - srec( PadNSInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), - srec( ReferenceIDStruct, req_cond="ncp.ret_info_mask_id == 1" ), - srec( NSAttributeStruct, req_cond="ncp.ret_info_mask_ns_attr == 1" ), - srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1" ), - srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1" ), - srec( LastUpdatedInSecondsStruct, req_cond="ncp.ext_info_update == 1" ), - srec( DOSName16Struct, req_cond="ncp.ext_info_dos_name == 1" ), - srec( FlushTimeStruct, req_cond="ncp.ext_info_flush == 1" ), - srec( ParentBaseIDStruct, req_cond="ncp.ext_info_parental == 1" ), - srec( MacFinderInfoStruct, req_cond="ncp.ext_info_mac_finder == 1" ), - srec( SiblingCountStruct, req_cond="ncp.ext_info_sibling == 1" ), - srec( EffectiveRightsStruct, req_cond="ncp.ext_info_effective == 1" ), - srec( MacTimeStruct, req_cond="ncp.ext_info_mac_date == 1" ), - srec( LastAccessedTimeStruct, req_cond="ncp.ext_info_access == 1" ), - srec( FileSize64bitStruct, req_cond="ncp.ext_info_64_bit_fs == 1" ), - srec( FileName16Struct, req_cond="ncp.ret_info_mask_fname == 1" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x0102, 0x7f00, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5921, 89/33 - pkt = NCP(0x5921, "Open/Create File or Subdirectory II with Callback", 'enhanced', has_length=0) - pkt.Request((41, 294), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, DataStream ), - rec( 10, 1, OpenCreateMode ), - rec( 11, 1, Reserved ), - rec( 12, 2, SearchAttributesLow ), - rec( 14, 2, Reserved2 ), - rec( 16, 2, ReturnInfoMask ), - rec( 18, 2, ExtendedInfo ), - rec( 20, 4, AttributesDef32 ), - rec( 24, 2, DesiredAccessRights ), - rec( 26, 4, DirectoryBase ), - rec( 30, 1, VolumeNumber ), - rec( 31, 1, HandleFlag ), - rec( 32, 1, DataTypeFlag ), - rec( 33, 5, Reserved5 ), - rec( 38, 1, PathCount, var="x" ), - rec( 39, (2,255), Path16, repeat="x" ), - ], info_str=(Path16, "Open or Create II with Op-Lock: %s", "/%s")) - pkt.Reply( NO_LENGTH_CHECK, [ - rec( 8, 4, FileHandle ), - rec( 12, 1, OpenCreateAction ), - rec( 13, 1, OCRetFlags ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), - srec( PadDSSpaceAllocate, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), - srec( AttributesStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), - srec( PadAttributes, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), - srec( PadDataStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), - srec( PadTotalStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), - srec( CreationInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), - srec( PadCreationInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), - srec( PadModifyInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), - srec( PadArchiveInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), - srec( RightsInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), - srec( PadRightsInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), - srec( DirEntryStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), - srec( PadDirEntry, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), - srec( EAInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), - srec( PadEAInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), - srec( NSInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), - srec( PadNSInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), - srec( ReferenceIDStruct, req_cond="ncp.ret_info_mask_id == 1" ), - srec( NSAttributeStruct, req_cond="ncp.ret_info_mask_ns_attr == 1" ), - srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1" ), - srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1" ), - srec( LastUpdatedInSecondsStruct, req_cond="ncp.ext_info_update == 1" ), - srec( DOSName16Struct, req_cond="ncp.ext_info_dos_name == 1" ), - srec( FlushTimeStruct, req_cond="ncp.ext_info_flush == 1" ), - srec( ParentBaseIDStruct, req_cond="ncp.ext_info_parental == 1" ), - srec( MacFinderInfoStruct, req_cond="ncp.ext_info_mac_finder == 1" ), - srec( SiblingCountStruct, req_cond="ncp.ext_info_sibling == 1" ), - srec( EffectiveRightsStruct, req_cond="ncp.ext_info_effective == 1" ), - srec( MacTimeStruct, req_cond="ncp.ext_info_mac_date == 1" ), - srec( LastAccessedTimeStruct, req_cond="ncp.ext_info_access == 1" ), - srec( FileSize64bitStruct, req_cond="ncp.ext_info_64_bit_fs == 1" ), - srec( FileName16Struct, req_cond="ncp.ret_info_mask_fname == 1" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5923, 89/35 - pkt = NCP(0x5923, "Modify DOS Attributes on a File or Subdirectory", 'enhanced', has_length=0) - pkt.Request((35, 288), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, Flags ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, ReturnInfoMask ), - rec( 14, 2, ExtendedInfo ), - rec( 16, 4, AttributesDef32 ), - rec( 20, 4, DirectoryBase ), - rec( 24, 1, VolumeNumber ), - rec( 25, 1, HandleFlag ), - rec( 26, 1, DataTypeFlag ), - rec( 27, 5, Reserved5 ), - rec( 32, 1, PathCount, var="x" ), - rec( 33, (2,255), Path16, repeat="x" ), - ], info_str=(Path16, "Modify DOS Attributes for: %s", "/%s")) - pkt.Reply(24, [ - rec( 8, 4, ItemsChecked ), - rec( 12, 4, ItemsChanged ), - rec( 16, 4, AttributeValidFlag ), - rec( 20, 4, AttributesDef32 ), - ]) - pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5927, 89/39 - pkt = NCP(0x5927, "Get Directory Disk Space Restriction", 'enhanced', has_length=0) - pkt.Request((26, 279), [ - rec( 8, 1, NameSpace ), - rec( 9, 2, Reserved2 ), - rec( 11, 4, DirectoryBase ), - rec( 15, 1, VolumeNumber ), - rec( 16, 1, HandleFlag ), - rec( 17, 1, DataTypeFlag ), - rec( 18, 5, Reserved5 ), - rec( 23, 1, PathCount, var="x" ), - rec( 24, (2,255), Path16, repeat="x" ), - ], info_str=(Path16, "Get Disk Space Restriction for: %s", "/%s")) - pkt.Reply(18, [ - rec( 8, 1, NumberOfEntries, var="x" ), - rec( 9, 9, SpaceStruct, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, - 0xff16]) - # 2222/5928, 89/40 - pkt = NCP(0x5928, "Search for File or Subdirectory Set (Extended Errors)", 'enhanced', has_length=0) - pkt.Request((30, 283), [ - rec( 8, 1, NameSpace ), - rec( 9, 1, DataStream ), - rec( 10, 2, SearchAttributesLow ), - rec( 12, 2, ReturnInfoMask ), - rec( 14, 2, ExtendedInfo ), - rec( 16, 2, ReturnInfoCount ), - rec( 18, 9, SeachSequenceStruct ), - rec( 27, 1, DataTypeFlag ), - rec( 28, (2,255), SearchPattern16 ), - ], info_str=(SearchPattern16, "Search for: %s", ", %s")) - pkt.Reply(NO_LENGTH_CHECK, [ - rec( 8, 9, SeachSequenceStruct ), - rec( 17, 1, MoreFlag ), - rec( 18, 2, InfoCount ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), - srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), - srec( PadAttributes, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), - srec( PadDataStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), - srec( PadTotalStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), - srec( PadCreationInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), - srec( PadModifyInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), - srec( PadArchiveInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), - srec( PadRightsInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), - srec( PadDirEntry, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), - srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), - srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), - srec( FileName16Struct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_fname == 1)" ), - srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), - srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), - srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), - srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), - srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), - srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), - srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), - srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), - srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), - srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), - srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), - srec( FileSize64bitStruct, req_cond="(ncp.ext_info_64_bit_fs == 1) && (ncp.ret_info_mask_fname == 1)" ), - srec( FileName16Struct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_fname == 1)" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5932, 89/50 - pkt = NCP(0x5932, "Get Object Effective Rights", "enhanced", has_length=0) - pkt.Request(25, [ - rec( 8, 1, NameSpace ), - rec( 9, 4, ObjectID ), - rec( 13, 4, DirectoryBase ), - rec( 17, 1, VolumeNumber ), - rec( 18, 1, HandleFlag ), - rec( 19, 1, DataTypeFlag ), - rec( 20, 5, Reserved5 ), - ]) - pkt.Reply( 10, [ - rec( 8, 2, TrusteeRights ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0x9b00, 0x9c03, 0xa901, 0xaa00]) - # 2222/5934, 89/52 - pkt = NCP(0x5934, "Write Extended Attribute", 'enhanced', has_length=0 ) - pkt.Request((36,98), [ - rec( 8, 2, EAFlags ), - rec( 10, 4, EAHandleOrNetWareHandleOrVolume ), - rec( 14, 4, ReservedOrDirectoryNumber ), - rec( 18, 4, TtlWriteDataSize ), - rec( 22, 4, FileOffset ), - rec( 26, 4, EAAccessFlag ), - rec( 30, 1, DataTypeFlag ), - rec( 31, 2, EAValueLength, var='x' ), - rec( 33, (2,64), EAKey ), - rec( -1, 1, EAValueRep, repeat='x' ), - ], info_str=(EAKey, "Write Extended Attribute: %s", ", %s")) - pkt.Reply(20, [ - rec( 8, 4, EAErrorCodes ), - rec( 12, 4, EABytesWritten ), - rec( 16, 4, NewEAHandle ), - ]) - pkt.CompletionCodes([0x0000, 0xc800, 0xc900, 0xcb00, 0xce00, 0xcf00, 0xd101, - 0xd203, 0xa901, 0xaa00, 0xd301, 0xd402]) - # 2222/5935, 89/53 - pkt = NCP(0x5935, "Read Extended Attribute", 'enhanced', has_length=0 ) - pkt.Request((31,541), [ - rec( 8, 2, EAFlags ), - rec( 10, 4, EAHandleOrNetWareHandleOrVolume ), - rec( 14, 4, ReservedOrDirectoryNumber ), - rec( 18, 4, FileOffset ), - rec( 22, 4, InspectSize ), - rec( 26, 1, DataTypeFlag ), - rec( 27, 2, MaxReadDataReplySize ), - rec( 29, (2,512), EAKey ), - ], info_str=(EAKey, "Read Extended Attribute: %s", ", %s")) - pkt.Reply((26,536), [ - rec( 8, 4, EAErrorCodes ), - rec( 12, 4, TtlValuesLength ), - rec( 16, 4, NewEAHandle ), - rec( 20, 4, EAAccessFlag ), - rec( 24, (2,512), EAValue ), - ]) - pkt.CompletionCodes([0x0000, 0xa901, 0xaa00, 0xc900, 0xce00, 0xcf00, 0xd101, - 0xd301]) - # 2222/5936, 89/54 - pkt = NCP(0x5936, "Enumerate Extended Attribute", 'enhanced', has_length=0 ) - pkt.Request((27,537), [ - rec( 8, 2, EAFlags ), - rec( 10, 4, EAHandleOrNetWareHandleOrVolume ), - rec( 14, 4, ReservedOrDirectoryNumber ), - rec( 18, 4, InspectSize ), - rec( 22, 2, SequenceNumber ), - rec( 24, 1, DataTypeFlag ), - rec( 25, (2,512), EAKey ), - ], info_str=(EAKey, "Enumerate Extended Attribute: %s", ", %s")) - pkt.Reply(28, [ - rec( 8, 4, EAErrorCodes ), - rec( 12, 4, TtlEAs ), - rec( 16, 4, TtlEAsDataSize ), - rec( 20, 4, TtlEAsKeySize ), - rec( 24, 4, NewEAHandle ), - ]) - pkt.CompletionCodes([0x0000, 0x8800, 0xa901, 0xaa00, 0xc900, 0xce00, 0xcf00, 0xd101, - 0xd301]) - # 2222/5947, 89/71 - pkt = NCP(0x5947, "Scan Volume Trustee Object Paths", 'enhanced', has_length=0) - pkt.Request(21, [ - rec( 8, 4, VolumeID ), - rec( 12, 4, ObjectID ), - rec( 16, 4, SequenceNumber ), - rec( 20, 1, DataTypeFlag ), - ]) - pkt.Reply((20,273), [ - rec( 8, 4, SequenceNumber ), - rec( 12, 4, ObjectID ), - rec( 16, 1, TrusteeAccessMask ), - rec( 17, 1, PathCount, var="x" ), - rec( 18, (2,255), Path16, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) - # 2222/5A01, 90/00 - pkt = NCP(0x5A00, "Parse Tree", 'file') - pkt.Request(46, [ - rec( 10, 4, InfoMask ), - rec( 14, 4, Reserved4 ), - rec( 18, 4, Reserved4 ), - rec( 22, 4, limbCount ), - rec( 26, 4, limbFlags ), - rec( 30, 4, VolumeNumberLong ), - rec( 34, 4, DirectoryBase ), - rec( 38, 4, limbScanNum ), - rec( 42, 4, NameSpace ), - ]) - pkt.Reply(32, [ - rec( 8, 4, limbCount ), - rec( 12, 4, ItemsCount ), - rec( 16, 4, nextLimbScanNum ), - rec( 20, 4, CompletionCode ), - rec( 24, 1, FolderFlag ), - rec( 25, 3, Reserved ), - rec( 28, 4, DirectoryBase ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xfd00, 0xff16]) - # 2222/5A0A, 90/10 - pkt = NCP(0x5A0A, "Get Reference Count from Dir Entry Number", 'file') - pkt.Request(19, [ - rec( 10, 4, VolumeNumberLong ), - rec( 14, 4, DirectoryBase ), - rec( 18, 1, NameSpace ), - ]) - pkt.Reply(12, [ - rec( 8, 4, ReferenceCount ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xfd00, 0xff16]) - # 2222/5A0B, 90/11 - pkt = NCP(0x5A0B, "Get Reference Count from Dir Handle", 'file') - pkt.Request(14, [ - rec( 10, 4, DirHandle ), - ]) - pkt.Reply(12, [ - rec( 8, 4, ReferenceCount ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xfd00, 0xff16]) - # 2222/5A0C, 90/12 - pkt = NCP(0x5A0C, "Set Compressed File Size", 'file') - pkt.Request(20, [ - rec( 10, 6, FileHandle ), - rec( 16, 4, SuggestedFileSize ), - ]) - pkt.Reply(16, [ - rec( 8, 4, OldFileSize ), - rec( 12, 4, NewFileSize ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xfd00, 0xff16]) - # 2222/5A80, 90/128 - pkt = NCP(0x5A80, "Move File Data To Data Migration", 'migration') - pkt.Request(27, [ - rec( 10, 4, VolumeNumberLong ), - rec( 14, 4, DirectoryEntryNumber ), - rec( 18, 1, NameSpace ), - rec( 19, 3, Reserved ), - rec( 22, 4, SupportModuleID ), - rec( 26, 1, DMFlags ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # 2222/5A81, 90/129 - pkt = NCP(0x5A81, "Data Migration File Information", 'migration') - pkt.Request(19, [ - rec( 10, 4, VolumeNumberLong ), - rec( 14, 4, DirectoryEntryNumber ), - rec( 18, 1, NameSpace ), - ]) - pkt.Reply(24, [ - rec( 8, 4, SupportModuleID ), - rec( 12, 4, RestoreTime ), - rec( 16, 4, DMInfoEntries, var="x" ), - rec( 20, 4, DataSize, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # 2222/5A82, 90/130 - pkt = NCP(0x5A82, "Volume Data Migration Status", 'migration') - pkt.Request(18, [ - rec( 10, 4, VolumeNumberLong ), - rec( 14, 4, SupportModuleID ), - ]) - pkt.Reply(32, [ - rec( 8, 4, NumOfFilesMigrated ), - rec( 12, 4, TtlMigratedSize ), - rec( 16, 4, SpaceUsed ), - rec( 20, 4, LimboUsed ), - rec( 24, 4, SpaceMigrated ), - rec( 28, 4, FileLimbo ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # 2222/5A83, 90/131 - pkt = NCP(0x5A83, "Migrator Status Info", 'migration') - pkt.Request(10) - pkt.Reply(20, [ - rec( 8, 1, DMPresentFlag ), - rec( 9, 3, Reserved3 ), - rec( 12, 4, DMmajorVersion ), - rec( 16, 4, DMminorVersion ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # 2222/5A84, 90/132 - pkt = NCP(0x5A84, "Data Migration Support Module Information", 'migration') - pkt.Request(18, [ - rec( 10, 1, DMInfoLevel ), - rec( 11, 3, Reserved3), - rec( 14, 4, SupportModuleID ), - ]) - pkt.Reply(NO_LENGTH_CHECK, [ - srec( DMInfoLevel0, req_cond="ncp.dm_info_level == 0x00" ), - srec( DMInfoLevel1, req_cond="ncp.dm_info_level == 0x01" ), - srec( DMInfoLevel2, req_cond="ncp.dm_info_level == 0x02" ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # 2222/5A85, 90/133 - pkt = NCP(0x5A85, "Move File Data From Data Migration", 'migration') - pkt.Request(19, [ - rec( 10, 4, VolumeNumberLong ), - rec( 14, 4, DirectoryEntryNumber ), - rec( 18, 1, NameSpace ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # 2222/5A86, 90/134 - pkt = NCP(0x5A86, "Get/Set Default Read-Write Support Module ID", 'migration') - pkt.Request(18, [ - rec( 10, 1, GetSetFlag ), - rec( 11, 3, Reserved3 ), - rec( 14, 4, SupportModuleID ), - ]) - pkt.Reply(12, [ - rec( 8, 4, SupportModuleID ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # 2222/5A87, 90/135 - pkt = NCP(0x5A87, "Data Migration Support Module Capacity Request", 'migration') - pkt.Request(22, [ - rec( 10, 4, SupportModuleID ), - rec( 14, 4, VolumeNumberLong ), - rec( 18, 4, DirectoryBase ), - ]) - pkt.Reply(20, [ - rec( 8, 4, BlockSizeInSectors ), - rec( 12, 4, TotalBlocks ), - rec( 16, 4, UsedBlocks ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # 2222/5A88, 90/136 - pkt = NCP(0x5A88, "RTDM Request", 'migration') - pkt.Request(15, [ - rec( 10, 4, Verb ), - rec( 14, 1, VerbData ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # 2222/5A96, 90/150 - pkt = NCP(0x5A96, "File Migration Request", 'file') - pkt.Request(22, [ - rec( 10, 4, VolumeNumberLong ), - rec( 14, 4, DirectoryBase ), - rec( 18, 4, FileMigrationState ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfb00, 0xff16]) - # 2222/5C, 91 - pkt = NCP(0x5B, "NMAS Graded Authentication", 'nmas') - #Need info on this packet structure - pkt.Request(7) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # SecretStore data is dissected by packet-ncp-sss.c - # 2222/5C01, 9201 - pkt = NCP(0x5C01, "SecretStore Services (Ping Server)", 'sss', 0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # 2222/5C02, 9202 - pkt = NCP(0x5C02, "SecretStore Services (Fragment)", 'sss', 0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # 2222/5C03, 9203 - pkt = NCP(0x5C03, "SecretStore Services (Write App Secrets)", 'sss', 0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # 2222/5C04, 9204 - pkt = NCP(0x5C04, "SecretStore Services (Add Secret ID)", 'sss', 0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # 2222/5C05, 9205 - pkt = NCP(0x5C05, "SecretStore Services (Remove Secret ID)", 'sss', 0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # 2222/5C06, 9206 - pkt = NCP(0x5C06, "SecretStore Services (Remove SecretStore)", 'sss', 0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # 2222/5C07, 9207 - pkt = NCP(0x5C07, "SecretStore Services (Enumerate Secret IDs)", 'sss', 0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # 2222/5C08, 9208 - pkt = NCP(0x5C08, "SecretStore Services (Unlock Store)", 'sss', 0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # 2222/5C09, 9209 - pkt = NCP(0x5C09, "SecretStore Services (Set Master Password)", 'sss', 0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # 2222/5C0a, 9210 - pkt = NCP(0x5C0a, "SecretStore Services (Get Service Information)", 'sss', 0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, - 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, - 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) - # NMAS packets are dissected in packet-ncp-nmas.c - # 2222/5E, 9401 - pkt = NCP(0x5E01, "NMAS Communications Packet (Ping)", 'nmas', 0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xfb09, 0xff08]) - # 2222/5E, 9402 - pkt = NCP(0x5E02, "NMAS Communications Packet (Fragment)", 'nmas', 0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xfb09, 0xff08]) - # 2222/5E, 9403 - pkt = NCP(0x5E03, "NMAS Communications Packet (Abort)", 'nmas', 0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xfb09, 0xff08]) - # 2222/61, 97 - pkt = NCP(0x61, "Get Big Packet NCP Max Packet Size", 'connection') - pkt.Request(10, [ - rec( 7, 2, ProposedMaxSize, BE ), - rec( 9, 1, SecurityFlag ), - ],info_str=(ProposedMaxSize, "Get Big Max Packet Size - %d", ", %d")) - pkt.Reply(13, [ - rec( 8, 2, AcceptedMaxSize, BE ), - rec( 10, 2, EchoSocket, BE ), - rec( 12, 1, SecurityFlag ), - ]) - pkt.CompletionCodes([0x0000]) - # 2222/63, 99 - pkt = NCP(0x63, "Undocumented Packet Burst", 'pburst') - pkt.Request(7) - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - # 2222/64, 100 - pkt = NCP(0x64, "Undocumented Packet Burst", 'pburst') - pkt.Request(7) - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - # 2222/65, 101 - pkt = NCP(0x65, "Packet Burst Connection Request", 'pburst') - pkt.Request(25, [ - rec( 7, 4, LocalConnectionID, BE ), - rec( 11, 4, LocalMaxPacketSize, BE ), - rec( 15, 2, LocalTargetSocket, BE ), - rec( 17, 4, LocalMaxSendSize, BE ), - rec( 21, 4, LocalMaxRecvSize, BE ), - ]) - pkt.Reply(16, [ - rec( 8, 4, RemoteTargetID, BE ), - rec( 12, 4, RemoteMaxPacketSize, BE ), - ]) - pkt.CompletionCodes([0x0000]) - # 2222/66, 102 - pkt = NCP(0x66, "Undocumented Packet Burst", 'pburst') - pkt.Request(7) - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - # 2222/67, 103 - pkt = NCP(0x67, "Undocumented Packet Burst", 'pburst') - pkt.Request(7) - pkt.Reply(8) - pkt.CompletionCodes([0x0000]) - # 2222/6801, 104/01 - pkt = NCP(0x6801, "Ping for NDS NCP", "nds", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x8100, 0xfb04, 0xfe0c]) - # 2222/6802, 104/02 - # - # XXX - if FraggerHandle is not 0xffffffff, this is not the - # first fragment, so we can only dissect this by reassembling; - # the fields after "Fragment Handle" are bogus for non-0xffffffff - # fragments, so we shouldn't dissect them. This is all handled in packet-ncp2222.inc. - # - pkt = NCP(0x6802, "Send NDS Fragmented Request/Reply", "nds", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0xac00, 0xfd01]) - # 2222/6803, 104/03 - pkt = NCP(0x6803, "Fragment Close", "nds", has_length=0) - pkt.Request(12, [ - rec( 8, 4, FraggerHandle ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xff00]) - # 2222/6804, 104/04 - pkt = NCP(0x6804, "Return Bindery Context", "nds", has_length=0) - pkt.Request(8) - pkt.Reply((9, 263), [ - rec( 8, (1,255), binderyContext ), - ]) - pkt.CompletionCodes([0x0000, 0xfe0c, 0xff00]) - # 2222/6805, 104/05 - pkt = NCP(0x6805, "Monitor NDS Connection", "nds", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/6806, 104/06 - pkt = NCP(0x6806, "Return NDS Statistics", "nds", has_length=0) - pkt.Request(10, [ - rec( 8, 2, NDSRequestFlags ), - ]) - pkt.Reply(8) - #Need to investigate how to decode Statistics Return Value - pkt.CompletionCodes([0x0000, 0xfb00, 0xfe0c, 0xff00]) - # 2222/6807, 104/07 - pkt = NCP(0x6807, "Clear NDS Statistics", "nds", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xfb00, 0xfe0c, 0xff00]) - # 2222/6808, 104/08 - pkt = NCP(0x6808, "Reload NDS Software", "nds", has_length=0) - pkt.Request(8) - pkt.Reply(12, [ - rec( 8, 4, NDSStatus ), - ]) - pkt.CompletionCodes([0x0000, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68C8, 104/200 - pkt = NCP(0x68C8, "Query Container Audit Status", "auditing", has_length=0) - pkt.Request(12, [ - rec( 8, 4, ConnectionNumber ), - ]) - pkt.Reply(40, [ - rec(8, 32, NWAuditStatus ), - ]) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68CA, 104/202 - pkt = NCP(0x68CA, "Add Auditor Access", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68CB, 104/203 - pkt = NCP(0x68CB, "Change Auditor Container Password", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68CC, 104/204 - pkt = NCP(0x68CC, "Check Auditor Access", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68CE, 104/206 - pkt = NCP(0x680CE, "Disable Container Auditing", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68CF, 104/207 - pkt = NCP(0x68CF, "Enable Container Auditing", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68D1, 104/209 - pkt = NCP(0x68D1, "Read Audit File Header", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68D3, 104/211 - pkt = NCP(0x68D3, "Remove Auditor Access", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68D4, 104/212 - pkt = NCP(0x68D4, "Reset Audit File", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68D6, 104/214 - pkt = NCP(0x68D6, "Write Audit File Configuration Header", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68D7, 104/215 - pkt = NCP(0x68D7, "Change Auditor Container Password2", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68D8, 104/216 - pkt = NCP(0x68D8, "Return Audit Flags", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68D9, 104/217 - pkt = NCP(0x68D9, "Close Old Audit File", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68DB, 104/219 - pkt = NCP(0x68DB, "Check Level Two Access", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68DC, 104/220 - pkt = NCP(0x68DC, "Check Object Audited", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68DD, 104/221 - pkt = NCP(0x68DD, "Change Object Audited", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68DE, 104/222 - pkt = NCP(0x68DE, "Return Old Audit File List", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68DF, 104/223 - pkt = NCP(0x68DF, "Init Audit File Reads", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68E0, 104/224 - pkt = NCP(0x68E0, "Read Auditing File", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68E1, 104/225 - pkt = NCP(0x68E1, "Delete Old Audit File", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68E5, 104/229 - pkt = NCP(0x68E5, "Set Audit Password", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/68E7, 104/231 - pkt = NCP(0x68E7, "External Audit Append To File", "auditing", has_length=0) - pkt.Request(8) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) - # 2222/69, 105 - pkt = NCP(0x69, "Log File", 'sync') - pkt.Request( (12, 267), [ - rec( 7, 1, DirHandle ), - rec( 8, 1, LockFlag ), - rec( 9, 2, TimeoutLimit ), - rec( 11, (1, 256), FilePath ), - ], info_str=(FilePath, "Log File: %s", "/%s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7f00, 0x8200, 0x9600, 0xfe0d, 0xff01]) - # 2222/6A, 106 - pkt = NCP(0x6A, "Lock File Set", 'sync') - pkt.Request( 9, [ - rec( 7, 2, TimeoutLimit ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7f00, 0x8200, 0x9600, 0xfe0d, 0xff01]) - # 2222/6B, 107 - pkt = NCP(0x6B, "Log Logical Record", 'sync') - pkt.Request( (11, 266), [ - rec( 7, 1, LockFlag ), - rec( 8, 2, TimeoutLimit ), - rec( 10, (1, 256), SynchName ), - ], info_str=(SynchName, "Log Logical Record: %s", ", %s")) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7f00, 0x9600, 0xfe0d, 0xff01]) - # 2222/6C, 108 - pkt = NCP(0x6C, "Log Logical Record", 'sync') - pkt.Request( 10, [ - rec( 7, 1, LockFlag ), - rec( 8, 2, TimeoutLimit ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7f00, 0x9600, 0xfe0d, 0xff01]) - # 2222/6D, 109 - pkt = NCP(0x6D, "Log Physical Record", 'sync') - pkt.Request(24, [ - rec( 7, 1, LockFlag ), - rec( 8, 6, FileHandle ), - rec( 14, 4, LockAreasStartOffset ), - rec( 18, 4, LockAreaLen ), - rec( 22, 2, LockTimeout ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7f00, 0x8200, 0x8800, 0x9600, 0xfd02, 0xfe04, 0xff01]) - # 2222/6E, 110 - pkt = NCP(0x6E, "Lock Physical Record Set", 'sync') - pkt.Request(10, [ - rec( 7, 1, LockFlag ), - rec( 8, 2, LockTimeout ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7f00, 0x8200, 0x8800, 0x9600, 0xfd02, 0xfe04, 0xff01]) - # 2222/6F00, 111/00 - pkt = NCP(0x6F00, "Open/Create a Semaphore", 'sync', has_length=0) - pkt.Request((10,521), [ - rec( 8, 1, InitialSemaphoreValue ), - rec( 9, (1, 512), SemaphoreName ), - ], info_str=(SemaphoreName, "Open/Create Semaphore: %s", ", %s")) - pkt.Reply(13, [ - rec( 8, 4, SemaphoreHandle ), - rec( 12, 1, SemaphoreOpenCount ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xff01]) - # 2222/6F01, 111/01 - pkt = NCP(0x6F01, "Examine Semaphore", 'sync', has_length=0) - pkt.Request(12, [ - rec( 8, 4, SemaphoreHandle ), - ]) - pkt.Reply(10, [ - rec( 8, 1, SemaphoreValue ), - rec( 9, 1, SemaphoreOpenCount ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xff01]) - # 2222/6F02, 111/02 - pkt = NCP(0x6F02, "Wait On (P) Semaphore", 'sync', has_length=0) - pkt.Request(14, [ - rec( 8, 4, SemaphoreHandle ), - rec( 12, 2, LockTimeout ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xfe04, 0xff01]) - # 2222/6F03, 111/03 - pkt = NCP(0x6F03, "Signal (V) Semaphore", 'sync', has_length=0) - pkt.Request(12, [ - rec( 8, 4, SemaphoreHandle ), - ]) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9600, 0xfe04, 0xff01]) - # 2222/6F04, 111/04 - pkt = NCP(0x6F04, "Close Semaphore", 'sync', has_length=0) - pkt.Request(12, [ - rec( 8, 4, SemaphoreHandle ), - ]) - pkt.Reply(10, [ - rec( 8, 1, SemaphoreOpenCount ), - rec( 9, 1, SemaphoreShareCount ), - ]) - pkt.CompletionCodes([0x0000, 0x9600, 0xfe04, 0xff01]) - ## 2222/1125 - pkt = NCP(0x70, "Clear and Get Waiting Lock Completion", 'sync') - pkt.Request(7) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x9b00, 0x9c03, 0xff1a]) - # 2222/7201, 114/01 - pkt = NCP(0x7201, "Timesync Get Time", 'tsync') - pkt.Request(10) - pkt.Reply(32,[ - rec( 8, 12, theTimeStruct ), - rec(20, 8, eventOffset ), - rec(28, 4, eventTime ), - ]) - pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) - # 2222/7202, 114/02 - pkt = NCP(0x7202, "Timesync Exchange Time", 'tsync') - pkt.Request((63,112), [ - rec( 10, 4, protocolFlags ), - rec( 14, 4, nodeFlags ), - rec( 18, 8, sourceOriginateTime ), - rec( 26, 8, targetReceiveTime ), - rec( 34, 8, targetTransmitTime ), - rec( 42, 8, sourceReturnTime ), - rec( 50, 8, eventOffset ), - rec( 58, 4, eventTime ), - rec( 62, (1,50), ServerNameLen ), - ], info_str=(ServerNameLen, "Timesync Exchange Time: %s", ", %s")) - pkt.Reply((64,113), [ - rec( 8, 3, Reserved3 ), - rec( 11, 4, protocolFlags ), - rec( 15, 4, nodeFlags ), - rec( 19, 8, sourceOriginateTime ), - rec( 27, 8, targetReceiveTime ), - rec( 35, 8, targetTransmitTime ), - rec( 43, 8, sourceReturnTime ), - rec( 51, 8, eventOffset ), - rec( 59, 4, eventTime ), - rec( 63, (1,50), ServerNameLen ), - ]) - pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) - # 2222/7205, 114/05 - pkt = NCP(0x7205, "Timesync Get Server List", 'tsync') - pkt.Request(14, [ - rec( 10, 4, StartNumber ), - ]) - pkt.Reply(66, [ - rec( 8, 4, nameType ), - rec( 12, 48, ServerName ), - rec( 60, 4, serverListFlags ), - rec( 64, 2, startNumberFlag ), - ]) - pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) - # 2222/7206, 114/06 - pkt = NCP(0x7206, "Timesync Set Server List", 'tsync') - pkt.Request(14, [ - rec( 10, 4, StartNumber ), - ]) - pkt.Reply(66, [ - rec( 8, 4, nameType ), - rec( 12, 48, ServerName ), - rec( 60, 4, serverListFlags ), - rec( 64, 2, startNumberFlag ), - ]) - pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) - # 2222/720C, 114/12 - pkt = NCP(0x720C, "Timesync Get Version", 'tsync') - pkt.Request(10) - pkt.Reply(12, [ - rec( 8, 4, version ), - ]) - pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) - # 2222/7B01, 123/01 - pkt = NCP(0x7B01, "Get Cache Information", 'stats') - pkt.Request(10) - pkt.Reply(288, [ - rec(8, 4, CurrentServerTime, LE), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 104, Counters ), - rec(120, 40, ExtraCacheCntrs ), - rec(160, 40, MemoryCounters ), - rec(200, 48, TrendCounters ), - rec(248, 40, CacheInfo ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xff00]) - # 2222/7B02, 123/02 - pkt = NCP(0x7B02, "Get File Server Information", 'stats') - pkt.Request(10) - pkt.Reply(150, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, NCPStaInUseCnt ), - rec(20, 4, NCPPeakStaInUse ), - rec(24, 4, NumOfNCPReqs ), - rec(28, 4, ServerUtilization ), - rec(32, 96, ServerInfo ), - rec(128, 22, FileServerCounters ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B03, 123/03 - pkt = NCP(0x7B03, "NetWare File System Information", 'stats') - pkt.Request(11, [ - rec(10, 1, FileSystemID ), - ]) - pkt.Reply(68, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 52, FileSystemInfo ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B04, 123/04 - pkt = NCP(0x7B04, "User Information", 'stats') - pkt.Request(14, [ - rec(10, 4, ConnectionNumber, LE ), - ]) - pkt.Reply((85, 132), [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 68, UserInformation ), - rec(84, (1, 48), UserName ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B05, 123/05 - pkt = NCP(0x7B05, "Packet Burst Information", 'stats') - pkt.Request(10) - pkt.Reply(216, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 200, PacketBurstInformation ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B06, 123/06 - pkt = NCP(0x7B06, "IPX SPX Information", 'stats') - pkt.Request(10) - pkt.Reply(94, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 34, IPXInformation ), - rec(50, 44, SPXInformation ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B07, 123/07 - pkt = NCP(0x7B07, "Garbage Collection Information", 'stats') - pkt.Request(10) - pkt.Reply(40, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, FailedAllocReqCnt ), - rec(20, 4, NumberOfAllocs ), - rec(24, 4, NoMoreMemAvlCnt ), - rec(28, 4, NumOfGarbageColl ), - rec(32, 4, FoundSomeMem ), - rec(36, 4, NumOfChecks ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B08, 123/08 - pkt = NCP(0x7B08, "CPU Information", 'stats') - pkt.Request(14, [ - rec(10, 4, CPUNumber ), - ]) - pkt.Reply(51, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, NumberOfCPUs ), - rec(20, 31, CPUInformation ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B09, 123/09 - pkt = NCP(0x7B09, "Volume Switch Information", 'stats') - pkt.Request(14, [ - rec(10, 4, StartNumber ) - ]) - pkt.Reply(28, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, TotalLFSCounters ), - rec(20, 4, CurrentLFSCounters, var="x"), - rec(24, 4, LFSCounters, repeat="x"), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B0A, 123/10 - pkt = NCP(0x7B0A, "Get NLM Loaded List", 'stats') - pkt.Request(14, [ - rec(10, 4, StartNumber ) - ]) - pkt.Reply(28, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, NLMcount ), - rec(20, 4, NLMsInList, var="x" ), - rec(24, 4, NLMNumbers, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B0B, 123/11 - pkt = NCP(0x7B0B, "NLM Information", 'stats') - pkt.Request(14, [ - rec(10, 4, NLMNumber ), - ]) - pkt.Reply(NO_LENGTH_CHECK, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 60, NLMInformation ), - # The remainder of this dissection is manually decoded in packet-ncp2222.inc - #rec(-1, (1,255), FileName ), - #rec(-1, (1,255), Name ), - #rec(-1, (1,255), Copyright ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B0C, 123/12 - pkt = NCP(0x7B0C, "Get Directory Cache Information", 'stats') - pkt.Request(10) - pkt.Reply(72, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 56, DirCacheInfo ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B0D, 123/13 - pkt = NCP(0x7B0D, "Get Operating System Version Information", 'stats') - pkt.Request(10) - pkt.Reply(70, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 1, OSMajorVersion ), - rec(17, 1, OSMinorVersion ), - rec(18, 1, OSRevision ), - rec(19, 1, AccountVersion ), - rec(20, 1, VAPVersion ), - rec(21, 1, QueueingVersion ), - rec(22, 1, SecurityRestrictionVersion ), - rec(23, 1, InternetBridgeVersion ), - rec(24, 4, MaxNumOfVol ), - rec(28, 4, MaxNumOfConn ), - rec(32, 4, MaxNumOfUsers ), - rec(36, 4, MaxNumOfNmeSps ), - rec(40, 4, MaxNumOfLANS ), - rec(44, 4, MaxNumOfMedias ), - rec(48, 4, MaxNumOfStacks ), - rec(52, 4, MaxDirDepth ), - rec(56, 4, MaxDataStreams ), - rec(60, 4, MaxNumOfSpoolPr ), - rec(64, 4, ServerSerialNumber ), - rec(68, 2, ServerAppNumber ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B0E, 123/14 - pkt = NCP(0x7B0E, "Get Active Connection List by Type", 'stats') - pkt.Request(15, [ - rec(10, 4, StartConnNumber ), - rec(14, 1, ConnectionType ), - ]) - pkt.Reply(528, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 512, ActiveConnBitList ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfd01, 0xff00]) - # 2222/7B0F, 123/15 - pkt = NCP(0x7B0F, "Get NLM Resource Tag List", 'stats') - pkt.Request(18, [ - rec(10, 4, NLMNumber ), - rec(14, 4, NLMStartNumber ), - ]) - pkt.Reply(37, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, TtlNumOfRTags ), - rec(20, 4, CurNumOfRTags ), - rec(24, 13, RTagStructure ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B10, 123/16 - pkt = NCP(0x7B10, "Enumerate Connection Information from Connection List", 'stats') - pkt.Request(22, [ - rec(10, 1, EnumInfoMask), - rec(11, 3, Reserved3), - rec(14, 4, itemsInList, var="x"), - rec(18, 4, connList, repeat="x"), - ]) - pkt.Reply(NO_LENGTH_CHECK, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, ItemsInPacket ), - srec(netAddr, req_cond="ncp.enum_info_transport==TRUE"), - srec(timeInfo, req_cond="ncp.enum_info_time==TRUE"), - srec(nameInfo, req_cond="ncp.enum_info_name==TRUE"), - srec(lockInfo, req_cond="ncp.enum_info_lock==TRUE"), - srec(printInfo, req_cond="ncp.enum_info_print==TRUE"), - srec(statsInfo, req_cond="ncp.enum_info_stats==TRUE"), - srec(acctngInfo, req_cond="ncp.enum_info_account==TRUE"), - srec(authInfo, req_cond="ncp.enum_info_auth==TRUE"), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B11, 123/17 - pkt = NCP(0x7B11, "Enumerate NCP Service Network Addresses", 'stats') - pkt.Request(14, [ - rec(10, 4, SearchNumber ), - ]) - pkt.Reply(36, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, ServerInfoFlags ), - rec(16, 16, GUID ), - rec(32, 4, NextSearchNum ), - # The following two items are dissected in packet-ncp2222.inc - #rec(36, 4, ItemsInPacket, var="x"), - #rec(40, 20, NCPNetworkAddress, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb01, 0xff00]) - # 2222/7B14, 123/20 - pkt = NCP(0x7B14, "Active LAN Board List", 'stats') - pkt.Request(14, [ - rec(10, 4, StartNumber ), - ]) - pkt.Reply(28, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, MaxNumOfLANS ), - rec(20, 4, ItemsInPacket, var="x"), - rec(24, 4, BoardNumbers, repeat="x"), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B15, 123/21 - pkt = NCP(0x7B15, "LAN Configuration Information", 'stats') - pkt.Request(14, [ - rec(10, 4, BoardNumber ), - ]) - pkt.Reply(152, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16,136, LANConfigInfo ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B16, 123/22 - pkt = NCP(0x7B16, "LAN Common Counters Information", 'stats') - pkt.Request(18, [ - rec(10, 4, BoardNumber ), - rec(14, 4, BlockNumber ), - ]) - pkt.Reply(86, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 1, StatMajorVersion ), - rec(15, 1, StatMinorVersion ), - rec(16, 4, TotalCommonCnts ), - rec(20, 4, TotalCntBlocks ), - rec(24, 4, CustomCounters ), - rec(28, 4, NextCntBlock ), - rec(32, 54, CommonLanStruc ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B17, 123/23 - pkt = NCP(0x7B17, "LAN Custom Counters Information", 'stats') - pkt.Request(18, [ - rec(10, 4, BoardNumber ), - rec(14, 4, StartNumber ), - ]) - pkt.Reply(25, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, NumOfCCinPkt, var="x"), - rec(20, 5, CustomCntsInfo, repeat="x"), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B18, 123/24 - pkt = NCP(0x7B18, "LAN Name Information", 'stats') - pkt.Request(14, [ - rec(10, 4, BoardNumber ), - ]) - pkt.Reply(NO_LENGTH_CHECK, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, PROTO_LENGTH_UNKNOWN, DriverBoardName ), - rec(-1, PROTO_LENGTH_UNKNOWN, DriverShortName ), - rec(-1, PROTO_LENGTH_UNKNOWN, DriverLogicalName ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B19, 123/25 - pkt = NCP(0x7B19, "LSL Information", 'stats') - pkt.Request(10) - pkt.Reply(90, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 74, LSLInformation ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B1A, 123/26 - pkt = NCP(0x7B1A, "LSL Logical Board Statistics", 'stats') - pkt.Request(14, [ - rec(10, 4, BoardNumber ), - ]) - pkt.Reply(28, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, LogTtlTxPkts ), - rec(20, 4, LogTtlRxPkts ), - rec(24, 4, UnclaimedPkts ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B1B, 123/27 - pkt = NCP(0x7B1B, "MLID Board Information", 'stats') - pkt.Request(14, [ - rec(10, 4, BoardNumber ), - ]) - pkt.Reply(44, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 1, Reserved ), - rec(15, 1, NumberOfProtocols ), - rec(16, 28, MLIDBoardInfo ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B1E, 123/30 - pkt = NCP(0x7B1E, "Get Media Manager Object Information", 'stats') - pkt.Request(14, [ - rec(10, 4, ObjectNumber ), - ]) - pkt.Reply(212, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 196, GenericInfoDef ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B1F, 123/31 - pkt = NCP(0x7B1F, "Get Media Manager Objects List", 'stats') - pkt.Request(15, [ - rec(10, 4, StartNumber ), - rec(14, 1, MediaObjectType ), - ]) - pkt.Reply(28, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, nextStartingNumber ), - rec(20, 4, ObjectCount, var="x"), - rec(24, 4, ObjectID, repeat="x"), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B20, 123/32 - pkt = NCP(0x7B20, "Get Media Manager Object Childrens List", 'stats') - pkt.Request(22, [ - rec(10, 4, StartNumber ), - rec(14, 1, MediaObjectType ), - rec(15, 3, Reserved3 ), - rec(18, 4, ParentObjectNumber ), - ]) - pkt.Reply(28, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, nextStartingNumber ), - rec(20, 4, ObjectCount, var="x" ), - rec(24, 4, ObjectID, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B21, 123/33 - pkt = NCP(0x7B21, "Get Volume Segment List", 'stats') - pkt.Request(14, [ - rec(10, 4, VolumeNumberLong ), - ]) - pkt.Reply(32, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, NumOfSegments, var="x" ), - rec(20, 12, Segments, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0x9801, 0xfb06, 0xff00]) - # 2222/7B22, 123/34 - pkt = NCP(0x7B22, "Get Volume Information by Level", 'stats') - pkt.Request(15, [ - rec(10, 4, VolumeNumberLong ), - rec(14, 1, InfoLevelNumber ), - ]) - pkt.Reply(NO_LENGTH_CHECK, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 1, InfoLevelNumber ), - rec(17, 3, Reserved3 ), - srec(VolInfoStructure, req_cond="ncp.info_level_num==0x01"), - srec(VolInfo2Struct, req_cond="ncp.info_level_num==0x02"), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B28, 123/40 - pkt = NCP(0x7B28, "Active Protocol Stacks", 'stats') - pkt.Request(14, [ - rec(10, 4, StartNumber ), - ]) - pkt.Reply(48, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, MaxNumOfLANS ), - rec(20, 4, StackCount, var="x" ), - rec(24, 4, nextStartingNumber ), - rec(28, 20, StackInfo, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B29, 123/41 - pkt = NCP(0x7B29, "Get Protocol Stack Configuration Information", 'stats') - pkt.Request(14, [ - rec(10, 4, StackNumber ), - ]) - pkt.Reply((37,164), [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 1, ConfigMajorVN ), - rec(17, 1, ConfigMinorVN ), - rec(18, 1, StackMajorVN ), - rec(19, 1, StackMinorVN ), - rec(20, 16, ShortStkName ), - rec(36, (1,128), StackFullNameStr ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B2A, 123/42 - pkt = NCP(0x7B2A, "Get Protocol Stack Statistics Information", 'stats') - pkt.Request(14, [ - rec(10, 4, StackNumber ), - ]) - pkt.Reply(38, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 1, StatMajorVersion ), - rec(17, 1, StatMinorVersion ), - rec(18, 2, ComCnts ), - rec(20, 4, CounterMask ), - rec(24, 4, TotalTxPkts ), - rec(28, 4, TotalRxPkts ), - rec(32, 4, IgnoredRxPkts ), - rec(36, 2, CustomCnts ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B2B, 123/43 - pkt = NCP(0x7B2B, "Get Protocol Stack Custom Information", 'stats') - pkt.Request(18, [ - rec(10, 4, StackNumber ), - rec(14, 4, StartNumber ), - ]) - pkt.Reply(25, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, CustomCount, var="x" ), - rec(20, 5, CustomCntsInfo, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B2C, 123/44 - pkt = NCP(0x7B2C, "Get Protocol Stack Numbers by Media Number", 'stats') - pkt.Request(14, [ - rec(10, 4, MediaNumber ), - ]) - pkt.Reply(24, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, StackCount, var="x" ), - rec(20, 4, StackNumber, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B2D, 123/45 - pkt = NCP(0x7B2D, "Get Protocol Stack Numbers by LAN Board Number", 'stats') - pkt.Request(14, [ - rec(10, 4, BoardNumber ), - ]) - pkt.Reply(24, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, StackCount, var="x" ), - rec(20, 4, StackNumber, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B2E, 123/46 - pkt = NCP(0x7B2E, "Get Media Name by Media Number", 'stats') - pkt.Request(14, [ - rec(10, 4, MediaNumber ), - ]) - pkt.Reply((17,144), [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, (1,128), MediaName ), - ]) - pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B2F, 123/47 - pkt = NCP(0x7B2F, "Get Loaded Media Number", 'stats') - pkt.Request(10) - pkt.Reply(28, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, MaxNumOfMedias ), - rec(20, 4, MediaListCount, var="x" ), - rec(24, 4, MediaList, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B32, 123/50 - pkt = NCP(0x7B32, "Get General Router and SAP Information", 'stats') - pkt.Request(10) - pkt.Reply(37, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 2, RIPSocketNumber ), - rec(18, 2, Reserved2 ), - rec(20, 1, RouterDownFlag ), - rec(21, 3, Reserved3 ), - rec(24, 1, TrackOnFlag ), - rec(25, 3, Reserved3 ), - rec(28, 1, ExtRouterActiveFlag ), - rec(29, 3, Reserved3 ), - rec(32, 2, SAPSocketNumber ), - rec(34, 2, Reserved2 ), - rec(36, 1, RpyNearestSrvFlag ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B33, 123/51 - pkt = NCP(0x7B33, "Get Network Router Information", 'stats') - pkt.Request(14, [ - rec(10, 4, NetworkNumber ), - ]) - pkt.Reply(26, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 10, KnownRoutes ), - ]) - pkt.CompletionCodes([0x0000, 0x0108, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B34, 123/52 - pkt = NCP(0x7B34, "Get Network Routers Information", 'stats') - pkt.Request(18, [ - rec(10, 4, NetworkNumber), - rec(14, 4, StartNumber ), - ]) - pkt.Reply(34, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, NumOfEntries, var="x" ), - rec(20, 14, RoutersInfo, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x0108, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B35, 123/53 - pkt = NCP(0x7B35, "Get Known Networks Information", 'stats') - pkt.Request(14, [ - rec(10, 4, StartNumber ), - ]) - pkt.Reply(30, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, NumOfEntries, var="x" ), - rec(20, 10, KnownRoutes, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B36, 123/54 - pkt = NCP(0x7B36, "Get Server Information", 'stats') - pkt.Request((15,64), [ - rec(10, 2, ServerType ), - rec(12, 2, Reserved2 ), - rec(14, (1,50), ServerNameLen ), - ], info_str=(ServerNameLen, "Get Server Information: %s", ", %s")) - pkt.Reply(30, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 12, ServerAddress ), - rec(28, 2, HopsToNet ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B37, 123/55 - pkt = NCP(0x7B37, "Get Server Sources Information", 'stats') - pkt.Request((19,68), [ - rec(10, 4, StartNumber ), - rec(14, 2, ServerType ), - rec(16, 2, Reserved2 ), - rec(18, (1,50), ServerNameLen ), - ], info_str=(ServerNameLen, "Get Server Sources Info: %s", ", %s")) - pkt.Reply(32, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, NumOfEntries, var="x" ), - rec(20, 12, ServersSrcInfo, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x0108, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B38, 123/56 - pkt = NCP(0x7B38, "Get Known Servers Information", 'stats') - pkt.Request(16, [ - rec(10, 4, StartNumber ), - rec(14, 2, ServerType ), - ]) - pkt.Reply(35, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, NumOfEntries, var="x" ), - rec(20, 15, KnownServStruc, repeat="x" ), - ]) - pkt.CompletionCodes([0x0000, 0x0108, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B3C, 123/60 - pkt = NCP(0x7B3C, "Get Server Set Commands Information", 'stats') - pkt.Request(14, [ - rec(10, 4, StartNumber ), - ]) - pkt.Reply(NO_LENGTH_CHECK, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, TtlNumOfSetCmds ), - rec(20, 4, nextStartingNumber ), - rec(24, 1, SetCmdType ), - rec(25, 3, Reserved3 ), - rec(28, 1, SetCmdCategory ), - rec(29, 3, Reserved3 ), - rec(32, 1, SetCmdFlags ), - rec(33, 3, Reserved3 ), - rec(36, PROTO_LENGTH_UNKNOWN, SetCmdName ), - rec(-1, 4, SetCmdValueNum ), - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B3D, 123/61 - pkt = NCP(0x7B3D, "Get Server Set Categories", 'stats') - pkt.Request(14, [ - rec(10, 4, StartNumber ), - ]) - pkt.Reply(NO_LENGTH_CHECK, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, NumberOfSetCategories ), - rec(20, 4, nextStartingNumber ), - rec(24, PROTO_LENGTH_UNKNOWN, CategoryName ), - ]) - pkt.CompletionCodes([0x0000, 0x7e01, 0xfb06, 0xff00]) - # 2222/7B3E, 123/62 - pkt = NCP(0x7B3E, "Get Server Set Commands Information By Name", 'stats') - pkt.Request(NO_LENGTH_CHECK, [ - rec(10, PROTO_LENGTH_UNKNOWN, SetParmName ), - ], info_str=(SetParmName, "Get Server Set Command Info for: %s", ", %s")) - pkt.Reply(NO_LENGTH_CHECK, [ - rec(8, 4, CurrentServerTime ), - rec(12, 1, VConsoleVersion ), - rec(13, 1, VConsoleRevision ), - rec(14, 2, Reserved2 ), - rec(16, 4, TtlNumOfSetCmds ), - rec(20, 4, nextStartingNumber ), - rec(24, 1, SetCmdType ), - rec(25, 3, Reserved3 ), - rec(28, 1, SetCmdCategory ), - rec(29, 3, Reserved3 ), - rec(32, 1, SetCmdFlags ), - rec(33, 3, Reserved3 ), - rec(36, PROTO_LENGTH_UNKNOWN, SetCmdName ), - # The value of the set command is decoded in packet-ncp2222.inc - ]) - pkt.ReqCondSizeVariable() - pkt.CompletionCodes([0x0000, 0x7e01, 0xc600, 0xfb06, 0xff22]) - # 2222/7B46, 123/70 - pkt = NCP(0x7B46, "Get Current Compressing File", 'stats') - pkt.Request(14, [ - rec(10, 4, VolumeNumberLong ), - ]) - pkt.Reply(56, [ - rec(8, 4, ParentID ), - rec(12, 4, DirectoryEntryNumber ), - rec(16, 4, compressionStage ), - rec(20, 4, ttlIntermediateBlks ), - rec(24, 4, ttlCompBlks ), - rec(28, 4, curIntermediateBlks ), - rec(32, 4, curCompBlks ), - rec(36, 4, curInitialBlks ), - rec(40, 4, fileFlags ), - rec(44, 4, projectedCompSize ), - rec(48, 4, originalSize ), - rec(52, 4, compressVolume ), - ]) - pkt.CompletionCodes([0x0000, 0x7e00, 0x7901, 0x9801, 0xfb06, 0xff00]) - # 2222/7B47, 123/71 - pkt = NCP(0x7B47, "Get Current DeCompressing File Info List", 'stats') - pkt.Request(14, [ - rec(10, 4, VolumeNumberLong ), - ]) - pkt.Reply(24, [ - #rec(8, 4, FileListCount ), - rec(8, 16, FileInfoStruct ), - ]) - pkt.CompletionCodes([0x0000, 0x7e00, 0x9801, 0xfb06, 0xff00]) - # 2222/7B48, 123/72 - pkt = NCP(0x7B48, "Get Compression and Decompression Time and Counts", 'stats') - pkt.Request(14, [ - rec(10, 4, VolumeNumberLong ), - ]) - pkt.Reply(64, [ - rec(8, 56, CompDeCompStat ), - ]) - pkt.CompletionCodes([0x0000, 0x7e00, 0x9801, 0xfb06, 0xff00]) - # 2222/7BF9, 123/249 - pkt = NCP(0x7BF9, "Set Alert Notification", 'stats') - pkt.Request(10) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) - # 2222/7BFB, 123/251 - pkt = NCP(0x7BFB, "Get Item Configuration Information", 'stats') - pkt.Request(10) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) - # 2222/7BFC, 123/252 - pkt = NCP(0x7BFC, "Get Subject Item ID List", 'stats') - pkt.Request(10) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) - # 2222/7BFD, 123/253 - pkt = NCP(0x7BFD, "Get Subject Item List Count", 'stats') - pkt.Request(10) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) - # 2222/7BFE, 123/254 - pkt = NCP(0x7BFE, "Get Subject ID List", 'stats') - pkt.Request(10) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) - # 2222/7BFF, 123/255 - pkt = NCP(0x7BFF, "Get Number of NetMan Subjects", 'stats') - pkt.Request(10) - pkt.Reply(8) - pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) - # 2222/8301, 131/01 - pkt = NCP(0x8301, "RPC Load an NLM", 'remote') - pkt.Request(NO_LENGTH_CHECK, [ - rec(10, 4, NLMLoadOptions ), - rec(14, 16, Reserved16 ), - rec(30, PROTO_LENGTH_UNKNOWN, PathAndName ), - ], info_str=(PathAndName, "RPC Load NLM: %s", ", %s")) - pkt.Reply(12, [ - rec(8, 4, RPCccode ), - ]) - pkt.CompletionCodes([0x0000, 0x7c00, 0x7e00, 0xfb07, 0xff00]) - # 2222/8302, 131/02 - pkt = NCP(0x8302, "RPC Unload an NLM", 'remote') - pkt.Request(NO_LENGTH_CHECK, [ - rec(10, 20, Reserved20 ), - rec(30, PROTO_LENGTH_UNKNOWN, NLMName ), - ], info_str=(NLMName, "RPC Unload NLM: %s", ", %s")) - pkt.Reply(12, [ - rec(8, 4, RPCccode ), - ]) - pkt.CompletionCodes([0x0000, 0x7c00, 0x7e00, 0xfb07, 0xff00]) - # 2222/8303, 131/03 - pkt = NCP(0x8303, "RPC Mount Volume", 'remote') - pkt.Request(NO_LENGTH_CHECK, [ - rec(10, 20, Reserved20 ), - rec(30, PROTO_LENGTH_UNKNOWN, VolumeNameStringz ), - ], info_str=(VolumeNameStringz, "RPC Mount Volume: %s", ", %s")) - pkt.Reply(32, [ - rec(8, 4, RPCccode), - rec(12, 16, Reserved16 ), - rec(28, 4, VolumeNumberLong ), - ]) - pkt.CompletionCodes([0x0000, 0x7e00, 0xfb07, 0xff00]) - # 2222/8304, 131/04 - pkt = NCP(0x8304, "RPC Dismount Volume", 'remote') - pkt.Request(NO_LENGTH_CHECK, [ - rec(10, 20, Reserved20 ), - rec(30, PROTO_LENGTH_UNKNOWN, VolumeNameStringz ), - ], info_str=(VolumeNameStringz, "RPC Dismount Volume: %s", ", %s")) - pkt.Reply(12, [ - rec(8, 4, RPCccode ), - ]) - pkt.CompletionCodes([0x0000, 0x7e00, 0xfb07, 0xff00]) - # 2222/8305, 131/05 - pkt = NCP(0x8305, "RPC Add Name Space To Volume", 'remote') - pkt.Request(NO_LENGTH_CHECK, [ - rec(10, 20, Reserved20 ), - rec(30, PROTO_LENGTH_UNKNOWN, AddNameSpaceAndVol ), - ], info_str=(AddNameSpaceAndVol, "RPC Add Name Space to Volume: %s", ", %s")) - pkt.Reply(12, [ - rec(8, 4, RPCccode ), - ]) - pkt.CompletionCodes([0x0000, 0x7e00, 0xfb07, 0xff00]) - # 2222/8306, 131/06 - pkt = NCP(0x8306, "RPC Set Command Value", 'remote') - pkt.Request(NO_LENGTH_CHECK, [ - rec(10, 1, SetCmdType ), - rec(11, 3, Reserved3 ), - rec(14, 4, SetCmdValueNum ), - rec(18, 12, Reserved12 ), - rec(30, PROTO_LENGTH_UNKNOWN, SetCmdName ), - # - # XXX - optional string, if SetCmdType is 0 - # - ], info_str=(SetCmdName, "RPC Set Command Value: %s", ", %s")) - pkt.Reply(12, [ - rec(8, 4, RPCccode ), - ]) - pkt.CompletionCodes([0x0000, 0x7e00, 0xfb07, 0xff00]) - # 2222/8307, 131/07 - pkt = NCP(0x8307, "RPC Execute NCF File", 'remote') - pkt.Request(NO_LENGTH_CHECK, [ - rec(10, 20, Reserved20 ), - rec(30, PROTO_LENGTH_UNKNOWN, PathAndName ), - ], info_str=(PathAndName, "RPC Execute NCF File: %s", ", %s")) - pkt.Reply(12, [ - rec(8, 4, RPCccode ), - ]) - pkt.CompletionCodes([0x0000, 0x7e00, 0xfb07, 0xff00]) + srec( FileNameStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_fname == 1)" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/5711, 87/17 + pkt = NCP(0x5711, "Recover Salvageable File", 'file', has_length=0) + pkt.Request((23,277), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 4, SequenceNumber ), + rec( 14, 4, VolumeID ), + rec( 18, 4, DirectoryBase ), + rec( 22, (1,255), FileName ), + ], info_str=(FileName, "Recover Deleted File: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa802, 0xbf00, 0xfe02, 0xfd00, 0xff16]) + # 2222/5712, 87/18 + pkt = NCP(0x5712, "Purge Salvageable Files", 'file', has_length=0) + pkt.Request(22, [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 4, SequenceNumber ), + rec( 14, 4, VolumeID ), + rec( 18, 4, DirectoryBase ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x010a, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/5713, 87/19 + pkt = NCP(0x5713, "Get Name Space Information", 'file', has_length=0) + pkt.Request(18, [ + rec( 8, 1, SrcNameSpace ), + rec( 9, 1, DestNameSpace ), + rec( 10, 1, Reserved ), + rec( 11, 1, VolumeNumber ), + rec( 12, 4, DirectoryBase ), + rec( 16, 2, NamesSpaceInfoMask ), + ]) + pkt.Reply(NO_LENGTH_CHECK, [ + srec( FileNameStruct, req_cond="ncp.ns_info_mask_modify == TRUE" ), + srec( FileAttributesStruct, req_cond="ncp.ns_info_mask_fatt == TRUE" ), + srec( CreationDateStruct, req_cond="ncp.ns_info_mask_cdate == TRUE" ), + srec( CreationTimeStruct, req_cond="ncp.ns_info_mask_ctime == TRUE" ), + srec( OwnerIDStruct, req_cond="ncp.ns_info_mask_owner == TRUE" ), + srec( ArchiveDateStruct, req_cond="ncp.ns_info_mask_adate == TRUE" ), + srec( ArchiveTimeStruct, req_cond="ncp.ns_info_mask_atime == TRUE" ), + srec( ArchiveIdStruct, req_cond="ncp.ns_info_mask_aid == TRUE" ), + srec( UpdateDateStruct, req_cond="ncp.ns_info_mask_udate == TRUE" ), + srec( UpdateTimeStruct, req_cond="ncp.ns_info_mask_utime == TRUE" ), + srec( UpdateIDStruct, req_cond="ncp.ns_info_mask_uid == TRUE" ), + srec( LastAccessStruct, req_cond="ncp.ns_info_mask_acc_date == TRUE" ), + srec( RightsInfoStruct, req_cond="ncp.ns_info_mask_max_acc_mask == TRUE" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/5714, 87/20 + pkt = NCP(0x5714, "Search for File or Subdirectory Set", 'file', has_length=0) + pkt.Request((28, 282), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, DataStream ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, ReturnInfoMask ), + rec( 14, 2, ExtendedInfo ), + rec( 16, 2, ReturnInfoCount ), + rec( 18, 9, SeachSequenceStruct ), + rec( 27, (1,255), SearchPattern ), + ]) +# The reply packet is dissected in packet-ncp2222.inc + pkt.Reply(NO_LENGTH_CHECK, [ + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xbf00, 0xfd00, 0xff16]) + # 2222/5715, 87/21 + pkt = NCP(0x5715, "Get Path String from Short Directory Handle", 'file', has_length=0) + pkt.Request(10, [ + rec( 8, 1, NameSpace ), + rec( 9, 1, DirHandle ), + ]) + pkt.Reply((9,263), [ + rec( 8, (1,255), Path ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xfd00, 0xff16]) + # 2222/5716, 87/22 + pkt = NCP(0x5716, "Generate Directory Base and Volume Number", 'file', has_length=0) + pkt.Request((20,274), [ + rec( 8, 1, SrcNameSpace ), + rec( 9, 1, DestNameSpace ), + rec( 10, 2, dstNSIndicator ), + rec( 12, 1, VolumeNumber ), + rec( 13, 4, DirectoryBase ), + rec( 17, 1, HandleFlag ), + rec( 18, 1, PathCount, var="x" ), + rec( 19, (1,255), Path, repeat="x" ), + ], info_str=(Path, "Get Volume and Directory Base from: %s", "/%s")) + pkt.Reply(17, [ + rec( 8, 4, DirectoryBase ), + rec( 12, 4, DOSDirectoryBase ), + rec( 16, 1, VolumeNumber ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/5717, 87/23 + pkt = NCP(0x5717, "Query Name Space Information Format", 'file', has_length=0) + pkt.Request(10, [ + rec( 8, 1, NameSpace ), + rec( 9, 1, VolumeNumber ), + ]) + pkt.Reply(58, [ + rec( 8, 4, FixedBitMask ), + rec( 12, 4, VariableBitMask ), + rec( 16, 4, HugeBitMask ), + rec( 20, 2, FixedBitsDefined ), + rec( 22, 2, VariableBitsDefined ), + rec( 24, 2, HugeBitsDefined ), + rec( 26, 32, FieldsLenTable ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/5718, 87/24 + pkt = NCP(0x5718, "Get Name Spaces Loaded List from Volume Number", 'file', has_length=0) + pkt.Request(11, [ + rec( 8, 2, Reserved2 ), + rec( 10, 1, VolumeNumber ), + ], info_str=(VolumeNumber, "Get Name Spaces Loaded List from Vol: %d", "/%d")) + pkt.Reply(11, [ + rec( 8, 2, NumberOfNSLoaded, var="x" ), + rec( 10, 1, NameSpace, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/5719, 87/25 + pkt = NCP(0x5719, "Set Name Space Information", 'file', has_length=0) + pkt.Request(531, [ + rec( 8, 1, SrcNameSpace ), + rec( 9, 1, DestNameSpace ), + rec( 10, 1, VolumeNumber ), + rec( 11, 4, DirectoryBase ), + rec( 15, 2, NamesSpaceInfoMask ), + rec( 17, 2, Reserved2 ), + rec( 19, 512, NSSpecificInfo ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8b00, 0x8d00, 0x8f00, 0x9001, + 0x9600, 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, + 0xff16]) + # 2222/571A, 87/26 + pkt = NCP(0x571A, "Get Huge Name Space Information", 'file', has_length=0) + pkt.Request(34, [ + rec( 8, 1, NameSpace ), + rec( 9, 1, VolumeNumber ), + rec( 10, 4, DirectoryBase ), + rec( 14, 4, HugeBitMask ), + rec( 18, 16, HugeStateInfo ), + ]) + pkt.Reply((25,279), [ + rec( 8, 16, NextHugeStateInfo ), + rec( 24, (1,255), HugeData ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8b00, 0x8d00, 0x8f00, 0x9001, + 0x9600, 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, + 0xff16]) + # 2222/571B, 87/27 + pkt = NCP(0x571B, "Set Huge Name Space Information", 'file', has_length=0) + pkt.Request((35,289), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, VolumeNumber ), + rec( 10, 4, DirectoryBase ), + rec( 14, 4, HugeBitMask ), + rec( 18, 16, HugeStateInfo ), + rec( 34, (1,255), HugeData ), + ]) + pkt.Reply(28, [ + rec( 8, 16, NextHugeStateInfo ), + rec( 24, 4, HugeDataUsed ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8b00, 0x8d00, 0x8f00, 0x9001, + 0x9600, 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, + 0xff16]) + # 2222/571C, 87/28 + pkt = NCP(0x571C, "Get Full Path String", 'file', has_length=0) + pkt.Request((28,282), [ + rec( 8, 1, SrcNameSpace ), + rec( 9, 1, DestNameSpace ), + rec( 10, 2, PathCookieFlags ), + rec( 12, 4, Cookie1 ), + rec( 16, 4, Cookie2 ), + rec( 20, 1, VolumeNumber ), + rec( 21, 4, DirectoryBase ), + rec( 25, 1, HandleFlag ), + rec( 26, 1, PathCount, var="x" ), + rec( 27, (1,255), Path, repeat="x" ), + ], info_str=(Path, "Get Full Path from: %s", "/%s")) + pkt.Reply((23,277), [ + rec( 8, 2, PathCookieFlags ), + rec( 10, 4, Cookie1 ), + rec( 14, 4, Cookie2 ), + rec( 18, 2, PathComponentSize ), + rec( 20, 2, PathComponentCount, var='x' ), + rec( 22, (1,255), Path, repeat='x' ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8b00, 0x8d00, 0x8f00, 0x9001, + 0x9600, 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, + 0xff16]) + # 2222/571D, 87/29 + pkt = NCP(0x571D, "Get Effective Directory Rights", 'file', has_length=0) + pkt.Request((24, 278), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, DestNameSpace ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, ReturnInfoMask ), + rec( 14, 2, ExtendedInfo ), + rec( 16, 1, VolumeNumber ), + rec( 17, 4, DirectoryBase ), + rec( 21, 1, HandleFlag ), + rec( 22, 1, PathCount, var="x" ), + rec( 23, (1,255), Path, repeat="x" ), + ], info_str=(Path, "Get Effective Rights for: %s", "/%s")) + pkt.Reply(NO_LENGTH_CHECK, [ + rec( 8, 2, EffectiveRights ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), + srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), + srec( PadAttributes, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), + srec( PadDataStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), + srec( PadTotalStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), + srec( PadCreationInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), + srec( PadModifyInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), + srec( PadArchiveInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), + srec( PadRightsInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), + srec( PadDirEntry, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), + srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), + srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), + srec( FileNameStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_fname == 1)" ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), + srec( FileNameStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_fname == 1)" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/571E, 87/30 + pkt = NCP(0x571E, "Open/Create File or Subdirectory", 'file', has_length=0) + pkt.Request((34, 288), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, DataStream ), + rec( 10, 1, OpenCreateMode ), + rec( 11, 1, Reserved ), + rec( 12, 2, SearchAttributesLow ), + rec( 14, 2, Reserved2 ), + rec( 16, 2, ReturnInfoMask ), + rec( 18, 2, ExtendedInfo ), + rec( 20, 4, AttributesDef32 ), + rec( 24, 2, DesiredAccessRights ), + rec( 26, 1, VolumeNumber ), + rec( 27, 4, DirectoryBase ), + rec( 31, 1, HandleFlag ), + rec( 32, 1, PathCount, var="x" ), + rec( 33, (1,255), Path, repeat="x" ), + ], info_str=(Path, "Open or Create File: %s", "/%s")) + pkt.Reply(NO_LENGTH_CHECK, [ + rec( 8, 4, FileHandle, BE ), + rec( 12, 1, OpenCreateAction ), + rec( 13, 1, Reserved ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), + srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), + srec( PadAttributes, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), + srec( PadDataStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), + srec( PadTotalStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), + srec( PadCreationInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), + srec( PadModifyInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), + srec( PadArchiveInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), + srec( PadRightsInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), + srec( PadDirEntry, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), + srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), + srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), + srec( FileNameStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_fname == 1)" ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), + srec( FileNameStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_fname == 1)" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbe00, 0xbf00, 0xfd00, 0xff16]) + # 2222/571F, 87/31 + pkt = NCP(0x571F, "Get File Information", 'file', has_length=0) + pkt.Request(15, [ + rec( 8, 6, FileHandle ), + rec( 14, 1, HandleInfoLevel ), + ], info_str=(FileHandle, "Get File Information - 0x%s", ", %s")) + pkt.Reply(NO_LENGTH_CHECK, [ + rec( 8, 4, VolumeNumberLong ), + rec( 12, 4, DirectoryBase ), + srec(HandleInfoLevel0, req_cond="ncp.handle_info_level==0x00" ), + srec(HandleInfoLevel1, req_cond="ncp.handle_info_level==0x01" ), + srec(HandleInfoLevel2, req_cond="ncp.handle_info_level==0x02" ), + srec(HandleInfoLevel3, req_cond="ncp.handle_info_level==0x03" ), + srec(HandleInfoLevel4, req_cond="ncp.handle_info_level==0x04" ), + srec(HandleInfoLevel5, req_cond="ncp.handle_info_level==0x05" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/5720, 87/32 + pkt = NCP(0x5720, "Open/Create File or Subdirectory with Callback", 'file', has_length=0) + pkt.Request((30, 284), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, OpenCreateMode ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, ReturnInfoMask ), + rec( 14, 2, ExtendedInfo ), + rec( 16, 4, AttributesDef32 ), + rec( 20, 2, DesiredAccessRights ), + rec( 22, 1, VolumeNumber ), + rec( 23, 4, DirectoryBase ), + rec( 27, 1, HandleFlag ), + rec( 28, 1, PathCount, var="x" ), + rec( 29, (1,255), Path, repeat="x" ), + ], info_str=(Path, "Open or Create with Op-Lock: %s", "/%s")) + pkt.Reply( NO_LENGTH_CHECK, [ + rec( 8, 4, FileHandle, BE ), + rec( 12, 1, OpenCreateAction ), + rec( 13, 1, OCRetFlags ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), + srec( PadDSSpaceAllocate, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), + srec( AttributesStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), + srec( PadAttributes, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), + srec( PadDataStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), + srec( PadTotalStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), + srec( CreationInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), + srec( PadCreationInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), + srec( PadModifyInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), + srec( PadArchiveInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), + srec( RightsInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), + srec( PadRightsInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), + srec( DirEntryStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), + srec( PadDirEntry, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), + srec( EAInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), + srec( PadEAInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), + srec( NSInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), + srec( PadNSInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), + srec( ReferenceIDStruct, req_cond="ncp.ret_info_mask_id == 1" ), + srec( NSAttributeStruct, req_cond="ncp.ret_info_mask_ns_attr == 1" ), + srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1" ), + srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1" ), + srec( LastUpdatedInSecondsStruct, req_cond="ncp.ext_info_update == 1" ), + srec( DOSNameStruct, req_cond="ncp.ext_info_dos_name == 1" ), + srec( FlushTimeStruct, req_cond="ncp.ext_info_flush == 1" ), + srec( ParentBaseIDStruct, req_cond="ncp.ext_info_parental == 1" ), + srec( MacFinderInfoStruct, req_cond="ncp.ext_info_mac_finder == 1" ), + srec( SiblingCountStruct, req_cond="ncp.ext_info_sibling == 1" ), + srec( EffectiveRightsStruct, req_cond="ncp.ext_info_effective == 1" ), + srec( MacTimeStruct, req_cond="ncp.ext_info_mac_date == 1" ), + srec( LastAccessedTimeStruct, req_cond="ncp.ext_info_access == 1" ), + srec( FileNameStruct, req_cond="ncp.ret_info_mask_fname == 1" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x0102, 0x7f00, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/5721, 87/33 + pkt = NCP(0x5721, "Open/Create File or Subdirectory II with Callback", 'file', has_length=0) + pkt.Request((34, 288), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, DataStream ), + rec( 10, 1, OpenCreateMode ), + rec( 11, 1, Reserved ), + rec( 12, 2, SearchAttributesLow ), + rec( 14, 2, Reserved2 ), + rec( 16, 2, ReturnInfoMask ), + rec( 18, 2, ExtendedInfo ), + rec( 20, 4, AttributesDef32 ), + rec( 24, 2, DesiredAccessRights ), + rec( 26, 1, VolumeNumber ), + rec( 27, 4, DirectoryBase ), + rec( 31, 1, HandleFlag ), + rec( 32, 1, PathCount, var="x" ), + rec( 33, (1,255), Path, repeat="x" ), + ], info_str=(FilePath, "Open or Create II with Op-Lock: %s", "/%s")) + pkt.Reply(NO_LENGTH_CHECK, [ + rec( 8, 4, FileHandle ), + rec( 12, 1, OpenCreateAction ), + rec( 13, 1, OCRetFlags ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), + srec( PadDSSpaceAllocate, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), + srec( AttributesStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), + srec( PadAttributes, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), + srec( PadDataStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), + srec( PadTotalStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), + srec( CreationInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), + srec( PadCreationInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), + srec( PadModifyInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), + srec( PadArchiveInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), + srec( RightsInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), + srec( PadRightsInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), + srec( DirEntryStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), + srec( PadDirEntry, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), + srec( EAInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), + srec( PadEAInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), + srec( NSInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), + srec( PadNSInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), + srec( ReferenceIDStruct, req_cond="ncp.ret_info_mask_id == 1" ), + srec( NSAttributeStruct, req_cond="ncp.ret_info_mask_ns_attr == 1" ), + srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1" ), + srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1" ), + srec( LastUpdatedInSecondsStruct, req_cond="ncp.ext_info_update == 1" ), + srec( DOSNameStruct, req_cond="ncp.ext_info_dos_name == 1" ), + srec( FlushTimeStruct, req_cond="ncp.ext_info_flush == 1" ), + srec( ParentBaseIDStruct, req_cond="ncp.ext_info_parental == 1" ), + srec( MacFinderInfoStruct, req_cond="ncp.ext_info_mac_finder == 1" ), + srec( SiblingCountStruct, req_cond="ncp.ext_info_sibling == 1" ), + srec( EffectiveRightsStruct, req_cond="ncp.ext_info_effective == 1" ), + srec( MacTimeStruct, req_cond="ncp.ext_info_mac_date == 1" ), + srec( LastAccessedTimeStruct, req_cond="ncp.ext_info_access == 1" ), + srec( FileNameStruct, req_cond="ncp.ret_info_mask_fname == 1" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbe00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5722, 87/34 + pkt = NCP(0x5722, "Open CallBack Control (Op-Lock)", 'file', has_length=0) + pkt.Request(13, [ + rec( 10, 4, CCFileHandle, BE ), + rec( 14, 1, CCFunction ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8000, 0x8800, 0xff16]) + # 2222/5723, 87/35 + pkt = NCP(0x5723, "Modify DOS Attributes on a File or Subdirectory", 'file', has_length=0) + pkt.Request((28, 282), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Flags ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, ReturnInfoMask ), + rec( 14, 2, ExtendedInfo ), + rec( 16, 4, AttributesDef32 ), + rec( 20, 1, VolumeNumber ), + rec( 21, 4, DirectoryBase ), + rec( 25, 1, HandleFlag ), + rec( 26, 1, PathCount, var="x" ), + rec( 27, (1,255), Path, repeat="x" ), + ], info_str=(Path, "Modify DOS Attributes for: %s", "/%s")) + pkt.Reply(24, [ + rec( 8, 4, ItemsChecked ), + rec( 12, 4, ItemsChanged ), + rec( 16, 4, AttributeValidFlag ), + rec( 20, 4, AttributesDef32 ), + ]) + pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/5724, 87/36 + pkt = NCP(0x5724, "Log File", 'sync', has_length=0) + pkt.Request((28, 282), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 2, Reserved2 ), + rec( 12, 1, LogFileFlagLow ), + rec( 13, 1, LogFileFlagHigh ), + rec( 14, 2, Reserved2 ), + rec( 16, 4, WaitTime ), + rec( 20, 1, VolumeNumber ), + rec( 21, 4, DirectoryBase ), + rec( 25, 1, HandleFlag ), + rec( 26, 1, PathCount, var="x" ), + rec( 27, (1,255), Path, repeat="x" ), + ], info_str=(Path, "Lock File: %s", "/%s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/5725, 87/37 + pkt = NCP(0x5725, "Release File", 'sync', has_length=0) + pkt.Request((20, 274), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 2, Reserved2 ), + rec( 12, 1, VolumeNumber ), + rec( 13, 4, DirectoryBase ), + rec( 17, 1, HandleFlag ), + rec( 18, 1, PathCount, var="x" ), + rec( 19, (1,255), Path, repeat="x" ), + ], info_str=(Path, "Release Lock on: %s", "/%s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/5726, 87/38 + pkt = NCP(0x5726, "Clear File", 'sync', has_length=0) + pkt.Request((20, 274), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 2, Reserved2 ), + rec( 12, 1, VolumeNumber ), + rec( 13, 4, DirectoryBase ), + rec( 17, 1, HandleFlag ), + rec( 18, 1, PathCount, var="x" ), + rec( 19, (1,255), Path, repeat="x" ), + ], info_str=(Path, "Clear File: %s", "/%s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/5727, 87/39 + pkt = NCP(0x5727, "Get Directory Disk Space Restriction", 'file', has_length=0) + pkt.Request((19, 273), [ + rec( 8, 1, NameSpace ), + rec( 9, 2, Reserved2 ), + rec( 11, 1, VolumeNumber ), + rec( 12, 4, DirectoryBase ), + rec( 16, 1, HandleFlag ), + rec( 17, 1, PathCount, var="x" ), + rec( 18, (1,255), Path, repeat="x" ), + ], info_str=(Path, "Get Disk Space Restriction for: %s", "/%s")) + pkt.Reply(18, [ + rec( 8, 1, NumberOfEntries, var="x" ), + rec( 9, 9, SpaceStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, + 0xff16]) + # 2222/5728, 87/40 + pkt = NCP(0x5728, "Search for File or Subdirectory Set (Extended Errors)", 'file', has_length=0) + pkt.Request((28, 282), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, DataStream ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, ReturnInfoMask ), + rec( 14, 2, ExtendedInfo ), + rec( 16, 2, ReturnInfoCount ), + rec( 18, 9, SeachSequenceStruct ), + rec( 27, (1,255), SearchPattern ), + ], info_str=(SearchPattern, "Search for: %s", ", %s")) + pkt.Reply(NO_LENGTH_CHECK, [ + rec( 8, 9, SeachSequenceStruct ), + rec( 17, 1, MoreFlag ), + rec( 18, 2, InfoCount ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), + srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), + srec( PadAttributes, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), + srec( PadDataStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), + srec( PadTotalStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), + srec( PadCreationInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), + srec( PadModifyInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), + srec( PadArchiveInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), + srec( PadRightsInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), + srec( PadDirEntry, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), + srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), + srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), + srec( FileNameStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_fname == 1)" ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), + srec( FileNameStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_fname == 1)" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/5729, 87/41 + pkt = NCP(0x5729, "Scan Salvageable Files", 'file', has_length=0) + pkt.Request((24,278), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 2, CtrlFlags, LE ), + rec( 12, 4, SequenceNumber ), + rec( 16, 1, VolumeNumber ), + rec( 17, 4, DirectoryBase ), + rec( 21, 1, HandleFlag ), + rec( 22, 1, PathCount, var="x" ), + rec( 23, (1,255), Path, repeat="x" ), + ], info_str=(Path, "Scan Deleted Files: %s", "/%s")) + pkt.Reply(NO_LENGTH_CHECK, [ + rec( 8, 4, SequenceNumber ), + rec( 12, 4, DirectoryBase ), + rec( 16, 4, ScanItems, var="x" ), + srec(ScanInfoFileName, req_cond="ncp.ctrl_flags==0x0001", repeat="x" ), + srec(ScanInfoFileNoName, req_cond="ncp.ctrl_flags==0x0000", repeat="x" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/572A, 87/42 + pkt = NCP(0x572A, "Purge Salvageable File List", 'file', has_length=0) + pkt.Request(28, [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 2, PurgeFlags ), + rec( 12, 4, VolumeNumberLong ), + rec( 16, 4, DirectoryBase ), + rec( 20, 4, PurgeCount, var="x" ), + rec( 24, 4, PurgeList, repeat="x" ), + ]) + pkt.Reply(16, [ + rec( 8, 4, PurgeCount, var="x" ), + rec( 12, 4, PurgeCcode, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/572B, 87/43 + pkt = NCP(0x572B, "Revoke File Handle Rights", 'file', has_length=0) + pkt.Request(17, [ + rec( 8, 3, Reserved3 ), + rec( 11, 1, RevQueryFlag ), + rec( 12, 4, FileHandle ), + rec( 16, 1, RemoveOpenRights ), + ]) + pkt.Reply(13, [ + rec( 8, 4, FileHandle ), + rec( 12, 1, OpenRights ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/572C, 87/44 + pkt = NCP(0x572C, "Update File Handle Rights", 'file', has_length=0) + pkt.Request(24, [ + rec( 8, 2, Reserved2 ), + rec( 10, 1, VolumeNumber ), + rec( 11, 1, NameSpace ), + rec( 12, 4, DirectoryNumber ), + rec( 16, 2, AccessRightsMaskWord ), + rec( 18, 2, NewAccessRights ), + rec( 20, 4, FileHandle, BE ), + ]) + pkt.Reply(16, [ + rec( 8, 4, FileHandle, BE ), + rec( 12, 4, EffectiveRights, LE ), + ]) + pkt.CompletionCodes([0x0000, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff16]) + # 2222/5740, 87/64 + pkt = NCP(0x5740, "Read from File", 'file', has_length=0) + pkt.Request(22, [ + rec( 8, 4, FileHandle, BE ), + rec( 12, 8, StartOffset64bit, BE ), + rec( 20, 2, NumBytes, BE ), +]) + pkt.Reply(10, [ + rec( 8, 2, NumBytes, BE), +]) + pkt.CompletionCodes([0x0000, 0x8300, 0x8800, 0x9300, 0x9500, 0xa201, 0xfd00, 0xff1b]) + # 2222/5741, 87/65 + pkt = NCP(0x5741, "Write to File", 'file', has_length=0) + pkt.Request(22, [ + rec( 8, 4, FileHandle, BE ), + rec( 12, 8, StartOffset64bit, BE ), + rec( 20, 2, NumBytes, BE ), +]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0102, 0x8300, 0x8800, 0x9400, 0x9500, 0xa201, 0xfd00, 0xff1b]) + # 2222/5742, 87/66 + pkt = NCP(0x5742, "Get Current Size of File", 'file', has_length=0) + pkt.Request(12, [ + rec( 8, 4, FileHandle, BE ), +]) + pkt.Reply(16, [ + rec( 8, 8, FileSize64bit), +]) + pkt.CompletionCodes([0x0000, 0x7f00, 0x8800, 0x9600, 0xfd02, 0xff01]) + # 2222/5743, 87/67 + pkt = NCP(0x5743, "Log Physical Record", 'file', has_length=0) + pkt.Request(36, [ + rec( 8, 4, LockFlag, BE ), + rec(12, 4, FileHandle, BE ), + rec(16, 8, StartOffset64bit, BE ), + rec(24, 8, Length64bit, BE ), + rec(32, 4, LockTimeout, BE), +]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7f00, 0x8800, 0x9600, 0xfb08, 0xfd02, 0xff01]) + # 2222/5744, 87/68 + pkt = NCP(0x5744, "Release Physical Record", 'file', has_length=0) + pkt.Request(28, [ + rec(8, 4, FileHandle, BE ), + rec(12, 8, StartOffset64bit, BE ), + rec(20, 8, Length64bit, BE ), +]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff1a]) + # 2222/5745, 87/69 + pkt = NCP(0x5745, "Clear Physical Record", 'file', has_length=0) + pkt.Request(28, [ + rec(8, 4, FileHandle, BE ), + rec(12, 8, StartOffset64bit, BE ), + rec(20, 8, Length64bit, BE ), +]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xbf00, 0xfd00, 0xff1a]) + # 2222/5801, 8801 + pkt = NCP(0x5801, "Query Volume Audit Status", "auditing", has_length=0) + pkt.Request(12, [ + rec( 8, 4, ConnectionNumber ), + ]) + pkt.Reply(40, [ + rec(8, 32, NWAuditStatus ), + ]) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/5802, 8802 + pkt = NCP(0x5802, "Add User Audit Property", "auditing", has_length=0) + pkt.Request(25, [ + rec(8, 4, AuditIDType ), + rec(12, 4, AuditID ), + rec(16, 4, AuditHandle ), + rec(20, 4, ObjectID ), + rec(24, 1, AuditFlag ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/5803, 8803 + pkt = NCP(0x5803, "Add Auditor Access", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xde00, 0xfd00, 0xff16]) + # 2222/5804, 8804 + pkt = NCP(0x5804, "Change Auditor Volume Password", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/5805, 8805 + pkt = NCP(0x5805, "Check Auditor Access", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/5806, 8806 + pkt = NCP(0x5806, "Delete User Audit Property", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff21]) + # 2222/5807, 8807 + pkt = NCP(0x5807, "Disable Auditing On A Volume", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/5808, 8808 + pkt = NCP(0x5808, "Enable Auditing On A Volume", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xde00, 0xfd00, 0xff16]) + # 2222/5809, 8809 + pkt = NCP(0x5809, "Query User Being Audited", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/580A, 88,10 + pkt = NCP(0x580A, "Read Audit Bit Map", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/580B, 88,11 + pkt = NCP(0x580B, "Read Audit File Configuration Header", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/580D, 88,13 + pkt = NCP(0x580D, "Remove Auditor Access", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/580E, 88,14 + pkt = NCP(0x580E, "Reset Audit File", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + + # 2222/580F, 88,15 + pkt = NCP(0x580F, "Auditing NCP", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfb00, 0xfd00, 0xff16]) + # 2222/5810, 88,16 + pkt = NCP(0x5810, "Write Audit Bit Map", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/5811, 88,17 + pkt = NCP(0x5811, "Write Audit File Configuration Header", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/5812, 88,18 + pkt = NCP(0x5812, "Change Auditor Volume Password2", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/5813, 88,19 + pkt = NCP(0x5813, "Return Audit Flags", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/5814, 88,20 + pkt = NCP(0x5814, "Close Old Audit File", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/5816, 88,22 + pkt = NCP(0x5816, "Check Level Two Access", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xde00, 0xfd00, 0xff16]) + # 2222/5817, 88,23 + pkt = NCP(0x5817, "Return Old Audit File List", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/5818, 88,24 + pkt = NCP(0x5818, "Init Audit File Reads", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/5819, 88,25 + pkt = NCP(0x5819, "Read Auditing File", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/581A, 88,26 + pkt = NCP(0x581A, "Delete Old Audit File", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/581E, 88,30 + pkt = NCP(0x581E, "Restart Volume auditing", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/581F, 88,31 + pkt = NCP(0x581F, "Set Volume Password", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0106, 0x7300, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa600, 0xa700, 0xa801, 0xbe00, 0xfd00, 0xff16]) + # 2222/5901, 89,01 + pkt = NCP(0x5901, "Open/Create File or Subdirectory", "enhanced", has_length=0) + pkt.Request((37,290), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, OpenCreateMode ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, ReturnInfoMask ), + rec( 14, 2, ExtendedInfo ), + rec( 16, 4, AttributesDef32 ), + rec( 20, 2, DesiredAccessRights ), + rec( 22, 4, DirectoryBase ), + rec( 26, 1, VolumeNumber ), + rec( 27, 1, HandleFlag ), + rec( 28, 1, DataTypeFlag ), + rec( 29, 5, Reserved5 ), + rec( 34, 1, PathCount, var="x" ), + rec( 35, (2,255), Path16, repeat="x" ), + ], info_str=(Path16, "Open or Create File or Subdirectory: %s", "/%s")) + pkt.Reply( NO_LENGTH_CHECK, [ + rec( 8, 4, FileHandle, BE ), + rec( 12, 1, OpenCreateAction ), + rec( 13, 1, Reserved ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), + srec( PadDSSpaceAllocate, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), + srec( AttributesStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), + srec( PadAttributes, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), + srec( PadDataStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), + srec( PadTotalStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), + srec( CreationInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), + srec( PadCreationInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), + srec( PadModifyInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), + srec( PadArchiveInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), + srec( RightsInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), + srec( PadRightsInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), + srec( DirEntryStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), + srec( PadDirEntry, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), + srec( EAInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), + srec( PadEAInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), + srec( NSInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), + srec( PadNSInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), + srec( ReferenceIDStruct, req_cond="ncp.ret_info_mask_id == 1" ), + srec( NSAttributeStruct, req_cond="ncp.ret_info_mask_ns_attr == 1" ), + srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1" ), + srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1" ), + srec( LastUpdatedInSecondsStruct, req_cond="ncp.ext_info_update == 1" ), + srec( DOSName16Struct, req_cond="ncp.ext_info_dos_name == 1" ), + srec( FlushTimeStruct, req_cond="ncp.ext_info_flush == 1" ), + srec( ParentBaseIDStruct, req_cond="ncp.ext_info_parental == 1" ), + srec( MacFinderInfoStruct, req_cond="ncp.ext_info_mac_finder == 1" ), + srec( SiblingCountStruct, req_cond="ncp.ext_info_sibling == 1" ), + srec( EffectiveRightsStruct, req_cond="ncp.ext_info_effective == 1" ), + srec( MacTimeStruct, req_cond="ncp.ext_info_mac_date == 1" ), + srec( LastAccessedTimeStruct, req_cond="ncp.ext_info_access == 1" ), + srec( FileSize64bitStruct, req_cond="ncp.ext_info_64_bit_fs == 1" ), + srec( FileName16Struct, req_cond="ncp.ret_info_mask_fname == 1" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x0102, 0x7f00, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9900, 0x9b03, 0x9c03, 0xa901, 0xa500, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5902, 89/02 + pkt = NCP(0x5902, "Initialize Search", 'enhanced', has_length=0) + pkt.Request( (25,278), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 4, DirectoryBase ), + rec( 14, 1, VolumeNumber ), + rec( 15, 1, HandleFlag ), + rec( 16, 1, DataTypeFlag ), + rec( 17, 5, Reserved5 ), + rec( 22, 1, PathCount, var="x" ), + rec( 23, (2,255), Path16, repeat="x" ), + ], info_str=(Path16, "Set Search Pointer to: %s", "/%s")) + pkt.Reply(17, [ + rec( 8, 1, VolumeNumber ), + rec( 9, 4, DirectoryNumber ), + rec( 13, 4, DirectoryEntryNumber ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5903, 89/03 + pkt = NCP(0x5903, "Search for File or Subdirectory", 'enhanced', has_length=0) + pkt.Request((28, 281), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, DataStream ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, ReturnInfoMask ), + rec( 14, 2, ExtendedInfo ), + rec( 16, 9, SeachSequenceStruct ), + rec( 25, 1, DataTypeFlag ), + rec( 26, (2,255), SearchPattern16 ), + ], info_str=(SearchPattern16, "Search for: %s", "/%s")) + pkt.Reply( NO_LENGTH_CHECK, [ + rec( 8, 9, SeachSequenceStruct ), + rec( 17, 1, Reserved ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), + srec( PadDSSpaceAllocate, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), + srec( AttributesStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), + srec( PadAttributes, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), + srec( PadDataStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), + srec( PadTotalStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), + srec( CreationInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), + srec( PadCreationInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), + srec( PadModifyInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), + srec( PadArchiveInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), + srec( RightsInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), + srec( PadRightsInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), + srec( DirEntryStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), + srec( PadDirEntry, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), + srec( EAInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), + srec( PadEAInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), + srec( NSInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), + srec( PadNSInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), + srec( ReferenceIDStruct, req_cond="ncp.ret_info_mask_id == 1" ), + srec( NSAttributeStruct, req_cond="ncp.ret_info_mask_ns_attr == 1" ), + srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1" ), + srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1" ), + srec( LastUpdatedInSecondsStruct, req_cond="ncp.ext_info_update == 1" ), + srec( DOSName16Struct, req_cond="ncp.ext_info_dos_name == 1" ), + srec( FlushTimeStruct, req_cond="ncp.ext_info_flush == 1" ), + srec( ParentBaseIDStruct, req_cond="ncp.ext_info_parental == 1" ), + srec( MacFinderInfoStruct, req_cond="ncp.ext_info_mac_finder == 1" ), + srec( SiblingCountStruct, req_cond="ncp.ext_info_sibling == 1" ), + srec( EffectiveRightsStruct, req_cond="ncp.ext_info_effective == 1" ), + srec( MacTimeStruct, req_cond="ncp.ext_info_mac_date == 1" ), + srec( LastAccessedTimeStruct, req_cond="ncp.ext_info_access == 1" ), + srec( FileSize64bitStruct, req_cond="ncp.ext_info_64_bit_fs == 1" ), + srec( FileName16Struct, req_cond="ncp.ret_info_mask_fname == 1" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5904, 89/04 + pkt = NCP(0x5904, "Rename Or Move a File or Subdirectory", 'enhanced', has_length=0) + pkt.Request((42, 548), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, RenameFlag ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 12, SrcEnhNWHandlePathS1 ), + rec( 24, 1, PathCount, var="x" ), + rec( 25, 12, DstEnhNWHandlePathS1 ), + rec( 37, 1, PathCount, var="y" ), + rec( 38, (2, 255), Path16, repeat="x" ), + rec( -1, (2,255), DestPath16, repeat="y" ), + ], info_str=(Path16, "Rename or Move: %s", "/%s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8e00, 0x8f00, 0x9001, 0x9200, 0x9600, + 0x9804, 0x9a00, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5905, 89/05 + pkt = NCP(0x5905, "Scan File or Subdirectory for Trustees", 'enhanced', has_length=0) + pkt.Request((31, 284), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, MaxReplyObjectIDCount ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 4, SequenceNumber ), + rec( 16, 4, DirectoryBase ), + rec( 20, 1, VolumeNumber ), + rec( 21, 1, HandleFlag ), + rec( 22, 1, DataTypeFlag ), + rec( 23, 5, Reserved5 ), + rec( 28, 1, PathCount, var="x" ), + rec( 29, (2, 255), Path16, repeat="x" ), + ], info_str=(Path16, "Scan Trustees for: %s", "/%s")) + pkt.Reply(20, [ + rec( 8, 4, SequenceNumber ), + rec( 12, 2, ObjectIDCount, var="x" ), + rec( 14, 6, TrusteeStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5906, 89/06 + pkt = NCP(0x5906, "Obtain File or SubDirectory Information", 'enhanced', has_length=0) + pkt.Request((22), [ + rec( 8, 1, SrcNameSpace ), + rec( 9, 1, DestNameSpace ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, ReturnInfoMask, LE ), + rec( 14, 2, ExtendedInfo ), + rec( 16, 4, DirectoryBase ), + rec( 20, 1, VolumeNumber ), + rec( 21, 1, HandleFlag ), + # + # Move to packet-ncp2222.inc + # The datatype flag indicates if the path is represented as ASCII or UTF8 + # ASCII has a 1 byte count field whereas UTF8 has a two byte count field. + # + #rec( 22, 1, DataTypeFlag ), + #rec( 23, 5, Reserved5 ), + #rec( 28, 1, PathCount, var="x" ), + #rec( 29, (2,255), Path16, repeat="x",), + ], info_str=(Path16, "Obtain Info for: %s", "/%s")) + pkt.Reply(NO_LENGTH_CHECK, [ + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), + srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), + srec( PadAttributes, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), + srec( PadDataStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), + srec( PadTotalStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), + srec( PadCreationInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), + srec( PadModifyInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), + srec( PadArchiveInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), + srec( PadRightsInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), + srec( PadDirEntry, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), + srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), + srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), + srec( ReferenceIDStruct, req_cond="ncp.ret_info_mask_id == 1" ), + srec( NSAttributeStruct, req_cond="ncp.ret_info_mask_ns_attr == 1" ), + srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1" ), + srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1" ), + srec( LastUpdatedInSecondsStruct, req_cond="ncp.ext_info_update == 1" ), + srec( DOSName16Struct, req_cond="ncp.ext_info_dos_name == 1" ), + srec( FlushTimeStruct, req_cond="ncp.ext_info_flush == 1" ), + srec( ParentBaseIDStruct, req_cond="ncp.ext_info_parental == 1" ), + srec( MacFinderInfoStruct, req_cond="ncp.ext_info_mac_finder == 1" ), + srec( SiblingCountStruct, req_cond="ncp.ext_info_sibling == 1" ), + srec( EffectiveRightsStruct, req_cond="ncp.ext_info_effective == 1" ), + srec( MacTimeStruct, req_cond="ncp.ext_info_mac_date == 1" ), + srec( LastAccessedTimeStruct, req_cond="ncp.ext_info_access == 1" ), + srec( FileSize64bitStruct, req_cond="ncp.ext_info_64_bit_fs == 1" ), + srec( FileName16Struct, req_cond="ncp.ret_info_mask_fname == 1" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8700, 0x8900, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa802, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5907, 89/07 + pkt = NCP(0x5907, "Modify File or Subdirectory DOS Information", 'enhanced', has_length=0) + pkt.Request((69,322), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, ModifyDOSInfoMask ), + rec( 14, 2, Reserved2 ), + rec( 16, 2, AttributesDef16 ), + rec( 18, 1, FileMode ), + rec( 19, 1, FileExtendedAttributes ), + rec( 20, 2, CreationDate ), + rec( 22, 2, CreationTime ), + rec( 24, 4, CreatorID, BE ), + rec( 28, 2, ModifiedDate ), + rec( 30, 2, ModifiedTime ), + rec( 32, 4, ModifierID, BE ), + rec( 36, 2, ArchivedDate ), + rec( 38, 2, ArchivedTime ), + rec( 40, 4, ArchiverID, BE ), + rec( 44, 2, LastAccessedDate ), + rec( 46, 2, InheritedRightsMask ), + rec( 48, 2, InheritanceRevokeMask ), + rec( 50, 4, MaxSpace ), + rec( 54, 4, DirectoryBase ), + rec( 58, 1, VolumeNumber ), + rec( 59, 1, HandleFlag ), + rec( 60, 1, DataTypeFlag ), + rec( 61, 5, Reserved5 ), + rec( 66, 1, PathCount, var="x" ), + rec( 67, (2,255), Path16, repeat="x" ), + ], info_str=(Path16, "Modify DOS Information for: %s", "/%s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8c01, 0x8d00, 0x8e00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5908, 89/08 + pkt = NCP(0x5908, "Delete a File or Subdirectory", 'enhanced', has_length=0) + pkt.Request((27,280), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 4, DirectoryBase ), + rec( 16, 1, VolumeNumber ), + rec( 17, 1, HandleFlag ), + rec( 18, 1, DataTypeFlag ), + rec( 19, 5, Reserved5 ), + rec( 24, 1, PathCount, var="x" ), + rec( 25, (2,255), Path16, repeat="x" ), + ], info_str=(Path16, "Delete a File or Subdirectory: %s", "/%s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8900, 0x8a00, 0x8d00, 0x8e00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5909, 89/09 + pkt = NCP(0x5909, "Set Short Directory Handle", 'enhanced', has_length=0) + pkt.Request((27,280), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, DataStream ), + rec( 10, 1, DestDirHandle ), + rec( 11, 1, Reserved ), + rec( 12, 4, DirectoryBase ), + rec( 16, 1, VolumeNumber ), + rec( 17, 1, HandleFlag ), + rec( 18, 1, DataTypeFlag ), + rec( 19, 5, Reserved5 ), + rec( 24, 1, PathCount, var="x" ), + rec( 25, (2,255), Path16, repeat="x" ), + ], info_str=(Path16, "Set Short Directory Handle to: %s", "/%s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/590A, 89/10 + pkt = NCP(0x590A, "Add Trustee Set to File or Subdirectory", 'enhanced', has_length=0) + pkt.Request((37,290), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, AccessRightsMaskWord ), + rec( 14, 2, ObjectIDCount, var="y" ), + rec( -1, 6, TrusteeStruct, repeat="y" ), + rec( -1, 4, DirectoryBase ), + rec( -1, 1, VolumeNumber ), + rec( -1, 1, HandleFlag ), + rec( -1, 1, DataTypeFlag ), + rec( -1, 5, Reserved5 ), + rec( -1, 1, PathCount, var="x" ), + rec( -1, (2,255), Path16, repeat="x" ), + ], info_str=(Path16, "Add Trustee Set to: %s", "/%s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8c01, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfc01, 0xfd00, 0xff16]) + # 2222/590B, 89/11 + pkt = NCP(0x590B, "Delete Trustee Set from File or SubDirectory", 'enhanced', has_length=0) + pkt.Request((34,287), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 2, ObjectIDCount, var="y" ), + rec( 12, 7, TrusteeStruct, repeat="y" ), + rec( 19, 4, DirectoryBase ), + rec( 23, 1, VolumeNumber ), + rec( 24, 1, HandleFlag ), + rec( 25, 1, DataTypeFlag ), + rec( 26, 5, Reserved5 ), + rec( 31, 1, PathCount, var="x" ), + rec( 32, (2,255), Path16, repeat="x" ), + ], info_str=(Path16, "Delete Trustee Set from: %s", "/%s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8c01, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/590C, 89/12 + pkt = NCP(0x590C, "Allocate Short Directory Handle", 'enhanced', has_length=0) + pkt.Request((27,280), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, DestNameSpace ), + rec( 10, 2, AllocateMode ), + rec( 12, 4, DirectoryBase ), + rec( 16, 1, VolumeNumber ), + rec( 17, 1, HandleFlag ), + rec( 18, 1, DataTypeFlag ), + rec( 19, 5, Reserved5 ), + rec( 24, 1, PathCount, var="x" ), + rec( 25, (2,255), Path16, repeat="x" ), + ], info_str=(Path16, "Allocate Short Directory Handle to: %s", "/%s")) + pkt.Reply(NO_LENGTH_CHECK, [ + srec( ReplyLevel2Struct, req_cond="ncp.alloc_reply_lvl2 == TRUE" ), + srec( ReplyLevel1Struct, req_cond="ncp.alloc_reply_lvl2 == FALSE" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) +# 2222/5910, 89/16 + pkt = NCP(0x5910, "Scan Salvageable Files", 'enhanced', has_length=0) + pkt.Request((33,286), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, DataStream ), + rec( 10, 2, ReturnInfoMask ), + rec( 12, 2, ExtendedInfo ), + rec( 14, 4, SequenceNumber ), + rec( 18, 4, DirectoryBase ), + rec( 22, 1, VolumeNumber ), + rec( 23, 1, HandleFlag ), + rec( 24, 1, DataTypeFlag ), + rec( 25, 5, Reserved5 ), + rec( 30, 1, PathCount, var="x" ), + rec( 31, (2,255), Path16, repeat="x" ), + ], info_str=(Path16, "Scan for Deleted Files in: %s", "/%s")) + pkt.Reply(NO_LENGTH_CHECK, [ + rec( 8, 4, SequenceNumber ), + rec( 12, 2, DeletedTime ), + rec( 14, 2, DeletedDate ), + rec( 16, 4, DeletedID, BE ), + rec( 20, 4, VolumeID ), + rec( 24, 4, DirectoryBase ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), + srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), + srec( PadAttributes, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), + srec( PadDataStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), + srec( PadTotalStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), + srec( PadCreationInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), + srec( PadModifyInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), + srec( PadArchiveInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), + srec( PadRightsInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), + srec( PadDirEntry, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), + srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), + srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), + srec( FileName16Struct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_fname == 1)" ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), + srec( FileSize64bitStruct, req_cond="ncp.ext_info_64_bit_fs == 1" ), + srec( FileName16Struct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_fname == 1)" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5911, 89/17 + pkt = NCP(0x5911, "Recover Salvageable File", 'enhanced', has_length=0) + pkt.Request((24,278), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Reserved ), + rec( 10, 4, SequenceNumber ), + rec( 14, 4, VolumeID ), + rec( 18, 4, DirectoryBase ), + rec( 22, 1, DataTypeFlag ), + rec( 23, (1,255), FileName ), + ], info_str=(FileName, "Recover Deleted File: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5913, 89/19 + pkt = NCP(0x5913, "Get Name Space Information", 'enhanced', has_length=0) + pkt.Request(18, [ + rec( 8, 1, SrcNameSpace ), + rec( 9, 1, DestNameSpace ), + rec( 10, 1, DataTypeFlag ), + rec( 11, 1, VolumeNumber ), + rec( 12, 4, DirectoryBase ), + rec( 16, 2, NamesSpaceInfoMask ), + ]) + pkt.Reply(NO_LENGTH_CHECK, [ + srec( FileName16Struct, req_cond="ncp.ns_info_mask_modify == TRUE" ), + srec( FileAttributesStruct, req_cond="ncp.ns_info_mask_fatt == TRUE" ), + srec( CreationDateStruct, req_cond="ncp.ns_info_mask_cdate == TRUE" ), + srec( CreationTimeStruct, req_cond="ncp.ns_info_mask_ctime == TRUE" ), + srec( OwnerIDStruct, req_cond="ncp.ns_info_mask_owner == TRUE" ), + srec( ArchiveDateStruct, req_cond="ncp.ns_info_mask_adate == TRUE" ), + srec( ArchiveTimeStruct, req_cond="ncp.ns_info_mask_atime == TRUE" ), + srec( ArchiveIdStruct, req_cond="ncp.ns_info_mask_aid == TRUE" ), + srec( UpdateDateStruct, req_cond="ncp.ns_info_mask_udate == TRUE" ), + srec( UpdateTimeStruct, req_cond="ncp.ns_info_mask_utime == TRUE" ), + srec( UpdateIDStruct, req_cond="ncp.ns_info_mask_uid == TRUE" ), + srec( LastAccessStruct, req_cond="ncp.ns_info_mask_acc_date == TRUE" ), + srec( RightsInfoStruct, req_cond="ncp.ns_info_mask_max_acc_mask == TRUE" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5914, 89/20 + pkt = NCP(0x5914, "Search for File or Subdirectory Set", 'enhanced', has_length=0) + pkt.Request((30, 283), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, DataStream ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, ReturnInfoMask ), + rec( 14, 2, ExtendedInfo ), + rec( 16, 2, ReturnInfoCount ), + rec( 18, 9, SeachSequenceStruct ), + rec( 27, 1, DataTypeFlag ), + rec( 28, (2,255), SearchPattern16 ), + ]) +# The reply packet is dissected in packet-ncp2222.inc + pkt.Reply(NO_LENGTH_CHECK, [ + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5916, 89/22 + pkt = NCP(0x5916, "Generate Directory Base and Volume Number", 'enhanced', has_length=0) + pkt.Request((27,280), [ + rec( 8, 1, SrcNameSpace ), + rec( 9, 1, DestNameSpace ), + rec( 10, 2, dstNSIndicator ), + rec( 12, 4, DirectoryBase ), + rec( 16, 1, VolumeNumber ), + rec( 17, 1, HandleFlag ), + rec( 18, 1, DataTypeFlag ), + rec( 19, 5, Reserved5 ), + rec( 24, 1, PathCount, var="x" ), + rec( 25, (2,255), Path16, repeat="x" ), + ], info_str=(Path16, "Get Volume and Directory Base from: %s", "/%s")) + pkt.Reply(17, [ + rec( 8, 4, DirectoryBase ), + rec( 12, 4, DOSDirectoryBase ), + rec( 16, 1, VolumeNumber ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5919, 89/25 + pkt = NCP(0x5919, "Set Name Space Information", 'enhanced', has_length=0) + pkt.Request(530, [ + rec( 8, 1, SrcNameSpace ), + rec( 9, 1, DestNameSpace ), + rec( 10, 1, VolumeNumber ), + rec( 11, 4, DirectoryBase ), + rec( 15, 2, NamesSpaceInfoMask ), + rec( 17, 1, DataTypeFlag ), + rec( 18, 512, NSSpecificInfo ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8b00, 0x8d00, 0x8f00, 0x9001, + 0x9600, 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, + 0xff16]) + # 2222/591C, 89/28 + pkt = NCP(0x591C, "Get Full Path String", 'enhanced', has_length=0) + pkt.Request((35,288), [ + rec( 8, 1, SrcNameSpace ), + rec( 9, 1, DestNameSpace ), + rec( 10, 2, PathCookieFlags ), + rec( 12, 4, Cookie1 ), + rec( 16, 4, Cookie2 ), + rec( 20, 4, DirectoryBase ), + rec( 24, 1, VolumeNumber ), + rec( 25, 1, HandleFlag ), + rec( 26, 1, DataTypeFlag ), + rec( 27, 5, Reserved5 ), + rec( 32, 1, PathCount, var="x" ), + rec( 33, (2,255), Path16, repeat="x" ), + ], info_str=(Path16, "Get Full Path from: %s", "/%s")) + pkt.Reply((24,277), [ + rec( 8, 2, PathCookieFlags ), + rec( 10, 4, Cookie1 ), + rec( 14, 4, Cookie2 ), + rec( 18, 2, PathComponentSize ), + rec( 20, 2, PathComponentCount, var='x' ), + rec( 22, (2,255), Path16, repeat='x' ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8b00, 0x8d00, 0x8f00, 0x9001, + 0x9600, 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, + 0xff16]) + # 2222/591D, 89/29 + pkt = NCP(0x591D, "Get Effective Directory Rights", 'enhanced', has_length=0) + pkt.Request((31, 284), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, DestNameSpace ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, ReturnInfoMask ), + rec( 14, 2, ExtendedInfo ), + rec( 16, 4, DirectoryBase ), + rec( 20, 1, VolumeNumber ), + rec( 21, 1, HandleFlag ), + rec( 22, 1, DataTypeFlag ), + rec( 23, 5, Reserved5 ), + rec( 28, 1, PathCount, var="x" ), + rec( 29, (2,255), Path16, repeat="x" ), + ], info_str=(Path16, "Get Effective Rights for: %s", "/%s")) + pkt.Reply(NO_LENGTH_CHECK, [ + rec( 8, 2, EffectiveRights, LE ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), + srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), + srec( PadAttributes, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), + srec( PadDataStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), + srec( PadTotalStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), + srec( PadCreationInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), + srec( PadModifyInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), + srec( PadArchiveInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), + srec( PadRightsInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), + srec( PadDirEntry, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), + srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), + srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), + srec( FileName16Struct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_fname == 1)" ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), + srec( FileSize64bitStruct, req_cond="(ncp.ext_info_64_bit_fs == 1) && (ncp.ret_info_mask_fname == 1)" ), + srec( FileName16Struct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_fname == 1)" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/591E, 89/30 + pkt = NCP(0x591E, "Open/Create File or Subdirectory", 'enhanced', has_length=0) + pkt.Request((41, 294), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, DataStream ), + rec( 10, 1, OpenCreateMode ), + rec( 11, 1, Reserved ), + rec( 12, 2, SearchAttributesLow ), + rec( 14, 2, Reserved2 ), + rec( 16, 2, ReturnInfoMask ), + rec( 18, 2, ExtendedInfo ), + rec( 20, 4, AttributesDef32 ), + rec( 24, 2, DesiredAccessRights ), + rec( 26, 4, DirectoryBase ), + rec( 30, 1, VolumeNumber ), + rec( 31, 1, HandleFlag ), + rec( 32, 1, DataTypeFlag ), + rec( 33, 5, Reserved5 ), + rec( 38, 1, PathCount, var="x" ), + rec( 39, (2,255), Path16, repeat="x" ), + ], info_str=(Path16, "Open or Create File: %s", "/%s")) + pkt.Reply(NO_LENGTH_CHECK, [ + rec( 8, 4, FileHandle, BE ), + rec( 12, 1, OpenCreateAction ), + rec( 13, 1, Reserved ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), + srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), + srec( PadAttributes, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), + srec( PadDataStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), + srec( PadTotalStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), + srec( PadCreationInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), + srec( PadModifyInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), + srec( PadArchiveInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), + srec( PadRightsInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), + srec( PadDirEntry, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), + srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), + srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), + srec( FileName16Struct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_fname == 1)" ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), + srec( FileSize64bitStruct, req_cond="(ncp.ext_info_64_bit_fs == 1) && (ncp.ret_info_mask_fname == 1)" ), + srec( FileName16Struct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_fname == 1)" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5920, 89/32 + pkt = NCP(0x5920, "Open/Create File or Subdirectory with Callback", 'enhanced', has_length=0) + pkt.Request((37, 290), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, OpenCreateMode ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, ReturnInfoMask ), + rec( 14, 2, ExtendedInfo ), + rec( 16, 4, AttributesDef32 ), + rec( 20, 2, DesiredAccessRights ), + rec( 22, 4, DirectoryBase ), + rec( 26, 1, VolumeNumber ), + rec( 27, 1, HandleFlag ), + rec( 28, 1, DataTypeFlag ), + rec( 29, 5, Reserved5 ), + rec( 34, 1, PathCount, var="x" ), + rec( 35, (2,255), Path16, repeat="x" ), + ], info_str=(Path16, "Open or Create with Op-Lock: %s", "/%s")) + pkt.Reply( NO_LENGTH_CHECK, [ + rec( 8, 4, FileHandle, BE ), + rec( 12, 1, OpenCreateAction ), + rec( 13, 1, OCRetFlags ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), + srec( PadDSSpaceAllocate, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), + srec( AttributesStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), + srec( PadAttributes, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), + srec( PadDataStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), + srec( PadTotalStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), + srec( CreationInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), + srec( PadCreationInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), + srec( PadModifyInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), + srec( PadArchiveInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), + srec( RightsInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), + srec( PadRightsInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), + srec( DirEntryStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), + srec( PadDirEntry, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), + srec( EAInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), + srec( PadEAInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), + srec( NSInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), + srec( PadNSInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), + srec( ReferenceIDStruct, req_cond="ncp.ret_info_mask_id == 1" ), + srec( NSAttributeStruct, req_cond="ncp.ret_info_mask_ns_attr == 1" ), + srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1" ), + srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1" ), + srec( LastUpdatedInSecondsStruct, req_cond="ncp.ext_info_update == 1" ), + srec( DOSName16Struct, req_cond="ncp.ext_info_dos_name == 1" ), + srec( FlushTimeStruct, req_cond="ncp.ext_info_flush == 1" ), + srec( ParentBaseIDStruct, req_cond="ncp.ext_info_parental == 1" ), + srec( MacFinderInfoStruct, req_cond="ncp.ext_info_mac_finder == 1" ), + srec( SiblingCountStruct, req_cond="ncp.ext_info_sibling == 1" ), + srec( EffectiveRightsStruct, req_cond="ncp.ext_info_effective == 1" ), + srec( MacTimeStruct, req_cond="ncp.ext_info_mac_date == 1" ), + srec( LastAccessedTimeStruct, req_cond="ncp.ext_info_access == 1" ), + srec( FileSize64bitStruct, req_cond="ncp.ext_info_64_bit_fs == 1" ), + srec( FileName16Struct, req_cond="ncp.ret_info_mask_fname == 1" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x0102, 0x7f00, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5921, 89/33 + pkt = NCP(0x5921, "Open/Create File or Subdirectory II with Callback", 'enhanced', has_length=0) + pkt.Request((41, 294), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, DataStream ), + rec( 10, 1, OpenCreateMode ), + rec( 11, 1, Reserved ), + rec( 12, 2, SearchAttributesLow ), + rec( 14, 2, Reserved2 ), + rec( 16, 2, ReturnInfoMask ), + rec( 18, 2, ExtendedInfo ), + rec( 20, 4, AttributesDef32 ), + rec( 24, 2, DesiredAccessRights ), + rec( 26, 4, DirectoryBase ), + rec( 30, 1, VolumeNumber ), + rec( 31, 1, HandleFlag ), + rec( 32, 1, DataTypeFlag ), + rec( 33, 5, Reserved5 ), + rec( 38, 1, PathCount, var="x" ), + rec( 39, (2,255), Path16, repeat="x" ), + ], info_str=(Path16, "Open or Create II with Op-Lock: %s", "/%s")) + pkt.Reply( NO_LENGTH_CHECK, [ + rec( 8, 4, FileHandle ), + rec( 12, 1, OpenCreateAction ), + rec( 13, 1, OCRetFlags ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), + srec( PadDSSpaceAllocate, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), + srec( AttributesStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), + srec( PadAttributes, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), + srec( PadDataStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), + srec( PadTotalStreamSize, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), + srec( CreationInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), + srec( PadCreationInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), + srec( PadModifyInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), + srec( PadArchiveInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), + srec( RightsInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), + srec( PadRightsInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), + srec( DirEntryStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), + srec( PadDirEntry, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), + srec( EAInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), + srec( PadEAInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), + srec( NSInfoStruct, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), + srec( PadNSInfo, req_cond="(ncp.ret_info_mask != 0x0000) && (ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), + srec( ReferenceIDStruct, req_cond="ncp.ret_info_mask_id == 1" ), + srec( NSAttributeStruct, req_cond="ncp.ret_info_mask_ns_attr == 1" ), + srec( DStreamActual, req_cond="ncp.ret_info_mask_actual == 1" ), + srec( DStreamLogical, req_cond="ncp.ret_info_mask_logical == 1" ), + srec( LastUpdatedInSecondsStruct, req_cond="ncp.ext_info_update == 1" ), + srec( DOSName16Struct, req_cond="ncp.ext_info_dos_name == 1" ), + srec( FlushTimeStruct, req_cond="ncp.ext_info_flush == 1" ), + srec( ParentBaseIDStruct, req_cond="ncp.ext_info_parental == 1" ), + srec( MacFinderInfoStruct, req_cond="ncp.ext_info_mac_finder == 1" ), + srec( SiblingCountStruct, req_cond="ncp.ext_info_sibling == 1" ), + srec( EffectiveRightsStruct, req_cond="ncp.ext_info_effective == 1" ), + srec( MacTimeStruct, req_cond="ncp.ext_info_mac_date == 1" ), + srec( LastAccessedTimeStruct, req_cond="ncp.ext_info_access == 1" ), + srec( FileSize64bitStruct, req_cond="ncp.ext_info_64_bit_fs == 1" ), + srec( FileName16Struct, req_cond="ncp.ret_info_mask_fname == 1" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5923, 89/35 + pkt = NCP(0x5923, "Modify DOS Attributes on a File or Subdirectory", 'enhanced', has_length=0) + pkt.Request((35, 288), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, Flags ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, ReturnInfoMask ), + rec( 14, 2, ExtendedInfo ), + rec( 16, 4, AttributesDef32 ), + rec( 20, 4, DirectoryBase ), + rec( 24, 1, VolumeNumber ), + rec( 25, 1, HandleFlag ), + rec( 26, 1, DataTypeFlag ), + rec( 27, 5, Reserved5 ), + rec( 32, 1, PathCount, var="x" ), + rec( 33, (2,255), Path16, repeat="x" ), + ], info_str=(Path16, "Modify DOS Attributes for: %s", "/%s")) + pkt.Reply(24, [ + rec( 8, 4, ItemsChecked ), + rec( 12, 4, ItemsChanged ), + rec( 16, 4, AttributeValidFlag ), + rec( 20, 4, AttributesDef32 ), + ]) + pkt.CompletionCodes([0x0000, 0x0102, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5927, 89/39 + pkt = NCP(0x5927, "Get Directory Disk Space Restriction", 'enhanced', has_length=0) + pkt.Request((26, 279), [ + rec( 8, 1, NameSpace ), + rec( 9, 2, Reserved2 ), + rec( 11, 4, DirectoryBase ), + rec( 15, 1, VolumeNumber ), + rec( 16, 1, HandleFlag ), + rec( 17, 1, DataTypeFlag ), + rec( 18, 5, Reserved5 ), + rec( 23, 1, PathCount, var="x" ), + rec( 24, (2,255), Path16, repeat="x" ), + ], info_str=(Path16, "Get Disk Space Restriction for: %s", "/%s")) + pkt.Reply(18, [ + rec( 8, 1, NumberOfEntries, var="x" ), + rec( 9, 9, SpaceStruct, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, + 0xff16]) + # 2222/5928, 89/40 + pkt = NCP(0x5928, "Search for File or Subdirectory Set (Extended Errors)", 'enhanced', has_length=0) + pkt.Request((30, 283), [ + rec( 8, 1, NameSpace ), + rec( 9, 1, DataStream ), + rec( 10, 2, SearchAttributesLow ), + rec( 12, 2, ReturnInfoMask ), + rec( 14, 2, ExtendedInfo ), + rec( 16, 2, ReturnInfoCount ), + rec( 18, 9, SeachSequenceStruct ), + rec( 27, 1, DataTypeFlag ), + rec( 28, (2,255), SearchPattern16 ), + ], info_str=(SearchPattern16, "Search for: %s", ", %s")) + pkt.Reply(NO_LENGTH_CHECK, [ + rec( 8, 9, SeachSequenceStruct ), + rec( 17, 1, MoreFlag ), + rec( 18, 2, InfoCount ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 1)" ), + srec( PadDSSpaceAllocate, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_alloc == 0)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 1)" ), + srec( PadAttributes, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_attr == 0)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 1)" ), + srec( PadDataStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_size == 0)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 1)" ), + srec( PadTotalStreamSize, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_tspace == 0)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 1)" ), + srec( PadCreationInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_create == 0)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 1)" ), + srec( PadModifyInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_mod == 0)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 1)" ), + srec( PadArchiveInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_arch == 0)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 1)" ), + srec( PadRightsInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_rights == 0)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 1)" ), + srec( PadDirEntry, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_dir == 0)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 1)" ), + srec( PadEAInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_eattr == 0)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 1)" ), + srec( PadNSInfo, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_ns == 0)" ), + srec( FileName16Struct, req_cond="(ncp.ext_info_newstyle == 0) && (ncp.ret_info_mask_fname == 1)" ), + srec( DSSpaceAllocateStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_alloc == 1)" ), + srec( AttributesStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_attr == 1)" ), + srec( DataStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_size == 1)" ), + srec( TotalStreamSizeStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_tspace == 1)" ), + srec( CreationInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_create == 1)" ), + srec( ModifyInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_mod == 1)" ), + srec( ArchiveInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_arch == 1)" ), + srec( RightsInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_rights == 1)" ), + srec( DirEntryStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_dir == 1)" ), + srec( EAInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_eattr == 1)" ), + srec( NSInfoStruct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_ns == 1)" ), + srec( FileSize64bitStruct, req_cond="(ncp.ext_info_64_bit_fs == 1) && (ncp.ret_info_mask_fname == 1)" ), + srec( FileName16Struct, req_cond="(ncp.ext_info_newstyle == 1) && (ncp.ret_info_mask_fname == 1)" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5932, 89/50 + pkt = NCP(0x5932, "Get Object Effective Rights", "enhanced", has_length=0) + pkt.Request(25, [ +rec( 8, 1, NameSpace ), +rec( 9, 4, ObjectID ), + rec( 13, 4, DirectoryBase ), + rec( 17, 1, VolumeNumber ), + rec( 18, 1, HandleFlag ), + rec( 19, 1, DataTypeFlag ), + rec( 20, 5, Reserved5 ), +]) + pkt.Reply( 10, [ + rec( 8, 2, TrusteeRights ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0x9b00, 0x9c03, 0xa901, 0xaa00]) + # 2222/5934, 89/52 + pkt = NCP(0x5934, "Write Extended Attribute", 'enhanced', has_length=0 ) + pkt.Request((36,98), [ + rec( 8, 2, EAFlags ), + rec( 10, 4, EAHandleOrNetWareHandleOrVolume ), + rec( 14, 4, ReservedOrDirectoryNumber ), + rec( 18, 4, TtlWriteDataSize ), + rec( 22, 4, FileOffset ), + rec( 26, 4, EAAccessFlag ), + rec( 30, 1, DataTypeFlag ), + rec( 31, 2, EAValueLength, var='x' ), + rec( 33, (2,64), EAKey ), + rec( -1, 1, EAValueRep, repeat='x' ), + ], info_str=(EAKey, "Write Extended Attribute: %s", ", %s")) + pkt.Reply(20, [ + rec( 8, 4, EAErrorCodes ), + rec( 12, 4, EABytesWritten ), + rec( 16, 4, NewEAHandle ), + ]) + pkt.CompletionCodes([0x0000, 0xc800, 0xc900, 0xcb00, 0xce00, 0xcf00, 0xd101, + 0xd203, 0xa901, 0xaa00, 0xd301, 0xd402]) + # 2222/5935, 89/53 + pkt = NCP(0x5935, "Read Extended Attribute", 'enhanced', has_length=0 ) + pkt.Request((31,541), [ + rec( 8, 2, EAFlags ), + rec( 10, 4, EAHandleOrNetWareHandleOrVolume ), + rec( 14, 4, ReservedOrDirectoryNumber ), + rec( 18, 4, FileOffset ), + rec( 22, 4, InspectSize ), + rec( 26, 1, DataTypeFlag ), + rec( 27, 2, MaxReadDataReplySize ), + rec( 29, (2,512), EAKey ), + ], info_str=(EAKey, "Read Extended Attribute: %s", ", %s")) + pkt.Reply((26,536), [ + rec( 8, 4, EAErrorCodes ), + rec( 12, 4, TtlValuesLength ), + rec( 16, 4, NewEAHandle ), + rec( 20, 4, EAAccessFlag ), + rec( 24, (2,512), EAValue ), + ]) + pkt.CompletionCodes([0x0000, 0xa901, 0xaa00, 0xc900, 0xce00, 0xcf00, 0xd101, + 0xd301]) + # 2222/5936, 89/54 + pkt = NCP(0x5936, "Enumerate Extended Attribute", 'enhanced', has_length=0 ) + pkt.Request((27,537), [ + rec( 8, 2, EAFlags ), + rec( 10, 4, EAHandleOrNetWareHandleOrVolume ), + rec( 14, 4, ReservedOrDirectoryNumber ), + rec( 18, 4, InspectSize ), + rec( 22, 2, SequenceNumber ), + rec( 24, 1, DataTypeFlag ), + rec( 25, (2,512), EAKey ), + ], info_str=(EAKey, "Enumerate Extended Attribute: %s", ", %s")) + pkt.Reply(28, [ + rec( 8, 4, EAErrorCodes ), + rec( 12, 4, TtlEAs ), + rec( 16, 4, TtlEAsDataSize ), + rec( 20, 4, TtlEAsKeySize ), + rec( 24, 4, NewEAHandle ), + ]) + pkt.CompletionCodes([0x0000, 0x8800, 0xa901, 0xaa00, 0xc900, 0xce00, 0xcf00, 0xd101, + 0xd301]) + # 2222/5947, 89/71 + pkt = NCP(0x5947, "Scan Volume Trustee Object Paths", 'enhanced', has_length=0) + pkt.Request(21, [ + rec( 8, 4, VolumeID ), + rec( 12, 4, ObjectID ), + rec( 16, 4, SequenceNumber ), + rec( 20, 1, DataTypeFlag ), + ]) + pkt.Reply((20,273), [ + rec( 8, 4, SequenceNumber ), + rec( 12, 4, ObjectID ), + rec( 16, 1, TrusteeAccessMask ), + rec( 17, 1, PathCount, var="x" ), + rec( 18, (2,255), Path16, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa901, 0xaa00, 0xbf00, 0xfd00, 0xff16]) + # 2222/5A01, 90/00 + pkt = NCP(0x5A00, "Parse Tree", 'file') + pkt.Request(46, [ + rec( 10, 4, InfoMask ), + rec( 14, 4, Reserved4 ), + rec( 18, 4, Reserved4 ), + rec( 22, 4, limbCount ), + rec( 26, 4, limbFlags ), + rec( 30, 4, VolumeNumberLong ), + rec( 34, 4, DirectoryBase ), + rec( 38, 4, limbScanNum ), + rec( 42, 4, NameSpace ), + ]) + pkt.Reply(32, [ + rec( 8, 4, limbCount ), + rec( 12, 4, ItemsCount ), + rec( 16, 4, nextLimbScanNum ), + rec( 20, 4, CompletionCode ), + rec( 24, 1, FolderFlag ), + rec( 25, 3, Reserved ), + rec( 28, 4, DirectoryBase ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xfd00, 0xff16]) + # 2222/5A0A, 90/10 + pkt = NCP(0x5A0A, "Get Reference Count from Dir Entry Number", 'file') + pkt.Request(19, [ + rec( 10, 4, VolumeNumberLong ), + rec( 14, 4, DirectoryBase ), + rec( 18, 1, NameSpace ), + ]) + pkt.Reply(12, [ + rec( 8, 4, ReferenceCount ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xfd00, 0xff16]) + # 2222/5A0B, 90/11 + pkt = NCP(0x5A0B, "Get Reference Count from Dir Handle", 'file') + pkt.Request(14, [ + rec( 10, 4, DirHandle ), + ]) + pkt.Reply(12, [ + rec( 8, 4, ReferenceCount ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xfd00, 0xff16]) + # 2222/5A0C, 90/12 + pkt = NCP(0x5A0C, "Set Compressed File Size", 'file') + pkt.Request(20, [ + rec( 10, 6, FileHandle ), + rec( 16, 4, SuggestedFileSize ), + ]) + pkt.Reply(16, [ + rec( 8, 4, OldFileSize ), + rec( 12, 4, NewFileSize ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xfd00, 0xff16]) + # 2222/5A80, 90/128 + pkt = NCP(0x5A80, "Move File Data To Data Migration", 'migration') + pkt.Request(27, [ + rec( 10, 4, VolumeNumberLong ), + rec( 14, 4, DirectoryEntryNumber ), + rec( 18, 1, NameSpace ), + rec( 19, 3, Reserved ), + rec( 22, 4, SupportModuleID ), + rec( 26, 1, DMFlags ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) + # 2222/5A81, 90/129 + pkt = NCP(0x5A81, "Data Migration File Information", 'migration') + pkt.Request(19, [ + rec( 10, 4, VolumeNumberLong ), + rec( 14, 4, DirectoryEntryNumber ), + rec( 18, 1, NameSpace ), + ]) + pkt.Reply(24, [ + rec( 8, 4, SupportModuleID ), + rec( 12, 4, RestoreTime ), + rec( 16, 4, DMInfoEntries, var="x" ), + rec( 20, 4, DataSize, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) + # 2222/5A82, 90/130 + pkt = NCP(0x5A82, "Volume Data Migration Status", 'migration') + pkt.Request(18, [ + rec( 10, 4, VolumeNumberLong ), + rec( 14, 4, SupportModuleID ), + ]) + pkt.Reply(32, [ + rec( 8, 4, NumOfFilesMigrated ), + rec( 12, 4, TtlMigratedSize ), + rec( 16, 4, SpaceUsed ), + rec( 20, 4, LimboUsed ), + rec( 24, 4, SpaceMigrated ), + rec( 28, 4, FileLimbo ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) + # 2222/5A83, 90/131 + pkt = NCP(0x5A83, "Migrator Status Info", 'migration') + pkt.Request(10) + pkt.Reply(20, [ + rec( 8, 1, DMPresentFlag ), + rec( 9, 3, Reserved3 ), + rec( 12, 4, DMmajorVersion ), + rec( 16, 4, DMminorVersion ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) + # 2222/5A84, 90/132 + pkt = NCP(0x5A84, "Data Migration Support Module Information", 'migration') + pkt.Request(18, [ + rec( 10, 1, DMInfoLevel ), + rec( 11, 3, Reserved3), + rec( 14, 4, SupportModuleID ), + ]) + pkt.Reply(NO_LENGTH_CHECK, [ + srec( DMInfoLevel0, req_cond="ncp.dm_info_level == 0x00" ), + srec( DMInfoLevel1, req_cond="ncp.dm_info_level == 0x01" ), + srec( DMInfoLevel2, req_cond="ncp.dm_info_level == 0x02" ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) + # 2222/5A85, 90/133 + pkt = NCP(0x5A85, "Move File Data From Data Migration", 'migration') + pkt.Request(19, [ + rec( 10, 4, VolumeNumberLong ), + rec( 14, 4, DirectoryEntryNumber ), + rec( 18, 1, NameSpace ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) + # 2222/5A86, 90/134 + pkt = NCP(0x5A86, "Get/Set Default Read-Write Support Module ID", 'migration') + pkt.Request(18, [ + rec( 10, 1, GetSetFlag ), + rec( 11, 3, Reserved3 ), + rec( 14, 4, SupportModuleID ), + ]) + pkt.Reply(12, [ + rec( 8, 4, SupportModuleID ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) + # 2222/5A87, 90/135 + pkt = NCP(0x5A87, "Data Migration Support Module Capacity Request", 'migration') + pkt.Request(22, [ + rec( 10, 4, SupportModuleID ), + rec( 14, 4, VolumeNumberLong ), + rec( 18, 4, DirectoryBase ), + ]) + pkt.Reply(20, [ + rec( 8, 4, BlockSizeInSectors ), + rec( 12, 4, TotalBlocks ), + rec( 16, 4, UsedBlocks ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) + # 2222/5A88, 90/136 + pkt = NCP(0x5A88, "RTDM Request", 'migration') + pkt.Request(15, [ + rec( 10, 4, Verb ), + rec( 14, 1, VerbData ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) +# 2222/5A96, 90/150 + pkt = NCP(0x5A96, "File Migration Request", 'file') + pkt.Request(22, [ + rec( 10, 4, VolumeNumberLong ), + rec( 14, 4, DirectoryBase ), + rec( 18, 4, FileMigrationState ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfb00, 0xff16]) +# 2222/5C, 91 + pkt = NCP(0x5B, "NMAS Graded Authentication", 'nmas') + #Need info on this packet structure + pkt.Request(7) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) + # SecretStore data is dissected by packet-ncp-sss.c +# 2222/5C01, 9201 + pkt = NCP(0x5C01, "SecretStore Services (Ping Server)", 'sss', 0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) + # 2222/5C02, 9202 + pkt = NCP(0x5C02, "SecretStore Services (Fragment)", 'sss', 0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) + # 2222/5C03, 9203 + pkt = NCP(0x5C03, "SecretStore Services (Write App Secrets)", 'sss', 0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) + # 2222/5C04, 9204 + pkt = NCP(0x5C04, "SecretStore Services (Add Secret ID)", 'sss', 0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) + # 2222/5C05, 9205 + pkt = NCP(0x5C05, "SecretStore Services (Remove Secret ID)", 'sss', 0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) + # 2222/5C06, 9206 + pkt = NCP(0x5C06, "SecretStore Services (Remove SecretStore)", 'sss', 0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) + # 2222/5C07, 9207 + pkt = NCP(0x5C07, "SecretStore Services (Enumerate Secret IDs)", 'sss', 0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) + # 2222/5C08, 9208 + pkt = NCP(0x5C08, "SecretStore Services (Unlock Store)", 'sss', 0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) + # 2222/5C09, 9209 + pkt = NCP(0x5C09, "SecretStore Services (Set Master Password)", 'sss', 0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) + # 2222/5C0a, 9210 + pkt = NCP(0x5C0a, "SecretStore Services (Get Service Information)", 'sss', 0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e01, 0x8000, 0x8101, 0x8401, 0x8501, + 0x8701, 0x8800, 0x8d00, 0x8f00, 0x9001, 0x9600, 0xfb0b, + 0x9804, 0x9b03, 0x9c03, 0xa800, 0xfd00, 0xff16]) +# NMAS packets are dissected in packet-ncp-nmas.c + # 2222/5E, 9401 + pkt = NCP(0x5E01, "NMAS Communications Packet (Ping)", 'nmas', 0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xfb09, 0xff08]) + # 2222/5E, 9402 + pkt = NCP(0x5E02, "NMAS Communications Packet (Fragment)", 'nmas', 0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xfb09, 0xff08]) + # 2222/5E, 9403 + pkt = NCP(0x5E03, "NMAS Communications Packet (Abort)", 'nmas', 0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xfb09, 0xff08]) + # 2222/61, 97 + pkt = NCP(0x61, "Get Big Packet NCP Max Packet Size", 'connection') + pkt.Request(10, [ + rec( 7, 2, ProposedMaxSize, BE ), + rec( 9, 1, SecurityFlag ), + ],info_str=(ProposedMaxSize, "Get Big Max Packet Size - %d", ", %d")) + pkt.Reply(13, [ + rec( 8, 2, AcceptedMaxSize, BE ), + rec( 10, 2, EchoSocket, BE ), + rec( 12, 1, SecurityFlag ), + ]) + pkt.CompletionCodes([0x0000]) + # 2222/63, 99 + pkt = NCP(0x63, "Undocumented Packet Burst", 'pburst') + pkt.Request(7) + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + # 2222/64, 100 + pkt = NCP(0x64, "Undocumented Packet Burst", 'pburst') + pkt.Request(7) + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + # 2222/65, 101 + pkt = NCP(0x65, "Packet Burst Connection Request", 'pburst') + pkt.Request(25, [ + rec( 7, 4, LocalConnectionID, BE ), + rec( 11, 4, LocalMaxPacketSize, BE ), + rec( 15, 2, LocalTargetSocket, BE ), + rec( 17, 4, LocalMaxSendSize, BE ), + rec( 21, 4, LocalMaxRecvSize, BE ), + ]) + pkt.Reply(16, [ + rec( 8, 4, RemoteTargetID, BE ), + rec( 12, 4, RemoteMaxPacketSize, BE ), + ]) + pkt.CompletionCodes([0x0000]) + # 2222/66, 102 + pkt = NCP(0x66, "Undocumented Packet Burst", 'pburst') + pkt.Request(7) + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + # 2222/67, 103 + pkt = NCP(0x67, "Undocumented Packet Burst", 'pburst') + pkt.Request(7) + pkt.Reply(8) + pkt.CompletionCodes([0x0000]) + # 2222/6801, 104/01 + pkt = NCP(0x6801, "Ping for NDS NCP", "nds", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x8100, 0xfb04, 0xfe0c]) + # 2222/6802, 104/02 + # + # XXX - if FraggerHandle is not 0xffffffff, this is not the + # first fragment, so we can only dissect this by reassembling; + # the fields after "Fragment Handle" are bogus for non-0xffffffff + # fragments, so we shouldn't dissect them. This is all handled in packet-ncp2222.inc. + # + pkt = NCP(0x6802, "Send NDS Fragmented Request/Reply", "nds", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0xac00, 0xfd01]) + # 2222/6803, 104/03 + pkt = NCP(0x6803, "Fragment Close", "nds", has_length=0) + pkt.Request(12, [ + rec( 8, 4, FraggerHandle ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xff00]) + # 2222/6804, 104/04 + pkt = NCP(0x6804, "Return Bindery Context", "nds", has_length=0) + pkt.Request(8) + pkt.Reply((9, 263), [ + rec( 8, (1,255), binderyContext ), + ]) + pkt.CompletionCodes([0x0000, 0xfe0c, 0xff00]) + # 2222/6805, 104/05 + pkt = NCP(0x6805, "Monitor NDS Connection", "nds", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/6806, 104/06 + pkt = NCP(0x6806, "Return NDS Statistics", "nds", has_length=0) + pkt.Request(10, [ + rec( 8, 2, NDSRequestFlags ), + ]) + pkt.Reply(8) + #Need to investigate how to decode Statistics Return Value + pkt.CompletionCodes([0x0000, 0xfb00, 0xfe0c, 0xff00]) + # 2222/6807, 104/07 + pkt = NCP(0x6807, "Clear NDS Statistics", "nds", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xfb00, 0xfe0c, 0xff00]) + # 2222/6808, 104/08 + pkt = NCP(0x6808, "Reload NDS Software", "nds", has_length=0) + pkt.Request(8) + pkt.Reply(12, [ + rec( 8, 4, NDSStatus ), + ]) + pkt.CompletionCodes([0x0000, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68C8, 104/200 + pkt = NCP(0x68C8, "Query Container Audit Status", "auditing", has_length=0) + pkt.Request(12, [ + rec( 8, 4, ConnectionNumber ), + ]) + pkt.Reply(40, [ + rec(8, 32, NWAuditStatus ), + ]) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68CA, 104/202 + pkt = NCP(0x68CA, "Add Auditor Access", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68CB, 104/203 + pkt = NCP(0x68CB, "Change Auditor Container Password", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68CC, 104/204 + pkt = NCP(0x68CC, "Check Auditor Access", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68CE, 104/206 + pkt = NCP(0x680CE, "Disable Container Auditing", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68CF, 104/207 + pkt = NCP(0x68CF, "Enable Container Auditing", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68D1, 104/209 + pkt = NCP(0x68D1, "Read Audit File Header", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68D3, 104/211 + pkt = NCP(0x68D3, "Remove Auditor Access", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68D4, 104/212 + pkt = NCP(0x68D4, "Reset Audit File", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68D6, 104/214 + pkt = NCP(0x68D6, "Write Audit File Configuration Header", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68D7, 104/215 + pkt = NCP(0x68D7, "Change Auditor Container Password2", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68D8, 104/216 + pkt = NCP(0x68D8, "Return Audit Flags", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68D9, 104/217 + pkt = NCP(0x68D9, "Close Old Audit File", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68DB, 104/219 + pkt = NCP(0x68DB, "Check Level Two Access", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68DC, 104/220 + pkt = NCP(0x68DC, "Check Object Audited", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68DD, 104/221 + pkt = NCP(0x68DD, "Change Object Audited", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68DE, 104/222 + pkt = NCP(0x68DE, "Return Old Audit File List", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68DF, 104/223 + pkt = NCP(0x68DF, "Init Audit File Reads", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68E0, 104/224 + pkt = NCP(0x68E0, "Read Auditing File", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68E1, 104/225 + pkt = NCP(0x68E1, "Delete Old Audit File", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68E5, 104/229 + pkt = NCP(0x68E5, "Set Audit Password", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/68E7, 104/231 + pkt = NCP(0x68E7, "External Audit Append To File", "auditing", has_length=0) + pkt.Request(8) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0xa700, 0xfb00, 0xfe0c, 0xff00]) + # 2222/69, 105 + pkt = NCP(0x69, "Log File", 'sync') + pkt.Request( (12, 267), [ + rec( 7, 1, DirHandle ), + rec( 8, 1, LockFlag ), + rec( 9, 2, TimeoutLimit ), + rec( 11, (1, 256), FilePath ), + ], info_str=(FilePath, "Log File: %s", "/%s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7f00, 0x8200, 0x9600, 0xfe0d, 0xff01]) + # 2222/6A, 106 + pkt = NCP(0x6A, "Lock File Set", 'sync') + pkt.Request( 9, [ + rec( 7, 2, TimeoutLimit ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7f00, 0x8200, 0x9600, 0xfe0d, 0xff01]) + # 2222/6B, 107 + pkt = NCP(0x6B, "Log Logical Record", 'sync') + pkt.Request( (11, 266), [ + rec( 7, 1, LockFlag ), + rec( 8, 2, TimeoutLimit ), + rec( 10, (1, 256), SynchName ), + ], info_str=(SynchName, "Log Logical Record: %s", ", %s")) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7f00, 0x9600, 0xfe0d, 0xff01]) + # 2222/6C, 108 + pkt = NCP(0x6C, "Log Logical Record", 'sync') + pkt.Request( 10, [ + rec( 7, 1, LockFlag ), + rec( 8, 2, TimeoutLimit ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7f00, 0x9600, 0xfe0d, 0xff01]) + # 2222/6D, 109 + pkt = NCP(0x6D, "Log Physical Record", 'sync') + pkt.Request(24, [ + rec( 7, 1, LockFlag ), + rec( 8, 6, FileHandle ), + rec( 14, 4, LockAreasStartOffset ), + rec( 18, 4, LockAreaLen ), + rec( 22, 2, LockTimeout ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7f00, 0x8200, 0x8800, 0x9600, 0xfd02, 0xfe04, 0xff01]) + # 2222/6E, 110 + pkt = NCP(0x6E, "Lock Physical Record Set", 'sync') + pkt.Request(10, [ + rec( 7, 1, LockFlag ), + rec( 8, 2, LockTimeout ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7f00, 0x8200, 0x8800, 0x9600, 0xfd02, 0xfe04, 0xff01]) + # 2222/6F00, 111/00 + pkt = NCP(0x6F00, "Open/Create a Semaphore", 'sync', has_length=0) + pkt.Request((10,521), [ + rec( 8, 1, InitialSemaphoreValue ), + rec( 9, (1, 512), SemaphoreName ), + ], info_str=(SemaphoreName, "Open/Create Semaphore: %s", ", %s")) + pkt.Reply(13, [ + rec( 8, 4, SemaphoreHandle ), + rec( 12, 1, SemaphoreOpenCount ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xff01]) + # 2222/6F01, 111/01 + pkt = NCP(0x6F01, "Examine Semaphore", 'sync', has_length=0) + pkt.Request(12, [ + rec( 8, 4, SemaphoreHandle ), + ]) + pkt.Reply(10, [ + rec( 8, 1, SemaphoreValue ), + rec( 9, 1, SemaphoreOpenCount ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xff01]) + # 2222/6F02, 111/02 + pkt = NCP(0x6F02, "Wait On (P) Semaphore", 'sync', has_length=0) + pkt.Request(14, [ + rec( 8, 4, SemaphoreHandle ), + rec( 12, 2, LockTimeout ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xfe04, 0xff01]) + # 2222/6F03, 111/03 + pkt = NCP(0x6F03, "Signal (V) Semaphore", 'sync', has_length=0) + pkt.Request(12, [ + rec( 8, 4, SemaphoreHandle ), + ]) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9600, 0xfe04, 0xff01]) + # 2222/6F04, 111/04 + pkt = NCP(0x6F04, "Close Semaphore", 'sync', has_length=0) + pkt.Request(12, [ + rec( 8, 4, SemaphoreHandle ), + ]) + pkt.Reply(10, [ + rec( 8, 1, SemaphoreOpenCount ), + rec( 9, 1, SemaphoreShareCount ), + ]) + pkt.CompletionCodes([0x0000, 0x9600, 0xfe04, 0xff01]) + ## 2222/1125 + pkt = NCP(0x70, "Clear and Get Waiting Lock Completion", 'sync') + pkt.Request(7) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x9b00, 0x9c03, 0xff1a]) + # 2222/7201, 114/01 + pkt = NCP(0x7201, "Timesync Get Time", 'tsync') + pkt.Request(10) + pkt.Reply(32,[ + rec( 8, 12, theTimeStruct ), + rec(20, 8, eventOffset ), + rec(28, 4, eventTime ), + ]) + pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) + # 2222/7202, 114/02 + pkt = NCP(0x7202, "Timesync Exchange Time", 'tsync') + pkt.Request((63,112), [ + rec( 10, 4, protocolFlags ), + rec( 14, 4, nodeFlags ), + rec( 18, 8, sourceOriginateTime ), + rec( 26, 8, targetReceiveTime ), + rec( 34, 8, targetTransmitTime ), + rec( 42, 8, sourceReturnTime ), + rec( 50, 8, eventOffset ), + rec( 58, 4, eventTime ), + rec( 62, (1,50), ServerNameLen ), + ], info_str=(ServerNameLen, "Timesync Exchange Time: %s", ", %s")) + pkt.Reply((64,113), [ + rec( 8, 3, Reserved3 ), + rec( 11, 4, protocolFlags ), + rec( 15, 4, nodeFlags ), + rec( 19, 8, sourceOriginateTime ), + rec( 27, 8, targetReceiveTime ), + rec( 35, 8, targetTransmitTime ), + rec( 43, 8, sourceReturnTime ), + rec( 51, 8, eventOffset ), + rec( 59, 4, eventTime ), + rec( 63, (1,50), ServerNameLen ), + ]) + pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) + # 2222/7205, 114/05 + pkt = NCP(0x7205, "Timesync Get Server List", 'tsync') + pkt.Request(14, [ + rec( 10, 4, StartNumber ), + ]) + pkt.Reply(66, [ + rec( 8, 4, nameType ), + rec( 12, 48, ServerName ), + rec( 60, 4, serverListFlags ), + rec( 64, 2, startNumberFlag ), + ]) + pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) + # 2222/7206, 114/06 + pkt = NCP(0x7206, "Timesync Set Server List", 'tsync') + pkt.Request(14, [ + rec( 10, 4, StartNumber ), + ]) + pkt.Reply(66, [ + rec( 8, 4, nameType ), + rec( 12, 48, ServerName ), + rec( 60, 4, serverListFlags ), + rec( 64, 2, startNumberFlag ), + ]) + pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) + # 2222/720C, 114/12 + pkt = NCP(0x720C, "Timesync Get Version", 'tsync') + pkt.Request(10) + pkt.Reply(12, [ + rec( 8, 4, version ), + ]) + pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) + # 2222/7B01, 123/01 + pkt = NCP(0x7B01, "Get Cache Information", 'stats') + pkt.Request(10) + pkt.Reply(288, [ + rec(8, 4, CurrentServerTime, LE), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 104, Counters ), + rec(120, 40, ExtraCacheCntrs ), + rec(160, 40, MemoryCounters ), + rec(200, 48, TrendCounters ), + rec(248, 40, CacheInfo ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xff00]) + # 2222/7B02, 123/02 + pkt = NCP(0x7B02, "Get File Server Information", 'stats') + pkt.Request(10) + pkt.Reply(150, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, NCPStaInUseCnt ), + rec(20, 4, NCPPeakStaInUse ), + rec(24, 4, NumOfNCPReqs ), + rec(28, 4, ServerUtilization ), + rec(32, 96, ServerInfo ), + rec(128, 22, FileServerCounters ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B03, 123/03 + pkt = NCP(0x7B03, "NetWare File System Information", 'stats') + pkt.Request(11, [ + rec(10, 1, FileSystemID ), + ]) + pkt.Reply(68, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 52, FileSystemInfo ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B04, 123/04 + pkt = NCP(0x7B04, "User Information", 'stats') + pkt.Request(14, [ + rec(10, 4, ConnectionNumber, LE ), + ]) + pkt.Reply((85, 132), [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 68, UserInformation ), + rec(84, (1, 48), UserName ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B05, 123/05 + pkt = NCP(0x7B05, "Packet Burst Information", 'stats') + pkt.Request(10) + pkt.Reply(216, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 200, PacketBurstInformation ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B06, 123/06 + pkt = NCP(0x7B06, "IPX SPX Information", 'stats') + pkt.Request(10) + pkt.Reply(94, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 34, IPXInformation ), + rec(50, 44, SPXInformation ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B07, 123/07 + pkt = NCP(0x7B07, "Garbage Collection Information", 'stats') + pkt.Request(10) + pkt.Reply(40, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, FailedAllocReqCnt ), + rec(20, 4, NumberOfAllocs ), + rec(24, 4, NoMoreMemAvlCnt ), + rec(28, 4, NumOfGarbageColl ), + rec(32, 4, FoundSomeMem ), + rec(36, 4, NumOfChecks ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B08, 123/08 + pkt = NCP(0x7B08, "CPU Information", 'stats') + pkt.Request(14, [ + rec(10, 4, CPUNumber ), + ]) + pkt.Reply(51, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, NumberOfCPUs ), + rec(20, 31, CPUInformation ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B09, 123/09 + pkt = NCP(0x7B09, "Volume Switch Information", 'stats') + pkt.Request(14, [ + rec(10, 4, StartNumber ) + ]) + pkt.Reply(28, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, TotalLFSCounters ), + rec(20, 4, CurrentLFSCounters, var="x"), + rec(24, 4, LFSCounters, repeat="x"), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B0A, 123/10 + pkt = NCP(0x7B0A, "Get NLM Loaded List", 'stats') + pkt.Request(14, [ + rec(10, 4, StartNumber ) + ]) + pkt.Reply(28, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, NLMcount ), + rec(20, 4, NLMsInList, var="x" ), + rec(24, 4, NLMNumbers, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B0B, 123/11 + pkt = NCP(0x7B0B, "NLM Information", 'stats') + pkt.Request(14, [ + rec(10, 4, NLMNumber ), + ]) + pkt.Reply(NO_LENGTH_CHECK, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 60, NLMInformation ), + # The remainder of this dissection is manually decoded in packet-ncp2222.inc + #rec(-1, (1,255), FileName ), + #rec(-1, (1,255), Name ), + #rec(-1, (1,255), Copyright ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B0C, 123/12 + pkt = NCP(0x7B0C, "Get Directory Cache Information", 'stats') + pkt.Request(10) + pkt.Reply(72, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 56, DirCacheInfo ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B0D, 123/13 + pkt = NCP(0x7B0D, "Get Operating System Version Information", 'stats') + pkt.Request(10) + pkt.Reply(70, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 1, OSMajorVersion ), + rec(17, 1, OSMinorVersion ), + rec(18, 1, OSRevision ), + rec(19, 1, AccountVersion ), + rec(20, 1, VAPVersion ), + rec(21, 1, QueueingVersion ), + rec(22, 1, SecurityRestrictionVersion ), + rec(23, 1, InternetBridgeVersion ), + rec(24, 4, MaxNumOfVol ), + rec(28, 4, MaxNumOfConn ), + rec(32, 4, MaxNumOfUsers ), + rec(36, 4, MaxNumOfNmeSps ), + rec(40, 4, MaxNumOfLANS ), + rec(44, 4, MaxNumOfMedias ), + rec(48, 4, MaxNumOfStacks ), + rec(52, 4, MaxDirDepth ), + rec(56, 4, MaxDataStreams ), + rec(60, 4, MaxNumOfSpoolPr ), + rec(64, 4, ServerSerialNumber ), + rec(68, 2, ServerAppNumber ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B0E, 123/14 + pkt = NCP(0x7B0E, "Get Active Connection List by Type", 'stats') + pkt.Request(15, [ + rec(10, 4, StartConnNumber ), + rec(14, 1, ConnectionType ), + ]) + pkt.Reply(528, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 512, ActiveConnBitList ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfd01, 0xff00]) + # 2222/7B0F, 123/15 + pkt = NCP(0x7B0F, "Get NLM Resource Tag List", 'stats') + pkt.Request(18, [ + rec(10, 4, NLMNumber ), + rec(14, 4, NLMStartNumber ), + ]) + pkt.Reply(37, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, TtlNumOfRTags ), + rec(20, 4, CurNumOfRTags ), + rec(24, 13, RTagStructure ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B10, 123/16 + pkt = NCP(0x7B10, "Enumerate Connection Information from Connection List", 'stats') + pkt.Request(22, [ + rec(10, 1, EnumInfoMask), + rec(11, 3, Reserved3), + rec(14, 4, itemsInList, var="x"), + rec(18, 4, connList, repeat="x"), + ]) + pkt.Reply(NO_LENGTH_CHECK, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, ItemsInPacket ), + srec(netAddr, req_cond="ncp.enum_info_transport==TRUE"), + srec(timeInfo, req_cond="ncp.enum_info_time==TRUE"), + srec(nameInfo, req_cond="ncp.enum_info_name==TRUE"), + srec(lockInfo, req_cond="ncp.enum_info_lock==TRUE"), + srec(printInfo, req_cond="ncp.enum_info_print==TRUE"), + srec(statsInfo, req_cond="ncp.enum_info_stats==TRUE"), + srec(acctngInfo, req_cond="ncp.enum_info_account==TRUE"), + srec(authInfo, req_cond="ncp.enum_info_auth==TRUE"), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B11, 123/17 + pkt = NCP(0x7B11, "Enumerate NCP Service Network Addresses", 'stats') + pkt.Request(14, [ + rec(10, 4, SearchNumber ), + ]) + pkt.Reply(36, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, ServerInfoFlags ), + rec(16, 16, GUID ), + rec(32, 4, NextSearchNum ), + # The following two items are dissected in packet-ncp2222.inc + #rec(36, 4, ItemsInPacket, var="x"), + #rec(40, 20, NCPNetworkAddress, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb01, 0xff00]) + # 2222/7B14, 123/20 + pkt = NCP(0x7B14, "Active LAN Board List", 'stats') + pkt.Request(14, [ + rec(10, 4, StartNumber ), + ]) + pkt.Reply(28, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, MaxNumOfLANS ), + rec(20, 4, ItemsInPacket, var="x"), + rec(24, 4, BoardNumbers, repeat="x"), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B15, 123/21 + pkt = NCP(0x7B15, "LAN Configuration Information", 'stats') + pkt.Request(14, [ + rec(10, 4, BoardNumber ), + ]) + pkt.Reply(152, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16,136, LANConfigInfo ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B16, 123/22 + pkt = NCP(0x7B16, "LAN Common Counters Information", 'stats') + pkt.Request(18, [ + rec(10, 4, BoardNumber ), + rec(14, 4, BlockNumber ), + ]) + pkt.Reply(86, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 1, StatMajorVersion ), + rec(15, 1, StatMinorVersion ), + rec(16, 4, TotalCommonCnts ), + rec(20, 4, TotalCntBlocks ), + rec(24, 4, CustomCounters ), + rec(28, 4, NextCntBlock ), + rec(32, 54, CommonLanStruc ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B17, 123/23 + pkt = NCP(0x7B17, "LAN Custom Counters Information", 'stats') + pkt.Request(18, [ + rec(10, 4, BoardNumber ), + rec(14, 4, StartNumber ), + ]) + pkt.Reply(25, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, NumOfCCinPkt, var="x"), + rec(20, 5, CustomCntsInfo, repeat="x"), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B18, 123/24 + pkt = NCP(0x7B18, "LAN Name Information", 'stats') + pkt.Request(14, [ + rec(10, 4, BoardNumber ), + ]) + pkt.Reply(NO_LENGTH_CHECK, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, PROTO_LENGTH_UNKNOWN, DriverBoardName ), + rec(-1, PROTO_LENGTH_UNKNOWN, DriverShortName ), + rec(-1, PROTO_LENGTH_UNKNOWN, DriverLogicalName ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B19, 123/25 + pkt = NCP(0x7B19, "LSL Information", 'stats') + pkt.Request(10) + pkt.Reply(90, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 74, LSLInformation ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B1A, 123/26 + pkt = NCP(0x7B1A, "LSL Logical Board Statistics", 'stats') + pkt.Request(14, [ + rec(10, 4, BoardNumber ), + ]) + pkt.Reply(28, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, LogTtlTxPkts ), + rec(20, 4, LogTtlRxPkts ), + rec(24, 4, UnclaimedPkts ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B1B, 123/27 + pkt = NCP(0x7B1B, "MLID Board Information", 'stats') + pkt.Request(14, [ + rec(10, 4, BoardNumber ), + ]) + pkt.Reply(44, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 1, Reserved ), + rec(15, 1, NumberOfProtocols ), + rec(16, 28, MLIDBoardInfo ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B1E, 123/30 + pkt = NCP(0x7B1E, "Get Media Manager Object Information", 'stats') + pkt.Request(14, [ + rec(10, 4, ObjectNumber ), + ]) + pkt.Reply(212, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 196, GenericInfoDef ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B1F, 123/31 + pkt = NCP(0x7B1F, "Get Media Manager Objects List", 'stats') + pkt.Request(15, [ + rec(10, 4, StartNumber ), + rec(14, 1, MediaObjectType ), + ]) + pkt.Reply(28, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, nextStartingNumber ), + rec(20, 4, ObjectCount, var="x"), + rec(24, 4, ObjectID, repeat="x"), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B20, 123/32 + pkt = NCP(0x7B20, "Get Media Manager Object Childrens List", 'stats') + pkt.Request(22, [ + rec(10, 4, StartNumber ), + rec(14, 1, MediaObjectType ), + rec(15, 3, Reserved3 ), + rec(18, 4, ParentObjectNumber ), + ]) + pkt.Reply(28, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, nextStartingNumber ), + rec(20, 4, ObjectCount, var="x" ), + rec(24, 4, ObjectID, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B21, 123/33 + pkt = NCP(0x7B21, "Get Volume Segment List", 'stats') + pkt.Request(14, [ + rec(10, 4, VolumeNumberLong ), + ]) + pkt.Reply(32, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, NumOfSegments, var="x" ), + rec(20, 12, Segments, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0x9801, 0xfb06, 0xff00]) + # 2222/7B22, 123/34 + pkt = NCP(0x7B22, "Get Volume Information by Level", 'stats') + pkt.Request(15, [ + rec(10, 4, VolumeNumberLong ), + rec(14, 1, InfoLevelNumber ), + ]) + pkt.Reply(NO_LENGTH_CHECK, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 1, InfoLevelNumber ), + rec(17, 3, Reserved3 ), + srec(VolInfoStructure, req_cond="ncp.info_level_num==0x01"), + srec(VolInfo2Struct, req_cond="ncp.info_level_num==0x02"), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B28, 123/40 + pkt = NCP(0x7B28, "Active Protocol Stacks", 'stats') + pkt.Request(14, [ + rec(10, 4, StartNumber ), + ]) + pkt.Reply(48, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, MaxNumOfLANS ), + rec(20, 4, StackCount, var="x" ), + rec(24, 4, nextStartingNumber ), + rec(28, 20, StackInfo, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B29, 123/41 + pkt = NCP(0x7B29, "Get Protocol Stack Configuration Information", 'stats') + pkt.Request(14, [ + rec(10, 4, StackNumber ), + ]) + pkt.Reply((37,164), [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 1, ConfigMajorVN ), + rec(17, 1, ConfigMinorVN ), + rec(18, 1, StackMajorVN ), + rec(19, 1, StackMinorVN ), + rec(20, 16, ShortStkName ), + rec(36, (1,128), StackFullNameStr ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B2A, 123/42 + pkt = NCP(0x7B2A, "Get Protocol Stack Statistics Information", 'stats') + pkt.Request(14, [ + rec(10, 4, StackNumber ), + ]) + pkt.Reply(38, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 1, StatMajorVersion ), + rec(17, 1, StatMinorVersion ), + rec(18, 2, ComCnts ), + rec(20, 4, CounterMask ), + rec(24, 4, TotalTxPkts ), + rec(28, 4, TotalRxPkts ), + rec(32, 4, IgnoredRxPkts ), + rec(36, 2, CustomCnts ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B2B, 123/43 + pkt = NCP(0x7B2B, "Get Protocol Stack Custom Information", 'stats') + pkt.Request(18, [ + rec(10, 4, StackNumber ), + rec(14, 4, StartNumber ), + ]) + pkt.Reply(25, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, CustomCount, var="x" ), + rec(20, 5, CustomCntsInfo, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B2C, 123/44 + pkt = NCP(0x7B2C, "Get Protocol Stack Numbers by Media Number", 'stats') + pkt.Request(14, [ + rec(10, 4, MediaNumber ), + ]) + pkt.Reply(24, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, StackCount, var="x" ), + rec(20, 4, StackNumber, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B2D, 123/45 + pkt = NCP(0x7B2D, "Get Protocol Stack Numbers by LAN Board Number", 'stats') + pkt.Request(14, [ + rec(10, 4, BoardNumber ), + ]) + pkt.Reply(24, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, StackCount, var="x" ), + rec(20, 4, StackNumber, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B2E, 123/46 + pkt = NCP(0x7B2E, "Get Media Name by Media Number", 'stats') + pkt.Request(14, [ + rec(10, 4, MediaNumber ), + ]) + pkt.Reply((17,144), [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, (1,128), MediaName ), + ]) + pkt.CompletionCodes([0x0000, 0x7900, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B2F, 123/47 + pkt = NCP(0x7B2F, "Get Loaded Media Number", 'stats') + pkt.Request(10) + pkt.Reply(28, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, MaxNumOfMedias ), + rec(20, 4, MediaListCount, var="x" ), + rec(24, 4, MediaList, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B32, 123/50 + pkt = NCP(0x7B32, "Get General Router and SAP Information", 'stats') + pkt.Request(10) + pkt.Reply(37, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 2, RIPSocketNumber ), + rec(18, 2, Reserved2 ), + rec(20, 1, RouterDownFlag ), + rec(21, 3, Reserved3 ), + rec(24, 1, TrackOnFlag ), + rec(25, 3, Reserved3 ), + rec(28, 1, ExtRouterActiveFlag ), + rec(29, 3, Reserved3 ), + rec(32, 2, SAPSocketNumber ), + rec(34, 2, Reserved2 ), + rec(36, 1, RpyNearestSrvFlag ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B33, 123/51 + pkt = NCP(0x7B33, "Get Network Router Information", 'stats') + pkt.Request(14, [ + rec(10, 4, NetworkNumber ), + ]) + pkt.Reply(26, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 10, KnownRoutes ), + ]) + pkt.CompletionCodes([0x0000, 0x0108, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B34, 123/52 + pkt = NCP(0x7B34, "Get Network Routers Information", 'stats') + pkt.Request(18, [ + rec(10, 4, NetworkNumber), + rec(14, 4, StartNumber ), + ]) + pkt.Reply(34, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, NumOfEntries, var="x" ), + rec(20, 14, RoutersInfo, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x0108, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B35, 123/53 + pkt = NCP(0x7B35, "Get Known Networks Information", 'stats') + pkt.Request(14, [ + rec(10, 4, StartNumber ), + ]) + pkt.Reply(30, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, NumOfEntries, var="x" ), + rec(20, 10, KnownRoutes, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B36, 123/54 + pkt = NCP(0x7B36, "Get Server Information", 'stats') + pkt.Request((15,64), [ + rec(10, 2, ServerType ), + rec(12, 2, Reserved2 ), + rec(14, (1,50), ServerNameLen ), + ], info_str=(ServerNameLen, "Get Server Information: %s", ", %s")) + pkt.Reply(30, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 12, ServerAddress ), + rec(28, 2, HopsToNet ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B37, 123/55 + pkt = NCP(0x7B37, "Get Server Sources Information", 'stats') + pkt.Request((19,68), [ + rec(10, 4, StartNumber ), + rec(14, 2, ServerType ), + rec(16, 2, Reserved2 ), + rec(18, (1,50), ServerNameLen ), + ], info_str=(ServerNameLen, "Get Server Sources Info: %s", ", %s")) + pkt.Reply(32, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, NumOfEntries, var="x" ), + rec(20, 12, ServersSrcInfo, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x0108, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B38, 123/56 + pkt = NCP(0x7B38, "Get Known Servers Information", 'stats') + pkt.Request(16, [ + rec(10, 4, StartNumber ), + rec(14, 2, ServerType ), + ]) + pkt.Reply(35, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, NumOfEntries, var="x" ), + rec(20, 15, KnownServStruc, repeat="x" ), + ]) + pkt.CompletionCodes([0x0000, 0x0108, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B3C, 123/60 + pkt = NCP(0x7B3C, "Get Server Set Commands Information", 'stats') + pkt.Request(14, [ + rec(10, 4, StartNumber ), + ]) + pkt.Reply(NO_LENGTH_CHECK, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, TtlNumOfSetCmds ), + rec(20, 4, nextStartingNumber ), + rec(24, 1, SetCmdType ), + rec(25, 3, Reserved3 ), + rec(28, 1, SetCmdCategory ), + rec(29, 3, Reserved3 ), + rec(32, 1, SetCmdFlags ), + rec(33, 3, Reserved3 ), + rec(36, PROTO_LENGTH_UNKNOWN, SetCmdName ), + rec(-1, 4, SetCmdValueNum ), + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B3D, 123/61 + pkt = NCP(0x7B3D, "Get Server Set Categories", 'stats') + pkt.Request(14, [ + rec(10, 4, StartNumber ), + ]) + pkt.Reply(NO_LENGTH_CHECK, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, NumberOfSetCategories ), + rec(20, 4, nextStartingNumber ), + rec(24, PROTO_LENGTH_UNKNOWN, CategoryName ), + ]) + pkt.CompletionCodes([0x0000, 0x7e01, 0xfb06, 0xff00]) + # 2222/7B3E, 123/62 + pkt = NCP(0x7B3E, "Get Server Set Commands Information By Name", 'stats') + pkt.Request(NO_LENGTH_CHECK, [ + rec(10, PROTO_LENGTH_UNKNOWN, SetParmName ), + ], info_str=(SetParmName, "Get Server Set Command Info for: %s", ", %s")) + pkt.Reply(NO_LENGTH_CHECK, [ + rec(8, 4, CurrentServerTime ), + rec(12, 1, VConsoleVersion ), + rec(13, 1, VConsoleRevision ), + rec(14, 2, Reserved2 ), + rec(16, 4, TtlNumOfSetCmds ), + rec(20, 4, nextStartingNumber ), + rec(24, 1, SetCmdType ), + rec(25, 3, Reserved3 ), + rec(28, 1, SetCmdCategory ), + rec(29, 3, Reserved3 ), + rec(32, 1, SetCmdFlags ), + rec(33, 3, Reserved3 ), + rec(36, PROTO_LENGTH_UNKNOWN, SetCmdName ), + # The value of the set command is decoded in packet-ncp2222.inc + ]) + pkt.ReqCondSizeVariable() + pkt.CompletionCodes([0x0000, 0x7e01, 0xc600, 0xfb06, 0xff22]) + # 2222/7B46, 123/70 + pkt = NCP(0x7B46, "Get Current Compressing File", 'stats') + pkt.Request(14, [ + rec(10, 4, VolumeNumberLong ), + ]) + pkt.Reply(56, [ + rec(8, 4, ParentID ), + rec(12, 4, DirectoryEntryNumber ), + rec(16, 4, compressionStage ), + rec(20, 4, ttlIntermediateBlks ), + rec(24, 4, ttlCompBlks ), + rec(28, 4, curIntermediateBlks ), + rec(32, 4, curCompBlks ), + rec(36, 4, curInitialBlks ), + rec(40, 4, fileFlags ), + rec(44, 4, projectedCompSize ), + rec(48, 4, originalSize ), + rec(52, 4, compressVolume ), + ]) + pkt.CompletionCodes([0x0000, 0x7e00, 0x7901, 0x9801, 0xfb06, 0xff00]) + # 2222/7B47, 123/71 + pkt = NCP(0x7B47, "Get Current DeCompressing File Info List", 'stats') + pkt.Request(14, [ + rec(10, 4, VolumeNumberLong ), + ]) + pkt.Reply(24, [ + #rec(8, 4, FileListCount ), + rec(8, 16, FileInfoStruct ), + ]) + pkt.CompletionCodes([0x0000, 0x7e00, 0x9801, 0xfb06, 0xff00]) + # 2222/7B48, 123/72 + pkt = NCP(0x7B48, "Get Compression and Decompression Time and Counts", 'stats') + pkt.Request(14, [ + rec(10, 4, VolumeNumberLong ), + ]) + pkt.Reply(64, [ + rec(8, 56, CompDeCompStat ), + ]) + pkt.CompletionCodes([0x0000, 0x7e00, 0x9801, 0xfb06, 0xff00]) + # 2222/7BF9, 123/249 + pkt = NCP(0x7BF9, "Set Alert Notification", 'stats') + pkt.Request(10) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) + # 2222/7BFB, 123/251 + pkt = NCP(0x7BFB, "Get Item Configuration Information", 'stats') + pkt.Request(10) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) + # 2222/7BFC, 123/252 + pkt = NCP(0x7BFC, "Get Subject Item ID List", 'stats') + pkt.Request(10) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) + # 2222/7BFD, 123/253 + pkt = NCP(0x7BFD, "Get Subject Item List Count", 'stats') + pkt.Request(10) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) + # 2222/7BFE, 123/254 + pkt = NCP(0x7BFE, "Get Subject ID List", 'stats') + pkt.Request(10) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) + # 2222/7BFF, 123/255 + pkt = NCP(0x7BFF, "Get Number of NetMan Subjects", 'stats') + pkt.Request(10) + pkt.Reply(8) + pkt.CompletionCodes([0x0000, 0x7e00, 0xfb06, 0xff00]) + # 2222/8301, 131/01 + pkt = NCP(0x8301, "RPC Load an NLM", 'remote') + pkt.Request(NO_LENGTH_CHECK, [ + rec(10, 4, NLMLoadOptions ), + rec(14, 16, Reserved16 ), + rec(30, PROTO_LENGTH_UNKNOWN, PathAndName ), + ], info_str=(PathAndName, "RPC Load NLM: %s", ", %s")) + pkt.Reply(12, [ + rec(8, 4, RPCccode ), + ]) + pkt.CompletionCodes([0x0000, 0x7c00, 0x7e00, 0xfb07, 0xff00]) + # 2222/8302, 131/02 + pkt = NCP(0x8302, "RPC Unload an NLM", 'remote') + pkt.Request(NO_LENGTH_CHECK, [ + rec(10, 20, Reserved20 ), + rec(30, PROTO_LENGTH_UNKNOWN, NLMName ), + ], info_str=(NLMName, "RPC Unload NLM: %s", ", %s")) + pkt.Reply(12, [ + rec(8, 4, RPCccode ), + ]) + pkt.CompletionCodes([0x0000, 0x7c00, 0x7e00, 0xfb07, 0xff00]) + # 2222/8303, 131/03 + pkt = NCP(0x8303, "RPC Mount Volume", 'remote') + pkt.Request(NO_LENGTH_CHECK, [ + rec(10, 20, Reserved20 ), + rec(30, PROTO_LENGTH_UNKNOWN, VolumeNameStringz ), + ], info_str=(VolumeNameStringz, "RPC Mount Volume: %s", ", %s")) + pkt.Reply(32, [ + rec(8, 4, RPCccode), + rec(12, 16, Reserved16 ), + rec(28, 4, VolumeNumberLong ), + ]) + pkt.CompletionCodes([0x0000, 0x7e00, 0xfb07, 0xff00]) + # 2222/8304, 131/04 + pkt = NCP(0x8304, "RPC Dismount Volume", 'remote') + pkt.Request(NO_LENGTH_CHECK, [ + rec(10, 20, Reserved20 ), + rec(30, PROTO_LENGTH_UNKNOWN, VolumeNameStringz ), + ], info_str=(VolumeNameStringz, "RPC Dismount Volume: %s", ", %s")) + pkt.Reply(12, [ + rec(8, 4, RPCccode ), + ]) + pkt.CompletionCodes([0x0000, 0x7e00, 0xfb07, 0xff00]) + # 2222/8305, 131/05 + pkt = NCP(0x8305, "RPC Add Name Space To Volume", 'remote') + pkt.Request(NO_LENGTH_CHECK, [ + rec(10, 20, Reserved20 ), + rec(30, PROTO_LENGTH_UNKNOWN, AddNameSpaceAndVol ), + ], info_str=(AddNameSpaceAndVol, "RPC Add Name Space to Volume: %s", ", %s")) + pkt.Reply(12, [ + rec(8, 4, RPCccode ), + ]) + pkt.CompletionCodes([0x0000, 0x7e00, 0xfb07, 0xff00]) + # 2222/8306, 131/06 + pkt = NCP(0x8306, "RPC Set Command Value", 'remote') + pkt.Request(NO_LENGTH_CHECK, [ + rec(10, 1, SetCmdType ), + rec(11, 3, Reserved3 ), + rec(14, 4, SetCmdValueNum ), + rec(18, 12, Reserved12 ), + rec(30, PROTO_LENGTH_UNKNOWN, SetCmdName ), + # + # XXX - optional string, if SetCmdType is 0 + # + ], info_str=(SetCmdName, "RPC Set Command Value: %s", ", %s")) + pkt.Reply(12, [ + rec(8, 4, RPCccode ), + ]) + pkt.CompletionCodes([0x0000, 0x7e00, 0xfb07, 0xff00]) + # 2222/8307, 131/07 + pkt = NCP(0x8307, "RPC Execute NCF File", 'remote') + pkt.Request(NO_LENGTH_CHECK, [ + rec(10, 20, Reserved20 ), + rec(30, PROTO_LENGTH_UNKNOWN, PathAndName ), + ], info_str=(PathAndName, "RPC Execute NCF File: %s", ", %s")) + pkt.Reply(12, [ + rec(8, 4, RPCccode ), + ]) + pkt.CompletionCodes([0x0000, 0x7e00, 0xfb07, 0xff00]) if __name__ == '__main__': -# import profile -# filename = "ncp.pstats" -# profile.run("main()", filename) +# import profile +# filename = "ncp.pstats" +# profile.run("main()", filename) # -# import pstats -# sys.stdout = msg -# p = pstats.Stats(filename) +# import pstats +# sys.stdout = msg +# p = pstats.Stats(filename) # -# print "Stats sorted by cumulative time" -# p.strip_dirs().sort_stats('cumulative').print_stats() +# print "Stats sorted by cumulative time" +# p.strip_dirs().sort_stats('cumulative').print_stats() # -# print "Function callees" -# p.print_callees() - main() +# print "Function callees" +# p.print_callees() + main() diff -Nru wireshark-1.10.5/tools/netscreen2dump.py wireshark-1.10.6/tools/netscreen2dump.py --- wireshark-1.10.5/tools/netscreen2dump.py 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/netscreen2dump.py 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ """ Converts netscreen snoop hex-dumps to a hex-dump that text2pcap can read. -$Id: netscreen2dump.py 43536 2012-06-28 22:56:06Z darkjames $ +$Id$ Copyright (c) 2004 by Gilbert Ramirez diff -Nru wireshark-1.10.5/tools/process-x11-fields.pl wireshark-1.10.6/tools/process-x11-fields.pl --- wireshark-1.10.5/tools/process-x11-fields.pl 2013-04-22 21:38:17.000000000 +0000 +++ wireshark-1.10.6/tools/process-x11-fields.pl 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ # # Copyright 2000, Christophe Tronche # -# $Id: process-x11-fields.pl 48991 2013-04-22 21:32:55Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/process-x11-xcb.pl wireshark-1.10.6/tools/process-x11-xcb.pl --- wireshark-1.10.5/tools/process-x11-xcb.pl 2013-04-22 21:38:17.000000000 +0000 +++ wireshark-1.10.6/tools/process-x11-xcb.pl 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ # # Copyright 2008, 2009 Open Text Corporation # -# $Id: process-x11-xcb.pl 48991 2013-04-22 21:32:55Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/randpkt-test.sh wireshark-1.10.6/tools/randpkt-test.sh --- wireshark-1.10.5/tools/randpkt-test.sh 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/randpkt-test.sh 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/bash # -# $Id: randpkt-test.sh 47307 2013-01-26 20:36:57Z gerald $ +# $Id$ # Randpkt testing script for TShark # diff -Nru wireshark-1.10.5/tools/rdps.py wireshark-1.10.6/tools/rdps.py --- wireshark-1.10.5/tools/rdps.py 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/rdps.py 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ # # rdps.py # -# $Id: rdps.py 43536 2012-06-28 22:56:06Z darkjames $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/runlex.sh wireshark-1.10.6/tools/runlex.sh --- wireshark-1.10.5/tools/runlex.sh 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/runlex.sh 2014-03-07 18:07:16.000000000 +0000 @@ -7,7 +7,7 @@ # means that neither Flex nor Lex was found, so we report an error and # quit. # -# $Id: runlex.sh 43555 2012-07-02 21:15:51Z morriss $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/setuid-root.pl.in wireshark-1.10.6/tools/setuid-root.pl.in --- wireshark-1.10.5/tools/setuid-root.pl.in 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/setuid-root.pl.in 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ # # setuid-root - Enable/disable setuid for tshark and dumpcap. # -# $Id: setuid-root.pl.in 43538 2012-06-28 23:18:38Z darkjames $ +# $Id$ # # Copyright 2007, Luis Ontanon and Gerald Combs # diff -Nru wireshark-1.10.5/tools/test-common.sh wireshark-1.10.6/tools/test-common.sh --- wireshark-1.10.5/tools/test-common.sh 2013-06-28 15:40:19.000000000 +0000 +++ wireshark-1.10.6/tools/test-common.sh 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/bash # -# $Id: test-common.sh 50213 2013-06-28 15:32:17Z morriss $ +# $Id$ # Common variables and functions for fuzz and randpkt tests. diff -Nru wireshark-1.10.5/tools/test-fuzzed-cap.sh wireshark-1.10.6/tools/test-fuzzed-cap.sh --- wireshark-1.10.5/tools/test-fuzzed-cap.sh 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/test-fuzzed-cap.sh 2014-03-07 18:07:16.000000000 +0000 @@ -8,7 +8,7 @@ # # Copyright 2012 Jeff Morriss # -# $Id: test-fuzzed-cap.sh 46514 2012-12-12 02:22:14Z morriss $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/textify.sh wireshark-1.10.6/tools/textify.sh --- wireshark-1.10.5/tools/textify.sh 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/textify.sh 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/bash # -# $Id: textify.sh 32440 2010-04-09 21:42:51Z gerald $ +# $Id$ # # Text file conversion script for packaging on Windows # diff -Nru wireshark-1.10.5/tools/valgrind-wireshark.sh wireshark-1.10.6/tools/valgrind-wireshark.sh --- wireshark-1.10.5/tools/valgrind-wireshark.sh 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/valgrind-wireshark.sh 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ # # Copyright 2012 Jeff Morriss # -# $Id: valgrind-wireshark.sh 48320 2013-03-15 16:42:05Z eapache $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/tools/win32-setup.sh wireshark-1.10.6/tools/win32-setup.sh --- wireshark-1.10.5/tools/win32-setup.sh 2013-04-22 20:55:14.000000000 +0000 +++ wireshark-1.10.6/tools/win32-setup.sh 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/bash # -# $Id: win32-setup.sh 48979 2013-04-22 20:49:02Z pascal $ +# $Id$ # 32-bit wrapper for win-setup.sh. diff -Nru wireshark-1.10.5/tools/win64-setup.sh wireshark-1.10.6/tools/win64-setup.sh --- wireshark-1.10.5/tools/win64-setup.sh 2013-04-22 20:55:14.000000000 +0000 +++ wireshark-1.10.6/tools/win64-setup.sh 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/bash # -# $Id: win64-setup.sh 48979 2013-04-22 20:49:02Z pascal $ +# $Id$ # 64-bit wrapper for win-setup.sh. diff -Nru wireshark-1.10.5/tools/win-setup.sh wireshark-1.10.6/tools/win-setup.sh --- wireshark-1.10.5/tools/win-setup.sh 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/win-setup.sh 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ (set -o igncr) 2>/dev/null && set -o igncr; # hack to force this file to be processed by cygwin bash with -o igncr # needed when this file is exec'd from win32-setup.sh & win64-setup.sh # -# $Id: win-setup.sh 44888 2012-09-13 21:28:28Z gerald $ +# $Id$ err_exit () { echo "" diff -Nru wireshark-1.10.5/tools/wireshark_be.py wireshark-1.10.6/tools/wireshark_be.py --- wireshark-1.10.5/tools/wireshark_be.py 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/wireshark_be.py 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # -*- python -*- # -# $Id: wireshark_be.py 48848 2013-04-14 18:55:28Z eapache $ +# $Id$ # # File : wireshark_be.py # diff -Nru wireshark-1.10.5/tools/wireshark_gen.py wireshark-1.10.6/tools/wireshark_gen.py --- wireshark-1.10.5/tools/wireshark_gen.py 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/wireshark_gen.py 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # -*- python -*- # -# $Id: wireshark_gen.py 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ # # wireshark_gen.py (part of idl2wrs) # @@ -2297,7 +2297,7 @@ template_Header = """\ /* packet-@dissector_name@.c * - * $Id: wireshark_gen.py 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Routines for IDL dissection * diff -Nru wireshark-1.10.5/tools/ws-coding-style.cfg wireshark-1.10.6/tools/ws-coding-style.cfg --- wireshark-1.10.5/tools/ws-coding-style.cfg 2013-04-22 18:04:29.000000000 +0000 +++ wireshark-1.10.6/tools/ws-coding-style.cfg 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: ws-coding-style.cfg 37628 2011-06-09 08:28:04Z etxrab $ +# $Id$ # # Ref: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5924 # diff -Nru wireshark-1.10.5/tpncp/tpncp.dat wireshark-1.10.6/tpncp/tpncp.dat --- wireshark-1.10.5/tpncp/tpncp.dat 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/tpncp/tpncp.dat 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: tpncp.dat 27189 2009-01-08 05:36:23Z jake $ +# $Id$ Audiocodes TrunkPack Network Control Protocol (TPNCP) Version L5.60.000.000 acEV_NONE 0 acEV_ERROR 1 diff -Nru wireshark-1.10.5/tshark.c wireshark-1.10.6/tshark.c --- wireshark-1.10.5/tshark.c 2013-10-29 23:01:22.000000000 +0000 +++ wireshark-1.10.6/tshark.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * Text-mode variant of Wireshark, along the lines of tcpdump and snoop, * by Gilbert Ramirez and Guy Harris . * - * $Id: tshark.c 52974 2013-10-29 22:55:21Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -240,7 +240,7 @@ "See http://www.wireshark.org for more information.\n" "\n" "%s", - wireshark_svnversion, get_copyright_info()); + wireshark_gitversion, get_copyright_info()); } else { output = stderr; } @@ -349,7 +349,7 @@ output = stdout; - fprintf(output, "TShark " VERSION "%s\n", wireshark_svnversion); + fprintf(output, "TShark " VERSION "%s\n", wireshark_gitversion); fprintf(output, "\n"); fprintf(output, "Usage: tshark -G [report]\n"); @@ -853,7 +853,7 @@ "%s" "\n" "%s", - wireshark_svnversion, get_copyright_info(), comp_info_str->str, + wireshark_gitversion, get_copyright_info(), comp_info_str->str, runtime_info_str->str); } @@ -947,7 +947,7 @@ "%s" "\n" "%s", - wireshark_svnversion, comp_info_str->str, runtime_info_str->str); + wireshark_gitversion, comp_info_str->str, runtime_info_str->str); #ifdef _WIN32 arg_list_utf_16to8(argc, argv); @@ -1412,6 +1412,7 @@ } break; case 'T': /* printing Type */ + print_packet_info = TRUE; if (strcmp(optarg, "text") == 0) { output_action = WRITE_TEXT; print_format = PR_FMT_TEXT; @@ -2891,7 +2892,7 @@ } /* If we don't have an application name add Tshark */ if (shb_hdr->shb_user_appl == NULL) { - g_snprintf(appname, sizeof(appname), "TShark " VERSION "%s", wireshark_svnversion); + g_snprintf(appname, sizeof(appname), "TShark " VERSION "%s", wireshark_gitversion); shb_hdr->shb_user_appl = appname; } diff -Nru wireshark-1.10.5/u3.c wireshark-1.10.6/u3.c --- wireshark-1.10.5/u3.c 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/u3.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* u3.c * u3 2006 Graeme Lunt * - * $Id: u3.c 48108 2013-03-05 22:15:20Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/u3.h wireshark-1.10.6/u3.h --- wireshark-1.10.5/u3.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/u3.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* u3.h * u3 2006 Graeme Lunt * - * $Id: u3.h 46748 2012-12-26 05:57:06Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/alert_box.c wireshark-1.10.6/ui/alert_box.c --- wireshark-1.10.5/ui/alert_box.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/alert_box.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines to put up various "standard" alert boxes used in multiple * places * - * $Id: alert_box.c 45765 2012-10-24 15:52:26Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/alert_box.h wireshark-1.10.6/ui/alert_box.h --- wireshark-1.10.5/ui/alert_box.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/alert_box.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines to put up various "standard" alert boxes used in multiple * places * - * $Id: alert_box.h 45765 2012-10-24 15:52:26Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/capture_globals.h wireshark-1.10.6/ui/capture_globals.h --- wireshark-1.10.5/ui/capture_globals.h 2013-06-04 07:45:21.000000000 +0000 +++ wireshark-1.10.6/ui/capture_globals.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_globals.h * Capture-related globals. * - * $Id: capture_globals.h 49759 2013-06-04 07:37:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/Makefile.am wireshark-1.10.6/ui/cli/Makefile.am --- wireshark-1.10.5/ui/cli/Makefile.am 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for the TShark taps # -# $Id: Makefile.am 44974 2012-09-18 17:40:50Z morriss $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/Makefile.in wireshark-1.10.6/ui/cli/Makefile.in --- wireshark-1.10.5/ui/cli/Makefile.in 2013-12-19 19:13:53.000000000 +0000 +++ wireshark-1.10.6/ui/cli/Makefile.in 2014-03-07 18:07:38.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for the TShark taps # -# $Id: Makefile.am 44974 2012-09-18 17:40:50Z morriss $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -66,7 +66,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-afpstat.c wireshark-1.10.6/ui/cli/tap-afpstat.c --- wireshark-1.10.5/ui/cli/tap-afpstat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-afpstat.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Based on * smbstat 2003 Ronnie Sahlberg * - * $Id: tap-afpstat.c 48179 2013-03-07 19:52:33Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-ansi_astat.c wireshark-1.10.6/ui/cli/tap-ansi_astat.c --- wireshark-1.10.5/ui/cli/tap-ansi_astat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-ansi_astat.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2003, Michael Lum * In association with Telos Technology Inc. * - * $Id: tap-ansi_astat.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-bootpstat.c wireshark-1.10.6/ui/cli/tap-bootpstat.c --- wireshark-1.10.5/ui/cli/tap-bootpstat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-bootpstat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-bootpstat.c * boop_stat 2003 Jean-Michel FAYARD * - * $Id: tap-bootpstat.c 48108 2013-03-05 22:15:20Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-camelcounter.c wireshark-1.10.6/ui/cli/tap-camelcounter.c --- wireshark-1.10.5/ui/cli/tap-camelcounter.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-camelcounter.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * camel message counter for tshark * Copyright 2006 Florent DROUIN * - * $Id: tap-camelcounter.c 48108 2013-03-05 22:15:20Z etxrab $ + * $Id$ * * This part of code is extracted from tap-h225counter.c from Lars Roland * diff -Nru wireshark-1.10.5/ui/cli/tap-camelsrt.c wireshark-1.10.6/ui/cli/tap-camelsrt.c --- wireshark-1.10.5/ui/cli/tap-camelsrt.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-camelsrt.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * CAMEL Service Response Time statistics for tshark * Copyright 2006 Florent Drouin (based on tap_h225rassrt.c from Lars Roland) * - * $Id: tap-camelsrt.c 48108 2013-03-05 22:15:20Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-comparestat.c wireshark-1.10.6/ui/cli/tap-comparestat.c --- wireshark-1.10.5/ui/cli/tap-comparestat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-comparestat.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2008 Vincenzo Condoleo, Christophe Dirac, Reto Ruoss * supported by HSR (Hochschule Rapperswil) * - * $Id: tap-comparestat.c 48609 2013-03-28 07:34:13Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-dcerpcstat.c wireshark-1.10.6/ui/cli/tap-dcerpcstat.c --- wireshark-1.10.5/ui/cli/tap-dcerpcstat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-dcerpcstat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-dcerpcstat.c * dcerpcstat 2002 Ronnie Sahlberg * - * $Id: tap-dcerpcstat.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-diameter-avp.c wireshark-1.10.6/ui/cli/tap-diameter-avp.c --- wireshark-1.10.5/ui/cli/tap-diameter-avp.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-diameter-avp.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-diameter-avp.c * Copyright 2010 Andrej Kuehnal * - * $Id: tap-diameter-avp.c 48161 2013-03-07 07:05:45Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-expert.c wireshark-1.10.6/ui/cli/tap-expert.c --- wireshark-1.10.5/ui/cli/tap-expert.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-expert.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-expert.c * Copyright 2011 Martin Mathieson * - * $Id: tap-expert.c 48137 2013-03-06 17:35:11Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-follow.c wireshark-1.10.6/ui/cli/tap-follow.c --- wireshark-1.10.5/ui/cli/tap-follow.c 2013-06-03 17:50:21.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-follow.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * * Copyright 2011-2013, QA Cafe * - * $Id: tap-follow.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-funnel.c wireshark-1.10.6/ui/cli/tap-funnel.c --- wireshark-1.10.5/ui/cli/tap-funnel.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-funnel.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * (c) 2006, Luis E. Garcia Ontanon * - * $Id: tap-funnel.c 48137 2013-03-06 17:35:11Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-gsm_astat.c wireshark-1.10.6/ui/cli/tap-gsm_astat.c --- wireshark-1.10.5/ui/cli/tap-gsm_astat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-gsm_astat.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2003, Michael Lum * In association with Telos Technology Inc. * - * $Id: tap-gsm_astat.c 48161 2013-03-07 07:05:45Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-h225counter.c wireshark-1.10.6/ui/cli/tap-h225counter.c --- wireshark-1.10.5/ui/cli/tap-h225counter.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-h225counter.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * h225 message counter for wireshark * Copyright 2003 Lars Roland * - * $Id: tap-h225counter.c 48137 2013-03-06 17:35:11Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-h225rassrt.c wireshark-1.10.6/ui/cli/tap-h225rassrt.c --- wireshark-1.10.5/ui/cli/tap-h225rassrt.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-h225rassrt.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * h225 RAS Service Response Time statistics for wireshark * Copyright 2003 Lars Roland * - * $Id: tap-h225rassrt.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-hosts.c wireshark-1.10.6/ui/cli/tap-hosts.c --- wireshark-1.10.5/ui/cli/tap-hosts.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-hosts.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* tap-hosts.c * - * $Id: tap-hosts.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-httpstat.c wireshark-1.10.6/ui/cli/tap-httpstat.c --- wireshark-1.10.5/ui/cli/tap-httpstat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-httpstat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-httpstat.c * tap-httpstat 2003 Jean-Michel FAYARD * - * $Id: tap-httpstat.c 48137 2013-03-06 17:35:11Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-icmpstat.c wireshark-1.10.6/ui/cli/tap-icmpstat.c --- wireshark-1.10.5/ui/cli/tap-icmpstat.c 2013-06-03 17:50:21.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-icmpstat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-icmpstat.c * icmpstat 2011 Christopher Maynard * - * $Id: tap-icmpstat.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-icmpv6stat.c wireshark-1.10.6/ui/cli/tap-icmpv6stat.c --- wireshark-1.10.5/ui/cli/tap-icmpv6stat.c 2013-06-03 17:50:21.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-icmpv6stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-icmpv6stat.c * icmpv6stat 2011 Christopher Maynard * - * $Id: tap-icmpv6stat.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-iostat.c wireshark-1.10.6/ui/cli/tap-iostat.c --- wireshark-1.10.5/ui/cli/tap-iostat.c 2013-07-17 23:27:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-iostat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-iostat.c * iostat 2002 Ronnie Sahlberg * - * $Id: tap-iostat.c 50712 2013-07-17 23:21:12Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-iousers.c wireshark-1.10.6/ui/cli/tap-iousers.c --- wireshark-1.10.5/ui/cli/tap-iousers.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-iousers.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-iousers.c * iostat 2003 Ronnie Sahlberg * - * $Id: tap-iousers.c 48137 2013-03-06 17:35:11Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-macltestat.c wireshark-1.10.6/ui/cli/tap-macltestat.c --- wireshark-1.10.5/ui/cli/tap-macltestat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-macltestat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-macltestat.c * Copyright 2011 Martin Mathieson * - * $Id: tap-macltestat.c 48137 2013-03-06 17:35:11Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-megacostat.c wireshark-1.10.6/ui/cli/tap-megacostat.c --- wireshark-1.10.5/ui/cli/tap-megacostat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-megacostat.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2008, Ericsson AB * By Balint Reczey * - * $Id: tap-megacostat.c 48137 2013-03-06 17:35:11Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-mgcpstat.c wireshark-1.10.6/ui/cli/tap-mgcpstat.c --- wireshark-1.10.5/ui/cli/tap-mgcpstat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-mgcpstat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-mgcpstat.c * mgcpstat 2003 Lars Roland * - * $Id: tap-mgcpstat.c 48137 2013-03-06 17:35:11Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-protocolinfo.c wireshark-1.10.6/ui/cli/tap-protocolinfo.c --- wireshark-1.10.5/ui/cli/tap-protocolinfo.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-protocolinfo.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-protocolinfo.c * protohierstat 2002 Ronnie Sahlberg * - * $Id: tap-protocolinfo.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-protohierstat.c wireshark-1.10.6/ui/cli/tap-protohierstat.c --- wireshark-1.10.5/ui/cli/tap-protohierstat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-protohierstat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-protohierstat.c * protohierstat 2002 Ronnie Sahlberg * - * $Id: tap-protohierstat.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-radiusstat.c wireshark-1.10.6/ui/cli/tap-radiusstat.c --- wireshark-1.10.5/ui/cli/tap-radiusstat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-radiusstat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-radiusstat.c * Copyright 2006 Alejandro Vaquero * - * $Id: tap-radiusstat.c 48161 2013-03-07 07:05:45Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-rlcltestat.c wireshark-1.10.6/ui/cli/tap-rlcltestat.c --- wireshark-1.10.5/ui/cli/tap-rlcltestat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-rlcltestat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-rlclte_stat.c * Copyright 2011 Martin Mathieson * - * $Id: tap-rlcltestat.c 48161 2013-03-07 07:05:45Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-rpcprogs.c wireshark-1.10.6/ui/cli/tap-rpcprogs.c --- wireshark-1.10.5/ui/cli/tap-rpcprogs.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-rpcprogs.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-rpcprogs.c * rpcstat 2002 Ronnie Sahlberg * - * $Id: tap-rpcprogs.c 48161 2013-03-07 07:05:45Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-rpcstat.c wireshark-1.10.6/ui/cli/tap-rpcstat.c --- wireshark-1.10.5/ui/cli/tap-rpcstat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-rpcstat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-rpcstat.c * rpcstat 2002 Ronnie Sahlberg * - * $Id: tap-rpcstat.c 48161 2013-03-07 07:05:45Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-rtp.c wireshark-1.10.6/ui/cli/tap-rtp.c --- wireshark-1.10.5/ui/cli/tap-rtp.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-rtp.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-rtp.c * RTP TAP for tshark * - * $Id: tap-rtp.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Copyright 2008, Ericsson AB * By Balint Reczey diff -Nru wireshark-1.10.5/ui/cli/tap-rtspstat.c wireshark-1.10.6/ui/cli/tap-rtspstat.c --- wireshark-1.10.5/ui/cli/tap-rtspstat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-rtspstat.c 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ * Stephane GORSE (Orange Labs / France Telecom) * Copied from Jean-Michel FAYARD's works (HTTP) * - * $Id: tap-rtspstat.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-scsistat.c wireshark-1.10.6/ui/cli/tap-scsistat.c --- wireshark-1.10.5/ui/cli/tap-scsistat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-scsistat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* tap-scsistat.c 2010 Chris Costa and Cal Turney * - * $Id: tap-scsistat.c 48161 2013-03-07 07:05:45Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-sctpchunkstat.c wireshark-1.10.6/ui/cli/tap-sctpchunkstat.c --- wireshark-1.10.5/ui/cli/tap-sctpchunkstat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-sctpchunkstat.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * SCTP chunk counter for wireshark * Copyright 2005 Oleg Terletsky * - * $Id: tap-sctpchunkstat.c 48161 2013-03-07 07:05:45Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-sipstat.c wireshark-1.10.6/ui/cli/tap-sipstat.c --- wireshark-1.10.5/ui/cli/tap-sipstat.c 2013-07-22 22:01:24.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-sipstat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap_sipstat.c * sip message counter for wireshark * - * $Id: tap-sipstat.c 50800 2013-07-22 21:52:07Z gerald $ + * $Id$ * Copied from ui/gtk/sip_stat.c and tap-httpstat.c * * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/ui/cli/tap-smbsids.c wireshark-1.10.6/ui/cli/tap-smbsids.c --- wireshark-1.10.5/ui/cli/tap-smbsids.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-smbsids.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-smbsids.c * smbstat 2003 Ronnie Sahlberg * - * $Id: tap-smbsids.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-smbstat.c wireshark-1.10.6/ui/cli/tap-smbstat.c --- wireshark-1.10.5/ui/cli/tap-smbstat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-smbstat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-smbstat.c * smbstat 2003 Ronnie Sahlberg * - * $Id: tap-smbstat.c 48161 2013-03-07 07:05:45Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-stats_tree.c wireshark-1.10.6/ui/cli/tap-stats_tree.c --- wireshark-1.10.5/ui/cli/tap-stats_tree.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-stats_tree.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * tshark's tap implememntation of stats_tree * 2005, Luis E. G. Ontanon * - * $Id: tap-stats_tree.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-sv.c wireshark-1.10.6/ui/cli/tap-sv.c --- wireshark-1.10.5/ui/cli/tap-sv.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-sv.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-sv.c * Copyright 2008 Michael Bernhard * - * $Id: tap-sv.c 48161 2013-03-07 07:05:45Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/cli/tap-wspstat.c wireshark-1.10.6/ui/cli/tap-wspstat.c --- wireshark-1.10.5/ui/cli/tap-wspstat.c 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/cli/tap-wspstat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* tap-rpcstat.c * wspstat 2003 Jean-Michel FAYARD * - * $Id: tap-wspstat.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/CMakeLists.txt wireshark-1.10.6/ui/CMakeLists.txt --- wireshark-1.10.5/ui/CMakeLists.txt 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/CMakeLists.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 47767 2013-02-20 06:51:16Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/ui/doxygen.cfg.in wireshark-1.10.6/ui/doxygen.cfg.in --- wireshark-1.10.5/ui/doxygen.cfg.in 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/doxygen.cfg.in 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: doxygen.cfg.in 41594 2012-03-16 03:39:51Z guy $ +# $Id$ # @configure_input@ # The PROJECT_NAME tag is a single word (or a sequence of words surrounded diff -Nru wireshark-1.10.5/ui/export_object.c wireshark-1.10.6/ui/export_object.c --- wireshark-1.10.5/ui/export_object.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/export_object.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Common routines for tracking & saving objects found in streams of data * Copyright 2007, Stephen Fisher (see AUTHORS file) * - * $Id: export_object.c 46402 2012-12-05 15:56:36Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/export_object_dicom.c wireshark-1.10.6/ui/export_object_dicom.c --- wireshark-1.10.5/ui/export_object_dicom.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/export_object_dicom.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,10 +1,10 @@ /* export_object_dicom.c - * $Id: export_object_dicom.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * Routines for tracking & saving objects found in DICOM streams * See also: export_object.c / export_object.h for common code * Copyright 2008, David Aggeler * - * $Id: export_object_dicom.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/export_object.h wireshark-1.10.6/ui/export_object.h --- wireshark-1.10.5/ui/export_object.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/export_object.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Common routines for tracking & saving objects found in streams of data * Copyright 2007, Stephen Fisher (see AUTHORS file) * - * $Id: export_object.h 48210 2013-03-09 08:44:14Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/export_object_http.c wireshark-1.10.6/ui/export_object_http.c --- wireshark-1.10.5/ui/export_object_http.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/export_object_http.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * See also: export_object.c / export_object.h for common code * Copyright 2007, Stephen Fisher (see AUTHORS file) * - * $Id: export_object_http.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/export_object_smb.c wireshark-1.10.6/ui/export_object_smb.c --- wireshark-1.10.5/ui/export_object_smb.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/export_object_smb.c 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ * * Copyright 2010, David Perez & Jose Pico from TADDONG S.L. * - * $Id: export_object_smb.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -254,7 +254,7 @@ /* ...then, put the chunk of the file in the right place */ if (!file->is_out_of_memory) { dest_memory_addr = entry->payload_data + chunk_offset; - g_memmove(dest_memory_addr, eo_info->payload_data, eo_info->payload_len); + memmove(dest_memory_addr, eo_info->payload_data, eo_info->payload_len); } } diff -Nru wireshark-1.10.5/ui/file_dialog.h wireshark-1.10.6/ui/file_dialog.h --- wireshark-1.10.5/ui/file_dialog.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/file_dialog.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* file_dialog.h * Common file dialog definitions * - * $Id: file_dialog.h 45764 2012-10-24 15:52:17Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/about_dlg.c wireshark-1.10.6/ui/gtk/about_dlg.c --- wireshark-1.10.5/ui/gtk/about_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/about_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* about_dlg.c * - * $Id: about_dlg.c 48797 2013-04-09 02:48:03Z morriss $ + * $Id$ * * Ulf Lamping * @@ -324,7 +324,7 @@ "Wireshark is Open Source Software released under the GNU General Public License.\n" "\n" "Check the man page and http://www.wireshark.org for more information.", - wireshark_svnversion, get_copyright_info(), comp_info_str->str, + wireshark_gitversion, get_copyright_info(), comp_info_str->str, runtime_info_str->str); msg_label = gtk_label_new(message); diff -Nru wireshark-1.10.5/ui/gtk/about_dlg.h wireshark-1.10.6/ui/gtk/about_dlg.h --- wireshark-1.10.5/ui/gtk/about_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/about_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* about_dlg.h * Declarations of routines for the "About" dialog * - * $Id: about_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/addr_resolution_dlg.c wireshark-1.10.6/ui/gtk/addr_resolution_dlg.c --- wireshark-1.10.5/ui/gtk/addr_resolution_dlg.c 2013-09-29 12:28:13.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/addr_resolution_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2012 Anders Broman * - * $Id: addr_resolution_dlg.c 52263 2013-09-29 12:22:40Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/addr_resolution_dlg.h wireshark-1.10.6/ui/gtk/addr_resolution_dlg.h --- wireshark-1.10.5/ui/gtk/addr_resolution_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/addr_resolution_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* addr_resolution_dlg.h * Show current addres resolution as a hosts file * - * $Id: addr_resolution_dlg.h 46307 2012-11-30 14:57:50Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/afp_stat.c wireshark-1.10.6/ui/gtk/afp_stat.c --- wireshark-1.10.5/ui/gtk/afp_stat.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/afp_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Based on * smb_stat 2003 Ronnie Sahlberg * - * $Id: afp_stat.c 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/airpcap_dlg.c wireshark-1.10.6/ui/gtk/airpcap_dlg.c --- wireshark-1.10.5/ui/gtk/airpcap_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/airpcap_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* airpcap_dlg.c * - * $Id: airpcap_dlg.c 48903 2013-04-17 19:52:20Z eapache $ + * $Id$ * * Giorgio Tino * Copyright (c) CACE Technologies, LLC 2006 diff -Nru wireshark-1.10.5/ui/gtk/airpcap_dlg.h wireshark-1.10.6/ui/gtk/airpcap_dlg.h --- wireshark-1.10.5/ui/gtk/airpcap_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/airpcap_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* airpcap_dlg.h * Declarations of routines for the "Airpcap" dialog * - * $Id: airpcap_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Giorgio Tino * Copyright (c) CACE Technologies, LLC 2006 diff -Nru wireshark-1.10.5/ui/gtk/airpcap_gui_utils.c wireshark-1.10.6/ui/gtk/airpcap_gui_utils.c --- wireshark-1.10.5/ui/gtk/airpcap_gui_utils.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/airpcap_gui_utils.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* airpcap_gui_utils.c * - * $Id: airpcap_gui_utils.c 48202 2013-03-08 22:10:06Z etxrab $ + * $Id$ * * Giorgio Tino * Copyright (c) CACE Technologies, LLC 2006 diff -Nru wireshark-1.10.5/ui/gtk/airpcap_gui_utils.h wireshark-1.10.6/ui/gtk/airpcap_gui_utils.h --- wireshark-1.10.5/ui/gtk/airpcap_gui_utils.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/airpcap_gui_utils.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* airpcap_utils.h * Declarations of utility routines for the "Airpcap" dialog widgets * - * $Id: airpcap_gui_utils.h 48903 2013-04-17 19:52:20Z eapache $ + * $Id$ * * Giorgio Tino * Copyright (c) CACE Technologies, LLC 2006 diff -Nru wireshark-1.10.5/ui/gtk/ansi_a_stat.c wireshark-1.10.6/ui/gtk/ansi_a_stat.c --- wireshark-1.10.5/ui/gtk/ansi_a_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/ansi_a_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * MUCH code modified from service_response_time_table.c. * - * $Id: ansi_a_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/ansi_map_stat.c wireshark-1.10.6/ui/gtk/ansi_map_stat.c --- wireshark-1.10.5/ui/gtk/ansi_map_stat.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/ansi_map_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * MUCH code modified from service_response_time_table.c. * - * $Id: ansi_map_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/bootp_stat.c wireshark-1.10.6/ui/gtk/bootp_stat.c --- wireshark-1.10.5/ui/gtk/bootp_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/bootp_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* bootp_stat.c * boop_stat 2003 Jean-Michel FAYARD * - * $Id: bootp_stat.c 48606 2013-03-28 06:36:44Z jake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/bytes_view.c wireshark-1.10.6/ui/gtk/bytes_view.c --- wireshark-1.10.5/ui/gtk/bytes_view.c 2013-09-29 12:28:13.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/bytes_view.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* bytes_view.c * - * $Id: bytes_view.c 52263 2013-09-29 12:22:40Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/bytes_view.h wireshark-1.10.6/ui/gtk/bytes_view.h --- wireshark-1.10.5/ui/gtk/bytes_view.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/bytes_view.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* bytes_view.h * - * $Id: bytes_view.h 44536 2012-08-15 23:22:20Z jmayer $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/camel_counter.c wireshark-1.10.6/ui/gtk/camel_counter.c --- wireshark-1.10.5/ui/gtk/camel_counter.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/camel_counter.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * camel message counter for Wireshark * Copyright 2006 Florent Drouin (based on h225_counter.c from Lars Roland) * - * $Id: camel_counter.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/camel_srt.c wireshark-1.10.6/ui/gtk/camel_srt.c --- wireshark-1.10.5/ui/gtk/camel_srt.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/camel_srt.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * camel Service Response Time statistics for Wireshark * Copyright 2006 Florent Drouin (based on h225_ras_srt.c from Lars Roland) * - * $Id: camel_srt.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/capture_dlg.c wireshark-1.10.6/ui/gtk/capture_dlg.c --- wireshark-1.10.5/ui/gtk/capture_dlg.c 2013-12-18 16:37:22.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/capture_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for the "Capture Options" dialog and dialog windows popped * up from it * - * $Id: capture_dlg.c 54225 2013-12-18 16:31:29Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -4866,7 +4866,6 @@ } } if (global_capture_opts.default_options.cfilter && (strlen(global_capture_opts.default_options.cfilter) > 0)) { -fprintf(stderr, "Adding the default filter \"%s\"???\n", global_capture_opts.default_options.cfilter); gtk_combo_box_text_prepend_text(GTK_COMBO_BOX_TEXT(all_filter_cm), global_capture_opts.default_options.cfilter); gtk_combo_box_set_active(GTK_COMBO_BOX(all_filter_cm), 0); } diff -Nru wireshark-1.10.5/ui/gtk/capture_dlg.h wireshark-1.10.6/ui/gtk/capture_dlg.h --- wireshark-1.10.5/ui/gtk/capture_dlg.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/capture_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for the "Capture Options" dialog and dialog windows popped * up from it * - * $Id: capture_dlg.h 46780 2012-12-26 12:24:55Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/capture_file_dlg.c wireshark-1.10.6/ui/gtk/capture_file_dlg.c --- wireshark-1.10.5/ui/gtk/capture_file_dlg.c 2013-06-05 04:57:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/capture_file_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_file_dlg.c * Dialog boxes for handling capture files * - * $Id: capture_file_dlg.c 49781 2013-06-05 04:51:03Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/capture_file_dlg.h wireshark-1.10.6/ui/gtk/capture_file_dlg.h --- wireshark-1.10.5/ui/gtk/capture_file_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/capture_file_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_file_dlg.h * Definitions for dialog boxes for handling files * - * $Id: capture_file_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/capture_if_details_dlg_win32.c wireshark-1.10.6/ui/gtk/capture_if_details_dlg_win32.c --- wireshark-1.10.5/ui/gtk/capture_if_details_dlg_win32.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/capture_if_details_dlg_win32.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_if_details_dlg.c * Routines for capture interface details window (only Win32!) * - * $Id: capture_if_details_dlg_win32.c 47787 2013-02-21 01:00:44Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/capture_if_details_dlg_win32.h wireshark-1.10.6/ui/gtk/capture_if_details_dlg_win32.h --- wireshark-1.10.5/ui/gtk/capture_if_details_dlg_win32.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/capture_if_details_dlg_win32.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_if_details_dlg.h * Definitions for capture interface details window (only Win32!) * - * $Id: capture_if_details_dlg_win32.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/capture_if_dlg.c wireshark-1.10.6/ui/gtk/capture_if_dlg.c --- wireshark-1.10.5/ui/gtk/capture_if_dlg.c 2013-06-04 07:45:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/capture_if_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_if_dlg.c * Routines for the capture interface dialog * - * $Id: capture_if_dlg.c 49759 2013-06-04 07:37:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/capture_if_dlg.h wireshark-1.10.6/ui/gtk/capture_if_dlg.h --- wireshark-1.10.5/ui/gtk/capture_if_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/capture_if_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_if_dlg.h * Definitions for packet capture interface windows * - * $Id: capture_if_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/capture_info_dlg.c wireshark-1.10.6/ui/gtk/capture_info_dlg.c --- wireshark-1.10.5/ui/gtk/capture_info_dlg.c 2013-06-04 07:45:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/capture_info_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_info_dlg.c * Routines for packet capture info dialog * - * $Id: capture_info_dlg.c 49759 2013-06-04 07:37:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/cfilter_combo_utils.h wireshark-1.10.6/ui/gtk/cfilter_combo_utils.h --- wireshark-1.10.5/ui/gtk/cfilter_combo_utils.h 2013-07-27 22:50:28.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/cfilter_combo_utils.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* cfilter_combo_utils.h * Capture filter combo box routines * - * $Id: cfilter_combo_utils.h 50957 2013-07-27 22:44:41Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/CMakeLists.txt wireshark-1.10.6/ui/gtk/CMakeLists.txt --- wireshark-1.10.5/ui/gtk/CMakeLists.txt 2013-07-28 17:34:24.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/CMakeLists.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 50980 2013-07-28 17:28:26Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/color_dlg.c wireshark-1.10.6/ui/gtk/color_dlg.c --- wireshark-1.10.5/ui/gtk/color_dlg.c 2013-06-04 19:20:37.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/color_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* color_dlg.c * Definitions for dialog boxes for color filters * - * $Id: color_dlg.c 49769 2013-06-04 19:04:22Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/color_dlg.h wireshark-1.10.6/ui/gtk/color_dlg.h --- wireshark-1.10.5/ui/gtk/color_dlg.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/color_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* color_dlg.h * Definitions for dialog boxes for color filters * - * $Id: color_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/color_edit_dlg.c wireshark-1.10.6/ui/gtk/color_edit_dlg.c --- wireshark-1.10.5/ui/gtk/color_edit_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/color_edit_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* color_edit_dlg.c * Definitions for single color filter edit dialog boxes * - * $Id: color_edit_dlg.c 48606 2013-03-28 06:36:44Z jake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/color_edit_dlg.h wireshark-1.10.6/ui/gtk/color_edit_dlg.h --- wireshark-1.10.5/ui/gtk/color_edit_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/color_edit_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* color_edit_dlg.h * Definitions for dialog boxes for color filters * - * $Id: color_edit_dlg.h 47976 2013-03-01 16:31:42Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/color_utils.c wireshark-1.10.6/ui/gtk/color_utils.c --- wireshark-1.10.5/ui/gtk/color_utils.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/color_utils.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* color_utils.c * Toolkit-dependent implementations of routines to handle colors. * - * $Id: color_utils.c 46932 2013-01-04 17:07:26Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/color_utils.h wireshark-1.10.6/ui/gtk/color_utils.h --- wireshark-1.10.5/ui/gtk/color_utils.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/color_utils.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* colors.h * Definitions for color structures and routines * - * $Id: color_utils.h 46932 2013-01-04 17:07:26Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/compare_stat.c wireshark-1.10.6/ui/gtk/compare_stat.c --- wireshark-1.10.5/ui/gtk/compare_stat.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/compare_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2008 Vincenzo Condoleo, Christophe Dirac, Reto Ruoss * supported by HSR (Hochschule Rapperswil) * - * $Id: compare_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/conversations_eth.c wireshark-1.10.6/ui/gtk/conversations_eth.c --- wireshark-1.10.5/ui/gtk/conversations_eth.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/conversations_eth.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* conversations_eth.c * conversations_eth 2003 Ronnie Sahlberg * - * $Id: conversations_eth.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/conversations_fc.c wireshark-1.10.6/ui/gtk/conversations_fc.c --- wireshark-1.10.5/ui/gtk/conversations_fc.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/conversations_fc.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* conversations_fc.c * conversations_fc 2003 Ronnie Sahlberg * - * $Id: conversations_fc.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/conversations_fddi.c wireshark-1.10.6/ui/gtk/conversations_fddi.c --- wireshark-1.10.5/ui/gtk/conversations_fddi.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/conversations_fddi.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* conversations_fddi.c * conversations_fddi 2003 Ronnie Sahlberg * - * $Id: conversations_fddi.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/conversations_ip.c wireshark-1.10.6/ui/gtk/conversations_ip.c --- wireshark-1.10.5/ui/gtk/conversations_ip.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/conversations_ip.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* conversations_ip.c * conversations_ip 2003 Ronnie Sahlberg * - * $Id: conversations_ip.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/conversations_ipv6.c wireshark-1.10.6/ui/gtk/conversations_ipv6.c --- wireshark-1.10.5/ui/gtk/conversations_ipv6.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/conversations_ipv6.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* conversations_ipv6.c 2009 Clif Bratcher * Modified from conversations_ip 2003 Ronnie Sahlberg * - * $Id: conversations_ipv6.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/conversations_ipx.c wireshark-1.10.6/ui/gtk/conversations_ipx.c --- wireshark-1.10.5/ui/gtk/conversations_ipx.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/conversations_ipx.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* conversations_ipx.c * conversations_ipx 2003 Ronnie Sahlberg * - * $Id: conversations_ipx.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/conversations_jxta.c wireshark-1.10.6/ui/gtk/conversations_jxta.c --- wireshark-1.10.5/ui/gtk/conversations_jxta.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/conversations_jxta.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * conversations_jxta copyright (c) 2005 Mike Duigou * copied from conversations_sctp.c * - * $Id: conversations_jxta.c 46402 2012-12-05 15:56:36Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/conversations_ncp.c wireshark-1.10.6/ui/gtk/conversations_ncp.c --- wireshark-1.10.5/ui/gtk/conversations_ncp.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/conversations_ncp.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* conversations_ncp.c 2005 Greg Morris * modified from conversations_eth.c 2003 Ronnie Sahlberg * - * $Id: conversations_ncp.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/conversations_rsvp.c wireshark-1.10.6/ui/gtk/conversations_rsvp.c --- wireshark-1.10.5/ui/gtk/conversations_rsvp.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/conversations_rsvp.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* conversations_rsvp.c * conversations_rsvp.c August 2005, Manu Pathak * - * $Id: conversations_rsvp.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/conversations_sctp.c wireshark-1.10.6/ui/gtk/conversations_sctp.c --- wireshark-1.10.5/ui/gtk/conversations_sctp.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/conversations_sctp.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* conversations_sctp.c * conversations_sctp 2005 Oleg Terletsky * - * $Id: conversations_sctp.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/conversations_table.c wireshark-1.10.6/ui/gtk/conversations_table.c --- wireshark-1.10.5/ui/gtk/conversations_table.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/conversations_table.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * conversations_table 2003 Ronnie Sahlberg * Helper routines common to all endpoint conversations tap. * - * $Id: conversations_table.c 48459 2013-03-21 18:39:16Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/conversations_table.h wireshark-1.10.6/ui/gtk/conversations_table.h --- wireshark-1.10.5/ui/gtk/conversations_table.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/conversations_table.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * conversations_table 2003 Ronnie Sahlberg * Helper routines common to all conversations taps. * - * $Id: conversations_table.h 46027 2012-11-14 02:53:41Z martinm $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/conversations_tcpip.c wireshark-1.10.6/ui/gtk/conversations_tcpip.c --- wireshark-1.10.5/ui/gtk/conversations_tcpip.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/conversations_tcpip.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* conversations_tcpip.c * conversations_tcpip 2003 Ronnie Sahlberg * - * $Id: conversations_tcpip.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/conversations_tr.c wireshark-1.10.6/ui/gtk/conversations_tr.c --- wireshark-1.10.5/ui/gtk/conversations_tr.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/conversations_tr.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* conversations_tr.c * conversations_tr 2003 Ronnie Sahlberg * - * $Id: conversations_tr.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/conversations_udpip.c wireshark-1.10.6/ui/gtk/conversations_udpip.c --- wireshark-1.10.5/ui/gtk/conversations_udpip.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/conversations_udpip.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* conversations_udpip.c * conversations_udpip 2003 Ronnie Sahlberg * - * $Id: conversations_udpip.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/conversations_usb.c wireshark-1.10.6/ui/gtk/conversations_usb.c --- wireshark-1.10.5/ui/gtk/conversations_usb.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/conversations_usb.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* conversations_usb.c 2007 Jon Smirl * modified from conversations_eth.c 2003 Ronnie Sahlberg * - * $Id: conversations_usb.c 46402 2012-12-05 15:56:36Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/conversations_wlan.c wireshark-1.10.6/ui/gtk/conversations_wlan.c --- wireshark-1.10.5/ui/gtk/conversations_wlan.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/conversations_wlan.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* conversations_wlan.c 2004 Giles Scott * modified from conversations_eth.c 2003 Ronnie Sahlberg * - * $Id: conversations_wlan.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/dcerpc_stat.c wireshark-1.10.6/ui/gtk/dcerpc_stat.c --- wireshark-1.10.5/ui/gtk/dcerpc_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/dcerpc_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* dcerpc_stat.c * dcerpc_stat 2002 Ronnie Sahlberg * - * $Id: dcerpc_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/decode_as_ber.c wireshark-1.10.6/ui/gtk/decode_as_ber.c --- wireshark-1.10.5/ui/gtk/decode_as_ber.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/decode_as_ber.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* decode_as_ber.c * - * $Id: decode_as_ber.c 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * Routines to modify BER decoding on the fly. * diff -Nru wireshark-1.10.5/ui/gtk/decode_as_ber.h wireshark-1.10.6/ui/gtk/decode_as_ber.h --- wireshark-1.10.5/ui/gtk/decode_as_ber.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/decode_as_ber.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* decode_as_ber.h * - * $Id: decode_as_ber.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Routines to modify BER decoding on the fly. * Only internally used between decode_as_dlg and decode_as_ber diff -Nru wireshark-1.10.5/ui/gtk/decode_as_dcerpc.c wireshark-1.10.6/ui/gtk/decode_as_dcerpc.c --- wireshark-1.10.5/ui/gtk/decode_as_dcerpc.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/decode_as_dcerpc.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* decode_as_dcerpc.c * - * $Id: decode_as_dcerpc.c 48202 2013-03-08 22:10:06Z etxrab $ + * $Id$ * * Routines to modify dcerpc bindings on the fly. * diff -Nru wireshark-1.10.5/ui/gtk/decode_as_dcerpc.h wireshark-1.10.6/ui/gtk/decode_as_dcerpc.h --- wireshark-1.10.5/ui/gtk/decode_as_dcerpc.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/decode_as_dcerpc.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* decode_as_dcerpc.h * - * $Id: decode_as_dcerpc.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Routines to modify dcerpc bindings on the fly. * Only internally used between decode_as_dlg and decode_as_dcerpc diff -Nru wireshark-1.10.5/ui/gtk/decode_as_dlg.c wireshark-1.10.6/ui/gtk/decode_as_dlg.c --- wireshark-1.10.5/ui/gtk/decode_as_dlg.c 2013-11-28 16:57:24.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/decode_as_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* decode_as_dlg.c * - * $Id: decode_as_dlg.c 53627 2013-11-28 16:51:08Z mmann $ + * $Id$ * * Routines to modify dissector tables on the fly. * diff -Nru wireshark-1.10.5/ui/gtk/decode_as_dlg.h wireshark-1.10.6/ui/gtk/decode_as_dlg.h --- wireshark-1.10.5/ui/gtk/decode_as_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/decode_as_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* decode_as_dlg.h * - * $Id: decode_as_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Routines to modify dissector tables on the fly. * diff -Nru wireshark-1.10.5/ui/gtk/dfilter_expr_dlg.c wireshark-1.10.6/ui/gtk/dfilter_expr_dlg.c --- wireshark-1.10.5/ui/gtk/dfilter_expr_dlg.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/dfilter_expr_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -7,7 +7,7 @@ * Copyright 2000, Jeffrey C. Foster and * Guy Harris * - * $Id: dfilter_expr_dlg.c 48212 2013-03-09 10:09:58Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/dfilter_expr_dlg.h wireshark-1.10.6/ui/gtk/dfilter_expr_dlg.h --- wireshark-1.10.5/ui/gtk/dfilter_expr_dlg.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/dfilter_expr_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* dfilter_expr_dlg.h * Definitions for dialog boxes for display filter expression construction * - * $Id: dfilter_expr_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/diameter_stat.c wireshark-1.10.6/ui/gtk/diameter_stat.c --- wireshark-1.10.5/ui/gtk/diameter_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/diameter_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ * * Based almost completely on gtp_stat by Kari Tiirikainen * - * $Id: diameter_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/dissector_tables_dlg.c wireshark-1.10.6/ui/gtk/dissector_tables_dlg.c --- wireshark-1.10.5/ui/gtk/dissector_tables_dlg.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/dissector_tables_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* dissector_tables_dlg.c * dissector_tables_dlg 2010 Anders Broman * - * $Id: dissector_tables_dlg.c 48212 2013-03-09 10:09:58Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/dissector_tables_dlg.h wireshark-1.10.6/ui/gtk/dissector_tables_dlg.h --- wireshark-1.10.5/ui/gtk/dissector_tables_dlg.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/dissector_tables_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* dissector_tables_dlg.h * dissector_tables_dlg 2010 Anders Broman * - * $Id: dissector_tables_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/dlg_utils.c wireshark-1.10.6/ui/gtk/dlg_utils.c --- wireshark-1.10.5/ui/gtk/dlg_utils.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/dlg_utils.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* dlg_utils.c * Utilities to use when constructing dialogs * - * $Id: dlg_utils.c 48467 2013-03-21 23:00:21Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/dlg_utils.h wireshark-1.10.6/ui/gtk/dlg_utils.h --- wireshark-1.10.5/ui/gtk/dlg_utils.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/dlg_utils.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* dlg_utils.h * Declarations of utilities to use when constructing dialogs * - * $Id: dlg_utils.h 47889 2013-02-25 23:35:13Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/doxygen.cfg.in wireshark-1.10.6/ui/gtk/doxygen.cfg.in --- wireshark-1.10.5/ui/gtk/doxygen.cfg.in 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/doxygen.cfg.in 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: doxygen.cfg.in 41652 2012-03-19 01:10:19Z morriss $ +# $Id$ # @configure_input@ # The PROJECT_NAME tag is a single word (or a sequence of words surrounded diff -Nru wireshark-1.10.5/ui/gtk/drag_and_drop.c wireshark-1.10.6/ui/gtk/drag_and_drop.c --- wireshark-1.10.5/ui/gtk/drag_and_drop.c 2013-06-04 07:45:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/drag_and_drop.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* drag_and_drop.c * Drag and Drop * - * $Id: drag_and_drop.c 49759 2013-06-04 07:37:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/drag_and_drop.h wireshark-1.10.6/ui/gtk/drag_and_drop.h --- wireshark-1.10.5/ui/gtk/drag_and_drop.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/drag_and_drop.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* drag_and_drop.h * - * $Id: drag_and_drop.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/edit_packet_comment_dlg.c wireshark-1.10.6/ui/gtk/edit_packet_comment_dlg.c --- wireshark-1.10.5/ui/gtk/edit_packet_comment_dlg.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/edit_packet_comment_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Dialog box for editing or adding packet comments. * Copyright 2012 Anders Broman * - * $Id: edit_packet_comment_dlg.c 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/edit_packet_comment_dlg.h wireshark-1.10.6/ui/gtk/edit_packet_comment_dlg.h --- wireshark-1.10.5/ui/gtk/edit_packet_comment_dlg.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/edit_packet_comment_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* edit_packet_comment_dlg.h * Dialog box for editing or adding packet comments. * - * $Id: edit_packet_comment_dlg.h 47780 2013-02-20 22:18:56Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/expert_comp_dlg.c wireshark-1.10.6/ui/gtk/expert_comp_dlg.c --- wireshark-1.10.5/ui/gtk/expert_comp_dlg.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/expert_comp_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* expert_comp_dlg.c * expert_comp_dlg 2005 Greg Morris * - * $Id: expert_comp_dlg.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/expert_comp_dlg.h wireshark-1.10.6/ui/gtk/expert_comp_dlg.h --- wireshark-1.10.5/ui/gtk/expert_comp_dlg.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/expert_comp_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* expert_comp_dlg.h * expert_comp_dlg 2005 Greg Morris * - * $Id: expert_comp_dlg.h 44852 2012-09-10 19:48:16Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/expert_comp_table.c wireshark-1.10.6/ui/gtk/expert_comp_table.c --- wireshark-1.10.5/ui/gtk/expert_comp_table.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/expert_comp_table.c 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ * Helper routines common to all composite expert statistics * tap. * - * $Id: expert_comp_table.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/expert_comp_table.h wireshark-1.10.6/ui/gtk/expert_comp_table.h --- wireshark-1.10.5/ui/gtk/expert_comp_table.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/expert_comp_table.h 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ * Helper routines common to all composite expert statistics * tap. * - * $Id: expert_comp_table.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/export_object_dlg.c wireshark-1.10.6/ui/gtk/export_object_dlg.c --- wireshark-1.10.5/ui/gtk/export_object_dlg.c 2013-06-05 04:57:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/export_object_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Common routines for tracking & saving objects found in streams of data * Copyright 2007, Stephen Fisher (see AUTHORS file) * - * $Id: export_object_dlg.c 49781 2013-06-05 04:51:03Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/export_object_dlg.h wireshark-1.10.6/ui/gtk/export_object_dlg.h --- wireshark-1.10.5/ui/gtk/export_object_dlg.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/export_object_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Common routines for tracking & saving objects found in streams of data * Copyright 2007, Stephen Fisher (see AUTHORS file) * - * $Id: export_object_dlg.h 45647 2012-10-18 21:14:43Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/export_sslkeys.c wireshark-1.10.6/ui/gtk/export_sslkeys.c --- wireshark-1.10.5/ui/gtk/export_sslkeys.c 2013-06-05 04:57:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/export_sslkeys.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* export_sslkeys.c * - * $Id: export_sslkeys.c 49781 2013-06-05 04:51:03Z etxrab $ + * $Id$ * * Export SSL Session Keys dialog * by Sake Blok (20110526) diff -Nru wireshark-1.10.5/ui/gtk/export_sslkeys.h wireshark-1.10.6/ui/gtk/export_sslkeys.h --- wireshark-1.10.5/ui/gtk/export_sslkeys.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/export_sslkeys.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* export_sslkeys.h * - * $Id: export_sslkeys.h 45589 2012-10-16 18:14:16Z gerald $ + * $Id$ * * Export SSL Session Keys dialog * by Sake Blok (20110526) diff -Nru wireshark-1.10.5/ui/gtk/fc_stat.c wireshark-1.10.6/ui/gtk/fc_stat.c --- wireshark-1.10.5/ui/gtk/fc_stat.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/fc_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* fc_stat.c * fc_stat 2003 Ronnie Sahlberg * - * $Id: fc_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/file_dlg.c wireshark-1.10.6/ui/gtk/file_dlg.c --- wireshark-1.10.5/ui/gtk/file_dlg.c 2013-06-05 04:57:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/file_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* file_dlg.c * Utilities to use when constructing file selection dialogs * - * $Id: file_dlg.c 49781 2013-06-05 04:51:03Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/file_dlg.h wireshark-1.10.6/ui/gtk/file_dlg.h --- wireshark-1.10.5/ui/gtk/file_dlg.h 2013-06-05 04:57:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/file_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* file_dlg.h * Declarations of utilities to use when constructing file selection dialogs * - * $Id: file_dlg.h 49781 2013-06-05 04:51:03Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/file_import_dlg.c wireshark-1.10.6/ui/gtk/file_import_dlg.c --- wireshark-1.10.5/ui/gtk/file_import_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/file_import_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Dialog to setup for import of a text file, like text2pcap * November 2010, Jaap Keuter * - * $Id: file_import_dlg.c 48745 2013-04-05 06:43:38Z ruengeler $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -461,7 +461,7 @@ os_info_str = g_string_new(""); get_os_version_info(os_info_str); - g_snprintf(appname, sizeof(appname), "Wireshark " VERSION "%s", wireshark_svnversion); + g_snprintf(appname, sizeof(appname), "Wireshark " VERSION "%s", wireshark_gitversion); shb_hdr = g_new(wtapng_section_t,1); shb_hdr->section_length = -1; diff -Nru wireshark-1.10.5/ui/gtk/file_import_dlg.h wireshark-1.10.6/ui/gtk/file_import_dlg.h --- wireshark-1.10.5/ui/gtk/file_import_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/file_import_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for file import dialog box * November 2010, Jaap Keuter * - * $Id: file_import_dlg.h 48424 2013-03-19 19:02:25Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/fileset_dlg.c wireshark-1.10.6/ui/gtk/fileset_dlg.c --- wireshark-1.10.5/ui/gtk/fileset_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/fileset_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* fileset_dlg.c * Routines for the file set dialog * - * $Id: fileset_dlg.c 48606 2013-03-28 06:36:44Z jake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/fileset_dlg.h wireshark-1.10.6/ui/gtk/fileset_dlg.h --- wireshark-1.10.5/ui/gtk/fileset_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/fileset_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* fileset_dlg.h * Definitions for the fileset dialog box * - * $Id: fileset_dlg.h 45163 2012-09-26 23:40:56Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/filter_autocomplete.c wireshark-1.10.6/ui/gtk/filter_autocomplete.c --- wireshark-1.10.5/ui/gtk/filter_autocomplete.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/filter_autocomplete.c 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ * With several usability improvements: * Copyright 2008, Stig Bjorlykke * - * $Id: filter_autocomplete.c 48217 2013-03-09 17:33:15Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/filter_autocomplete.h wireshark-1.10.6/ui/gtk/filter_autocomplete.h --- wireshark-1.10.5/ui/gtk/filter_autocomplete.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/filter_autocomplete.h 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2008, Bahaa Naamneh * - * $Id: filter_autocomplete.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/filter_dlg.c wireshark-1.10.6/ui/gtk/filter_dlg.c --- wireshark-1.10.5/ui/gtk/filter_dlg.c 2013-07-24 18:21:29.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/filter_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* filter_dlg.c * Dialog boxes for (display and capture) filter editing * - * $Id: filter_dlg.c 50871 2013-07-24 18:15:28Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/filter_dlg.h wireshark-1.10.6/ui/gtk/filter_dlg.h --- wireshark-1.10.5/ui/gtk/filter_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/filter_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* filter_dlg.h * Definitions for dialog boxes for filter editing * - * $Id: filter_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/filter_expression_save_dlg.c wireshark-1.10.6/ui/gtk/filter_expression_save_dlg.c --- wireshark-1.10.5/ui/gtk/filter_expression_save_dlg.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/filter_expression_save_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for "Filter Save" window * Submitted by Edwin Groothuis * - * $Id: filter_expression_save_dlg.c 48217 2013-03-09 17:33:15Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/filter_expression_save_dlg.h wireshark-1.10.6/ui/gtk/filter_expression_save_dlg.h --- wireshark-1.10.5/ui/gtk/filter_expression_save_dlg.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/filter_expression_save_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* filter_expression_save_dlg.h * Submitted by Edwin Groothuis * - * $Id: filter_expression_save_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/filter_utils.c wireshark-1.10.6/ui/gtk/filter_utils.c --- wireshark-1.10.5/ui/gtk/filter_utils.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/filter_utils.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* filter_utils.c * - * $Id: filter_utils.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/filter_utils.h wireshark-1.10.6/ui/gtk/filter_utils.h --- wireshark-1.10.5/ui/gtk/filter_utils.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/filter_utils.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* filter_utils.h * - * $Id: filter_utils.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/find_dlg.c wireshark-1.10.6/ui/gtk/find_dlg.c --- wireshark-1.10.5/ui/gtk/find_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/find_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* find_dlg.c * Routines for "find frame" window * - * $Id: find_dlg.c 48217 2013-03-09 17:33:15Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/find_dlg.h wireshark-1.10.6/ui/gtk/find_dlg.h --- wireshark-1.10.5/ui/gtk/find_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/find_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* find_dlg.h * Definitions for "find frame" window * - * $Id: find_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/firewall_dlg.c wireshark-1.10.6/ui/gtk/firewall_dlg.c --- wireshark-1.10.5/ui/gtk/firewall_dlg.c 2013-06-05 04:57:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/firewall_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* firewall_rules_dlg.c * - * $Id: firewall_dlg.c 49781 2013-06-05 04:51:03Z etxrab $ + * $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/ui/gtk/firewall_dlg.h wireshark-1.10.6/ui/gtk/firewall_dlg.h --- wireshark-1.10.5/ui/gtk/firewall_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/firewall_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* firewall_dlg.h * Produce ACL rules for various products from a packet. * - * $Id: firewall_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/flow_graph.c wireshark-1.10.6/ui/gtk/flow_graph.c --- wireshark-1.10.5/ui/gtk/flow_graph.c 2013-12-16 19:31:13.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/flow_graph.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ /* flow_graph.c - * $Id: flow_graph.c 54150 2013-12-16 19:25:16Z wmeier $ + * $Id$ * Allows to display a flow graph of the currently displayed packets * * Copyright 2004, Ericsson , Spain diff -Nru wireshark-1.10.5/ui/gtk/follow_ssl.c wireshark-1.10.6/ui/gtk/follow_ssl.c --- wireshark-1.10.5/ui/gtk/follow_ssl.c 2013-06-03 17:50:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/follow_ssl.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* follow_ssl.c * SSL specific routines for following traffic streams * - * $Id: follow_ssl.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/follow_ssl.h wireshark-1.10.6/ui/gtk/follow_ssl.h --- wireshark-1.10.5/ui/gtk/follow_ssl.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/follow_ssl.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* follow_ssl.h * SSL specific routines for following traffic streams * - * $Id: follow_ssl.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/follow_stream.c wireshark-1.10.6/ui/gtk/follow_stream.c --- wireshark-1.10.5/ui/gtk/follow_stream.c 2013-06-05 04:57:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/follow_stream.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* follow_stream.c * Common routines for following data streams * - * $Id: follow_stream.c 49781 2013-06-05 04:51:03Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/follow_stream.h wireshark-1.10.6/ui/gtk/follow_stream.h --- wireshark-1.10.5/ui/gtk/follow_stream.h 2013-06-05 04:57:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/follow_stream.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* follow_stream.h * Common routines for following data streams * - * $Id: follow_stream.h 49781 2013-06-05 04:51:03Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/follow_tcp.c wireshark-1.10.6/ui/gtk/follow_tcp.c --- wireshark-1.10.5/ui/gtk/follow_tcp.c 2013-10-10 19:56:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/follow_tcp.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* follow_tcp.c * TCP specific routines for following traffic streams * - * $Id: follow_tcp.c 52507 2013-10-10 19:50:30Z cmaynard $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/follow_tcp.h wireshark-1.10.6/ui/gtk/follow_tcp.h --- wireshark-1.10.5/ui/gtk/follow_tcp.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/follow_tcp.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* follow_tcp.h * TCP specific routines for following traffic streams * - * $Id: follow_tcp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/follow_udp.c wireshark-1.10.6/ui/gtk/follow_udp.c --- wireshark-1.10.5/ui/gtk/follow_udp.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/follow_udp.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* follow_udp.c * UDP specific routines for following traffic streams * - * $Id: follow_udp.c 48217 2013-03-09 17:33:15Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/follow_udp.h wireshark-1.10.6/ui/gtk/follow_udp.h --- wireshark-1.10.5/ui/gtk/follow_udp.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/follow_udp.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* follow_udp.h * UDP specific routines for following traffic streams * - * $Id: follow_udp.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/font_utils.c wireshark-1.10.6/ui/gtk/font_utils.c --- wireshark-1.10.5/ui/gtk/font_utils.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/font_utils.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* font_utils.c * Utilities to use for font manipulation * - * $Id: font_utils.c 47240 2013-01-24 01:10:12Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/font_utils.h wireshark-1.10.6/ui/gtk/font_utils.h --- wireshark-1.10.5/ui/gtk/font_utils.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/font_utils.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* font_utils.h * Declarations of utilities to use for font manipulation * - * $Id: font_utils.h 43729 2012-07-15 20:29:22Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/funnel_stat.c wireshark-1.10.6/ui/gtk/funnel_stat.c --- wireshark-1.10.5/ui/gtk/funnel_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/funnel_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * (c) 2006, Luis E. Garcia Ontanon * - * $Id: funnel_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/goto_dlg.c wireshark-1.10.6/ui/gtk/goto_dlg.c --- wireshark-1.10.5/ui/gtk/goto_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/goto_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* goto_dlg.c * Routines for "go to packet" window * - * $Id: goto_dlg.c 48217 2013-03-09 17:33:15Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/goto_dlg.h wireshark-1.10.6/ui/gtk/goto_dlg.h --- wireshark-1.10.5/ui/gtk/goto_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/goto_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* goto_dlg.h * Definitions for "go to frame" window * - * $Id: goto_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/graph_analysis.c wireshark-1.10.6/ui/gtk/graph_analysis.c --- wireshark-1.10.5/ui/gtk/graph_analysis.c 2013-12-13 20:37:22.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/graph_analysis.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* graph_analysis.c * Graphic Analysis addition for Wireshark * - * $Id: graph_analysis.c 54059 2013-12-13 20:31:28Z gerald $ + * $Id$ * * Copyright 2004, Verso Technologies Inc. * By Alejandro Vaquero diff -Nru wireshark-1.10.5/ui/gtk/graph_analysis.h wireshark-1.10.6/ui/gtk/graph_analysis.h --- wireshark-1.10.5/ui/gtk/graph_analysis.h 2013-06-05 04:57:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/graph_analysis.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* graph_analysis.h * Graphic Analysis addition for Wireshark * - * $Id: graph_analysis.h 49781 2013-06-05 04:51:03Z etxrab $ + * $Id$ * * Copyright 2004, Verso Technologies Inc. * By Alejandro Vaquero diff -Nru wireshark-1.10.5/ui/gtk/gsm_a_stat.c wireshark-1.10.6/ui/gtk/gsm_a_stat.c --- wireshark-1.10.5/ui/gtk/gsm_a_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/gsm_a_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * MUCH code modified from service_response_time_table.c. * - * $Id: gsm_a_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/gsm_map_stat.c wireshark-1.10.6/ui/gtk/gsm_map_stat.c --- wireshark-1.10.5/ui/gtk/gsm_map_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/gsm_map_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * MUCH code modified from service_response_time_table.c. * - * $Id: gsm_map_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/gsm_map_stat.h wireshark-1.10.6/ui/gtk/gsm_map_stat.h --- wireshark-1.10.5/ui/gtk/gsm_map_stat.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/gsm_map_stat.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* gsm_map_stat.h * - * $Id: gsm_map_stat.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Copyright 2004, Michael Lum , * In association with Telos Technology Inc. diff -Nru wireshark-1.10.5/ui/gtk/gsm_map_summary.c wireshark-1.10.6/ui/gtk/gsm_map_summary.c --- wireshark-1.10.5/ui/gtk/gsm_map_summary.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/gsm_map_summary.c 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ * * Modified from summary_dlg.c * - * $Id: gsm_map_summary.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/gtkglobals.h wireshark-1.10.6/ui/gtk/gtkglobals.h --- wireshark-1.10.5/ui/gtk/gtkglobals.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/gtkglobals.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* gtkglobals.h * GTK-related Global defines, etc. * - * $Id: gtkglobals.h 47139 2013-01-18 00:50:14Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/gtk_iface_monitor.c wireshark-1.10.6/ui/gtk/gtk_iface_monitor.c --- wireshark-1.10.5/ui/gtk/gtk_iface_monitor.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/gtk_iface_monitor.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* gtk_iface_monitor.c * interface monitor by Pontus Fuchs * - * $Id: gtk_iface_monitor.c 48880 2013-04-16 15:12:38Z ruengeler $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/gtk_iface_monitor.h wireshark-1.10.6/ui/gtk/gtk_iface_monitor.h --- wireshark-1.10.5/ui/gtk/gtk_iface_monitor.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/gtk_iface_monitor.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* gtk_iface_monitor.h * interface monitor by Pontus Fuchs * - * $Id: gtk_iface_monitor.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/gtp_stat.c wireshark-1.10.6/ui/gtk/gtp_stat.c --- wireshark-1.10.5/ui/gtk/gtp_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/gtp_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * gtp_stat 2008 Kari Tiirikainen * Largely based on ldap_stat by Ronnie Sahlberg, all mistakes added by KTi * - * $Id: gtp_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/gui_stat_menu.h wireshark-1.10.6/ui/gtk/gui_stat_menu.h --- wireshark-1.10.5/ui/gtk/gui_stat_menu.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/gui_stat_menu.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* gui_stat_menu.h * GTK+-specific menu definitions for use by stats * - * $Id: gui_stat_menu.h 48855 2013-04-15 18:25:04Z martinm $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/gui_stat_util.c wireshark-1.10.6/ui/gtk/gui_stat_util.c --- wireshark-1.10.5/ui/gtk/gui_stat_util.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/gui_stat_util.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * gui functions used by stats * Copyright 2003 Lars Roland * - * $Id: gui_stat_util.c 48232 2013-03-10 16:56:40Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/gui_stat_util.h wireshark-1.10.6/ui/gtk/gui_stat_util.h --- wireshark-1.10.5/ui/gtk/gui_stat_util.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/gui_stat_util.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * gui functions used by stats * Copyright 2003 Lars Roland * - * $Id: gui_stat_util.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/gui_utils.c wireshark-1.10.6/ui/gtk/gui_utils.c --- wireshark-1.10.5/ui/gtk/gui_utils.c 2013-07-17 01:50:17.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/gui_utils.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * and some with GUI-independent APIs, with this file containing the GTK+ * implementations of them (declared in ui_util.h) * - * $Id: gui_utils.c 50688 2013-07-17 01:34:46Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/gui_utils.h wireshark-1.10.6/ui/gtk/gui_utils.h --- wireshark-1.10.5/ui/gtk/gui_utils.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/gui_utils.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* gui_utils.h * Declarations of GTK+-specific UI utility routines * - * $Id: gui_utils.h 48606 2013-03-28 06:36:44Z jake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/h225_counter.c wireshark-1.10.6/ui/gtk/h225_counter.c --- wireshark-1.10.5/ui/gtk/h225_counter.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/h225_counter.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * H.225 message counter for Wireshark * Copyright 2003 Lars Roland * - * $Id: h225_counter.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/h225_ras_srt.c wireshark-1.10.6/ui/gtk/h225_ras_srt.c --- wireshark-1.10.5/ui/gtk/h225_ras_srt.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/h225_ras_srt.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * H.225 RAS Service Response Time statistics for Wireshar * Copyright 2003 Lars Roland * - * $Id: h225_ras_srt.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/help_dlg.c wireshark-1.10.6/ui/gtk/help_dlg.c --- wireshark-1.10.5/ui/gtk/help_dlg.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/help_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* help_dlg.c * - * $Id: help_dlg.c 45594 2012-10-16 19:47:43Z gerald $ + * $Id$ * * Laurent Deniel * diff -Nru wireshark-1.10.5/ui/gtk/help_dlg.h wireshark-1.10.6/ui/gtk/help_dlg.h --- wireshark-1.10.5/ui/gtk/help_dlg.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/help_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* help_dlg.h * - * $Id: help_dlg.h 44987 2012-09-18 21:51:22Z gerald $ + * $Id$ * * Laurent Deniel * diff -Nru wireshark-1.10.5/ui/gtk/hostlist_eth.c wireshark-1.10.6/ui/gtk/hostlist_eth.c --- wireshark-1.10.5/ui/gtk/hostlist_eth.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/hostlist_eth.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* hostlist_eth.c 2004 Ian Schorr * modified from endpoint_talkers_eth.c 2003 Ronnie Sahlberg * - * $Id: hostlist_eth.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/hostlist_fc.c wireshark-1.10.6/ui/gtk/hostlist_fc.c --- wireshark-1.10.5/ui/gtk/hostlist_fc.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/hostlist_fc.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* hostlist_fc.c 2004 Ian Schorr * modified from endpoint_talkers_fc.c 2003 Ronnie Sahlberg * - * $Id: hostlist_fc.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/hostlist_fddi.c wireshark-1.10.6/ui/gtk/hostlist_fddi.c --- wireshark-1.10.5/ui/gtk/hostlist_fddi.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/hostlist_fddi.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* hostlist_fddi.c 2004 Ian Schorr * modified from endpoint_talkers_fddi.c 2003 Ronnie Sahlberg * - * $Id: hostlist_fddi.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/hostlist_ip.c wireshark-1.10.6/ui/gtk/hostlist_ip.c --- wireshark-1.10.5/ui/gtk/hostlist_ip.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/hostlist_ip.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* hostlist_ip.c 2004 Ian Schorr * modified from endpoint_talkers_ip.c 2003 Ronnie Sahlberg * - * $Id: hostlist_ip.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/hostlist_ipv6.c wireshark-1.10.6/ui/gtk/hostlist_ipv6.c --- wireshark-1.10.5/ui/gtk/hostlist_ipv6.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/hostlist_ipv6.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Modified from hostlist_ip.c 2004 Ian Schorr * modified from endpoint_talkers_ip.c 2003 Ronnie Sahlberg * - * $Id: hostlist_ipv6.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/hostlist_ipx.c wireshark-1.10.6/ui/gtk/hostlist_ipx.c --- wireshark-1.10.5/ui/gtk/hostlist_ipx.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/hostlist_ipx.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* hostlist_ipx.c 2004 Ian Schorr * modified from endpoint_talkers_ipx.c 2003 Ronnie Sahlberg * - * $Id: hostlist_ipx.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/hostlist_jxta.c wireshark-1.10.6/ui/gtk/hostlist_jxta.c --- wireshark-1.10.5/ui/gtk/hostlist_jxta.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/hostlist_jxta.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* hostlist_jxta.c 2005 Mike Duigou * modified from hostlist_eth.c 2004 Ian Schorr * - * $Id: hostlist_jxta.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/hostlist_ncp.c wireshark-1.10.6/ui/gtk/hostlist_ncp.c --- wireshark-1.10.5/ui/gtk/hostlist_ncp.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/hostlist_ncp.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* hostlist_ncp.c 2006 Greg Morris * modified from endpoint_talkers_eth.c 2003 Ronnie Sahlberg * - * $Id: hostlist_ncp.c 46402 2012-12-05 15:56:36Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/hostlist_rsvp.c wireshark-1.10.6/ui/gtk/hostlist_rsvp.c --- wireshark-1.10.5/ui/gtk/hostlist_rsvp.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/hostlist_rsvp.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* hostlist_rsvp.c * hostlist_rsvp.c August 2005, Manu Pathak * - * $Id: hostlist_rsvp.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/hostlist_sctp.c wireshark-1.10.6/ui/gtk/hostlist_sctp.c --- wireshark-1.10.5/ui/gtk/hostlist_sctp.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/hostlist_sctp.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* hostlist_sctp.c 2008 Stig Bjorlykke * - * $Id: hostlist_sctp.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/hostlist_table.c wireshark-1.10.6/ui/gtk/hostlist_table.c --- wireshark-1.10.5/ui/gtk/hostlist_table.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/hostlist_table.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * modified from endpoint_talkers_table.c 2003 Ronnie Sahlberg * Helper routines common to all host list taps. * - * $Id: hostlist_table.c 48459 2013-03-21 18:39:16Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/hostlist_table.h wireshark-1.10.6/ui/gtk/hostlist_table.h --- wireshark-1.10.5/ui/gtk/hostlist_table.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/hostlist_table.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * modified from endpoint_talkers_table 2003 Ronnie Sahlberg * Helper routines common to all host talkers taps. * - * $Id: hostlist_table.h 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/hostlist_tcpip.c wireshark-1.10.6/ui/gtk/hostlist_tcpip.c --- wireshark-1.10.5/ui/gtk/hostlist_tcpip.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/hostlist_tcpip.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* hostlist_tcpip.c 2004 Ian Schorr * modified from endpoint_talkers_tcpip.c 2003 Ronnie Sahlberg * - * $Id: hostlist_tcpip.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/hostlist_tr.c wireshark-1.10.6/ui/gtk/hostlist_tr.c --- wireshark-1.10.5/ui/gtk/hostlist_tr.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/hostlist_tr.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* hostlist_tr.c 2004 Ian Schorr * modified from endpoint_talkers_tr.c 2003 Ronnie Sahlberg * - * $Id: hostlist_tr.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/hostlist_udpip.c wireshark-1.10.6/ui/gtk/hostlist_udpip.c --- wireshark-1.10.5/ui/gtk/hostlist_udpip.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/hostlist_udpip.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* hostlist_udpip.c 2004 Ian Schorr * modified from endpoint_talkers_udpip.c 2003 Ronnie Sahlberg * - * $Id: hostlist_udpip.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/hostlist_usb.c wireshark-1.10.6/ui/gtk/hostlist_usb.c --- wireshark-1.10.5/ui/gtk/hostlist_usb.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/hostlist_usb.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* hostlist_usb.c 2007 Jon Smirl * modified from endpoint_talkers_eth.c 2003 Ronnie Sahlberg * - * $Id: hostlist_usb.c 46402 2012-12-05 15:56:36Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/hostlist_wlan.c wireshark-1.10.6/ui/gtk/hostlist_wlan.c --- wireshark-1.10.5/ui/gtk/hostlist_wlan.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/hostlist_wlan.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* hostlist_wlan.c 2004 Giles Scott * modified from endpoint_talkers_eth.c 2003 Ronnie Sahlberg * - * $Id: hostlist_wlan.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/iax2_analysis.c wireshark-1.10.6/ui/gtk/iax2_analysis.c --- wireshark-1.10.5/ui/gtk/iax2_analysis.c 2013-06-05 04:57:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/iax2_analysis.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* iax2_analysis.c * IAX2 analysis addition for Wireshark * - * $Id: iax2_analysis.c 49781 2013-06-05 04:51:03Z etxrab $ + * $Id$ * * based on rtp_analysis.c * Copyright 2003, Alcatel Business Systems diff -Nru wireshark-1.10.5/ui/gtk/iax2_analysis.h wireshark-1.10.6/ui/gtk/iax2_analysis.h --- wireshark-1.10.5/ui/gtk/iax2_analysis.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/iax2_analysis.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* iax2_analysis.h * IAX2 analysis addition for Wireshark * - * $Id: iax2_analysis.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * based on rtp_analysis.c * Copyright 2003, Alcatel Business Systems diff -Nru wireshark-1.10.5/ui/gtk/io_stat.c wireshark-1.10.6/ui/gtk/io_stat.c --- wireshark-1.10.5/ui/gtk/io_stat.c 2013-09-07 00:36:13.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/io_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* io_stat.c * io_stat 2002 Ronnie Sahlberg * - * $Id: io_stat.c 51807 2013-09-07 00:30:29Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/keys.h wireshark-1.10.6/ui/gtk/keys.h --- wireshark-1.10.5/ui/gtk/keys.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/keys.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* keys.h * Key definitions for various objects * - * $Id: keys.h 45056 2012-09-22 20:09:55Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/ldap_stat.c wireshark-1.10.6/ui/gtk/ldap_stat.c --- wireshark-1.10.5/ui/gtk/ldap_stat.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/ldap_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* ldap_stat.c * ldap_stat 2003 Ronnie Sahlberg * - * $Id: ldap_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/mac_lte_stat_dlg.c wireshark-1.10.6/ui/gtk/mac_lte_stat_dlg.c --- wireshark-1.10.5/ui/gtk/mac_lte_stat_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/mac_lte_stat_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright 2009 Martin Mathieson * (originally based upon wlan_stat_dlg.c) * - * $Id: mac_lte_stat_dlg.c 48855 2013-04-15 18:25:04Z martinm $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/macros_dlg.c wireshark-1.10.6/ui/gtk/macros_dlg.c --- wireshark-1.10.5/ui/gtk/macros_dlg.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/macros_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* macros_dlg.c * - * $Id: macros_dlg.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/macros_dlg.h wireshark-1.10.6/ui/gtk/macros_dlg.h --- wireshark-1.10.5/ui/gtk/macros_dlg.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/macros_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* macros_dlg.h * - * $Id: macros_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/main_80211_toolbar.c wireshark-1.10.6/ui/gtk/main_80211_toolbar.c --- wireshark-1.10.5/ui/gtk/main_80211_toolbar.c 2013-06-04 07:45:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main_80211_toolbar.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* main_80211_toolbar.c * The 802.11 toolbar by Pontus Fuchs * - * $Id: main_80211_toolbar.c 49759 2013-06-04 07:37:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/main_80211_toolbar.h wireshark-1.10.6/ui/gtk/main_80211_toolbar.h --- wireshark-1.10.5/ui/gtk/main_80211_toolbar.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main_80211_toolbar.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* * Copyright 2012, Pontus Fuchs * - * $Id: main_80211_toolbar.h 43568 2012-07-05 02:01:43Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/main_airpcap_toolbar.c wireshark-1.10.6/ui/gtk/main_airpcap_toolbar.c --- wireshark-1.10.5/ui/gtk/main_airpcap_toolbar.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main_airpcap_toolbar.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* main_airpcap_toolbar.c * The airpcap toolbar * - * $Id: main_airpcap_toolbar.c 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/main_airpcap_toolbar.h wireshark-1.10.6/ui/gtk/main_airpcap_toolbar.h --- wireshark-1.10.5/ui/gtk/main_airpcap_toolbar.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main_airpcap_toolbar.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* main_airpcap_toolbar.h * Definitions for the airpcap toolbar routines * - * $Id: main_airpcap_toolbar.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/main.c wireshark-1.10.6/ui/gtk/main.c --- wireshark-1.10.5/ui/gtk/main.c 2013-07-17 23:27:24.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c 50712 2013-07-17 23:21:12Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -1142,7 +1142,7 @@ "See http://www.wireshark.org for more information.\n" "\n" "%s", - wireshark_svnversion, get_copyright_info()); + wireshark_gitversion, get_copyright_info()); } else { output = stderr; } @@ -1239,7 +1239,7 @@ "%s" "\n" "%s", - wireshark_svnversion, get_copyright_info(), comp_info_str->str, + wireshark_gitversion, get_copyright_info(), comp_info_str->str, runtime_info_str->str); } @@ -2249,7 +2249,7 @@ "%s" "\n" "%s", - wireshark_svnversion, comp_info_str->str, runtime_info_str->str); + wireshark_gitversion, comp_info_str->str, runtime_info_str->str); /* Start windows sockets */ WSAStartup( MAKEWORD( 1, 1 ), &wsaData ); @@ -2529,7 +2529,7 @@ prefs_p = read_configuration_files (&gdp_path, &dp_path); /* Removed thread code: - * http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=35027 + * https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9e277ae6154fd04bf6a0a34ec5655a73e5a736a3 */ /* this is to keep tap extensions updating once every 3 seconds */ diff -Nru wireshark-1.10.5/ui/gtk/main_filter_toolbar.c wireshark-1.10.6/ui/gtk/main_filter_toolbar.c --- wireshark-1.10.5/ui/gtk/main_filter_toolbar.c 2013-05-20 22:17:15.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main_filter_toolbar.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* main_filter_toolbar.c * The filter toolbar * - * $Id: main_filter_toolbar.c 49465 2013-05-20 22:07:30Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/main_filter_toolbar.h wireshark-1.10.6/ui/gtk/main_filter_toolbar.h --- wireshark-1.10.5/ui/gtk/main_filter_toolbar.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main_filter_toolbar.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for filter toolbar routines * Copyright 2003, Ulf Lamping * - * $Id: main_filter_toolbar.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/main.h wireshark-1.10.6/ui/gtk/main.h --- wireshark-1.10.5/ui/gtk/main.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* main.h * Global defines, etc. * - * $Id: main.h 47889 2013-02-25 23:35:13Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/main_menubar.c wireshark-1.10.6/ui/gtk/main_menubar.c --- wireshark-1.10.5/ui/gtk/main_menubar.c 2013-05-20 22:17:15.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main_menubar.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* main_menubar.c * Menu routines * - * $Id: main_menubar.c 49465 2013-05-20 22:07:30Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/main_menubar_private.h wireshark-1.10.6/ui/gtk/main_menubar_private.h --- wireshark-1.10.5/ui/gtk/main_menubar_private.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main_menubar_private.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* main_menubar_private.h * - * $Id: main_menubar_private.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/main_statusbar.c wireshark-1.10.6/ui/gtk/main_statusbar.c --- wireshark-1.10.5/ui/gtk/main_statusbar.c 2013-06-04 07:45:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main_statusbar.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* main_statusbar.c * - * $Id: main_statusbar.c 49759 2013-06-04 07:37:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/main_statusbar_private.h wireshark-1.10.6/ui/gtk/main_statusbar_private.h --- wireshark-1.10.5/ui/gtk/main_statusbar_private.h 2013-06-04 07:45:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main_statusbar_private.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* main_statusbar_private.h * - * $Id: main_statusbar_private.h 49759 2013-06-04 07:37:00Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/main_titlebar.c wireshark-1.10.6/ui/gtk/main_titlebar.c --- wireshark-1.10.5/ui/gtk/main_titlebar.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main_titlebar.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* main_titlebar.c * Main window title bar routines. * - * $Id: main_titlebar.c 48709 2013-04-02 20:35:46Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -78,7 +78,7 @@ if ((prefs.gui_version_placement == version_title_only) || (prefs.gui_version_placement == version_both)) { gchar *old_title = title; - title = g_strdup_printf("%s [Wireshark %s %s]", title, VERSION, wireshark_svnversion); + title = g_strdup_printf("%s [Wireshark %s %s]", title, VERSION, wireshark_gitversion); g_free(old_title); } gtk_window_set_title(GTK_WINDOW(top_level), title); diff -Nru wireshark-1.10.5/ui/gtk/main_titlebar.h wireshark-1.10.6/ui/gtk/main_titlebar.h --- wireshark-1.10.5/ui/gtk/main_titlebar.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main_titlebar.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* main_titlebar.h * Declarations of GTK+-specific UI utility routines * - * $Id: main_titlebar.h 48683 2013-04-01 00:21:44Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/main_toolbar.c wireshark-1.10.6/ui/gtk/main_toolbar.c --- wireshark-1.10.5/ui/gtk/main_toolbar.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main_toolbar.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * The main toolbar * Copyright 2003, Ulf Lamping * - * $Id: main_toolbar.c 48830 2013-04-12 13:33:22Z ruengeler $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/main_toolbar.h wireshark-1.10.6/ui/gtk/main_toolbar.h --- wireshark-1.10.5/ui/gtk/main_toolbar.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main_toolbar.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for toolbar utility routines * Copyright 2003, Ulf Lamping * - * $Id: main_toolbar.h 48827 2013-04-12 11:56:00Z ruengeler $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/main_toolbar_private.h wireshark-1.10.6/ui/gtk/main_toolbar_private.h --- wireshark-1.10.5/ui/gtk/main_toolbar_private.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main_toolbar_private.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* main_toolbar_private.h * - * $Id: main_toolbar_private.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/main_welcome.c wireshark-1.10.6/ui/gtk/main_welcome.c --- wireshark-1.10.5/ui/gtk/main_welcome.c 2013-11-15 23:22:11.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main_welcome.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* main_welcome.c * - * $Id: main_welcome.c 53348 2013-11-15 23:16:14Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -337,7 +337,7 @@ if ((prefs.gui_version_placement == version_welcome_only) || (prefs.gui_version_placement == version_both)) { g_string_append_printf(message, "\nVersion " VERSION "%s", - wireshark_svnversion); + wireshark_gitversion); } } diff -Nru wireshark-1.10.5/ui/gtk/main_welcome.h wireshark-1.10.6/ui/gtk/main_welcome.h --- wireshark-1.10.5/ui/gtk/main_welcome.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/main_welcome.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* main_welcome.h * Welcome "page" * - * $Id: main_welcome.h 48827 2013-04-12 11:56:00Z ruengeler $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/Makefile.am wireshark-1.10.6/ui/gtk/Makefile.am --- wireshark-1.10.5/ui/gtk/Makefile.am 2013-04-26 21:38:22.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for the GTK interface routines for Wireshark # -# $Id: Makefile.am 49061 2013-04-26 21:32:23Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/Makefile.common wireshark-1.10.6/ui/gtk/Makefile.common --- wireshark-1.10.5/ui/gtk/Makefile.common 2013-07-27 22:50:28.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/Makefile.common 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 50957 2013-07-27 22:44:41Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/Makefile_custom.common wireshark-1.10.6/ui/gtk/Makefile_custom.common --- wireshark-1.10.5/ui/gtk/Makefile_custom.common 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/Makefile_custom.common 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Makefile_custom.common 38825 2011-08-31 17:02:54Z wmeier $ +# $Id$ # You can add custom GUI files here # diff -Nru wireshark-1.10.5/ui/gtk/Makefile.in wireshark-1.10.6/ui/gtk/Makefile.in --- wireshark-1.10.5/ui/gtk/Makefile.in 2013-12-19 19:13:54.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/Makefile.in 2014-03-07 18:07:39.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for the GTK interface routines for Wireshark # -# $Id: Makefile.am 49061 2013-04-26 21:32:23Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -43,7 +43,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 50957 2013-07-27 22:44:41Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -64,14 +64,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# $Id: Makefile_custom.common 38825 2011-08-31 17:02:54Z wmeier $ +# $Id$ # You can add custom GUI files here # # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/Makefile.nmake wireshark-1.10.6/ui/gtk/Makefile.nmake --- wireshark-1.10.5/ui/gtk/Makefile.nmake 2013-10-10 19:56:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ ## Makefile for building wireshark.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 52507 2013-10-10 19:50:30Z cmaynard $ +# $Id$ include ..\..\config.nmake include ..\..\Makefile.nmake.inc diff -Nru wireshark-1.10.5/ui/gtk/manual_addr_resolv.c wireshark-1.10.6/ui/gtk/manual_addr_resolv.c --- wireshark-1.10.5/ui/gtk/manual_addr_resolv.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/manual_addr_resolv.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Dialog box for manual address resolve * Copyright 2010 Stig Bjorlykke * - * $Id: manual_addr_resolv.c 48528 2013-03-24 16:47:38Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/manual_addr_resolv.h wireshark-1.10.6/ui/gtk/manual_addr_resolv.h --- wireshark-1.10.5/ui/gtk/manual_addr_resolv.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/manual_addr_resolv.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Dialog box for manual address resolve * Copyright 2010 Stig Bjorlykke * - * $Id: manual_addr_resolv.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/mcast_stream.c wireshark-1.10.6/ui/gtk/mcast_stream.c --- wireshark-1.10.5/ui/gtk/mcast_stream.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/mcast_stream.c 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ * By Jakob Bratkovic and * Miha Jemec * - * $Id: mcast_stream.c 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * based on rtp_stream.c * Copyright 2003, Alcatel Business Systems diff -Nru wireshark-1.10.5/ui/gtk/mcast_stream_dlg.c wireshark-1.10.6/ui/gtk/mcast_stream_dlg.c --- wireshark-1.10.5/ui/gtk/mcast_stream_dlg.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/mcast_stream_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ * By Jakob Bratkovic and * Miha Jemec * - * $Id: mcast_stream_dlg.c 46951 2013-01-05 15:25:30Z wmeier $ + * $Id$ * * based on rtp_stream_dlg.c * Copyright 2003, Alcatel Business Systems diff -Nru wireshark-1.10.5/ui/gtk/mcast_stream_dlg.h wireshark-1.10.6/ui/gtk/mcast_stream_dlg.h --- wireshark-1.10.5/ui/gtk/mcast_stream_dlg.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/mcast_stream_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ * By Jakob Bratkovic and * Miha Jemec * - * $Id: mcast_stream_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * based on rtp_stream_dlg.h * Copyright 2003, Alcatel Business Systems diff -Nru wireshark-1.10.5/ui/gtk/mcast_stream.h wireshark-1.10.6/ui/gtk/mcast_stream.h --- wireshark-1.10.5/ui/gtk/mcast_stream.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/mcast_stream.h 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ * By Jakob Bratkovic and * Miha Jemec * - * $Id: mcast_stream.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * based on rtp_stream.h * Copyright 2003, Alcatel Business Systems diff -Nru wireshark-1.10.5/ui/gtk/megaco_stat.c wireshark-1.10.6/ui/gtk/megaco_stat.c --- wireshark-1.10.5/ui/gtk/megaco_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/megaco_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ * Copyright 2008, Ericsson AB * By Balint Reczey * - * $Id: megaco_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/menus.h wireshark-1.10.6/ui/gtk/menus.h --- wireshark-1.10.5/ui/gtk/menus.h 2013-05-20 22:17:15.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/menus.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* menus.h * Menu definitions * - * $Id: menus.h 49465 2013-05-20 22:07:30Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/mgcp_stat.c wireshark-1.10.6/ui/gtk/mgcp_stat.c --- wireshark-1.10.5/ui/gtk/mgcp_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/mgcp_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * mgcp-statistics for Wireshark * Copyright 2003 Lars Roland * - * $Id: mgcp_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/mtp3_stat.c wireshark-1.10.6/ui/gtk/mtp3_stat.c --- wireshark-1.10.5/ui/gtk/mtp3_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/mtp3_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -5,7 +5,7 @@ * * Modified from gsm_map_stat.c * - * $Id: mtp3_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/mtp3_stat.h wireshark-1.10.6/ui/gtk/mtp3_stat.h --- wireshark-1.10.5/ui/gtk/mtp3_stat.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/mtp3_stat.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* mtp3_stat.h * - * $Id: mtp3_stat.h 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Copyright 2004, Michael Lum , * In association with Telos Technology Inc. diff -Nru wireshark-1.10.5/ui/gtk/mtp3_summary.c wireshark-1.10.6/ui/gtk/mtp3_summary.c --- wireshark-1.10.5/ui/gtk/mtp3_summary.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/mtp3_summary.c 2014-03-07 18:07:16.000000000 +0000 @@ -6,7 +6,7 @@ * * Modified from gsm_map_summary.c * - * $Id: mtp3_summary.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/ncp_stat.c wireshark-1.10.6/ui/gtk/ncp_stat.c --- wireshark-1.10.5/ui/gtk/ncp_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/ncp_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* ncp_stat.c * ncp_stat 2005 Greg Morris * - * $Id: ncp_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/old-gtk-compat.h wireshark-1.10.6/ui/gtk/old-gtk-compat.h --- wireshark-1.10.5/ui/gtk/old-gtk-compat.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/old-gtk-compat.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions to provide some functions that are not present in older * GTK versions (down to 2.12.0) * - * $Id: old-gtk-compat.h 44929 2012-09-16 18:00:56Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/packet_history.c wireshark-1.10.6/ui/gtk/packet_history.c --- wireshark-1.10.5/ui/gtk/packet_history.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/packet_history.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* packet_history.c * packet history related functions 2004 Ulf Lamping * - * $Id: packet_history.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/packet_history.h wireshark-1.10.6/ui/gtk/packet_history.h --- wireshark-1.10.5/ui/gtk/packet_history.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/packet_history.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* packet_history.h * packet history related functions 2004 Ulf Lamping * - * $Id: packet_history.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/packet_list.c wireshark-1.10.6/ui/gtk/packet_list.c --- wireshark-1.10.5/ui/gtk/packet_list.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/packet_list.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2008-2009, Stephen Fisher (see AUTHORS file) * Co-authors Anders Broman, Kovarththanan Rajaratnam and Stig Bjorlykke. * - * $Id: packet_list.c 48451 2013-03-21 15:27:38Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/packet_list.h wireshark-1.10.6/ui/gtk/packet_list.h --- wireshark-1.10.5/ui/gtk/packet_list.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/packet_list.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* packet_list.h * - * $Id: packet_list.h 47214 2013-01-22 18:27:18Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/packet_list_store.c wireshark-1.10.6/ui/gtk/packet_list_store.c --- wireshark-1.10.5/ui/gtk/packet_list_store.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/packet_list_store.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2008-2009, Stephen Fisher (see AUTHORS file) * * Co-authors Anders Broman and Kovarththanan Rajaratnam. * - * $Id: packet_list_store.c 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/packet_list_store.h wireshark-1.10.6/ui/gtk/packet_list_store.h --- wireshark-1.10.5/ui/gtk/packet_list_store.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/packet_list_store.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* packet_list_store.h * - * $Id: packet_list_store.h 44765 2012-09-04 02:35:25Z jmayer $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/packet_panes.c wireshark-1.10.6/ui/gtk/packet_panes.c --- wireshark-1.10.5/ui/gtk/packet_panes.c 2013-08-03 01:09:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/packet_panes.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* packet_panes.c * Routines for GTK+ packet display (packet details and hex dump panes) * - * $Id: packet_panes.c 51129 2013-08-03 01:03:13Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/packet_panes.h wireshark-1.10.6/ui/gtk/packet_panes.h --- wireshark-1.10.5/ui/gtk/packet_panes.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/packet_panes.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for GTK+ packet display structures and routines (packet * details and hex dump panes) * - * $Id: packet_panes.h 47214 2013-01-22 18:27:18Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/packet_win.c wireshark-1.10.6/ui/gtk/packet_win.c --- wireshark-1.10.5/ui/gtk/packet_win.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/packet_win.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2000, Jeffrey C. Foster * - * $Id: packet_win.c 48560 2013-03-26 15:14:02Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/packet_win.h wireshark-1.10.6/ui/gtk/packet_win.h --- wireshark-1.10.5/ui/gtk/packet_win.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/packet_win.h 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright 2000, Jeffrey C. Foster * - * $Id: packet_win.h 48528 2013-03-24 16:47:38Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/pixmap_save.c wireshark-1.10.6/ui/gtk/pixmap_save.c --- wireshark-1.10.5/ui/gtk/pixmap_save.c 2013-06-05 04:57:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/pixmap_save.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for saving pixmaps using the Gdk-Pixmap library * Copyright 2007, Stephen Fisher (see AUTHORS file) * - * $Id: pixmap_save.c 49781 2013-06-05 04:51:03Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/pixmap_save.h wireshark-1.10.6/ui/gtk/pixmap_save.h --- wireshark-1.10.5/ui/gtk/pixmap_save.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/pixmap_save.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for saving pixmaps using the Gdk-Pixmap library * Copyright 2007, Stephen Fisher (see AUTHORS file) * - * $Id: pixmap_save.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/plugins_dlg.c wireshark-1.10.6/ui/gtk/plugins_dlg.c --- wireshark-1.10.5/ui/gtk/plugins_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/plugins_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* plugins_dlg.c * Dialog boxes for plugins * - * $Id: plugins_dlg.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/plugins_dlg.h wireshark-1.10.6/ui/gtk/plugins_dlg.h --- wireshark-1.10.5/ui/gtk/plugins_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/plugins_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* plugins_dlg.h * Plugins definitions * - * $Id: plugins_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/prefs_capture.c wireshark-1.10.6/ui/gtk/prefs_capture.c --- wireshark-1.10.5/ui/gtk/prefs_capture.c 2013-12-13 23:12:44.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/prefs_capture.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_prefs.c * Dialog box for capture preferences * - * $Id: prefs_capture.c 54076 2013-12-13 22:49:30Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/prefs_capture.h wireshark-1.10.6/ui/gtk/prefs_capture.h --- wireshark-1.10.5/ui/gtk/prefs_capture.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/prefs_capture.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* capture_prefs.h * Definitions for capture preferences window * - * $Id: prefs_capture.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/prefs_column.c wireshark-1.10.6/ui/gtk/prefs_column.c --- wireshark-1.10.5/ui/gtk/prefs_column.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/prefs_column.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* column_prefs.c * Dialog box for column preferences * - * $Id: prefs_column.c 48606 2013-03-28 06:36:44Z jake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/prefs_column.h wireshark-1.10.6/ui/gtk/prefs_column.h --- wireshark-1.10.5/ui/gtk/prefs_column.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/prefs_column.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* prefs_column.h * Definitions for column preferences window * - * $Id: prefs_column.h 47231 2013-01-23 19:04:36Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/prefs_dlg.c wireshark-1.10.6/ui/gtk/prefs_dlg.c --- wireshark-1.10.5/ui/gtk/prefs_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/prefs_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* prefs_dlg.c * Routines for handling preferences * - * $Id: prefs_dlg.c 48528 2013-03-24 16:47:38Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/prefs_dlg.h wireshark-1.10.6/ui/gtk/prefs_dlg.h --- wireshark-1.10.5/ui/gtk/prefs_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/prefs_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* prefs_dlg.h * Definitions for preference handling routines * - * $Id: prefs_dlg.h 47262 2013-01-24 21:21:51Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/prefs_filter_expressions.c wireshark-1.10.6/ui/gtk/prefs_filter_expressions.c --- wireshark-1.10.5/ui/gtk/prefs_filter_expressions.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/prefs_filter_expressions.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* prefs_filter_expressions.c * Submitted by Edwin Groothuis * - * $Id: prefs_filter_expressions.c 46679 2012-12-21 17:07:51Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/prefs_filter_expressions.h wireshark-1.10.6/ui/gtk/prefs_filter_expressions.h --- wireshark-1.10.5/ui/gtk/prefs_filter_expressions.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/prefs_filter_expressions.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* prefs_filter_expressions.h * Submitted by Edwin Groothuis * - * $Id: prefs_filter_expressions.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/prefs_font_color.c wireshark-1.10.6/ui/gtk/prefs_font_color.c --- wireshark-1.10.5/ui/gtk/prefs_font_color.c 2013-07-24 18:21:29.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/prefs_font_color.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* prefs_font_color.c * Font and Color preferences widget * - * $Id: prefs_font_color.c 50871 2013-07-24 18:15:28Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/prefs_font_color.h wireshark-1.10.6/ui/gtk/prefs_font_color.h --- wireshark-1.10.5/ui/gtk/prefs_font_color.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/prefs_font_color.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* prefs_font_color.h * Definitions for stream preferences window * - * $Id: prefs_font_color.h 46909 2013-01-03 01:02:30Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/prefs_gui.c wireshark-1.10.6/ui/gtk/prefs_gui.c --- wireshark-1.10.5/ui/gtk/prefs_gui.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/prefs_gui.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* gui_prefs.c * Dialog box for GUI preferences * - * $Id: prefs_gui.c 48780 2013-04-07 18:06:19Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/prefs_gui.h wireshark-1.10.6/ui/gtk/prefs_gui.h --- wireshark-1.10.5/ui/gtk/prefs_gui.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/prefs_gui.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* prefs_gui.h * Definitions for GUI preferences window * - * $Id: prefs_gui.h 46909 2013-01-03 01:02:30Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/prefs_layout.c wireshark-1.10.6/ui/gtk/prefs_layout.c --- wireshark-1.10.5/ui/gtk/prefs_layout.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/prefs_layout.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* layout_prefs.c * Dialog box for layout preferences * - * $Id: prefs_layout.c 48683 2013-04-01 00:21:44Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/prefs_layout.h wireshark-1.10.6/ui/gtk/prefs_layout.h --- wireshark-1.10.5/ui/gtk/prefs_layout.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/prefs_layout.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* prefs_layout.h * Definitions for layout preferences window * - * $Id: prefs_layout.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/print_dlg.c wireshark-1.10.6/ui/gtk/print_dlg.c --- wireshark-1.10.5/ui/gtk/print_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/print_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* print_dlg.c * Dialog boxes for printing and exporting to text files * - * $Id: print_dlg.c 48736 2013-04-04 17:20:36Z jake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/profile_dlg.c wireshark-1.10.6/ui/gtk/profile_dlg.c --- wireshark-1.10.5/ui/gtk/profile_dlg.c 2013-07-17 23:27:24.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/profile_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Dialog box for profiles editing * Stig Bjorlykke , 2008 * - * $Id: profile_dlg.c 50712 2013-07-17 23:21:12Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/profile_dlg.h wireshark-1.10.6/ui/gtk/profile_dlg.h --- wireshark-1.10.5/ui/gtk/profile_dlg.h 2013-05-20 22:17:15.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/profile_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for dialog box for profiles editing. * Stig Bjorlykke , 2008 * - * $Id: profile_dlg.h 49465 2013-05-20 22:07:30Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/progress_dlg.c wireshark-1.10.6/ui/gtk/progress_dlg.c --- wireshark-1.10.5/ui/gtk/progress_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/progress_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* progress_dlg.c * Routines for progress-bar (modal) dialog * - * $Id: progress_dlg.c 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/proto_dlg.c wireshark-1.10.6/ui/gtk/proto_dlg.c --- wireshark-1.10.5/ui/gtk/proto_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/proto_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* proto_dlg.c * - * $Id: proto_dlg.c 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * Laurent Deniel * diff -Nru wireshark-1.10.5/ui/gtk/proto_dlg.h wireshark-1.10.6/ui/gtk/proto_dlg.h --- wireshark-1.10.5/ui/gtk/proto_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/proto_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* proto_dlg.h * - * $Id: proto_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Laurent Deniel * diff -Nru wireshark-1.10.5/ui/gtk/proto_help.c wireshark-1.10.6/ui/gtk/proto_help.c --- wireshark-1.10.5/ui/gtk/proto_help.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/proto_help.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* proto_help.c * Routines for dynamic protocol help menus * - * $Id: proto_help.c 45016 2012-09-20 01:48:30Z morriss $ + * $Id$ * * Edgar Gladkich * Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/proto_help.h wireshark-1.10.6/ui/gtk/proto_help.h --- wireshark-1.10.5/ui/gtk/proto_help.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/proto_help.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* proto_help.h * Routines for dynamic protocol help menus * - * $Id: proto_help.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Edgar Gladkich * Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/proto_hier_stats_dlg.c wireshark-1.10.6/ui/gtk/proto_hier_stats_dlg.c --- wireshark-1.10.5/ui/gtk/proto_hier_stats_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/proto_hier_stats_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* proto_hier_stats_dlg.c * - * $Id: proto_hier_stats_dlg.c 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/proto_hier_stats_dlg.h wireshark-1.10.6/ui/gtk/proto_hier_stats_dlg.h --- wireshark-1.10.5/ui/gtk/proto_hier_stats_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/proto_hier_stats_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* proto_hier_stats_dlg.h * - * $Id: proto_hier_stats_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/proto_hier_tree_model.c wireshark-1.10.6/ui/gtk/proto_hier_tree_model.c --- wireshark-1.10.5/ui/gtk/proto_hier_tree_model.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/proto_hier_tree_model.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* proto_hier_tree_model.c * - * $Id: proto_hier_tree_model.c 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/proto_hier_tree_model.h wireshark-1.10.6/ui/gtk/proto_hier_tree_model.h --- wireshark-1.10.5/ui/gtk/proto_hier_tree_model.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/proto_hier_tree_model.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* proto_hier_tree_model.h * - * $Id: proto_hier_tree_model.h 42411 2012-05-04 04:44:23Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/proto_tree_model.c wireshark-1.10.6/ui/gtk/proto_tree_model.c --- wireshark-1.10.5/ui/gtk/proto_tree_model.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/proto_tree_model.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* proto_tree_model.c * - * $Id: proto_tree_model.c 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/proto_tree_model.h wireshark-1.10.6/ui/gtk/proto_tree_model.h --- wireshark-1.10.5/ui/gtk/proto_tree_model.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/proto_tree_model.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* proto_tree_model.h * - * $Id: proto_tree_model.h 43584 2012-07-06 07:34:08Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/radius_stat.c wireshark-1.10.6/ui/gtk/radius_stat.c --- wireshark-1.10.5/ui/gtk/radius_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/radius_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * radius-statistics for Wireshark * Copyright 2006 Alejandro Vaquero * - * $Id: radius_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/range_utils.c wireshark-1.10.6/ui/gtk/range_utils.c --- wireshark-1.10.5/ui/gtk/range_utils.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/range_utils.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* range_utils.c * Packet range routines (save, print, ...) for GTK things * - * $Id: range_utils.c 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * Ulf Lamping * diff -Nru wireshark-1.10.5/ui/gtk/range_utils.h wireshark-1.10.6/ui/gtk/range_utils.h --- wireshark-1.10.5/ui/gtk/range_utils.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/range_utils.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* range_utils.h * Declarations of utilities to with range_utils.c (packet range dialog) * - * $Id: range_utils.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Ulf Lamping * diff -Nru wireshark-1.10.5/ui/gtk/rlc_lte_graph.c wireshark-1.10.6/ui/gtk/rlc_lte_graph.c --- wireshark-1.10.5/ui/gtk/rlc_lte_graph.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/rlc_lte_graph.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * By Martin Mathieson * Based upon tcp_graph.c * - * $Id: rlc_lte_graph.c 48869 2013-04-16 00:00:09Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/rlc_lte_stat_dlg.c wireshark-1.10.6/ui/gtk/rlc_lte_stat_dlg.c --- wireshark-1.10.5/ui/gtk/rlc_lte_stat_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/rlc_lte_stat_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* rlc_lte_stat_dlg.c * Copyright 2010 Martin Mathieson * - * $Id: rlc_lte_stat_dlg.c 48855 2013-04-15 18:25:04Z martinm $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/rpc_progs.c wireshark-1.10.6/ui/gtk/rpc_progs.c --- wireshark-1.10.5/ui/gtk/rpc_progs.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/rpc_progs.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* rpc_progs.c * rpc_progs 2002 Ronnie Sahlberg * - * $Id: rpc_progs.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/rpc_stat.c wireshark-1.10.6/ui/gtk/rpc_stat.c --- wireshark-1.10.5/ui/gtk/rpc_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/rpc_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* rpc_stat.c * rpc_stat 2002 Ronnie Sahlberg * - * $Id: rpc_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/rtp_analysis.c wireshark-1.10.6/ui/gtk/rtp_analysis.c --- wireshark-1.10.5/ui/gtk/rtp_analysis.c 2013-06-05 04:57:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/rtp_analysis.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* rtp_analysis.c * RTP analysis addition for Wireshark * - * $Id: rtp_analysis.c 49781 2013-06-05 04:51:03Z etxrab $ + * $Id$ * * Copyright 2003, Alcatel Business Systems * By Lars Ruoff diff -Nru wireshark-1.10.5/ui/gtk/rtp_analysis.h wireshark-1.10.6/ui/gtk/rtp_analysis.h --- wireshark-1.10.5/ui/gtk/rtp_analysis.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/rtp_analysis.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* rtp_analysis.h * RTP analysis addition for Wireshark * - * $Id: rtp_analysis.h 47324 2013-01-28 15:41:45Z etxrab $ + * $Id$ * * Copyright 2003, Alcatel Business Systems * By Lars Ruoff diff -Nru wireshark-1.10.5/ui/gtk/rtp_player.c wireshark-1.10.6/ui/gtk/rtp_player.c --- wireshark-1.10.5/ui/gtk/rtp_player.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/rtp_player.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* rtp_player.c * - * $Id: rtp_player.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Copyright 2006, Alejandro Vaquero * diff -Nru wireshark-1.10.5/ui/gtk/rtp_player.h wireshark-1.10.6/ui/gtk/rtp_player.h --- wireshark-1.10.5/ui/gtk/rtp_player.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/rtp_player.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* player_rtp.h * RTP Player for Wireshark * - * $Id: rtp_player.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Copyright 2006, Alejandro Vaquero * By Alejandro Vaquero diff -Nru wireshark-1.10.5/ui/gtk/rtp_stream.c wireshark-1.10.6/ui/gtk/rtp_stream.c --- wireshark-1.10.5/ui/gtk/rtp_stream.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/rtp_stream.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* rtp_stream.c * RTP streams summary addition for Wireshark * - * $Id: rtp_stream.c 45201 2012-09-28 21:36:21Z darkjames $ + * $Id$ * * Copyright 2003, Alcatel Business Systems * By Lars Ruoff diff -Nru wireshark-1.10.5/ui/gtk/rtp_stream_dlg.c wireshark-1.10.6/ui/gtk/rtp_stream_dlg.c --- wireshark-1.10.5/ui/gtk/rtp_stream_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/rtp_stream_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* rtp_stream_dlg.c * RTP streams summary addition for Wireshark * - * $Id: rtp_stream_dlg.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Copyright 2003, Alcatel Business Systems * By Lars Ruoff diff -Nru wireshark-1.10.5/ui/gtk/rtp_stream_dlg.h wireshark-1.10.6/ui/gtk/rtp_stream_dlg.h --- wireshark-1.10.5/ui/gtk/rtp_stream_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/rtp_stream_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* rtp_stream_dlg.h * RTP streams summary addition for Wireshark * - * $Id: rtp_stream_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Copyright 2003, Alcatel Business Systems * By Lars Ruoff diff -Nru wireshark-1.10.5/ui/gtk/rtp_stream.h wireshark-1.10.6/ui/gtk/rtp_stream.h --- wireshark-1.10.5/ui/gtk/rtp_stream.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/rtp_stream.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* rtp_stream.h * RTP streams summary addition for Wireshark * - * $Id: rtp_stream.h 47322 2013-01-28 12:04:15Z etxrab $ + * $Id$ * * Copyright 2003, Alcatel Business Systems * By Lars Ruoff diff -Nru wireshark-1.10.5/ui/gtk/sat.h wireshark-1.10.6/ui/gtk/sat.h --- wireshark-1.10.5/ui/gtk/sat.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/sat.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * 2003 Ronnie Sahlberg * Sub-address types for MAC/URI addresses * - * $Id: sat.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/scsi_stat.c wireshark-1.10.6/ui/gtk/scsi_stat.c --- wireshark-1.10.5/ui/gtk/scsi_stat.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/scsi_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* scsi_stat.c * scsi_stat 2006 Ronnie Sahlberg * - * $Id: scsi_stat.c 46426 2012-12-06 20:59:53Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/sctp_assoc_analyse.c wireshark-1.10.6/ui/gtk/sctp_assoc_analyse.c --- wireshark-1.10.5/ui/gtk/sctp_assoc_analyse.c 2013-06-03 17:50:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/sctp_assoc_analyse.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* * Copyright 2004, Irene Ruengeler * - * $Id: sctp_assoc_analyse.c 49721 2013-06-03 17:44:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/sctp_byte_graph_dlg.c wireshark-1.10.6/ui/gtk/sctp_byte_graph_dlg.c --- wireshark-1.10.5/ui/gtk/sctp_byte_graph_dlg.c 2013-07-17 23:27:24.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/sctp_byte_graph_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* * Copyright 2004, Irene Ruengeler * - * $Id: sctp_byte_graph_dlg.c 50712 2013-07-17 23:21:12Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/sctp_chunk_stat.c wireshark-1.10.6/ui/gtk/sctp_chunk_stat.c --- wireshark-1.10.5/ui/gtk/sctp_chunk_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/sctp_chunk_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright 2005 Oleg Terletsky * Copyright 2009 Varun Notibala * - * $Id: sctp_chunk_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/sctp_chunk_stat_dlg.c wireshark-1.10.6/ui/gtk/sctp_chunk_stat_dlg.c --- wireshark-1.10.5/ui/gtk/sctp_chunk_stat_dlg.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/sctp_chunk_stat_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright 2004, Irene Ruengeler * Copyright 2009, Varun Notibala * - * $Id: sctp_chunk_stat_dlg.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/sctp_error_dlg.c wireshark-1.10.6/ui/gtk/sctp_error_dlg.c --- wireshark-1.10.5/ui/gtk/sctp_error_dlg.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/sctp_error_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* * Copyright 2004, Irene Ruengeler * - * $Id: sctp_error_dlg.c 47787 2013-02-21 01:00:44Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/sctp_graph_dlg.c wireshark-1.10.6/ui/gtk/sctp_graph_dlg.c --- wireshark-1.10.5/ui/gtk/sctp_graph_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/sctp_graph_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright 2004, Irene Ruengeler * Copyright 2009, Varun Notibala * - * $Id: sctp_graph_dlg.c 48925 2013-04-19 11:34:46Z ruengeler $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/sctp_stat.c wireshark-1.10.6/ui/gtk/sctp_stat.c --- wireshark-1.10.5/ui/gtk/sctp_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/sctp_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* * Copyright 2004, Irene Ruengeler * - * $Id: sctp_stat.c 48926 2013-04-19 11:54:22Z ruengeler $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/sctp_stat_dlg.c wireshark-1.10.6/ui/gtk/sctp_stat_dlg.c --- wireshark-1.10.5/ui/gtk/sctp_stat_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/sctp_stat_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* * Copyright 2004, Irene Ruengeler * - * $Id: sctp_stat_dlg.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/sctp_stat.h wireshark-1.10.6/ui/gtk/sctp_stat.h --- wireshark-1.10.5/ui/gtk/sctp_stat.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/sctp_stat.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* * Copyright 2004, Irene Ruengeler * - * $Id: sctp_stat.h 48925 2013-04-19 11:34:46Z ruengeler $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/service_response_time_table.c wireshark-1.10.6/ui/gtk/service_response_time_table.c --- wireshark-1.10.5/ui/gtk/service_response_time_table.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/service_response_time_table.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * Helper routines common to all service response time statistics * tap. * - * $Id: service_response_time_table.c 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/service_response_time_table.h wireshark-1.10.6/ui/gtk/service_response_time_table.h --- wireshark-1.10.5/ui/gtk/service_response_time_table.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/service_response_time_table.h 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * Helper routines common to all service response time statistics * tap. * - * $Id: service_response_time_table.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/simple_dialog.c wireshark-1.10.6/ui/gtk/simple_dialog.c --- wireshark-1.10.5/ui/gtk/simple_dialog.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/simple_dialog.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* simple_dialog.c * Simple message dialog box routines. * - * $Id: simple_dialog.c 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/sip_stat.c wireshark-1.10.6/ui/gtk/sip_stat.c --- wireshark-1.10.5/ui/gtk/sip_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/sip_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* sip_stat.c * sip_stat 2004 Martin Mathieson * - * $Id: sip_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * Copied from http_stat.c * * Wireshark - Network traffic analyzer diff -Nru wireshark-1.10.5/ui/gtk/smb2_stat.c wireshark-1.10.6/ui/gtk/smb2_stat.c --- wireshark-1.10.5/ui/gtk/smb2_stat.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/smb2_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* smb2_stat.c * smb2_stat 2005 Ronnie Sahlberg * - * $Id: smb2_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/smb_stat.c wireshark-1.10.6/ui/gtk/smb_stat.c --- wireshark-1.10.5/ui/gtk/smb_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/smb_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* smb_stat.c * smb_stat 2003 Ronnie Sahlberg * - * $Id: smb_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/stats_tree_stat.c wireshark-1.10.6/ui/gtk/stats_tree_stat.c --- wireshark-1.10.5/ui/gtk/stats_tree_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/stats_tree_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * GTK Tap implementation of stats_tree * 2005, Luis E. G. Ontanon * - * $Id: stats_tree_stat.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/stock_icons.c wireshark-1.10.6/ui/gtk/stock_icons.c --- wireshark-1.10.5/ui/gtk/stock_icons.c 2013-04-26 21:38:22.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/stock_icons.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Wireshark specific stock icons * Copyright 2003-2008, Ulf Lamping * - * $Id: stock_icons.c 49061 2013-04-26 21:32:23Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/stock_icons.h wireshark-1.10.6/ui/gtk/stock_icons.h --- wireshark-1.10.5/ui/gtk/stock_icons.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/stock_icons.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Wireshark specific stock icons * Copyright 2003-2008, Ulf Lamping * - * $Id: stock_icons.h 46696 2012-12-22 17:41:40Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/summary_dlg.c wireshark-1.10.6/ui/gtk/summary_dlg.c --- wireshark-1.10.5/ui/gtk/summary_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/summary_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* summary_dlg.c * Routines for capture file summary window * - * $Id: summary_dlg.c 48708 2013-04-02 20:19:54Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -697,7 +697,7 @@ #endif /* Add Wireshark version*/ - g_snprintf(string_buff, SUM_STR_MAX, "Summary created by Wireshark %s\n\n", wireshark_svnversion); + g_snprintf(string_buff, SUM_STR_MAX, "Summary created by Wireshark %s\n\n", wireshark_gitversion); gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1); /* Info about file */ diff -Nru wireshark-1.10.5/ui/gtk/summary_dlg.h wireshark-1.10.6/ui/gtk/summary_dlg.h --- wireshark-1.10.5/ui/gtk/summary_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/summary_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* summary_dlg.h * Routines for capture file summary window * - * $Id: summary_dlg.h 46782 2012-12-26 12:29:43Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/supported_protos_dlg.c wireshark-1.10.6/ui/gtk/supported_protos_dlg.c --- wireshark-1.10.5/ui/gtk/supported_protos_dlg.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/supported_protos_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * * Laurent Deniel * - * $Id: supported_protos_dlg.c 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/supported_protos_dlg.h wireshark-1.10.6/ui/gtk/supported_protos_dlg.h --- wireshark-1.10.5/ui/gtk/supported_protos_dlg.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/supported_protos_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * * Laurent Deniel * - * $Id: supported_protos_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/tap_param_dlg.c wireshark-1.10.6/ui/gtk/tap_param_dlg.c --- wireshark-1.10.5/ui/gtk/tap_param_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/tap_param_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for parameter dialog used by gui taps * Copyright 2003 Lars Roland * - * $Id: tap_param_dlg.c 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/tap_param_dlg.h wireshark-1.10.6/ui/gtk/tap_param_dlg.h --- wireshark-1.10.5/ui/gtk/tap_param_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/tap_param_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Header file for parameter dialog used by gui taps * Copyright 2003 Lars Roland * - * $Id: tap_param_dlg.h 46297 2012-11-29 22:21:23Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/tcp_graph.c wireshark-1.10.6/ui/gtk/tcp_graph.c --- wireshark-1.10.5/ui/gtk/tcp_graph.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/tcp_graph.c 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ * By Pavel Mores * Win32 port: rwh@unifiedtech.com * - * $Id: tcp_graph.c 48606 2013-03-28 06:36:44Z jake $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/text_page_utils.c wireshark-1.10.6/ui/gtk/text_page_utils.c --- wireshark-1.10.5/ui/gtk/text_page_utils.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/text_page_utils.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* text_page_utils.c * Construct a simple text page widget from a file. * - * $Id: text_page_utils.c 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * Ulf Lamping * diff -Nru wireshark-1.10.5/ui/gtk/text_page_utils.h wireshark-1.10.6/ui/gtk/text_page_utils.h --- wireshark-1.10.5/ui/gtk/text_page_utils.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/text_page_utils.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* text_page.h * Declarations of routine to construct a simple text page from a file. * - * $Id: text_page_utils.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/time_shift_dlg.c wireshark-1.10.6/ui/gtk/time_shift_dlg.c --- wireshark-1.10.5/ui/gtk/time_shift_dlg.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/time_shift_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for "Time Shift" window * Submitted by Edwin Groothuis * - * $Id: time_shift_dlg.c 48447 2013-03-21 02:29:09Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/time_shift_dlg.h wireshark-1.10.6/ui/gtk/time_shift_dlg.h --- wireshark-1.10.5/ui/gtk/time_shift_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/time_shift_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* time_shift_dlg.h * Submitted by Edwin Groothuis * - * $Id: time_shift_dlg.h 46680 2012-12-21 17:37:57Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/uat_gui.c wireshark-1.10.6/ui/gtk/uat_gui.c --- wireshark-1.10.5/ui/gtk/uat_gui.c 2013-10-29 23:01:22.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/uat_gui.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* * uat_gui.c * - * $Id: uat_gui.c 52974 2013-10-29 22:55:21Z gerald $ + * $Id$ * * User Accessible Tables GUI * Mantain an array of user accessible data strucures diff -Nru wireshark-1.10.5/ui/gtk/uat_gui.h wireshark-1.10.6/ui/gtk/uat_gui.h --- wireshark-1.10.5/ui/gtk/uat_gui.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/uat_gui.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* * uat_gui.h * - * $Id: uat_gui.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * User Accessible Tables GUI * Mantain an array of user accessible data strucures diff -Nru wireshark-1.10.5/ui/gtk/voip_calls.c wireshark-1.10.6/ui/gtk/voip_calls.c --- wireshark-1.10.5/ui/gtk/voip_calls.c 2013-07-17 01:24:19.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/voip_calls.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* voip_calls.c * VoIP calls summary addition for Wireshark * - * $Id: voip_calls.c 50687 2013-07-17 01:18:54Z gerald $ + * $Id$ * * Copyright 2004, Ericsson, Spain * By Francisco Alcoba diff -Nru wireshark-1.10.5/ui/gtk/voip_calls_dlg.c wireshark-1.10.6/ui/gtk/voip_calls_dlg.c --- wireshark-1.10.5/ui/gtk/voip_calls_dlg.c 2013-07-17 20:08:21.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/voip_calls_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* voip_calls_dlg.c * VoIP calls summary addition for Wireshark * - * $Id: voip_calls_dlg.c 50704 2013-07-17 19:24:28Z gerald $ + * $Id$ * * Copyright 2004, Ericsson , Spain * By Francisco Alcoba diff -Nru wireshark-1.10.5/ui/gtk/voip_calls_dlg.h wireshark-1.10.6/ui/gtk/voip_calls_dlg.h --- wireshark-1.10.5/ui/gtk/voip_calls_dlg.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/voip_calls_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* voip_calls_dlg.h * VoIP conversations addition for Wireshark * - * $Id: voip_calls_dlg.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Copyright 2004, Ericsson , Spain * By Francisco Alcoba diff -Nru wireshark-1.10.5/ui/gtk/voip_calls.h wireshark-1.10.6/ui/gtk/voip_calls.h --- wireshark-1.10.5/ui/gtk/voip_calls.h 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/voip_calls.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* voip_calls.h * VoIP calls summary addition for Wireshark * - * $Id: voip_calls.h 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Copyright 2004, Ericsson , Spain * By Francisco Alcoba diff -Nru wireshark-1.10.5/ui/gtk/webbrowser.c wireshark-1.10.6/ui/gtk/webbrowser.c --- wireshark-1.10.5/ui/gtk/webbrowser.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/webbrowser.c 2014-03-07 18:07:16.000000000 +0000 @@ -4,7 +4,7 @@ * Web Browser Plug-in * Copyright (C) 2003 Henrik Brix Andersen * - * $Id: webbrowser.c 46785 2012-12-26 13:18:58Z eapache $ + * $Id$ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru wireshark-1.10.5/ui/gtk/webbrowser.h wireshark-1.10.6/ui/gtk/webbrowser.h --- wireshark-1.10.5/ui/gtk/webbrowser.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/webbrowser.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* webbrowser.h * Web browser activation functions * - * $Id: webbrowser.h 44987 2012-09-18 21:51:22Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/wlan_stat_dlg.c wireshark-1.10.6/ui/gtk/wlan_stat_dlg.c --- wireshark-1.10.5/ui/gtk/wlan_stat_dlg.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/wlan_stat_dlg.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* wlan_stat_dlg.c * Copyright 2008 Stig Bjorlykke * - * $Id: wlan_stat_dlg.c 48448 2013-03-21 02:58:59Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/gtk/wsp_stat.c wireshark-1.10.6/ui/gtk/wsp_stat.c --- wireshark-1.10.5/ui/gtk/wsp_stat.c 2013-04-22 18:04:26.000000000 +0000 +++ wireshark-1.10.6/ui/gtk/wsp_stat.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* wsp_stat.c * wsp_stat 2003 Jean-Michel FAYARD * - * $Id: wsp_stat.c 48634 2013-03-29 00:26:23Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/help_url.c wireshark-1.10.6/ui/help_url.c --- wireshark-1.10.5/ui/help_url.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/help_url.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* help_url.c * - * $Id: help_url.c 46912 2013-01-03 10:49:32Z etxrab $ + * $Id$ * * Some content from gtk/help_dlg.c by Laurent Deniel * diff -Nru wireshark-1.10.5/ui/help_url.h wireshark-1.10.6/ui/help_url.h --- wireshark-1.10.5/ui/help_url.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/help_url.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* help_dlg.h * - * $Id: help_url.h 45764 2012-10-24 15:52:17Z alagoutte $ + * $Id$ * * Some content from gtk/help_dlg.h by Laurent Deniel * diff -Nru wireshark-1.10.5/ui/iface_lists.c wireshark-1.10.6/ui/iface_lists.c --- wireshark-1.10.5/ui/iface_lists.c 2013-06-04 08:11:06.000000000 +0000 +++ wireshark-1.10.6/ui/iface_lists.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Code to manage the global list of interfaces and to update widgets/windows * displaying items from those lists * - * $Id: iface_lists.c 49762 2013-06-04 07:48:18Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/iface_lists.h wireshark-1.10.6/ui/iface_lists.h --- wireshark-1.10.5/ui/iface_lists.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/iface_lists.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Declarations of routines to manage the global list of interfaces and to * update widgets/windows displaying items from those lists * - * $Id: iface_lists.h 45767 2012-10-24 15:52:45Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/last_open_dir.h wireshark-1.10.6/ui/last_open_dir.h --- wireshark-1.10.5/ui/last_open_dir.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/last_open_dir.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Routines to fetch the last directory in which a file was opened; * its implementation is GUI-dependent, but the API isn't * - * $Id: last_open_dir.h 45767 2012-10-24 15:52:45Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/main_statusbar.h wireshark-1.10.6/ui/main_statusbar.h --- wireshark-1.10.5/ui/main_statusbar.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/main_statusbar.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* main_statusbar.h * - * $Id: main_statusbar.h 45764 2012-10-24 15:52:17Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/Makefile.am wireshark-1.10.6/ui/Makefile.am --- wireshark-1.10.5/ui/Makefile.am 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/Makefile.am 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ # Automake file for the common-to-all-toolkits user interface routines # for Wireshark # -# $Id: Makefile.am 44907 2012-09-14 21:06:26Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/ui/Makefile.common wireshark-1.10.6/ui/Makefile.common --- wireshark-1.10.5/ui/Makefile.common 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/Makefile.common 2014-03-07 18:07:16.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47748 2013-02-19 22:21:17Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/ui/Makefile.in wireshark-1.10.6/ui/Makefile.in --- wireshark-1.10.5/ui/Makefile.in 2013-12-19 19:13:51.000000000 +0000 +++ wireshark-1.10.6/ui/Makefile.in 2014-03-07 18:07:38.000000000 +0000 @@ -19,7 +19,7 @@ # Automake file for the common-to-all-toolkits user interface routines # for Wireshark # -# $Id: Makefile.am 44907 2012-09-14 21:06:26Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -44,7 +44,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47748 2013-02-19 22:21:17Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -67,7 +67,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/ui/Makefile.nmake wireshark-1.10.6/ui/Makefile.nmake --- wireshark-1.10.5/ui/Makefile.nmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/Makefile.nmake 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ ## Makefile for building wireshark.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 47992 2013-03-01 23:53:11Z rbalint $ +# $Id$ include ..\config.nmake include ..\Makefile.nmake.inc diff -Nru wireshark-1.10.5/ui/preference_utils.c wireshark-1.10.6/ui/preference_utils.c --- wireshark-1.10.5/ui/preference_utils.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/preference_utils.c 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* preference_utils.h * Routines for handling preferences * - * $Id: preference_utils.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/preference_utils.h wireshark-1.10.6/ui/preference_utils.h --- wireshark-1.10.5/ui/preference_utils.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/preference_utils.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* preference_utils.h * Routines for handling preferences * - * $Id: preference_utils.h 47231 2013-01-23 19:04:36Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/profile.c wireshark-1.10.6/ui/profile.c --- wireshark-1.10.5/ui/profile.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/profile.c 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Dialog box for profiles editing * Stig Bjorlykke , 2008 * - * $Id: profile.c 48438 2013-03-20 01:18:10Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/profile.h wireshark-1.10.6/ui/profile.h --- wireshark-1.10.5/ui/profile.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/profile.h 2014-03-07 18:07:16.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for dialog box for profiles editing. * Stig Bjorlykke , 2008 * - * $Id: profile.h 46863 2012-12-30 19:33:05Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/progress_dlg.h wireshark-1.10.6/ui/progress_dlg.h --- wireshark-1.10.5/ui/progress_dlg.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/ui/progress_dlg.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,7 +1,7 @@ /* progress_dlg.h * Definitions for progress dialog box routines * - * $Id: progress_dlg.h 45767 2012-10-24 15:52:45Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/accordion_frame.cpp wireshark-1.10.6/ui/qt/accordion_frame.cpp --- wireshark-1.10.5/ui/qt/accordion_frame.cpp 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/accordion_frame.cpp 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* accordion_frame.cpp * - * $Id: accordion_frame.cpp 46609 2012-12-19 02:56:01Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/accordion_frame.h wireshark-1.10.6/ui/qt/accordion_frame.h --- wireshark-1.10.5/ui/qt/accordion_frame.h 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/accordion_frame.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* accordion_frame.cpp * - * $Id: accordion_frame.h 46609 2012-12-19 02:56:01Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/byte_view_tab.cpp wireshark-1.10.6/ui/qt/byte_view_tab.cpp --- wireshark-1.10.5/ui/qt/byte_view_tab.cpp 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/byte_view_tab.cpp 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* byte_view_tab.cpp * - * $Id: byte_view_tab.cpp 47364 2013-01-30 00:07:57Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/byte_view_tab.h wireshark-1.10.6/ui/qt/byte_view_tab.h --- wireshark-1.10.5/ui/qt/byte_view_tab.h 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/byte_view_tab.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* byte_view_tab.h * - * $Id: byte_view_tab.h 45953 2012-11-06 21:49:16Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/byte_view_text.cpp wireshark-1.10.6/ui/qt/byte_view_text.cpp --- wireshark-1.10.5/ui/qt/byte_view_text.cpp 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/byte_view_text.cpp 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* byte_view_text.cpp * - * $Id: byte_view_text.cpp 46361 2012-12-03 23:15:59Z eapache $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/byte_view_text.h wireshark-1.10.6/ui/qt/byte_view_text.h --- wireshark-1.10.5/ui/qt/byte_view_text.h 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/byte_view_text.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* byte_view_text.h * - * $Id: byte_view_text.h 46942 2013-01-05 02:30:58Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/capture_file_dialog.cpp wireshark-1.10.6/ui/qt/capture_file_dialog.cpp --- wireshark-1.10.5/ui/qt/capture_file_dialog.cpp 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/capture_file_dialog.cpp 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* capture_file_dialog.cpp * - * $Id: capture_file_dialog.cpp 48690 2013-04-01 21:17:50Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/capture_file_dialog.h wireshark-1.10.6/ui/qt/capture_file_dialog.h --- wireshark-1.10.5/ui/qt/capture_file_dialog.h 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/capture_file_dialog.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* capture_file_dialog.h * - * $Id: capture_file_dialog.h 46410 2012-12-05 20:33:40Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/capture_info_dialog.cpp wireshark-1.10.6/ui/qt/capture_info_dialog.cpp --- wireshark-1.10.5/ui/qt/capture_info_dialog.cpp 2013-06-04 07:45:21.000000000 +0000 +++ wireshark-1.10.6/ui/qt/capture_info_dialog.cpp 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* capture_info_dialog.cpp * - * $Id: capture_info_dialog.cpp 49761 2013-06-04 07:39:26Z etxrab $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/capture_info_dialog.h wireshark-1.10.6/ui/qt/capture_info_dialog.h --- wireshark-1.10.5/ui/qt/capture_info_dialog.h 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/capture_info_dialog.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* capture_info_dialog.h * - * $Id: capture_info_dialog.h 44766 2012-09-04 08:18:31Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/capture_interface_dialog.cpp wireshark-1.10.6/ui/qt/capture_interface_dialog.cpp --- wireshark-1.10.5/ui/qt/capture_interface_dialog.cpp 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/capture_interface_dialog.cpp 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* capture_interface_dialog.cpp * - * $Id: capture_interface_dialog.cpp 46780 2012-12-26 12:24:55Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/capture_interface_dialog.h wireshark-1.10.6/ui/qt/capture_interface_dialog.h --- wireshark-1.10.5/ui/qt/capture_interface_dialog.h 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/capture_interface_dialog.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* capture_interface_dialog.h * - * $Id: capture_interface_dialog.h 44766 2012-09-04 08:18:31Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/capture_preferences_frame.cpp wireshark-1.10.6/ui/qt/capture_preferences_frame.cpp --- wireshark-1.10.5/ui/qt/capture_preferences_frame.cpp 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/capture_preferences_frame.cpp 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* capture_preferences_frame.cpp * - * $Id: capture_preferences_frame.cpp 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/capture_preferences_frame.h wireshark-1.10.6/ui/qt/capture_preferences_frame.h --- wireshark-1.10.5/ui/qt/capture_preferences_frame.h 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/capture_preferences_frame.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* capture_preferences_frame.h * - * $Id: capture_preferences_frame.h 47403 2013-02-01 00:14:15Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/CMakeLists.txt wireshark-1.10.6/ui/qt/CMakeLists.txt --- wireshark-1.10.5/ui/qt/CMakeLists.txt 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/CMakeLists.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 47546 2013-02-08 01:30:31Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/color_dialog.cpp wireshark-1.10.6/ui/qt/color_dialog.cpp --- wireshark-1.10.5/ui/qt/color_dialog.cpp 2013-04-22 18:04:24.000000000 +0000 +++ wireshark-1.10.6/ui/qt/color_dialog.cpp 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* color_dialog.cpp * - * $Id: color_dialog.cpp 45017 2012-09-20 02:03:38Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/color_dialog.h wireshark-1.10.6/ui/qt/color_dialog.h --- wireshark-1.10.5/ui/qt/color_dialog.h 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/color_dialog.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* color_dialog.h * - * $Id: color_dialog.h 44766 2012-09-04 08:18:31Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/color_utils.cpp wireshark-1.10.6/ui/qt/color_utils.cpp --- wireshark-1.10.5/ui/qt/color_utils.cpp 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/color_utils.cpp 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* color_utils.cpp * - * $Id: color_utils.cpp 47240 2013-01-24 01:10:12Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/color_utils.h wireshark-1.10.6/ui/qt/color_utils.h --- wireshark-1.10.5/ui/qt/color_utils.h 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/color_utils.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* color_utils.h * - * $Id: color_utils.h 47240 2013-01-24 01:10:12Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/column_preferences_frame.cpp wireshark-1.10.6/ui/qt/column_preferences_frame.cpp --- wireshark-1.10.5/ui/qt/column_preferences_frame.cpp 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/column_preferences_frame.cpp 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* column_preferences_frame.cpp * - * $Id: column_preferences_frame.cpp 47522 2013-02-06 18:22:54Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/column_preferences_frame.h wireshark-1.10.6/ui/qt/column_preferences_frame.h --- wireshark-1.10.5/ui/qt/column_preferences_frame.h 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/column_preferences_frame.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* column_preferences_frame.h * - * $Id: column_preferences_frame.h 47522 2013-02-06 18:22:54Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/display_filter_combo.cpp wireshark-1.10.6/ui/qt/display_filter_combo.cpp --- wireshark-1.10.5/ui/qt/display_filter_combo.cpp 2013-07-27 22:50:28.000000000 +0000 +++ wireshark-1.10.6/ui/qt/display_filter_combo.cpp 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* display_filter_combo.cpp * - * $Id: display_filter_combo.cpp 50957 2013-07-27 22:44:41Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/display_filter_combo.h wireshark-1.10.6/ui/qt/display_filter_combo.h --- wireshark-1.10.5/ui/qt/display_filter_combo.h 2013-04-22 18:04:24.000000000 +0000 +++ wireshark-1.10.6/ui/qt/display_filter_combo.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* display_filter_combo.h * - * $Id: display_filter_combo.h 46434 2012-12-07 01:46:20Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/display_filter_edit.cpp wireshark-1.10.6/ui/qt/display_filter_edit.cpp --- wireshark-1.10.5/ui/qt/display_filter_edit.cpp 2013-04-22 18:04:24.000000000 +0000 +++ wireshark-1.10.6/ui/qt/display_filter_edit.cpp 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* display_filter_edit.cpp * - * $Id: display_filter_edit.cpp 47522 2013-02-06 18:22:54Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/display_filter_edit.h wireshark-1.10.6/ui/qt/display_filter_edit.h --- wireshark-1.10.5/ui/qt/display_filter_edit.h 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/display_filter_edit.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* display_filter_edit.h * - * $Id: display_filter_edit.h 47522 2013-02-06 18:22:54Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/doxygen.cfg.in wireshark-1.10.6/ui/qt/doxygen.cfg.in --- wireshark-1.10.5/ui/qt/doxygen.cfg.in 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/doxygen.cfg.in 2014-03-07 18:07:16.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: doxygen.cfg.in 41653 2012-03-19 01:15:26Z morriss $ +# $Id$ # @configure_input@ # The PROJECT_NAME tag is a single word (or a sequence of words surrounded diff -Nru wireshark-1.10.5/ui/qt/export_dissection_dialog.cpp wireshark-1.10.6/ui/qt/export_dissection_dialog.cpp --- wireshark-1.10.5/ui/qt/export_dissection_dialog.cpp 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/export_dissection_dialog.cpp 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* export_dissection_dialog.cpp * - * $Id: export_dissection_dialog.cpp 46942 2013-01-05 02:30:58Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/export_dissection_dialog.h wireshark-1.10.6/ui/qt/export_dissection_dialog.h --- wireshark-1.10.5/ui/qt/export_dissection_dialog.h 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/export_dissection_dialog.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* export_dissection_dialog.h * - * $Id: export_dissection_dialog.h 45849 2012-10-31 15:40:55Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/export_object_dialog.cpp wireshark-1.10.6/ui/qt/export_object_dialog.cpp --- wireshark-1.10.5/ui/qt/export_object_dialog.cpp 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/export_object_dialog.cpp 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* export_object_dialog.cpp * - * $Id: export_object_dialog.cpp 45849 2012-10-31 15:40:55Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/export_object_dialog.h wireshark-1.10.6/ui/qt/export_object_dialog.h --- wireshark-1.10.5/ui/qt/export_object_dialog.h 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/export_object_dialog.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* export_object_dialog.h * - * $Id: export_object_dialog.h 45849 2012-10-31 15:40:55Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/file_set_dialog.cpp wireshark-1.10.6/ui/qt/file_set_dialog.cpp --- wireshark-1.10.5/ui/qt/file_set_dialog.cpp 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/file_set_dialog.cpp 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* fileset_dialog.cpp * - * $Id: file_set_dialog.cpp 45849 2012-10-31 15:40:55Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/file_set_dialog.h wireshark-1.10.6/ui/qt/file_set_dialog.h --- wireshark-1.10.5/ui/qt/file_set_dialog.h 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/file_set_dialog.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* fileset_dialog.h * - * $Id: file_set_dialog.h 45849 2012-10-31 15:40:55Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/filter_expressions_preferences_frame.cpp wireshark-1.10.6/ui/qt/filter_expressions_preferences_frame.cpp --- wireshark-1.10.5/ui/qt/filter_expressions_preferences_frame.cpp 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/filter_expressions_preferences_frame.cpp 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* filter_expressions_preferences_frame.cpp * - * $Id: filter_expressions_preferences_frame.cpp 47522 2013-02-06 18:22:54Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/filter_expressions_preferences_frame.h wireshark-1.10.6/ui/qt/filter_expressions_preferences_frame.h --- wireshark-1.10.5/ui/qt/filter_expressions_preferences_frame.h 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/filter_expressions_preferences_frame.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* filter_expressions_preferences_frame.h * - * $Id: filter_expressions_preferences_frame.h 47522 2013-02-06 18:22:54Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/font_color_preferences_frame.cpp wireshark-1.10.6/ui/qt/font_color_preferences_frame.cpp --- wireshark-1.10.5/ui/qt/font_color_preferences_frame.cpp 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/font_color_preferences_frame.cpp 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* font_color_preferences_frame.cpp * - * $Id: font_color_preferences_frame.cpp 47409 2013-02-01 09:21:38Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/font_color_preferences_frame.h wireshark-1.10.6/ui/qt/font_color_preferences_frame.h --- wireshark-1.10.5/ui/qt/font_color_preferences_frame.h 2013-04-22 18:04:24.000000000 +0000 +++ wireshark-1.10.6/ui/qt/font_color_preferences_frame.h 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* font_color_preferences_frame.h * - * $Id: font_color_preferences_frame.h 47240 2013-01-24 01:10:12Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/gpl-template.txt wireshark-1.10.6/ui/qt/gpl-template.txt --- wireshark-1.10.5/ui/qt/gpl-template.txt 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/gpl-template.txt 2014-03-07 18:07:16.000000000 +0000 @@ -1,6 +1,6 @@ /* .c * - * $Id: gpl-template.txt 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ui/qt/i18n.qrc wireshark-1.10.6/ui/qt/i18n.qrc --- wireshark-1.10.5/ui/qt/i18n.qrc 2013-04-22 18:04:23.000000000 +0000 +++ wireshark-1.10.6/ui/qt/i18n.qrc 2014-03-07 18:07:16.000000000 +0000 @@ -1,5 +1,5 @@ + diff -Nru wireshark-1.10.5/wimaxasncp/dictionary.xml wireshark-1.10.6/wimaxasncp/dictionary.xml --- wireshark-1.10.5/wimaxasncp/dictionary.xml 2013-04-22 18:05:21.000000000 +0000 +++ wireshark-1.10.6/wimaxasncp/dictionary.xml 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ - + diff -Nru wireshark-1.10.5/wireshark.desktop wireshark-1.10.6/wireshark.desktop --- wireshark-1.10.5/wireshark.desktop 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/wireshark.desktop 2014-03-07 18:07:17.000000000 +0000 @@ -1,5 +1,5 @@ [Desktop Entry] -# $Id: wireshark.desktop 48208 2013-03-09 01:35:58Z morriss $ +# $Id$ # The format of this file is specified at # http://standards.freedesktop.org/desktop-entry-spec/1.0/ # The entries are in the order they are listed in version 1.0 diff -Nru wireshark-1.10.5/wireshark-mime-package.xml wireshark-1.10.6/wireshark-mime-package.xml --- wireshark-1.10.5/wireshark-mime-package.xml 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/wireshark-mime-package.xml 2014-03-07 18:07:17.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru wireshark-1.10.5/wiretap/5views.c wireshark-1.10.6/wiretap/5views.c --- wireshark-1.10.5/wiretap/5views.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/5views.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* 5views.c * - * $Id: 5views.c 48348 2013-03-17 09:20:13Z etxrab $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/5views.h wireshark-1.10.6/wiretap/5views.h --- wireshark-1.10.5/wiretap/5views.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/5views.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* 5views.h * - * $Id: 5views.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/aethra.c wireshark-1.10.6/wiretap/aethra.c --- wireshark-1.10.5/wiretap/aethra.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/aethra.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* aethra.c * - * $Id: aethra.c 46803 2012-12-27 12:19:25Z guy $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/aethra.h wireshark-1.10.6/wiretap/aethra.h --- wireshark-1.10.5/wiretap/aethra.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/aethra.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* aethra.h * - * $Id: aethra.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/ascend.c wireshark-1.10.6/wiretap/ascend.c --- wireshark-1.10.5/wiretap/ascend.c 2013-12-19 19:15:25.000000000 +0000 +++ wireshark-1.10.6/wiretap/ascend.c 2014-03-07 18:09:04.000000000 +0000 @@ -78,7 +78,7 @@ /* ascend.y * - * $Id: ascend.y 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/ascend-int.h wireshark-1.10.6/wiretap/ascend-int.h --- wireshark-1.10.5/wiretap/ascend-int.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/ascend-int.h 2014-03-07 18:07:17.000000000 +0000 @@ -2,7 +2,7 @@ * Definitions for routines common to multiple modules in the Lucent/Ascend * capture file reading code code, but not used outside that code. * - * $Id: ascend-int.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wiretap/ascend_scanner.c wireshark-1.10.6/wiretap/ascend_scanner.c --- wireshark-1.10.5/wiretap/ascend_scanner.c 2013-12-19 19:24:31.000000000 +0000 +++ wireshark-1.10.6/wiretap/ascend_scanner.c 2014-03-07 18:09:07.000000000 +0000 @@ -1450,7 +1450,7 @@ #line 13 "ascend_scanner.l" /* ascend_scanner.l * - * $Id: ascend_scanner.l 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/ascend_scanner.l wireshark-1.10.6/wiretap/ascend_scanner.l --- wireshark-1.10.5/wiretap/ascend_scanner.l 2013-04-22 21:38:17.000000000 +0000 +++ wireshark-1.10.6/wiretap/ascend_scanner.l 2014-03-07 18:07:17.000000000 +0000 @@ -12,7 +12,7 @@ %{ /* ascend_scanner.l * - * $Id: ascend_scanner.l 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/ascendtext.c wireshark-1.10.6/wiretap/ascendtext.c --- wireshark-1.10.5/wiretap/ascendtext.c 2013-04-22 21:38:17.000000000 +0000 +++ wireshark-1.10.6/wiretap/ascendtext.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* ascendtext.c * - * $Id: ascendtext.c 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/ascendtext.h wireshark-1.10.6/wiretap/ascendtext.h --- wireshark-1.10.5/wiretap/ascendtext.h 2013-04-22 21:38:17.000000000 +0000 +++ wireshark-1.10.6/wiretap/ascendtext.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* ascend.h * - * $Id: ascendtext.h 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/ascend.y wireshark-1.10.6/wiretap/ascend.y --- wireshark-1.10.5/wiretap/ascend.y 2013-04-22 21:38:17.000000000 +0000 +++ wireshark-1.10.6/wiretap/ascend.y 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ %{ /* ascend.y * - * $Id: ascend.y 48991 2013-04-22 21:32:55Z gerald $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/atm.c wireshark-1.10.6/wiretap/atm.c --- wireshark-1.10.5/wiretap/atm.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/atm.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* atm.c * - * $Id: atm.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/atm.h wireshark-1.10.6/wiretap/atm.h --- wireshark-1.10.5/wiretap/atm.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/atm.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* atm.h * - * $Id: atm.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/ber.c wireshark-1.10.6/wiretap/ber.c --- wireshark-1.10.5/wiretap/ber.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/ber.c 2014-03-07 18:07:17.000000000 +0000 @@ -2,7 +2,7 @@ * * Basic Encoding Rules (BER) file reading * - * $Id: ber.c 46803 2012-12-27 12:19:25Z guy $ + * $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/wiretap/ber.h wireshark-1.10.6/wiretap/ber.h --- wireshark-1.10.5/wiretap/ber.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/ber.h 2014-03-07 18:07:17.000000000 +0000 @@ -2,7 +2,7 @@ * * Basic Encoding Rules (BER) file reading * - * $Id: ber.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/wiretap/btsnoop.c wireshark-1.10.6/wiretap/btsnoop.c --- wireshark-1.10.5/wiretap/btsnoop.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/btsnoop.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* btsnoop.c * - * $Id: btsnoop.c 46803 2012-12-27 12:19:25Z guy $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/btsnoop.h wireshark-1.10.6/wiretap/btsnoop.h --- wireshark-1.10.5/wiretap/btsnoop.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/btsnoop.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* btsnoop.h * - * $Id: btsnoop.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/buffer.c wireshark-1.10.6/wiretap/buffer.c --- wireshark-1.10.5/wiretap/buffer.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/buffer.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* buffer.c * - * $Id: buffer.c 47954 2013-02-28 22:17:06Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/buffer.h wireshark-1.10.6/wiretap/buffer.h --- wireshark-1.10.5/wiretap/buffer.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/buffer.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* buffer.h * - * $Id: buffer.h 47948 2013-02-28 19:35:59Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/camins.c wireshark-1.10.6/wiretap/camins.c --- wireshark-1.10.5/wiretap/camins.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/camins.c 2014-03-07 18:07:17.000000000 +0000 @@ -3,7 +3,7 @@ * File format support for Rabbit Labs CAM Inspector files * Copyright (c) 2013 by Martin Kaiser * - * $Id: camins.c 48647 2013-03-30 09:56:57Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wiretap/camins.h wireshark-1.10.6/wiretap/camins.h --- wireshark-1.10.5/wiretap/camins.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/camins.h 2014-03-07 18:07:17.000000000 +0000 @@ -3,7 +3,7 @@ * File format support for Rabbit Labs CAM Inspector files * Copyright (c) 2013 by Martin Kaiser * - * $Id: camins.h 48647 2013-03-30 09:56:57Z martink $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wiretap/catapult_dct2000.c wireshark-1.10.6/wiretap/catapult_dct2000.c --- wireshark-1.10.5/wiretap/catapult_dct2000.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/catapult_dct2000.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* catapult_dct2000.c * - * $Id: catapult_dct2000.c 48038 2013-03-03 17:14:19Z etxrab $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/catapult_dct2000.h wireshark-1.10.6/wiretap/catapult_dct2000.h --- wireshark-1.10.5/wiretap/catapult_dct2000.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/catapult_dct2000.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* catapult_dct2000.h * -* $Id: catapult_dct2000.h 47992 2013-03-01 23:53:11Z rbalint $ +* $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/CMakeLists.txt wireshark-1.10.6/wiretap/CMakeLists.txt --- wireshark-1.10.5/wiretap/CMakeLists.txt 2013-09-10 15:45:18.000000000 +0000 +++ wireshark-1.10.6/wiretap/CMakeLists.txt 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 51931 2013-09-10 15:39:51Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/wiretap/commview.c wireshark-1.10.6/wiretap/commview.c --- wireshark-1.10.5/wiretap/commview.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/commview.c 2014-03-07 18:07:17.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for opening CommView file format packet captures * Copyright 2007, Stephen Fisher (see AUTHORS file) * - * $Id: commview.c 46803 2012-12-27 12:19:25Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wiretap/commview.h wireshark-1.10.6/wiretap/commview.h --- wireshark-1.10.5/wiretap/commview.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/commview.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* commview.h * - * $Id: commview.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wiretap/cosine.c wireshark-1.10.6/wiretap/cosine.c --- wireshark-1.10.5/wiretap/cosine.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/cosine.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* cosine.c * - * $Id: cosine.c 46819 2012-12-27 22:59:39Z guy $ + * $Id$ * * CoSine IPNOS L2 debug output parsing * Copyright (c) 2002 by Motonori Shindo diff -Nru wireshark-1.10.5/wiretap/cosine.h wireshark-1.10.6/wiretap/cosine.h --- wireshark-1.10.5/wiretap/cosine.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/cosine.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* cosine.h * - * $Id: cosine.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * CoSine IPNOS L2 debug output parsing * Copyright (c) 2002 by Motonori Shindo diff -Nru wireshark-1.10.5/wiretap/csids.c wireshark-1.10.6/wiretap/csids.c --- wireshark-1.10.5/wiretap/csids.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/csids.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* csids.c * - * $Id: csids.c 47899 2013-02-26 04:42:26Z wmeier $ + * $Id$ * * Copyright (c) 2000 by Mike Hall * Copyright (c) 2000 by Cisco Systems diff -Nru wireshark-1.10.5/wiretap/csids.h wireshark-1.10.6/wiretap/csids.h --- wireshark-1.10.5/wiretap/csids.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/csids.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* csids.h * - * $Id: csids.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Copyright (c) 2000 by Mike Hall * Copyright (c) Cisco Systems diff -Nru wireshark-1.10.5/wiretap/daintree-sna.c wireshark-1.10.6/wiretap/daintree-sna.c --- wireshark-1.10.5/wiretap/daintree-sna.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/daintree-sna.c 2014-03-07 18:07:17.000000000 +0000 @@ -3,7 +3,7 @@ * Sensor Network Analyzer for 802.15.4 radios * Copyright 2009, Exegin Technologies Limited * - * $Id: daintree-sna.c 46803 2012-12-27 12:19:25Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wiretap/daintree-sna.h wireshark-1.10.6/wiretap/daintree-sna.h --- wireshark-1.10.5/wiretap/daintree-sna.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/daintree-sna.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* daintree-sna.h * - * $Id: daintree-sna.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wiretap/dbs-etherwatch.c wireshark-1.10.6/wiretap/dbs-etherwatch.c --- wireshark-1.10.5/wiretap/dbs-etherwatch.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/dbs-etherwatch.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* dbs-etherwatch.c * - * $Id: dbs-etherwatch.c 46819 2012-12-27 22:59:39Z guy $ + * $Id$ * * Wiretap Library * Copyright (c) 2001 by Marc Milgram diff -Nru wireshark-1.10.5/wiretap/dbs-etherwatch.h wireshark-1.10.6/wiretap/dbs-etherwatch.h --- wireshark-1.10.5/wiretap/dbs-etherwatch.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/dbs-etherwatch.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* dbs-etherwatch.h * - * $Id: dbs-etherwatch.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/dct3trace.c wireshark-1.10.6/wiretap/dct3trace.c --- wireshark-1.10.5/wiretap/dct3trace.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/dct3trace.c 2014-03-07 18:07:17.000000000 +0000 @@ -6,7 +6,7 @@ * * Duncan Salerno * - * $Id: dct3trace.c 46803 2012-12-27 12:19:25Z guy $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/dct3trace.h wireshark-1.10.6/wiretap/dct3trace.h --- wireshark-1.10.5/wiretap/dct3trace.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/dct3trace.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* dct3trace.h * - * $Id: dct3trace.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/erf.c wireshark-1.10.6/wiretap/erf.c --- wireshark-1.10.5/wiretap/erf.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/erf.c 2014-03-07 18:07:17.000000000 +0000 @@ -31,7 +31,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $Id: erf.c 46984 2013-01-06 20:44:49Z guy $ + * $Id$ */ /* diff -Nru wireshark-1.10.5/wiretap/erf.h wireshark-1.10.6/wiretap/erf.h --- wireshark-1.10.5/wiretap/erf.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/erf.h 2014-03-07 18:07:17.000000000 +0000 @@ -32,7 +32,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * -* $Id: erf.h 47992 2013-03-01 23:53:11Z rbalint $ +* $Id$ */ #ifndef __W_ERF_H__ diff -Nru wireshark-1.10.5/wiretap/eyesdn.c wireshark-1.10.6/wiretap/eyesdn.c --- wireshark-1.10.5/wiretap/eyesdn.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/eyesdn.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* eyesdn.c * - * $Id: eyesdn.c 46819 2012-12-27 22:59:39Z guy $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/eyesdn.h wireshark-1.10.6/wiretap/eyesdn.h --- wireshark-1.10.5/wiretap/eyesdn.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/eyesdn.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* eyesdn.h * - * $Id: eyesdn.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/file_access.c wireshark-1.10.6/wiretap/file_access.c --- wireshark-1.10.5/wiretap/file_access.c 2013-08-22 04:46:50.000000000 +0000 +++ wireshark-1.10.6/wiretap/file_access.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* file_access.c * - * $Id: file_access.c 51468 2013-08-22 03:44:50Z guy $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/file_wrappers.c wireshark-1.10.6/wiretap/file_wrappers.c --- wireshark-1.10.5/wiretap/file_wrappers.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/file_wrappers.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* file_wrappers.c * - * $Id: file_wrappers.c 48424 2013-03-19 19:02:25Z etxrab $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/file_wrappers.h wireshark-1.10.6/wiretap/file_wrappers.h --- wireshark-1.10.5/wiretap/file_wrappers.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/file_wrappers.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* file_wrappers.h * - * $Id: file_wrappers.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/hcidump.c wireshark-1.10.6/wiretap/hcidump.c --- wireshark-1.10.5/wiretap/hcidump.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/hcidump.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* hcidump.c * - * $Id: hcidump.c 46803 2012-12-27 12:19:25Z guy $ + * $Id$ * * Copyright (c) 2003 by Marcel Holtmann * diff -Nru wireshark-1.10.5/wiretap/hcidump.h wireshark-1.10.6/wiretap/hcidump.h --- wireshark-1.10.5/wiretap/hcidump.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/hcidump.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* hcidump.h * - * $Id: hcidump.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Copyright (c) 2003 by Marcel Holtmann * diff -Nru wireshark-1.10.5/wiretap/i4btrace.c wireshark-1.10.6/wiretap/i4btrace.c --- wireshark-1.10.5/wiretap/i4btrace.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/i4btrace.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* i4btrace.c * - * $Id: i4btrace.c 48424 2013-03-19 19:02:25Z etxrab $ + * $Id$ * * Wiretap Library * Copyright (c) 1999 by Bert Driehuis diff -Nru wireshark-1.10.5/wiretap/i4b_trace.h wireshark-1.10.6/wiretap/i4b_trace.h --- wireshark-1.10.5/wiretap/i4b_trace.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/i4b_trace.h 2014-03-07 18:07:17.000000000 +0000 @@ -27,7 +27,7 @@ * i4b_trace.h - header file for trace data read device * ---------------------------------------------------- * - * $Id: i4b_trace.h 37543 2011-06-04 21:20:57Z rbalint $ + * $Id$ * * last edit-date: [Sun Feb 14 10:39:26 1999] * diff -Nru wireshark-1.10.5/wiretap/i4btrace.h wireshark-1.10.6/wiretap/i4btrace.h --- wireshark-1.10.5/wiretap/i4btrace.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/i4btrace.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* i4btrace.h * - * $Id: i4btrace.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1999 by Bert Driehuis diff -Nru wireshark-1.10.5/wiretap/ipfix.c wireshark-1.10.6/wiretap/ipfix.c --- wireshark-1.10.5/wiretap/ipfix.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/ipfix.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* ipfix.c * - * $Id: ipfix.c 46803 2012-12-27 12:19:25Z guy $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/ipfix.h wireshark-1.10.6/wiretap/ipfix.h --- wireshark-1.10.5/wiretap/ipfix.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/ipfix.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* ipfix.h * - * $Id: ipfix.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 2010 by Hadriel Kaplan diff -Nru wireshark-1.10.5/wiretap/iptrace.c wireshark-1.10.6/wiretap/iptrace.c --- wireshark-1.10.5/wiretap/iptrace.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/iptrace.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* iptrace.c * - * $Id: iptrace.c 47258 2013-01-24 18:08:25Z gram $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/iptrace.h wireshark-1.10.6/wiretap/iptrace.h --- wireshark-1.10.5/wiretap/iptrace.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/iptrace.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* iptrace.h * - * $Id: iptrace.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/iseries.c wireshark-1.10.6/wiretap/iseries.c --- wireshark-1.10.5/wiretap/iseries.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/iseries.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* iseries.c * - * $Id: iseries.c 48424 2013-03-19 19:02:25Z etxrab $ + * $Id$ * * Wiretap Library * Copyright (c) 2011 by Martin Warnes diff -Nru wireshark-1.10.5/wiretap/iseries.h wireshark-1.10.6/wiretap/iseries.h --- wireshark-1.10.5/wiretap/iseries.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/iseries.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* iseries.h * - * $Id: iseries.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 2005 by Martin Warnes diff -Nru wireshark-1.10.5/wiretap/k12.c wireshark-1.10.6/wiretap/k12.c --- wireshark-1.10.5/wiretap/k12.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/k12.c 2014-03-07 18:07:17.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 2005, Luis E. Garia Ontanon * - * $Id: k12.c 48348 2013-03-17 09:20:13Z etxrab $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/k12.h wireshark-1.10.6/wiretap/k12.h --- wireshark-1.10.5/wiretap/k12.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/k12.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* k12.c * -* $Id: k12.h 47992 2013-03-01 23:53:11Z rbalint $ +* $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/k12text.c wireshark-1.10.6/wiretap/k12text.c --- wireshark-1.10.5/wiretap/k12text.c 2013-12-19 19:15:24.000000000 +0000 +++ wireshark-1.10.6/wiretap/k12text.c 2014-03-07 18:09:03.000000000 +0000 @@ -880,7 +880,7 @@ #line 44 "k12text.l" /* k12text.l * - * $Id: k12text.l 47613 2013-02-10 19:13:07Z guy $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/k12text.l wireshark-1.10.6/wiretap/k12text.l --- wireshark-1.10.5/wiretap/k12text.l 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/k12text.l 2014-03-07 18:07:17.000000000 +0000 @@ -43,7 +43,7 @@ %{ /* k12text.l * - * $Id: k12text.l 47613 2013-02-10 19:13:07Z guy $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/lanalyzer.c wireshark-1.10.6/wiretap/lanalyzer.c --- wireshark-1.10.5/wiretap/lanalyzer.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/lanalyzer.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* lanalyzer.c * - * $Id: lanalyzer.c 48552 2013-03-25 22:04:15Z eapache $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/lanalyzer.h wireshark-1.10.6/wiretap/lanalyzer.h --- wireshark-1.10.5/wiretap/lanalyzer.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/lanalyzer.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* lanalyzer.h * - * $Id: lanalyzer.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/libpcap.c wireshark-1.10.6/wiretap/libpcap.c --- wireshark-1.10.5/wiretap/libpcap.c 2013-11-07 02:00:25.000000000 +0000 +++ wireshark-1.10.6/wiretap/libpcap.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* libpcap.c * - * $Id: libpcap.c 53123 2013-11-07 01:54:16Z guy $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez @@ -773,9 +773,38 @@ return -1; } + if (hdr->hdr.orig_len > 64*1024*1024) { + /* + * In theory I guess the on-the-wire packet size can be + * arbitrarily large, and it can certainly be larger than the + * 64KB which bounds the snapshot size, but any file claiming + * 64MB in a single packet is *probably* corrupt, and makes the + * heuristics much more reliable. See, for example, + * https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9634 + * (64MB is an arbitrary size at this point) + */ + *err = WTAP_ERR_BAD_FILE; + if (err_info != NULL) { + *err_info = g_strdup_printf("pcap: File claims packet was %u bytes on the wire", + hdr->hdr.orig_len); + } + return -1; + } + + /* Disabling because this is not a fatal error, and packets that have + * one such packet probably have thousands. For discussion, see + * https://www.wireshark.org/lists/wireshark-dev/201307/msg00076.html + * and related messages. + * + * The packet contents will be copied to a Buffer, which expands + * as necessary to hold the contents; we don't have to worry + * about fixed-length buffers allocated based on the original + * snapshot length. */ +#if 0 if (hdr->hdr.incl_len > wth->snapshot_length) { g_warning("pcap: File has packet larger than file's snapshot length."); } +#endif return bytes_read; } diff -Nru wireshark-1.10.5/wiretap/libpcap.h wireshark-1.10.6/wiretap/libpcap.h --- wireshark-1.10.5/wiretap/libpcap.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/libpcap.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* libpcap.h * - * $Id: libpcap.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/Makefile.am wireshark-1.10.6/wiretap/Makefile.am --- wireshark-1.10.5/wiretap/Makefile.am 2013-12-17 20:10:15.000000000 +0000 +++ wireshark-1.10.6/wiretap/Makefile.am 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Wiretap # -# $Id: Makefile.am 54192 2013-12-17 20:03:59Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -30,7 +30,7 @@ noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwiretap_la_LDFLAGS = -version-info 3:5:0 @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 3:6:0 @LDFLAGS_SHAREDLIB@ AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL diff -Nru wireshark-1.10.5/wiretap/Makefile.common wireshark-1.10.6/wiretap/Makefile.common --- wireshark-1.10.5/wiretap/Makefile.common 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/Makefile.common 2014-03-07 18:07:17.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 48647 2013-03-30 09:56:57Z martink $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/wiretap/Makefile.in wireshark-1.10.6/wiretap/Makefile.in --- wireshark-1.10.5/wiretap/Makefile.in 2013-12-19 19:13:54.000000000 +0000 +++ wireshark-1.10.6/wiretap/Makefile.in 2014-03-07 18:07:40.000000000 +0000 @@ -18,7 +18,7 @@ # Makefile.am # Automake file for Wiretap # -# $Id: Makefile.am 54192 2013-12-17 20:03:59Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -41,7 +41,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -66,7 +66,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 48647 2013-03-30 09:56:57Z martink $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -647,7 +647,7 @@ noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwiretap_la_LDFLAGS = -version-info 3:5:0 @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 3:6:0 @LDFLAGS_SHAREDLIB@ AM_NON_GENERATED_CFLAGS = -DWS_BUILD_DLL $(am__append_1) AM_CPPFLAGS = -I$(srcdir)/.. CLEANFILES = \ diff -Nru wireshark-1.10.5/wiretap/Makefile.nmake wireshark-1.10.6/wiretap/Makefile.nmake --- wireshark-1.10.5/wiretap/Makefile.nmake 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/Makefile.nmake 2014-03-07 18:07:17.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake 48021 2013-03-02 22:19:33Z pascal $ +# $Id$ # include ..\config.nmake diff -Nru wireshark-1.10.5/wiretap/mime_file.c wireshark-1.10.6/wiretap/mime_file.c --- wireshark-1.10.5/wiretap/mime_file.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/mime_file.c 2014-03-07 18:07:17.000000000 +0000 @@ -11,7 +11,7 @@ * The "MIME file" dissector does the reassembly, and hands the result * off to heuristic dissectors to try to identify the file's contents. * - * $Id: mime_file.c 47378 2013-01-30 22:55:32Z guy $ + * $Id$ * * Wiretap Library * This program is free software; you can redistribute it and/or diff -Nru wireshark-1.10.5/wiretap/mime_file.h wireshark-1.10.6/wiretap/mime_file.h --- wireshark-1.10.5/wiretap/mime_file.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/mime_file.h 2014-03-07 18:07:17.000000000 +0000 @@ -2,7 +2,7 @@ * * MIME file format decoder for the Wiretap library. * - * $Id: mime_file.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * This program is free software; you can redistribute it and/or diff -Nru wireshark-1.10.5/wiretap/mp2t.c wireshark-1.10.6/wiretap/mp2t.c --- wireshark-1.10.5/wiretap/mp2t.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/mp2t.c 2014-03-07 18:07:17.000000000 +0000 @@ -4,7 +4,7 @@ * Written by Weston Schmidt * Copyright 2012 Weston Schmidt * - * $Id: mp2t.c 46803 2012-12-27 12:19:25Z guy $ + * $Id$ * * Wiretap Library * This program is free software; you can redistribute it and/or diff -Nru wireshark-1.10.5/wiretap/mp2t.h wireshark-1.10.6/wiretap/mp2t.h --- wireshark-1.10.5/wiretap/mp2t.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/mp2t.h 2014-03-07 18:07:17.000000000 +0000 @@ -4,7 +4,7 @@ * Written by Weston Schmidt * Copyright 2012 Weston Schmidt * - * $Id: mp2t.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * This program is free software; you can redistribute it and/or diff -Nru wireshark-1.10.5/wiretap/mpeg.c wireshark-1.10.6/wiretap/mpeg.c --- wireshark-1.10.5/wiretap/mpeg.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/mpeg.c 2014-03-07 18:07:17.000000000 +0000 @@ -4,8 +4,6 @@ * Written by Shaun Jackman * Copyright 2007 Shaun Jackman * - * $Id: mpeg.c 46928 2013-01-04 05:22:43Z mmann $ - * * Wiretap Library * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -51,7 +49,7 @@ time_t t0; } mpeg_t; -static int +static int mpeg_resync(wtap *wth, int *err, gchar **err_info _U_) { gint64 offset = file_tell(wth->fh); @@ -72,7 +70,7 @@ return count; } -static int +static int mpeg_read_header(wtap *wth, int *err, gchar **err_info, guint32 *n) { int bytes_read; @@ -111,7 +109,7 @@ #define SCRHZ 27000000 -static gboolean +static gboolean mpeg_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { mpeg_t *mpeg = (mpeg_t *)wth->priv; @@ -225,6 +223,18 @@ } *data_offset = file_tell(wth->fh); + if (packet_size > WTAP_MAX_PACKET_SIZE) { + /* + * Larger than we can handle. Don't blow up trying + * to allocate space for an immensely-large packet + * or clobber the stack. + */ + *err = WTAP_ERR_BAD_FILE; + *err_info = g_strdup_printf("mpeg: File has %u-byte packet, bigger than maximum of %u", + packet_size, WTAP_MAX_PACKET_SIZE); + return FALSE; + } + buffer_assure_space(wth->frame_buffer, packet_size); if (!mpeg_read_rec_data(wth->fh, buffer_start_ptr(wth->frame_buffer), packet_size, err, err_info)) @@ -258,14 +268,14 @@ { 0, NULL } }; -int +int mpeg_open(wtap *wth, int *err, gchar **err_info) { int bytes_read; char magic_buf[16]; struct _mpeg_magic* m; mpeg_t *mpeg; - + errno = WTAP_ERR_CANT_READ; bytes_read = file_read(magic_buf, sizeof magic_buf, wth->fh); if (bytes_read != (int) sizeof magic_buf) { @@ -279,7 +289,7 @@ if (memcmp(magic_buf, m->match, m->len) == 0) goto good_magic; } - + return 0; good_magic: @@ -302,3 +312,17 @@ return 1; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ + diff -Nru wireshark-1.10.5/wiretap/mpeg.h wireshark-1.10.6/wiretap/mpeg.h --- wireshark-1.10.5/wiretap/mpeg.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/mpeg.h 2014-03-07 18:07:17.000000000 +0000 @@ -4,7 +4,7 @@ * Written by Shaun Jackman * Copyright 2007 Shaun Jackman * - * $Id: mpeg.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * This program is free software; you can redistribute it and/or diff -Nru wireshark-1.10.5/wiretap/netmon.c wireshark-1.10.6/wiretap/netmon.c --- wireshark-1.10.5/wiretap/netmon.c 2013-09-10 00:13:13.000000000 +0000 +++ wireshark-1.10.6/wiretap/netmon.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* netmon.c * - * $Id: netmon.c 51910 2013-09-10 00:07:17Z gerald $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/netmon.h wireshark-1.10.6/wiretap/netmon.h --- wireshark-1.10.5/wiretap/netmon.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/netmon.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* netmon.h * - * $Id: netmon.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/netscaler.c wireshark-1.10.6/wiretap/netscaler.c --- wireshark-1.10.5/wiretap/netscaler.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/netscaler.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* netscaler.c * - * $Id: netscaler.c 48348 2013-03-17 09:20:13Z etxrab $ + * $Id$ * * Wiretap Library * Copyright (c) 2006 by Ravi Kondamuru diff -Nru wireshark-1.10.5/wiretap/netscaler.h wireshark-1.10.6/wiretap/netscaler.h --- wireshark-1.10.5/wiretap/netscaler.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/netscaler.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* netscaler.h * - * $Id: netscaler.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 2006 by Ravi Kondamuru diff -Nru wireshark-1.10.5/wiretap/netscreen.c wireshark-1.10.6/wiretap/netscreen.c --- wireshark-1.10.5/wiretap/netscreen.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/netscreen.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* netscreen.c * - * $Id: netscreen.c 46905 2013-01-02 22:56:24Z guy $ + * $Id$ * * Juniper NetScreen snoop output parser * Created by re-using a lot of code from cosine.c diff -Nru wireshark-1.10.5/wiretap/netscreen.h wireshark-1.10.6/wiretap/netscreen.h --- wireshark-1.10.5/wiretap/netscreen.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/netscreen.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* netscreen.h * - * $Id: netscreen.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Juniper NetScreen snoop output parser * Created by re-using a lot of code from cosine.c diff -Nru wireshark-1.10.5/wiretap/nettl.c wireshark-1.10.6/wiretap/nettl.c --- wireshark-1.10.5/wiretap/nettl.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/nettl.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* nettl.c * - * $Id: nettl.c 48552 2013-03-25 22:04:15Z eapache $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/nettl.h wireshark-1.10.6/wiretap/nettl.h --- wireshark-1.10.5/wiretap/nettl.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/nettl.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* nettl.h * - * $Id: nettl.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/network_instruments.c wireshark-1.10.6/wiretap/network_instruments.c --- wireshark-1.10.5/wiretap/network_instruments.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/network_instruments.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: network_instruments.c 46803 2012-12-27 12:19:25Z guy $ + * $Id$ */ /*************************************************************************** diff -Nru wireshark-1.10.5/wiretap/network_instruments.h wireshark-1.10.6/wiretap/network_instruments.h --- wireshark-1.10.5/wiretap/network_instruments.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/network_instruments.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: network_instruments.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ */ /*************************************************************************** diff -Nru wireshark-1.10.5/wiretap/netxray.c wireshark-1.10.6/wiretap/netxray.c --- wireshark-1.10.5/wiretap/netxray.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/netxray.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* netxray.c * - * $Id: netxray.c 48552 2013-03-25 22:04:15Z eapache $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/netxray.h wireshark-1.10.6/wiretap/netxray.h --- wireshark-1.10.5/wiretap/netxray.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/netxray.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* netxray.h * - * $Id: netxray.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/ngsniffer.c wireshark-1.10.6/wiretap/ngsniffer.c --- wireshark-1.10.5/wiretap/ngsniffer.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/ngsniffer.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* ngsniffer.c * - * $Id: ngsniffer.c 46979 2013-01-06 19:41:55Z alagoutte $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez @@ -740,7 +740,11 @@ /* We haven't allocated any uncompression buffers yet. */ ngsniffer->seq.buf = NULL; + ngsniffer->seq.nbytes = 0; + ngsniffer->seq.nextout = 0; ngsniffer->rand.buf = NULL; + ngsniffer->rand.nbytes = 0; + ngsniffer->rand.nextout = 0; /* Set the current file offset; the offset in the compressed file and in the uncompressed data stream currently the same. */ diff -Nru wireshark-1.10.5/wiretap/ngsniffer.h wireshark-1.10.6/wiretap/ngsniffer.h --- wireshark-1.10.5/wiretap/ngsniffer.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/ngsniffer.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* ngsniffer.h * - * $Id: ngsniffer.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/packetlogger.c wireshark-1.10.6/wiretap/packetlogger.c --- wireshark-1.10.5/wiretap/packetlogger.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/packetlogger.c 2014-03-07 18:07:17.000000000 +0000 @@ -2,7 +2,7 @@ * Routines for opening Apple's (Bluetooth) PacketLogger file format captures * Copyright 2008-2009, Stephen Fisher (see AUTHORS file) * - * $Id: packetlogger.c 46803 2012-12-27 12:19:25Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wiretap/packetlogger.h wireshark-1.10.6/wiretap/packetlogger.h --- wireshark-1.10.5/wiretap/packetlogger.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/packetlogger.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* packetlogger.h * - * $Id: packetlogger.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wiretap/pcap-common.c wireshark-1.10.6/wiretap/pcap-common.c --- wireshark-1.10.5/wiretap/pcap-common.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/pcap-common.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* pcap-common.c * Code common to libpcap and pcap-NG file formats * - * $Id: pcap-common.c 48847 2013-04-14 16:00:34Z pascal $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/pcap-common.h wireshark-1.10.6/wiretap/pcap-common.h --- wireshark-1.10.5/wiretap/pcap-common.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/pcap-common.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* pcap-common.h * Declarations for code common to libpcap and pcap-NG file formats * - * $Id: pcap-common.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/pcapng.c wireshark-1.10.6/wiretap/pcapng.c --- wireshark-1.10.5/wiretap/pcapng.c 2013-09-28 21:13:29.000000000 +0000 +++ wireshark-1.10.6/wiretap/pcapng.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* pcapng.c * - * $Id: pcapng.c 52254 2013-09-28 21:07:52Z guy $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez @@ -1222,7 +1222,7 @@ pcap_read_post_process(WTAP_FILE_PCAPNG, int_data.wtap_encap, (union wtap_pseudo_header *)wblock->pseudo_header, (guint8 *) (wblock->frame_buffer), - (int) (wblock->data.packet.cap_len - pseudo_header_len), + (int) (wblock->packet_header->caplen), pn->byte_swapped, fcslen); return block_read; } @@ -1391,7 +1391,7 @@ pcap_read_post_process(WTAP_FILE_PCAPNG, int_data.wtap_encap, (union wtap_pseudo_header *)wblock->pseudo_header, (guint8 *) (wblock->frame_buffer), - (int) wblock->data.simple_packet.cap_len, + (int) (wblock->packet_header->caplen), pn->byte_swapped, pn->if_fcslen); return block_read; } diff -Nru wireshark-1.10.5/wiretap/pcapng.h wireshark-1.10.6/wiretap/pcapng.h --- wireshark-1.10.5/wiretap/pcapng.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/pcapng.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* pcapng.h * - * $Id: pcapng.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/peekclassic.c wireshark-1.10.6/wiretap/peekclassic.c --- wireshark-1.10.5/wiretap/peekclassic.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/peekclassic.c 2014-03-07 18:07:17.000000000 +0000 @@ -15,7 +15,7 @@ * * Copyright (c) 2001, Daniel Thompson * - * $Id: peekclassic.c 46803 2012-12-27 12:19:25Z guy $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/peekclassic.h wireshark-1.10.6/wiretap/peekclassic.h --- wireshark-1.10.5/wiretap/peekclassic.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/peekclassic.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* peekclassic.h * - * $Id: peekclassic.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/peektagged.c wireshark-1.10.6/wiretap/peektagged.c --- wireshark-1.10.5/wiretap/peektagged.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/peektagged.c 2014-03-07 18:07:17.000000000 +0000 @@ -12,7 +12,7 @@ * 1.0 and later. They also say it'll be used by future WildPackets * products. * - * $Id: peektagged.c 46852 2012-12-29 21:59:27Z guy $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/peektagged.h wireshark-1.10.6/wiretap/peektagged.h --- wireshark-1.10.5/wiretap/peektagged.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/peektagged.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* peektagged.h * - * $Id: peektagged.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/pppdump.c wireshark-1.10.6/wiretap/pppdump.c --- wireshark-1.10.5/wiretap/pppdump.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/pppdump.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* pppdump.c * - * $Id: pppdump.c 46803 2012-12-27 12:19:25Z guy $ + * $Id$ * * Copyright (c) 2000 by Gilbert Ramirez * diff -Nru wireshark-1.10.5/wiretap/pppdump.h wireshark-1.10.6/wiretap/pppdump.h --- wireshark-1.10.5/wiretap/pppdump.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/pppdump.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* pppdump.h * - * $Id: pppdump.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Copyright (c) 2000 by Gilbert Ramirez * diff -Nru wireshark-1.10.5/wiretap/radcom.c wireshark-1.10.6/wiretap/radcom.c --- wireshark-1.10.5/wiretap/radcom.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/radcom.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* radcom.c * - * $Id: radcom.c 46803 2012-12-27 12:19:25Z guy $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/radcom.h wireshark-1.10.6/wiretap/radcom.h --- wireshark-1.10.5/wiretap/radcom.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/radcom.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* radcom.h * - * $Id: radcom.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/README wireshark-1.10.6/wiretap/README --- wireshark-1.10.5/wiretap/README 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/README 2014-03-07 18:07:17.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README 18369 2006-06-06 23:09:20Z gerald $ +$Id$ Wiretap is a library that is being developed as a future replacement for libpcap, the current standard Unix library for packet capturing. Libpcap diff -Nru wireshark-1.10.5/wiretap/README.airmagnet wireshark-1.10.6/wiretap/README.airmagnet --- wireshark-1.10.5/wiretap/README.airmagnet 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/README.airmagnet 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ AMC: Wireless Analyzer Captured Data (AirMagnet) ------------------------------------------------ -$Id: README.airmagnet 38561 2011-08-16 13:16:33Z morriss $ +$Id$ This is just a braindump from looking at some Airmagnet capture files, in one case having a look at a decoded display in Airmagnet itself. diff -Nru wireshark-1.10.5/wiretap/README.developer wireshark-1.10.6/wiretap/README.developer --- wireshark-1.10.5/wiretap/README.developer 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/README.developer 2014-03-07 18:07:17.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: README.developer 34578 2010-10-20 01:15:12Z wmeier $ +$Id$ This is a very quick and very dirty guide to adding support for new capture file formats. If you see any errors or have any improvements, diff -Nru wireshark-1.10.5/wiretap/snoop.c wireshark-1.10.6/wiretap/snoop.c --- wireshark-1.10.5/wiretap/snoop.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/snoop.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* snoop.c * - * $Id: snoop.c 46803 2012-12-27 12:19:25Z guy $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/snoop.h wireshark-1.10.6/wiretap/snoop.h --- wireshark-1.10.5/wiretap/snoop.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/snoop.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* snoop.h * - * $Id: snoop.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/tnef.c wireshark-1.10.6/wiretap/tnef.c --- wireshark-1.10.5/wiretap/tnef.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/tnef.c 2014-03-07 18:07:17.000000000 +0000 @@ -2,7 +2,7 @@ * * Transport-Neutral Encapsulation Format (TNEF) file reading * - * $Id: tnef.c 46803 2012-12-27 12:19:25Z guy $ + * $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/wiretap/tnef.h wireshark-1.10.6/wiretap/tnef.h --- wireshark-1.10.5/wiretap/tnef.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/tnef.h 2014-03-07 18:07:17.000000000 +0000 @@ -2,7 +2,7 @@ * * Transport-Neutral Encapsulation Format (TNEF) file reading * - * $Id: tnef.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru wireshark-1.10.5/wiretap/toshiba.c wireshark-1.10.6/wiretap/toshiba.c --- wireshark-1.10.5/wiretap/toshiba.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/toshiba.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* toshiba.c * - * $Id: toshiba.c 46819 2012-12-27 22:59:39Z guy $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/toshiba.h wireshark-1.10.6/wiretap/toshiba.h --- wireshark-1.10.5/wiretap/toshiba.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/toshiba.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* toshiba.h * - * $Id: toshiba.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/visual.c wireshark-1.10.6/wiretap/visual.c --- wireshark-1.10.5/wiretap/visual.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/visual.c 2014-03-07 18:07:17.000000000 +0000 @@ -2,7 +2,7 @@ * File read and write routines for Visual Networks cap files. * Copyright (c) 2001, Tom Nisbet tnisbet@visualnetworks.com * - * $Id: visual.c 48348 2013-03-17 09:20:13Z etxrab $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/visual.h wireshark-1.10.6/wiretap/visual.h --- wireshark-1.10.5/wiretap/visual.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/visual.h 2014-03-07 18:07:17.000000000 +0000 @@ -5,7 +5,7 @@ * * Based on the code that handles netmon files. * - * $Id: visual.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/vms.c wireshark-1.10.6/wiretap/vms.c --- wireshark-1.10.5/wiretap/vms.c 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/vms.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* vms.c * - * $Id: vms.c 47899 2013-02-26 04:42:26Z wmeier $ + * $Id$ * * Wiretap Library * Copyright (c) 2001 by Marc Milgram diff -Nru wireshark-1.10.5/wiretap/vms.h wireshark-1.10.6/wiretap/vms.h --- wireshark-1.10.5/wiretap/vms.h 2013-04-22 18:04:22.000000000 +0000 +++ wireshark-1.10.6/wiretap/vms.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* vms.h * - * $Id: vms.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 2001 by Marc Milgram diff -Nru wireshark-1.10.5/wiretap/vwr.c wireshark-1.10.6/wiretap/vwr.c --- wireshark-1.10.5/wiretap/vwr.c 2013-06-04 15:34:17.000000000 +0000 +++ wireshark-1.10.6/wiretap/vwr.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* vwr.c * Copyright (c) 2011 by Tom Alexander * - * $Id: vwr.c 49764 2013-06-04 15:28:27Z gerald $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/vwr.h wireshark-1.10.6/wiretap/vwr.h --- wireshark-1.10.5/wiretap/vwr.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/vwr.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* vwr.h * - * $Id: vwr.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wiretap Library * Copyright (c) 1998-2010 by Tom Alexander diff -Nru wireshark-1.10.5/wiretap/wtap.c wireshark-1.10.6/wiretap/wtap.c --- wireshark-1.10.5/wiretap/wtap.c 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/wtap.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* wtap.c * - * $Id: wtap.c 48847 2013-04-14 16:00:34Z pascal $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/wtap.h wireshark-1.10.6/wiretap/wtap.h --- wireshark-1.10.5/wiretap/wtap.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/wtap.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* wtap.h * - * $Id: wtap.h 48847 2013-04-14 16:00:34Z pascal $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wiretap/wtap-int.h wireshark-1.10.6/wiretap/wtap-int.h --- wireshark-1.10.5/wiretap/wtap-int.h 2013-04-22 18:04:21.000000000 +0000 +++ wireshark-1.10.6/wiretap/wtap-int.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* wtap-int.h * - * $Id: wtap-int.h 48348 2013-03-17 09:20:13Z etxrab $ + * $Id$ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez diff -Nru wireshark-1.10.5/wka.tmpl wireshark-1.10.6/wka.tmpl --- wireshark-1.10.5/wka.tmpl 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/wka.tmpl 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ # # Well-known addresses. # -# $Id: wka.tmpl 46386 2012-12-05 03:45:11Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/ws80211_utils.c wireshark-1.10.6/ws80211_utils.c --- wireshark-1.10.5/ws80211_utils.c 2013-07-17 22:26:25.000000000 +0000 +++ wireshark-1.10.6/ws80211_utils.c 2014-03-07 18:07:17.000000000 +0000 @@ -2,7 +2,7 @@ * ws80211 utilities * Copyright 2012, Pontus Fuchs -$Id: ws80211_utils.c 50710 2013-07-17 22:20:12Z gerald $ +$Id$ Parts of this file was copied from iw: diff -Nru wireshark-1.10.5/ws80211_utils.h wireshark-1.10.6/ws80211_utils.h --- wireshark-1.10.5/ws80211_utils.h 2013-04-22 18:05:29.000000000 +0000 +++ wireshark-1.10.6/ws80211_utils.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* * Copyright 2012, Pontus Fuchs * - * $Id: ws80211_utils.h 46849 2012-12-29 20:56:11Z wmeier $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/ws_symbol_export.h wireshark-1.10.6/ws_symbol_export.h --- wireshark-1.10.5/ws_symbol_export.h 2013-08-15 04:32:55.000000000 +0000 +++ wireshark-1.10.6/ws_symbol_export.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* * Cross platform defines for exporting symbols from shared libraries * - * $Id: ws_symbol_export.h 51377 2013-08-15 04:02:10Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Balint Reczey diff -Nru wireshark-1.10.5/wsutil/airpdcap_wep.c wireshark-1.10.6/wsutil/airpdcap_wep.c --- wireshark-1.10.5/wsutil/airpdcap_wep.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/airpdcap_wep.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* airpcap_wep.c * - * $Id: airpdcap_wep.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting * Copyright (c) 2006 CACE Technologies, Davis (California) diff -Nru wireshark-1.10.5/wsutil/CMakeLists.txt wireshark-1.10.6/wsutil/CMakeLists.txt --- wireshark-1.10.5/wsutil/CMakeLists.txt 2013-07-10 23:22:16.000000000 +0000 +++ wireshark-1.10.6/wsutil/CMakeLists.txt 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ # CMakeLists.txt # -# $Id: CMakeLists.txt 50495 2013-07-10 23:16:21Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/crash_info.c wireshark-1.10.6/wsutil/crash_info.c --- wireshark-1.10.5/wsutil/crash_info.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/crash_info.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* crash_info.c * Routines to try to provide more useful information in crash dumps. * - * $Id: crash_info.c 48863 2013-04-15 23:02:34Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/crash_info.h wireshark-1.10.6/wsutil/crash_info.h --- wireshark-1.10.5/wsutil/crash_info.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/crash_info.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* crash_info.h * Routines to try to provide more useful information in crash dumps. * - * $Id: crash_info.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/crc10.c wireshark-1.10.6/wsutil/crc10.c --- wireshark-1.10.5/wsutil/crc10.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/crc10.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* * crc10.c - * $Id: crc10.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/crc10.h wireshark-1.10.6/wsutil/crc10.h --- wireshark-1.10.5/wsutil/crc10.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/crc10.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* * crc10.h * - * $Id: crc10.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/crc11.c wireshark-1.10.6/wsutil/crc11.c --- wireshark-1.10.5/wsutil/crc11.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/crc11.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* * crc11.c - * $Id: crc11.c 46648 2012-12-21 01:57:03Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/crc16.c wireshark-1.10.6/wsutil/crc16.c --- wireshark-1.10.5/wsutil/crc16.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/crc16.c 2014-03-07 18:07:17.000000000 +0000 @@ -3,7 +3,7 @@ * * 2004 Richard van der Hoff * - * $Id: crc16.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/crc16.h wireshark-1.10.6/wsutil/crc16.h --- wireshark-1.10.5/wsutil/crc16.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/crc16.h 2014-03-07 18:07:17.000000000 +0000 @@ -3,7 +3,7 @@ * * 2004 Richard van der Hoff * - * $Id: crc16.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/crc16-plain.c wireshark-1.10.6/wsutil/crc16-plain.c --- wireshark-1.10.5/wsutil/crc16-plain.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/crc16-plain.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,5 +1,5 @@ /** - * $Id: crc16-plain.c 43982 2012-07-25 08:57:33Z etxrab $ + * $Id$ * \file crc16-plain.c * Functions and types for CRC checks. * diff -Nru wireshark-1.10.5/wsutil/crc32.c wireshark-1.10.6/wsutil/crc32.c --- wireshark-1.10.5/wsutil/crc32.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/crc32.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* crc32.c * CRC-32 routine * - * $Id: crc32.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/crc32.h wireshark-1.10.6/wsutil/crc32.h --- wireshark-1.10.5/wsutil/crc32.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/crc32.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* crc32.h * Declaration of CRC-32 routine and table * - * $Id: crc32.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/crc6.c wireshark-1.10.6/wsutil/crc6.c --- wireshark-1.10.5/wsutil/crc6.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/crc6.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* * crc6.c * - * $Id: crc6.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/crc6.h wireshark-1.10.6/wsutil/crc6.h --- wireshark-1.10.5/wsutil/crc6.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/crc6.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* * crc6.h * - * $Id: crc6.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/crc7.c wireshark-1.10.6/wsutil/crc7.c --- wireshark-1.10.5/wsutil/crc7.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/crc7.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /** * crc7.c * - * $Id: crc7.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Functions and types for CRC checks. * diff -Nru wireshark-1.10.5/wsutil/crc7.h wireshark-1.10.6/wsutil/crc7.h --- wireshark-1.10.5/wsutil/crc7.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/crc7.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* * crc7.h * - * $Id: crc7.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Functions and types for CRC checks. * diff -Nru wireshark-1.10.5/wsutil/crc8.c wireshark-1.10.6/wsutil/crc8.c --- wireshark-1.10.5/wsutil/crc8.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/crc8.c 2014-03-07 18:07:17.000000000 +0000 @@ -3,7 +3,7 @@ * * 2011 Roland Knall * - * $Id: crc8.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/crc8.h wireshark-1.10.6/wsutil/crc8.h --- wireshark-1.10.5/wsutil/crc8.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/crc8.h 2014-03-07 18:07:17.000000000 +0000 @@ -3,7 +3,7 @@ * * 2011 Roland Knall * - * $Id: crc8.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/crcdrm.c wireshark-1.10.6/wsutil/crcdrm.c --- wireshark-1.10.5/wsutil/crcdrm.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/crcdrm.c 2014-03-07 18:07:17.000000000 +0000 @@ -2,7 +2,7 @@ * another CRC 16 * Copyright 2006, British Broadcasting Corporation * - * $Id: crcdrm.c 43538 2012-06-28 23:18:38Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/crcdrm.h wireshark-1.10.6/wsutil/crcdrm.h --- wireshark-1.10.5/wsutil/crcdrm.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/crcdrm.h 2014-03-07 18:07:17.000000000 +0000 @@ -2,7 +2,7 @@ * another CRC 16 * Copyright 2006, British Broadcasting Corporation * - * $Id: crcdrm.h 47938 2013-02-28 14:09:46Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/file_util.c wireshark-1.10.6/wsutil/file_util.c --- wireshark-1.10.5/wsutil/file_util.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/file_util.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* file_util.c * - * $Id: file_util.c 47773 2013-02-20 19:58:55Z gerald $ + * $Id$ * * (Originally part of the Wiretap Library, now part of the Wireshark * utility library) diff -Nru wireshark-1.10.5/wsutil/file_util.h wireshark-1.10.6/wsutil/file_util.h --- wireshark-1.10.5/wsutil/file_util.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/file_util.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* file_util.h * File utility definitions * - * $Id: file_util.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/inet_aton.h wireshark-1.10.6/wsutil/inet_aton.h --- wireshark-1.10.5/wsutil/inet_aton.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/inet_aton.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* inet_aton.h * - * $Id: inet_aton.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/inet_ntop.c wireshark-1.10.6/wsutil/inet_ntop.c --- wireshark-1.10.5/wsutil/inet_ntop.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/inet_ntop.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: inet_ntop.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Copyright (c) 1996-1999 by Internet Software Consortium. * diff -Nru wireshark-1.10.5/wsutil/inet_pton.c wireshark-1.10.6/wsutil/inet_pton.c --- wireshark-1.10.5/wsutil/inet_pton.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/inet_pton.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* * Copyright (c) 1996,1999 by Internet Software Consortium. * - * $Id: inet_pton.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff -Nru wireshark-1.10.5/wsutil/inet_v6defs.h wireshark-1.10.6/wsutil/inet_v6defs.h --- wireshark-1.10.5/wsutil/inet_v6defs.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/inet_v6defs.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* inet_v6defs.h * - * $Id: inet_v6defs.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/Makefile.am wireshark-1.10.6/wsutil/Makefile.am --- wireshark-1.10.5/wsutil/Makefile.am 2013-06-03 23:37:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/Makefile.am 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ # Makefile.am # -# $Id: Makefile.am 49735 2013-06-03 23:31:09Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/Makefile.common wireshark-1.10.6/wsutil/Makefile.common --- wireshark-1.10.5/wsutil/Makefile.common 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/Makefile.common 2014-03-07 18:07:17.000000000 +0000 @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47104 2013-01-15 21:54:41Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/Makefile.in wireshark-1.10.6/wsutil/Makefile.in --- wireshark-1.10.5/wsutil/Makefile.in 2013-12-19 19:13:54.000000000 +0000 +++ wireshark-1.10.6/wsutil/Makefile.in 2014-03-07 18:07:40.000000000 +0000 @@ -17,7 +17,7 @@ # Makefile.am # -# $Id: Makefile.am 49735 2013-06-03 23:31:09Z gerald $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -40,7 +40,7 @@ # Makefile.am.inc # Include file for Makefile.am files to get additional rules # -# $Id: Makefile.am.inc 47879 2013-02-25 18:12:20Z rbalint $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -65,7 +65,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common 47104 2013-01-15 21:54:41Z guy $ +# $Id$ # # Wireshark - Network traffic analyzer # By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/Makefile.nmake wireshark-1.10.6/wsutil/Makefile.nmake --- wireshark-1.10.5/wsutil/Makefile.nmake 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/Makefile.nmake 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ ## Makefile for building wireshark.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 47938 2013-02-28 14:09:46Z rbalint $ +# $Id$ include ..\config.nmake include diff -Nru wireshark-1.10.5/wsutil/mpeg-audio.c wireshark-1.10.6/wsutil/mpeg-audio.c --- wireshark-1.10.5/wsutil/mpeg-audio.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/mpeg-audio.c 2014-03-07 18:07:17.000000000 +0000 @@ -4,7 +4,7 @@ * Written by Shaun Jackman * Copyright 2007 Shaun Jackman * - * $Id: mpeg-audio.c 46928 2013-01-04 05:22:43Z mmann $ + * $Id$ * * Wiretap Library * This program is free software; you can redistribute it and/or diff -Nru wireshark-1.10.5/wsutil/mpeg-audio.h wireshark-1.10.6/wsutil/mpeg-audio.h --- wireshark-1.10.5/wsutil/mpeg-audio.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/mpeg-audio.h 2014-03-07 18:07:17.000000000 +0000 @@ -4,7 +4,7 @@ * Written by Shaun Jackman * Copyright 2007 Shaun Jackman * - * $Id: mpeg-audio.h 48038 2013-03-03 17:14:19Z etxrab $ + * $Id$ * * Wiretap Library * This program is free software; you can redistribute it and/or diff -Nru wireshark-1.10.5/wsutil/privileges.c wireshark-1.10.6/wsutil/privileges.c --- wireshark-1.10.5/wsutil/privileges.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/privileges.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* privileges.c * Routines for handling privileges, e.g. set-UID and set-GID on UNIX. * - * $Id: privileges.c 46647 2012-12-21 00:53:30Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/privileges.h wireshark-1.10.6/wsutil/privileges.h --- wireshark-1.10.5/wsutil/privileges.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/privileges.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* privileges.h * Declarations of routines for handling privileges. * - * $Id: privileges.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/strptime.h wireshark-1.10.6/wsutil/strptime.h --- wireshark-1.10.5/wsutil/strptime.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/strptime.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,6 +1,6 @@ /* strptime.h * - * $Id: strptime.h 47992 2013-03-01 23:53:11Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/str_util.c wireshark-1.10.6/wsutil/str_util.c --- wireshark-1.10.5/wsutil/str_util.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/str_util.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* str_util.c * String utility routines * - * $Id: str_util.c 48042 2013-03-03 19:34:58Z gerald $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/str_util.h wireshark-1.10.6/wsutil/str_util.h --- wireshark-1.10.5/wsutil/str_util.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/str_util.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* str_util.h * String utility definitions * - * $Id: str_util.h 47938 2013-02-28 14:09:46Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/type_util.c wireshark-1.10.6/wsutil/type_util.c --- wireshark-1.10.5/wsutil/type_util.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/type_util.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* type_util.c * Types utility routines * - * $Id: type_util.c 45015 2012-09-20 01:29:52Z morriss $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/type_util.h wireshark-1.10.6/wsutil/type_util.h --- wireshark-1.10.5/wsutil/type_util.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/type_util.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* type_util.h * Types utility definitions * - * $Id: type_util.h 47938 2013-02-28 14:09:46Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/unicode-utils.c wireshark-1.10.6/wsutil/unicode-utils.c --- wireshark-1.10.5/wsutil/unicode-utils.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/unicode-utils.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* unicode-utils.c * Unicode utility routines * - * $Id: unicode-utils.c 43536 2012-06-28 22:56:06Z darkjames $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/unicode-utils.h wireshark-1.10.6/wsutil/unicode-utils.h --- wireshark-1.10.5/wsutil/unicode-utils.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/unicode-utils.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,7 +1,7 @@ /* unicode-utils.h * Unicode utility definitions * - * $Id: unicode-utils.h 47938 2013-02-28 14:09:46Z rbalint $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/wsgcrypt.h wireshark-1.10.6/wsutil/wsgcrypt.h --- wireshark-1.10.5/wsutil/wsgcrypt.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/wsgcrypt.h 2014-03-07 18:07:17.000000000 +0000 @@ -5,7 +5,7 @@ * compiler warnings about deprecated definitions. * Try to work around these warnings to ensure a clean build with -Werror. * - * $Id: wsgcrypt.h 48295 2013-03-14 08:42:51Z stig $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs diff -Nru wireshark-1.10.5/wsutil/wsgetopt.c wireshark-1.10.6/wsutil/wsgetopt.c --- wireshark-1.10.5/wsutil/wsgetopt.c 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/wsgetopt.c 2014-03-07 18:07:17.000000000 +0000 @@ -1,4 +1,4 @@ -/* $Id: wsgetopt.c 48869 2013-04-16 00:00:09Z eapache $ +/* $Id$ Copied from glibc-2.15 modified to compile on Windows. Getopt for GNU. diff -Nru wireshark-1.10.5/wsutil/wsgetopt_int.h wireshark-1.10.6/wsutil/wsgetopt_int.h --- wireshark-1.10.5/wsutil/wsgetopt_int.h 2013-04-22 18:04:27.000000000 +0000 +++ wireshark-1.10.6/wsutil/wsgetopt_int.h 2014-03-07 18:07:17.000000000 +0000 @@ -1,4 +1,4 @@ -/* $Id: wsgetopt_int.h 48869 2013-04-16 00:00:09Z eapache $ +/* $Id$ Copied from glibc-2.15 Internal declarations for getopt.