Wireshark · Ethereal-dev: Re: [Ethereal-dev] Minor doc updates

Ethereal-dev: Re: [Ethereal-dev] Minor doc updates

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

From: Brad Hards <bhards@xxxxxxxxxxxxxx>

Date: Fri, 18 Apr 2003 23:10:27 +1000

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Fri, 18 Apr 2003 21:00 pm, Brad Hards wrote:
> I've been a bit disappointed by the documentation for Ethereal, so I'm
> working through the user manual (and the FAQ, and some of the postings to
> ethereal-users).
Patches to Filter files - I just regenerated it.

Brad
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)

iD8DBQE+n/lDW6pHgIdAuOMRAqK8AKCQM7m4sX/qvrKTbIJ0WMFFSD4EAACfW7BJ
wvTvDBTPu/IVvysjwCgC6zw=
=dI0j
-----END PGP SIGNATURE-----

Index: ug-src/filter-fields.sgml
===================================================================
RCS file: /cvsroot/ethereal-doc/ug-src/filter-fields.sgml,v
retrieving revision 1.4
diff -u -3 -p -r1.4 filter-fields.sgml
--- ug-src/filter-fields.sgml	1 Oct 2002 23:00:22 -0000	1.4
+++ ug-src/filter-fields.sgml	18 Apr 2003 13:10:05 -0000
@@ -191,6 +191,20 @@
 </thead>
 <tbody>
   <row>
+    <entry>aim.buddyname</entry>
+    <entry>Buddy Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>aim.buddynamelen</entry>
+    <entry>Buddyname len</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>aim.channel</entry>
     <entry>Channel ID</entry>
     <entry>Unsigned 8-bit integer</entry>
@@ -205,6 +219,13 @@
   </row>
 
   <row>
+    <entry>aim.data</entry>
+    <entry>Data</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>aim.datalen</entry>
     <entry>Data Field Length</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -219,6 +240,20 @@
   </row>
 
   <row>
+    <entry>aim.fnac.flags</entry>
+    <entry>FNAC Flags</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>aim.fnac.id</entry>
+    <entry>FNAC ID</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>aim.fnac.subtype</entry>
     <entry>FNAC Subtype ID</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -226,12 +261,120 @@
   </row>
 
   <row>
+    <entry>aim.infotype</entry>
+    <entry>Infotype</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>aim.seqno</entry>
     <entry>Sequence Number</entry>
     <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
+  <row>
+    <entry>aim.signon.challenge</entry>
+    <entry>Signon challenge</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>aim.signon.challengelen</entry>
+    <entry>Signon challenge length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>aim.snac.location.request_user_info.infotype</entry>
+    <entry>Infotype</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>aim.userinfo.tlvcount</entry>
+    <entry>TLV Count</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>aim.userinfo.warninglevel</entry>
+    <entry>Warning Level</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDARCNET"><title>ARCNET (arcnet)</title>
+
+<table id="TIDARCNET"><title>ARCNET (arcnet)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>arcnet.dst</entry>
+    <entry>Dest</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Dest ID</>
+  </row>
+
+  <row>
+    <entry>arcnet.exception_flag</entry>
+    <entry>Exception Flag</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Exception flag</>
+  </row>
+
+  <row>
+    <entry>arcnet.offset</entry>
+    <entry>Offset</entry>
+    <entry>Byte array</entry>
+    <entry>Offset</>
+  </row>
+
+  <row>
+    <entry>arcnet.protID</entry>
+    <entry>Protocol ID</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Proto type</>
+  </row>
+
+  <row>
+    <entry>arcnet.sequence</entry>
+    <entry>Sequence</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Sequence number</>
+  </row>
+
+  <row>
+    <entry>arcnet.split_flag</entry>
+    <entry>Split Flag</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Split flag</>
+  </row>
+
+  <row>
+    <entry>arcnet.src</entry>
+    <entry>Source</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Source ID</>
+  </row>
+
 </tbody></tgroup></table>
 </section>
 
@@ -250,6 +393,13 @@
 </thead>
 <tbody>
   <row>
+    <entry>atm.aal</entry>
+    <entry>AAL</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>atm.vci</entry>
     <entry>VCI</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -266,6 +416,50 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDATMAAL1"><title>ATM AAL1 (aal1)</title>
+
+<table id="TIDATMAAL1"><title>ATM AAL1 (aal1)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry><entry></entry>
+  </row>
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDATMAAL3slash4"><title>ATM AAL3/4 (aal3_4)</title>
+
+<table id="TIDATMAAL3slash4"><title>ATM AAL3/4 (aal3_4)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry><entry></entry>
+  </row>
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDATMLANEmulation"><title>ATM LAN Emulation (lane)</title>
 
 <table id="TIDATMLANEmulation"><title>ATM LAN Emulation (lane)</title>
@@ -288,6 +482,143 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDATMOAMAAL"><title>ATM OAM AAL (oamaal)</title>
+
+<table id="TIDATMOAMAAL"><title>ATM OAM AAL (oamaal)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry><entry></entry>
+  </row>
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDAVSWLANCaptureheader"><title>AVS WLAN Capture header (wlancap)</title>
+
+<table id="TIDAVSWLANCaptureheader"><title>AVS WLAN Capture header (wlancap)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>wlancap.antenna</entry>
+    <entry>Antenna</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>wlancap.channel</entry>
+    <entry>Channel</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>wlancap.datarate</entry>
+    <entry>Data rate</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>wlancap.encoding</entry>
+    <entry>Encoding Type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>wlancap.hosttime</entry>
+    <entry>Host timestamp</entry>
+    <entry>Unsigned 64-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>wlancap.length</entry>
+    <entry>Header length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>wlancap.mactime</entry>
+    <entry>MAC timestamp</entry>
+    <entry>Unsigned 64-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>wlancap.phytype</entry>
+    <entry>PHY type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>wlancap.preamble</entry>
+    <entry>Preamble</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>wlancap.priority</entry>
+    <entry>Priority</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>wlancap.ssi_noise</entry>
+    <entry>SSI Noise</entry>
+    <entry>Signed 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>wlancap.ssi_signal</entry>
+    <entry>SSI Signal</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>wlancap.ssi_type</entry>
+    <entry>SSI Type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>wlancap.version</entry>
+    <entry>Header revision</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDAdhocOn-demandDistanceVectorRoutingPr0001"><title>Ad hoc On-demand Distance Vector Routing Protocol (aodv)</title>
 
 <table id="TIDAdhocOn-demandDistanceVectorRoutingPr0001"><title>Ad hoc On-demand Distance Vector Routing Protocol (aodv)</title>
@@ -1486,7 +1817,7 @@
   <row>
     <entry>afs.fs.callback.expires</entry>
     <entry>Expires</entry>
-    <entry>Date/Time stamp</entry>
+    <entry>Time duration</entry>
     <entry>Expires</>
   </row>
 
@@ -2114,6 +2445,20 @@
   </row>
 
   <row>
+    <entry>afs.repframe</entry>
+    <entry>Reply Frame</entry>
+    <entry></entry>
+    <entry>Reply Frame</>
+  </row>
+
+  <row>
+    <entry>afs.reqframe</entry>
+    <entry>Request Frame</entry>
+    <entry></entry>
+    <entry>Request Frame</>
+  </row>
+
+  <row>
     <entry>afs.rmtsys</entry>
     <entry>Rmtsys</entry>
     <entry>Boolean</entry>
@@ -2128,6 +2473,13 @@
   </row>
 
   <row>
+    <entry>afs.time</entry>
+    <entry>Time from request</entry>
+    <entry>Time duration</entry>
+    <entry>Time between Request and Reply for AFS calls</>
+  </row>
+
+  <row>
     <entry>afs.ubik</entry>
     <entry>Ubik</entry>
     <entry>Boolean</entry>
@@ -2967,6 +3319,13 @@
   </row>
 
   <row>
+    <entry>afp.afp_login_flags</entry>
+    <entry>Flags</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Login flags</>
+  </row>
+
+  <row>
     <entry>afp.appl_index</entry>
     <entry>Index</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -3807,6 +4166,13 @@
   </row>
 
   <row>
+    <entry>afp.ofork_len64</entry>
+    <entry>New length</entry>
+    <entry>Signed 64-bit integer</entry>
+    <entry>New length (64 bits)</>
+  </row>
+
+  <row>
     <entry>afp.pad</entry>
     <entry>Pad</entry>
     <entry>No value</entry>
@@ -3842,10 +4208,38 @@
   </row>
 
   <row>
+    <entry>afp.path_unicode_hint</entry>
+    <entry>Unicode hint</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Unicode hint</>
+  </row>
+
+  <row>
+    <entry>afp.path_unicode_len</entry>
+    <entry>Len</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Path length (unicode)</>
+  </row>
+
+  <row>
+    <entry>afp.random</entry>
+    <entry>Random number</entry>
+    <entry>Byte array</entry>
+    <entry>UAM random number</>
+  </row>
+
+  <row>
     <entry>afp.reply_size</entry>
     <entry>Reply size</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>First structure returned</>
+    <entry>Reply size</>
+  </row>
+
+  <row>
+    <entry>afp.reply_size32</entry>
+    <entry>Reply size</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Reply size</>
   </row>
 
   <row>
@@ -3905,6 +4299,13 @@
   </row>
 
   <row>
+    <entry>afp.session_token_timestamp</entry>
+    <entry>Time stamp</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Session time stamp</>
+  </row>
+
+  <row>
     <entry>afp.session_token_type</entry>
     <entry>Type</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -3926,6 +4327,13 @@
   </row>
 
   <row>
+    <entry>afp.start_index32</entry>
+    <entry>Start index</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>First structure returned</>
+  </row>
+
+  <row>
     <entry>afp.struct_size</entry>
     <entry>Struct size</entry>
     <entry>Unsigned 8-bit integer</entry>
@@ -3933,6 +4341,13 @@
   </row>
 
   <row>
+    <entry>afp.struct_size16</entry>
+    <entry>Struct size</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Sizeof of struct</>
+  </row>
+
+  <row>
     <entry>afp.unicode_name_offset</entry>
     <entry>Unicode name offset</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -4010,6 +4425,27 @@
   </row>
 
   <row>
+    <entry>afp.user_len</entry>
+    <entry>Len</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>User name length (unicode)</>
+  </row>
+
+  <row>
+    <entry>afp.user_name</entry>
+    <entry>User</entry>
+    <entry>String</entry>
+    <entry>User name (unicode)</>
+  </row>
+
+  <row>
+    <entry>afp.user_type</entry>
+    <entry>Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Type of user name</>
+  </row>
+
+  <row>
     <entry>afp.vol_attribute.blank_access_privs</entry>
     <entry>Blank access privileges</entry>
     <entry>Boolean</entry>
@@ -4412,6 +4848,13 @@
   </row>
 
   <row>
+    <entry>asp.server_flag.utf8_name</entry>
+    <entry>Support UTF8 server name</entry>
+    <entry>Boolean</entry>
+    <entry>Server support UTF8 server name</>
+  </row>
+
+  <row>
     <entry>asp.server_icon</entry>
     <entry>Icon bitmap</entry>
     <entry>Byte array</entry>
@@ -4447,6 +4890,20 @@
   </row>
 
   <row>
+    <entry>asp.server_utf8_name</entry>
+    <entry>Server name (UTF8)</entry>
+    <entry>String</entry>
+    <entry>Server name (UTF8)</>
+  </row>
+
+  <row>
+    <entry>asp.server_utf8_name_len</entry>
+    <entry>Server name length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>UTF8 server name length</>
+  </row>
+
+  <row>
     <entry>asp.server_vers</entry>
     <entry>AFP version</entry>
     <entry>String</entry>
@@ -4529,7 +4986,7 @@
   <row>
     <entry>atp.fragment</entry>
     <entry>ATP Fragment</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>ATP Fragment</>
   </row>
 
@@ -4549,8 +5006,8 @@
 
   <row>
     <entry>atp.segment.error</entry>
-    <entry> Desegmentation error</entry>
-    <entry>No value</entry>
+    <entry>Desegmentation error</entry>
+    <entry></entry>
     <entry>Desegmentation error due to illegal segments</>
   </row>
 
@@ -4570,7 +5027,7 @@
 
   <row>
     <entry>atp.segment.overlap.conflict</entry>
-    <entry>Conflicting data in seagment overlap</entry>
+    <entry>Conflicting data in segment overlap</entry>
     <entry>Boolean</entry>
     <entry>Overlapping segments contained conflicting data</>
   </row>
@@ -4728,6 +5185,37 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDApplicationConfigurationAccessProtocol"><title>Application Configuration Access Protocol (acap)</title>
+
+<table id="TIDApplicationConfigurationAccessProtocol"><title>Application Configuration Access Protocol (acap)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>acap.request</entry>
+    <entry>Request</entry>
+    <entry>Boolean</entry>
+    <entry>TRUE if ACAP request</>
+  </row>
+
+  <row>
+    <entry>acap.response</entry>
+    <entry>Response</entry>
+    <entry>Boolean</entry>
+    <entry>TRUE if ACAP response</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDAsyncdataoverISDNV.120"><title>Async data over ISDN (V.120) (v120)</title>
 
 <table id="TIDAsyncdataoverISDNV.120"><title>Async data over ISDN (V.120) (v120)</title>
@@ -5130,6 +5618,65 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDBoardwalk"><title>Boardwalk (brdwlk)</title>
+
+<table id="TIDBoardwalk"><title>Boardwalk (brdwlk)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>brdwlk.drop</entry>
+    <entry>Packet Dropped</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>brdwlk.eof</entry>
+    <entry>EOF</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>EOF</>
+  </row>
+
+  <row>
+    <entry>brdwlk.error</entry>
+    <entry>Error</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Error</>
+  </row>
+
+  <row>
+    <entry>brdwlk.pktcnt</entry>
+    <entry>Packet Count</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>brdwlk.sof</entry>
+    <entry>SOF</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>SOF</>
+  </row>
+
+  <row>
+    <entry>brdwlk.vsan</entry>
+    <entry>VSAN</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDBootParameters"><title>Boot Parameters (bootparams)</title>
 
 <table id="TIDBootParameters"><title>Boot Parameters (bootparams)</title>
@@ -5180,6 +5727,13 @@
   </row>
 
   <row>
+    <entry>bootparams.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
+  <row>
     <entry>bootparams.routeraddr</entry>
     <entry>Router Address</entry>
     <entry>IPv4 address</entry>
@@ -6373,6 +6927,20 @@
   </row>
 
   <row>
+    <entry>cflow.bgpnexthop</entry>
+    <entry>BGPNextHop</entry>
+    <entry>IPv4 address</entry>
+    <entry>BGP Router Nexthop</>
+  </row>
+
+  <row>
+    <entry>cflow.bgpnexthopv6</entry>
+    <entry>BGPNextHop</entry>
+    <entry>IPv6 address</entry>
+    <entry>BGP Router Nexthop</>
+  </row>
+
+  <row>
     <entry>cflow.count</entry>
     <entry>Count</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -6380,6 +6948,13 @@
   </row>
 
   <row>
+    <entry>cflow.data_flowset_id</entry>
+    <entry>Data FlowSet (Template Id)</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Data FlowSet with corresponding to a template Id</>
+  </row>
+
+  <row>
     <entry>cflow.dstaddr</entry>
     <entry>DstAddr</entry>
     <entry>IPv4 address</entry>
@@ -6387,6 +6962,13 @@
   </row>
 
   <row>
+    <entry>cflow.dstaddrv6</entry>
+    <entry>DstAddr</entry>
+    <entry>IPv6 address</entry>
+    <entry>Flow Destination Address</>
+  </row>
+
+  <row>
     <entry>cflow.dstas</entry>
     <entry>DstAS</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -6436,6 +7018,27 @@
   </row>
 
   <row>
+    <entry>cflow.flowset_id</entry>
+    <entry>FlowSet Id</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>FlowSet Id</>
+  </row>
+
+  <row>
+    <entry>cflow.flowset_length</entry>
+    <entry>FlowSet Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>FlowSet length</>
+  </row>
+
+  <row>
+    <entry>cflow.flowsexp</entry>
+    <entry>FlowsExp</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Flows exported</>
+  </row>
+
+  <row>
     <entry>cflow.inputint</entry>
     <entry>InputInt</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -6443,6 +7046,20 @@
   </row>
 
   <row>
+    <entry>cflow.muloctets</entry>
+    <entry>MulticastOctets</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Count of multicast octets</>
+  </row>
+
+  <row>
+    <entry>cflow.mulpackets</entry>
+    <entry>MulticastPackets</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Count of multicast packets</>
+  </row>
+
+  <row>
     <entry>cflow.nexthop</entry>
     <entry>NextHop</entry>
     <entry>IPv4 address</entry>
@@ -6450,6 +7067,13 @@
   </row>
 
   <row>
+    <entry>cflow.nexthopv6</entry>
+    <entry>NextHop</entry>
+    <entry>IPv6 address</entry>
+    <entry>Router nexthop</>
+  </row>
+
+  <row>
     <entry>cflow.octets</entry>
     <entry>Octets</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -6457,6 +7081,27 @@
   </row>
 
   <row>
+    <entry>cflow.octets64</entry>
+    <entry>Octets</entry>
+    <entry>Unsigned 64-bit integer</entry>
+    <entry>Count of bytes</>
+  </row>
+
+  <row>
+    <entry>cflow.octetsexp</entry>
+    <entry>OctetsExp</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Octets exported</>
+  </row>
+
+  <row>
+    <entry>cflow.options_flowset_id</entry>
+    <entry>Options FlowSet</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Options FlowSet</>
+  </row>
+
+  <row>
     <entry>cflow.outputint</entry>
     <entry>OutputInt</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -6471,6 +7116,27 @@
   </row>
 
   <row>
+    <entry>cflow.packets64</entry>
+    <entry>Packets</entry>
+    <entry>Unsigned 64-bit integer</entry>
+    <entry>Count of packets</>
+  </row>
+
+  <row>
+    <entry>cflow.packetsexp</entry>
+    <entry>PacketsExp</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Packets exported</>
+  </row>
+
+  <row>
+    <entry>cflow.packetsout</entry>
+    <entry>PacketsOut</entry>
+    <entry>Unsigned 64-bit integer</entry>
+    <entry>Count of packets going out</>
+  </row>
+
+  <row>
     <entry>cflow.protocol</entry>
     <entry>Protocol</entry>
     <entry>Unsigned 8-bit integer</entry>
@@ -6499,6 +7165,13 @@
   </row>
 
   <row>
+    <entry>cflow.source_id</entry>
+    <entry>SourceId</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Identifier for export device</>
+  </row>
+
+  <row>
     <entry>cflow.srcaddr</entry>
     <entry>SrcAddr</entry>
     <entry>IPv4 address</entry>
@@ -6506,6 +7179,13 @@
   </row>
 
   <row>
+    <entry>cflow.srcaddrv6</entry>
+    <entry>SrcAddr</entry>
+    <entry>IPv6 address</entry>
+    <entry>Flow Source Address</>
+  </row>
+
+  <row>
     <entry>cflow.srcas</entry>
     <entry>SrcAS</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -6548,10 +7228,45 @@
   </row>
 
   <row>
-    <entry>cflow.timeend</entry>
-    <entry>EndTime</entry>
-    <entry>Time duration</entry>
-    <entry>Uptime at end of flow</>
+    <entry>cflow.template_field_count</entry>
+    <entry>Field Count</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Template field count</>
+  </row>
+
+  <row>
+    <entry>cflow.template_field_length</entry>
+    <entry>Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Template field length</>
+  </row>
+
+  <row>
+    <entry>cflow.template_field_type</entry>
+    <entry>Type</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Template field type</>
+  </row>
+
+  <row>
+    <entry>cflow.template_flowset_id</entry>
+    <entry>Template FlowSet</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Template FlowSet</>
+  </row>
+
+  <row>
+    <entry>cflow.template_id</entry>
+    <entry>Template Id</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Template Id</>
+  </row>
+
+  <row>
+    <entry>cflow.timeend</entry>
+    <entry>EndTime</entry>
+    <entry>Time duration</entry>
+    <entry>Uptime at end of flow</>
   </row>
 
   <row>
@@ -6644,6 +7359,30 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDClearcaseNFS"><title>Clearcase NFS (clearcase)</title>
+
+<table id="TIDClearcaseNFS"><title>Clearcase NFS (clearcase)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>clearcase.procedure_v3</entry>
+    <entry>V3 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V3 Procedure</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDCoSineIPNOSL2debugoutput"><title>CoSine IPNOS L2 debug output (cosine)</title>
 
 <table id="TIDCoSineIPNOSL2debugoutput"><title>CoSine IPNOS L2 debug output (cosine)</title>
@@ -7041,6 +7780,61 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDDCEDistributedTimeServiceLocalServer"><title>DCE Distributed Time Service Local Server (dtsstime_req)</title>
+
+<table id="TIDDCEDistributedTimeServiceLocalServer"><title>DCE Distributed Time Service Local Server (dtsstime_req)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>dtsstime_req.opnum</entry>
+    <entry>Operation</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Operation</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDDCEDistributedTimeServiceProvider"><title>DCE Distributed Time Service Provider (dtsprovider)</title>
+
+<table id="TIDDCEDistributedTimeServiceProvider"><title>DCE Distributed Time Service Provider (dtsprovider)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>dtsprovider.opnum</entry>
+    <entry>Operation</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Operation</>
+  </row>
+
+  <row>
+    <entry>dtsprovider.status</entry>
+    <entry>Status</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Return code, status of executed command</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDDCENameService"><title>DCE Name Service (rs_pgo)</title>
 
 <table id="TIDDCENameService"><title>DCE Name Service (rs_pgo)</title>
@@ -7227,6 +8021,13 @@
   </row>
 
   <row>
+    <entry>dcerpc.array.buffer</entry>
+    <entry>Buffer</entry>
+    <entry>Byte array</entry>
+    <entry>Buffer: Buffer containing elements of the array</>
+  </row>
+
+  <row>
     <entry>dcerpc.array.max_count</entry>
     <entry>Max Count</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -7536,7 +8337,7 @@
 
   <row>
     <entry>dcerpc.dg_act_id</entry>
-    <entry>Activitiy</entry>
+    <entry>Activity</entry>
     <entry>String</entry>
     <entry></>
   </row>
@@ -7845,14 +8646,14 @@
   <row>
     <entry>dcerpc.fragment</entry>
     <entry>DCE/RPC Fragment</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>DCE/RPC Fragment</>
   </row>
 
   <row>
     <entry>dcerpc.fragment.error</entry>
     <entry>Defragmentation error</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>Defragmentation error due to illegal fragments</>
   </row>
 
@@ -7913,6 +8714,20 @@
   </row>
 
   <row>
+    <entry>dcerpc.nt.close_frame</entry>
+    <entry>Frame handle close</entry>
+    <entry></entry>
+    <entry>Frame handle closed</>
+  </row>
+
+  <row>
+    <entry>dcerpc.nt.open_frame</entry>
+    <entry>Frame handle opened</entry>
+    <entry></entry>
+    <entry>Frame handle opened</>
+  </row>
+
+  <row>
     <entry>dcerpc.obj_id</entry>
     <entry>Object</entry>
     <entry>String</entry>
@@ -7950,14 +8765,14 @@
   <row>
     <entry>dcerpc.request_in</entry>
     <entry>Request in</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry></entry>
     <entry>This packet is a response to the packet in this frame</>
   </row>
 
   <row>
     <entry>dcerpc.response_in</entry>
     <entry>Response in</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry></entry>
     <entry>The response to this packet is in this packet</>
   </row>
 
@@ -7969,6 +8784,13 @@
   </row>
 
   <row>
+    <entry>dcerpc.time</entry>
+    <entry>Time from request</entry>
+    <entry>Time duration</entry>
+    <entry>Time between Request and Reply for DCE-RPC calls</>
+  </row>
+
+  <row>
     <entry>dcerpc.ver</entry>
     <entry>Version</entry>
     <entry>Unsigned 8-bit integer</entry>
@@ -7982,6 +8804,20 @@
     <entry></>
   </row>
 
+  <row>
+    <entry>nt.str.len</entry>
+    <entry>Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of string in short integers</>
+  </row>
+
+  <row>
+    <entry>nt.str.size</entry>
+    <entry>Size</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Size of string in short integers</>
+  </row>
+
 </tbody></tgroup></table>
 </section>
 
@@ -8152,6 +8988,27 @@
 </thead>
 <tbody>
   <row>
+    <entry>epm.ann_len</entry>
+    <entry>Annotation length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>epm.ann_offset</entry>
+    <entry>Annotation offset</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>epm.annotation</entry>
+    <entry>Annotation</entry>
+    <entry>String</entry>
+    <entry>Annotation</>
+  </row>
+
+  <row>
     <entry>epm.hnd</entry>
     <entry>Handle</entry>
     <entry>Byte array</entry>
@@ -8166,13 +9023,6 @@
   </row>
 
   <row>
-    <entry>epm.if_id_p</entry>
-    <entry>Interface pointer</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
-  </row>
-
-  <row>
     <entry>epm.inq_type</entry>
     <entry>Inquiry type</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -8215,13 +9065,6 @@
   </row>
 
   <row>
-    <entry>epm.object_p</entry>
-    <entry>Object pointer</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
-  </row>
-
-  <row>
     <entry>epm.opnum</entry>
     <entry>Operation</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -8229,6 +9072,41 @@
   </row>
 
   <row>
+    <entry>epm.proto.ip</entry>
+    <entry>IP</entry>
+    <entry>IPv4 address</entry>
+    <entry>IP address where service is located</>
+  </row>
+
+  <row>
+    <entry>epm.proto.named_pipe</entry>
+    <entry>Named Pipe</entry>
+    <entry>String</entry>
+    <entry>Name of the named pipe for this service</>
+  </row>
+
+  <row>
+    <entry>epm.proto.netbios_name</entry>
+    <entry>NetBIOS Name</entry>
+    <entry>String</entry>
+    <entry>NetBIOS name where this service can be found</>
+  </row>
+
+  <row>
+    <entry>epm.proto.tcp_port</entry>
+    <entry>TCP Port</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>TCP Port where this service can be found</>
+  </row>
+
+  <row>
+    <entry>epm.proto.udp_port</entry>
+    <entry>UDP Port</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>UDP Port where this service can be found</>
+  </row>
+
+  <row>
     <entry>epm.rc</entry>
     <entry>Return code</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -8236,6 +9114,13 @@
   </row>
 
   <row>
+    <entry>epm.replace</entry>
+    <entry>Replace</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Replace existing objects?</>
+  </row>
+
+  <row>
     <entry>epm.tower</entry>
     <entry>Tower</entry>
     <entry>Byte array</entry>
@@ -8308,9 +9193,9 @@
 </tbody></tgroup></table>
 </section>
 
-<section id="SIDDCEslashRPCFLDB"><title>DCE/RPC FLDB (ubikvote)</title>
+<section id="SIDDCEslashRPCFLDB"><title>DCE/RPC FLDB (fldb)</title>
 
-<table id="TIDDCEslashRPCFLDB"><title>DCE/RPC FLDB (ubikvote)</title>
+<table id="TIDDCEslashRPCFLDB"><title>DCE/RPC FLDB (fldb)</title>
 <tgroup cols="4">
 <thead>
   <row>
@@ -8323,7 +9208,7 @@
 </thead>
 <tbody>
   <row>
-    <entry>ubikvote.opnum</entry>
+    <entry>fldb.opnum</entry>
     <entry>Operation</entry>
     <entry>Unsigned 16-bit integer</entry>
     <entry>Operation</>
@@ -8356,9 +9241,9 @@
 </tbody></tgroup></table>
 </section>
 
-<section id="SIDDCEslashRPCKerberosV"><title>DCE/RPC Kerberos V (krb5rpc)</title>
+<section id="SIDDCEslashRPCFLDBUBIKVOTE"><title>DCE/RPC FLDB UBIKVOTE (ubikvote)</title>
 
-<table id="TIDDCEslashRPCKerberosV"><title>DCE/RPC Kerberos V (krb5rpc)</title>
+<table id="TIDDCEslashRPCFLDBUBIKVOTE"><title>DCE/RPC FLDB UBIKVOTE (ubikvote)</title>
 <tgroup cols="4">
 <thead>
   <row>
@@ -8371,7 +9256,7 @@
 </thead>
 <tbody>
   <row>
-    <entry>krb5rpc.opnum</entry>
+    <entry>ubikvote.opnum</entry>
     <entry>Operation</entry>
     <entry>Unsigned 16-bit integer</entry>
     <entry>Operation</>
@@ -8380,6 +9265,79 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDDCEslashRPCKerberosV"><title>DCE/RPC Kerberos V (krb5rpc)</title>
+
+<table id="TIDDCEslashRPCKerberosV"><title>DCE/RPC Kerberos V (krb5rpc)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>hf_krb5rpc_krb5</entry>
+    <entry>hf_krb5rpc_krb5</entry>
+    <entry>Byte array</entry>
+    <entry>krb5_blob</>
+  </row>
+
+  <row>
+    <entry>hf_krb5rpc_sendto_kdc_resp_keysize</entry>
+    <entry>hf_krb5rpc_sendto_kdc_resp_keysize</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>hf_krb5rpc_sendto_kdc_resp_len</entry>
+    <entry>hf_krb5rpc_sendto_kdc_resp_len</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>hf_krb5rpc_sendto_kdc_resp_max</entry>
+    <entry>hf_krb5rpc_sendto_kdc_resp_max</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>hf_krb5rpc_sendto_kdc_resp_spare1</entry>
+    <entry>hf_krb5rpc_sendto_kdc_resp_spare1</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>hf_krb5rpc_sendto_kdc_resp_st</entry>
+    <entry>hf_krb5rpc_sendto_kdc_resp_st</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>hf_krb5rpc_sendto_kdc_rqst_keysize</entry>
+    <entry>hf_krb5rpc_sendto_kdc_rqst_keysize</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>hf_krb5rpc_sendto_kdc_rqst_spare1</entry>
+    <entry>hf_krb5rpc_sendto_kdc_rqst_spare1</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDDCEslashRPCRSACCT"><title>DCE/RPC RS_ACCT (rs_acct)</title>
 
 <table id="TIDDCEslashRPCRSACCT"><title>DCE/RPC RS_ACCT (rs_acct)</title>
@@ -8585,6 +9543,30 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDDCEslashRPCUpServer"><title>DCE/RPC UpServer (dce_update)</title>
+
+<table id="TIDDCEslashRPCUpServer"><title>DCE/RPC UpServer (dce_update)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>dce_update.opnum</entry>
+    <entry>Operation</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Operation</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDDCOMOXIDResolver"><title>DCOM OXID Resolver (oxid)</title>
 
 <table id="TIDDCOMOXIDResolver"><title>DCOM OXID Resolver (oxid)</title>
@@ -9096,6 +10078,13 @@
   </row>
 
   <row>
+    <entry>dsi.server_flag.utf8_name</entry>
+    <entry>Support UTF8 server name</entry>
+    <entry>Boolean</entry>
+    <entry>Server support UTF8 server name</>
+  </row>
+
+  <row>
     <entry>dsi.server_icon</entry>
     <entry>Icon bitmap</entry>
     <entry>Byte array</entry>
@@ -9915,49 +10904,49 @@
   <row>
     <entry>dccp.trace.admin</entry>
     <entry>Admin Requests</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Admin Requests</>
   </row>
 
   <row>
     <entry>dccp.trace.anon</entry>
     <entry>Anonymous Requests</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Anonymous Requests</>
   </row>
 
   <row>
     <entry>dccp.trace.client</entry>
     <entry>Authenticated Client Requests</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Authenticated Client Requests</>
   </row>
 
   <row>
     <entry>dccp.trace.flood</entry>
     <entry>Input/Output Flooding</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Input/Output Flooding</>
   </row>
 
   <row>
     <entry>dccp.trace.query</entry>
     <entry>Queries and Reports</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Queries and Reports</>
   </row>
 
   <row>
     <entry>dccp.trace.ridc</entry>
     <entry>RID Cache Messages</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>RID Cache Messages</>
   </row>
 
   <row>
     <entry>dccp.trace.rlim</entry>
     <entry>Rate-Limited Requests</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Rate-Limited Requests</>
   </row>
 
@@ -10093,212 +11082,6 @@
 </tbody></tgroup></table>
 </section>
 
-<section id="SIDDummyProtocol"><title>Dummy Protocol (DCERPC_NT)</title>
-
-<table id="TIDDummyProtocol"><title>Dummy Protocol (DCERPC_NT)</title>
-<tgroup cols="4">
-<thead>
-  <row>
-    <entry>Field</>
-    <entry>Field Name</>
-    <entry>Type</>
-    <entry>Description</>
-
-  </row>
-</thead>
-<tbody>
-  <row>
-    <entry>nt.access_mask.access_sacl</entry>
-    <entry>Access SACL</entry>
-    <entry>Boolean</entry>
-    <entry>Access SACL</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.delete</entry>
-    <entry>Delete</entry>
-    <entry>Boolean</entry>
-    <entry>Delete</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.generic_all</entry>
-    <entry>Generic all</entry>
-    <entry>Boolean</entry>
-    <entry>Generic all</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.generic_execute</entry>
-    <entry>Generic execute</entry>
-    <entry>Boolean</entry>
-    <entry>Generic execute</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.generic_read</entry>
-    <entry>Generic read</entry>
-    <entry>Boolean</entry>
-    <entry>Generic read</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.generic_write</entry>
-    <entry>Generic write</entry>
-    <entry>Boolean</entry>
-    <entry>Generic write</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.maximum_allowed</entry>
-    <entry>Maximum allowed</entry>
-    <entry>Boolean</entry>
-    <entry>Maximum allowed</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.read_control</entry>
-    <entry>Read control</entry>
-    <entry>Boolean</entry>
-    <entry>Read control</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.specific_0</entry>
-    <entry>Specific access, bit 0</entry>
-    <entry>Boolean</entry>
-    <entry>Specific access, bit 0</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.specific_1</entry>
-    <entry>Specific access, bit 1</entry>
-    <entry>Boolean</entry>
-    <entry>Specific access, bit 1</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.specific_10</entry>
-    <entry>Specific access, bit 10</entry>
-    <entry>Boolean</entry>
-    <entry>Specific access, bit 10</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.specific_11</entry>
-    <entry>Specific access, bit 11</entry>
-    <entry>Boolean</entry>
-    <entry>Specific access, bit 11</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.specific_12</entry>
-    <entry>Specific access, bit 12</entry>
-    <entry>Boolean</entry>
-    <entry>Specific access, bit 12</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.specific_13</entry>
-    <entry>Specific access, bit 13</entry>
-    <entry>Boolean</entry>
-    <entry>Specific access, bit 13</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.specific_14</entry>
-    <entry>Specific access, bit 14</entry>
-    <entry>Boolean</entry>
-    <entry>Specific access, bit 14</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.specific_15</entry>
-    <entry>Specific access, bit 15</entry>
-    <entry>Boolean</entry>
-    <entry>Specific access, bit 15</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.specific_2</entry>
-    <entry>Specific access, bit 2</entry>
-    <entry>Boolean</entry>
-    <entry>Specific access, bit 2</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.specific_3</entry>
-    <entry>Specific access, bit 3</entry>
-    <entry>Boolean</entry>
-    <entry>Specific access, bit 3</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.specific_4</entry>
-    <entry>Specific access, bit 4</entry>
-    <entry>Boolean</entry>
-    <entry>Specific access, bit 4</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.specific_5</entry>
-    <entry>Specific access, bit 5</entry>
-    <entry>Boolean</entry>
-    <entry>Specific access, bit 5</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.specific_6</entry>
-    <entry>Specific access, bit 6</entry>
-    <entry>Boolean</entry>
-    <entry>Specific access, bit 6</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.specific_7</entry>
-    <entry>Specific access, bit 7</entry>
-    <entry>Boolean</entry>
-    <entry>Specific access, bit 7</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.specific_8</entry>
-    <entry>Specific access, bit 8</entry>
-    <entry>Boolean</entry>
-    <entry>Specific access, bit 8</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.specific_9</entry>
-    <entry>Specific access, bit 9</entry>
-    <entry>Boolean</entry>
-    <entry>Specific access, bit 9</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.synchronise</entry>
-    <entry>Synchronise</entry>
-    <entry>Boolean</entry>
-    <entry>Synchronise</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.write_dac</entry>
-    <entry>Write DAC</entry>
-    <entry>Boolean</entry>
-    <entry>Write DAC</>
-  </row>
-
-  <row>
-    <entry>nt.access_mask.write_owner</entry>
-    <entry>Write owner</entry>
-    <entry>Boolean</entry>
-    <entry>Write owner</>
-  </row>
-
-</tbody></tgroup></table>
-</section>
-
 <section id="SIDDynamicDNSToolsProtocol"><title>Dynamic DNS Tools Protocol (ddtp)</title>
 
 <table id="TIDDynamicDNSToolsProtocol"><title>Dynamic DNS Tools Protocol (ddtp)</title>
@@ -10493,6 +11276,30 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDEthernetoverIP"><title>Ethernet over IP (etherip)</title>
+
+<table id="TIDEthernetoverIP"><title>Ethernet over IP (etherip)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>etherip.ver</entry>
+    <entry>Version</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDExtensibleAuthenticationProtocol"><title>Extensible Authentication Protocol (eap)</title>
 
 <table id="TIDExtensibleAuthenticationProtocol"><title>Extensible Authentication Protocol (eap)</title>
@@ -10545,14 +11352,14 @@
   <row>
     <entry>eaptls.fragment</entry>
     <entry>EAP-TLS Fragment</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>EAP-TLS Fragment</>
   </row>
 
   <row>
     <entry>eaptls.fragment.error</entry>
     <entry>Defragmentation error</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>Defragmentation error due to illegal fragments</>
   </row>
 
@@ -10594,9 +11401,9 @@
 </tbody></tgroup></table>
 </section>
 
-<section id="SIDFTPData"><title>FTP Data (ftp-data)</title>
+<section id="SIDFCExtendedLinkSvc"><title>FC Extended Link Svc (els)</title>
 
-<table id="TIDFTPData"><title>FTP Data (ftp-data)</title>
+<table id="TIDFCExtendedLinkSvc"><title>FC Extended Link Svc (els)</title>
 <tgroup cols="4">
 <thead>
   <row>
@@ -10609,16 +11416,480 @@
 </thead>
 <tbody>
   <row>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry><entry></entry>
+    <entry>fcels.alpa</entry>
+    <entry>AL_PA Map</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.edtov</entry>
+    <entry>E_D_TOV</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.faddr</entry>
+    <entry>Fabric Address</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.faildrcvr</entry>
+    <entry>Failed Receiver AL_PA</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.flacompliance</entry>
+    <entry>FC-FLA Compliance</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.flag</entry>
+    <entry>Flag</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.fnname</entry>
+    <entry>Fabric/Node Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.fpname</entry>
+    <entry>Fabric Port Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.hrdaddr</entry>
+    <entry>Hard Address of Originator</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.b2b</entry>
+    <entry>B2B Credit</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.bbscnum</entry>
+    <entry>BB_SC Number</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.cls1param</entry>
+    <entry>Class 1 Svc Param</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.cls2param</entry>
+    <entry>Class 2 Svc Param</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.cls3param</entry>
+    <entry>Class 3 Svc Param</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.cls4param</entry>
+    <entry>Class 4 Svc Param</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.clsflags</entry>
+    <entry>Class Flags</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.clsrcvsize</entry>
+    <entry>Class Recv Size</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.cmnfeatures</entry>
+    <entry>Common Features</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.e2e</entry>
+    <entry>End2End Credit</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.initctl</entry>
+    <entry>Initiator Ctl</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.maxconseq</entry>
+    <entry>Max Concurrent Seq</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.openseq</entry>
+    <entry>Open Seq Per Exchg</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.rcptctl</entry>
+    <entry>Recipient Ctl</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.rcvsize</entry>
+    <entry>Receive Size</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.reloff</entry>
+    <entry>Relative Offset By Info Cat</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.svcavail</entry>
+    <entry>Services Availability</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.totconseq</entry>
+    <entry>Total Concurrent Seq</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.logi.vendvers</entry>
+    <entry>Vendor Version</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.loopstate</entry>
+    <entry>Loop State</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.matchcp</entry>
+    <entry>Match Address Code Points</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.npname</entry>
+    <entry>N_Port Port_Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.opcode</entry>
+    <entry>Cmd Code</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.oxid</entry>
+    <entry>OXID</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.portid</entry>
+    <entry>Originator S_ID</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.portnum</entry>
+    <entry>Physical Port Number</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.portstatus</entry>
+    <entry>Port Status</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.pubdev_bmap</entry>
+    <entry>Public Loop Device Bitmap</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.pvtdev_bmap</entry>
+    <entry>Private Loop Device Bitmap</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rcovqual</entry>
+    <entry>Recovery Qualifier</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.reqipaddr</entry>
+    <entry>Requesting IP Address</entry>
+    <entry>IPv6 address</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.respaction</entry>
+    <entry>Responder Action</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.respipaddr</entry>
+    <entry>Responding IP Address</entry>
+    <entry>IPv6 address</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.respname</entry>
+    <entry>Responding Port Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.respnname</entry>
+    <entry>Responding Node Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.resportid</entry>
+    <entry>Responding Port ID</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rjt.detail</entry>
+    <entry>Reason Explanation</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rjt.reason</entry>
+    <entry>Reason Code</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rjt.vnduniq</entry>
+    <entry>Vendor Unique</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rnft.fc4type</entry>
+    <entry>FC-4 Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rnid.asstype</entry>
+    <entry>Associated Type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rnid.attnodes</entry>
+    <entry>Number of Attached Nodes</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rnid.ip</entry>
+    <entry>IP Address</entry>
+    <entry>IPv6 address</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rnid.ipvers</entry>
+    <entry>IP Version</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rnid.nodeidfmt</entry>
+    <entry>Node Identification Format</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rnid.nodemgmt</entry>
+    <entry>Node Management</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rnid.physport</entry>
+    <entry>Physical Port Number</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rnid.spidlen</entry>
+    <entry>Specific Id Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rnid.tcpport</entry>
+    <entry>TCP/UDP Port Number</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rnid.vendorsp</entry>
+    <entry>Vendor Specific</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rnid.vendoruniq</entry>
+    <entry>Vendor Unique</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rscn.addrfmt</entry>
+    <entry>Address Format</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rscn.area</entry>
+    <entry>Affected Area</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rscn.domain</entry>
+    <entry>Affected Domain</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rscn.evqual</entry>
+    <entry>Event Qualifier</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rscn.port</entry>
+    <entry>Affected Port</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcels.rxid</entry>
+    <entry>RXID</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
   </row>
+
+  <row>
+    <entry>fcels.scr.regn</entry>
+    <entry>Registration Function</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
 </tbody></tgroup></table>
 </section>
 
-<section id="SIDFTServerOperations"><title>FTServer Operations (ftserver)</title>
+<section id="SIDFCFabricConfigurationServer"><title>FC Fabric Configuration Server (fcs)</title>
 
-<table id="TIDFTServerOperations"><title>FTServer Operations (ftserver)</title>
+<table id="TIDFCFabricConfigurationServer"><title>FC Fabric Configuration Server (fcs)</title>
 <tgroup cols="4">
 <thead>
   <row>
@@ -10631,82 +11902,2074 @@
 </thead>
 <tbody>
   <row>
-    <entry>ftserver.opnum</entry>
-    <entry>Operation</entry>
+    <entry>fcs.err.vendor</entry>
+    <entry>Vendor Unique Reject Code</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.fcsmask</entry>
+    <entry>Subtype Capability Bitmask</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.gssubtype</entry>
+    <entry>Management GS Subtype</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.ie.domainid</entry>
+    <entry>Interconnect Element Domain ID</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.ie.fname</entry>
+    <entry>Interconnect Element Fabric Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.ie.logname</entry>
+    <entry>Interconnect Element Logical Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.ie.mgmtaddr</entry>
+    <entry>Interconnect Element Mgmt. Address</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.ie.mgmtid</entry>
+    <entry>Interconnect Element Mgmt. ID</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.ie.name</entry>
+    <entry>Interconnect Element Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.ie.type</entry>
+    <entry>Interconnect Element Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.maxres_size</entry>
+    <entry>Maximum/Residual Size</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>Operation</>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.modelname</entry>
+    <entry>Model Name/Number</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.numcap</entry>
+    <entry>Number of Capabilities</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.opcode</entry>
+    <entry>Opcode</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.platform.mgmtaddr</entry>
+    <entry>Management Address</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.platform.name</entry>
+    <entry>Platform Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.platform.nodename</entry>
+    <entry>Platform Node Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.platform.type</entry>
+    <entry>Platform Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.port.flags</entry>
+    <entry>Port Flags</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.port.moduletype</entry>
+    <entry>Port Module Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.port.name</entry>
+    <entry>Port Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.port.physportnum</entry>
+    <entry>Physical Port Number</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.port.state</entry>
+    <entry>Port State</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.port.txtype</entry>
+    <entry>Port TX Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.port.type</entry>
+    <entry>Port Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.reason</entry>
+    <entry>Reason Code</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.reasondet</entry>
+    <entry>Reason Code Explanantion</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.releasecode</entry>
+    <entry>Release Code</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.unsmask</entry>
+    <entry>Subtype Capability Bitmask</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.vbitmask</entry>
+    <entry>Vendor Unique Capability Bitmask</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcs.vendorname</entry>
+    <entry>Vendor Name</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
 </tbody></tgroup></table>
 </section>
 
-<section id="SIDFiberDistributedDataInterface"><title>Fiber Distributed Data Interface (fddi)</title>
+<section id="SIDFCIP"><title>FCIP (fcip)</title>
+
+<table id="TIDFCIP"><title>FCIP (fcip)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>fcencap.crc</entry>
+    <entry>CRC</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcencap.flags</entry>
+    <entry>Flags</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcencap.flagsc</entry>
+    <entry>Flags (1's Complement)</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcencap.framelen</entry>
+    <entry>Frame Length (in Words)</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcencap.framelenc</entry>
+    <entry>Frame Length (1's Complement)</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcencap.proto</entry>
+    <entry>Protocol</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Protocol</>
+  </row>
+
+  <row>
+    <entry>fcencap.protoc</entry>
+    <entry>Protocol (1's Complement)</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Protocol (1's Complement)</>
+  </row>
+
+  <row>
+    <entry>fcencap.tsec</entry>
+    <entry>Time (secs)</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcencap.tusec</entry>
+    <entry>Time (fraction)</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcencap.version</entry>
+    <entry>Version</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcencap.versionc</entry>
+    <entry>Version (1's Complement)</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcip.conncode</entry>
+    <entry>Connection Usage Code</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcip.connflags</entry>
+    <entry>Connection Usage Flags</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcip.dstwwn</entry>
+    <entry>Destination Fabric WWN</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcip.eof</entry>
+    <entry>EOF</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcip.eofc</entry>
+    <entry>EOF (1's Complement)</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcip.katov</entry>
+    <entry>K_A_TOV</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcip.nonce</entry>
+    <entry>Connection Nonce</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcip.pflags.ch</entry>
+    <entry>Changed Flag</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcip.pflags.sf</entry>
+    <entry>Special Frame Flag</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcip.pflagsc</entry>
+    <entry>Pflags (1's Complement)</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcip.sof</entry>
+    <entry>SOF</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcip.sofc</entry>
+    <entry>SOF (1's Complement)</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcip.srcid</entry>
+    <entry>FC/FCIP Entity Id</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcip.srcwwn</entry>
+    <entry>Source Fabric WWN</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcip.word1</entry>
+    <entry>FCIP Encapsulation Word1</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDFTPData"><title>FTP Data (ftp-data)</title>
+
+<table id="TIDFTPData"><title>FTP Data (ftp-data)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry><entry></entry>
+  </row>
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDFTServerOperations"><title>FTServer Operations (ftserver)</title>
+
+<table id="TIDFTServerOperations"><title>FTServer Operations (ftserver)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>ftserver.opnum</entry>
+    <entry>Operation</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Operation</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDFiberDistributedDataInterface"><title>Fiber Distributed Data Interface (fddi)</title>
+
+<table id="TIDFiberDistributedDataInterface"><title>Fiber Distributed Data Interface (fddi)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>fddi.addr</entry>
+    <entry>Source or Destination Address</entry>
+    <entry>6-byte Hardware (MAC) Address</entry>
+    <entry>Source or Destination Hardware Address</>
+  </row>
+
+  <row>
+    <entry>fddi.dst</entry>
+    <entry>Destination</entry>
+    <entry>6-byte Hardware (MAC) Address</entry>
+    <entry>Destination Hardware Address</>
+  </row>
+
+  <row>
+    <entry>fddi.fc</entry>
+    <entry>Frame Control</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fddi.fc.clf</entry>
+    <entry>Class/Length/Format</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fddi.fc.mac_subtype</entry>
+    <entry>MAC Subtype</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fddi.fc.prio</entry>
+    <entry>Priority</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fddi.fc.smt_subtype</entry>
+    <entry>SMT Subtype</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fddi.src</entry>
+    <entry>Source</entry>
+    <entry>6-byte Hardware (MAC) Address</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDFibreChannel"><title>Fibre Channel (fc)</title>
+
+<table id="TIDFibreChannel"><title>Fibre Channel (fc)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>fc.bls_hseqcnt</entry>
+    <entry>High SEQCNT</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fc.bls_lastseqid</entry>
+    <entry>Last Valid SEQID</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fc.bls_lseqcnt</entry>
+    <entry>Low SEQCNT</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fc.bls_oxid</entry>
+    <entry>OXID</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fc.bls_reason</entry>
+    <entry>Reason</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fc.bls_rjtdetail</entry>
+    <entry>Reason Explanantion</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fc.bls_rxid</entry>
+    <entry>RXID</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fc.bls_seqidvld</entry>
+    <entry>SEQID Valid</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fc.bls_vnduniq</entry>
+    <entry>Vendor Unique Reason</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fc.cs_ctl</entry>
+    <entry>CS_CTL</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>CS_CTL</>
+  </row>
+
+  <row>
+    <entry>fc.d_id</entry>
+    <entry>Dest Addr</entry>
+    <entry>String</entry>
+    <entry>Destination Address</>
+  </row>
+
+  <row>
+    <entry>fc.df_ctl</entry>
+    <entry>DF_CTL</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fc.f_ctl</entry>
+    <entry>F_CTL</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fc.ftype</entry>
+    <entry>Frame type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Derived Type</>
+  </row>
+
+  <row>
+    <entry>fc.nethdr.da</entry>
+    <entry>Network DA</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fc.nethdr.sa</entry>
+    <entry>Network SA</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fc.ox_id</entry>
+    <entry>OX_ID</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Originator ID</>
+  </row>
+
+  <row>
+    <entry>fc.parameter</entry>
+    <entry>Parameter</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Parameter</>
+  </row>
+
+  <row>
+    <entry>fc.r_ctl</entry>
+    <entry>R_CTL</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>R_CTL</>
+  </row>
+
+  <row>
+    <entry>fc.reassembled</entry>
+    <entry>Reassembled Frame</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fc.rx_id</entry>
+    <entry>RX_ID</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Receiver ID</>
+  </row>
+
+  <row>
+    <entry>fc.s_id</entry>
+    <entry>Src Addr</entry>
+    <entry>String</entry>
+    <entry>Source Address</>
+  </row>
+
+  <row>
+    <entry>fc.seq_cnt</entry>
+    <entry>SEQ_CNT</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Sequence Count</>
+  </row>
+
+  <row>
+    <entry>fc.seq_id</entry>
+    <entry>SEQ_ID</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Sequence ID</>
+  </row>
+
+  <row>
+    <entry>fc.type</entry>
+    <entry>Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fc.xchg_orig</entry>
+    <entry>Exchange Originator</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fc.xchg_resp</entry>
+    <entry>Exchange Responder</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDFibreChannelCommonTransport"><title>Fibre Channel Common Transport (fcct)</title>
+
+<table id="TIDFibreChannelCommonTransport"><title>Fibre Channel Common Transport (fcct)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>fcct.ext_said</entry>
+    <entry>Auth SAID</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcct.ext_tid</entry>
+    <entry>Transaction ID</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcct.gssubtype</entry>
+    <entry>GS Subtype</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcct.gstype</entry>
+    <entry>GS Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcct.in_id</entry>
+    <entry>IN_ID</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcct.options</entry>
+    <entry>Options</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcct.revision</entry>
+    <entry>Revision</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcct.server</entry>
+    <entry>Server</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Derived from GS Type &amp; Subtype fields</>
+  </row>
+
+  <row>
+    <entry>fcct_ext_authblk</entry>
+    <entry>Auth Hash Blk</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcct_ext_reqnm</entry>
+    <entry>Requestor Port Name</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcct_ext_tstamp</entry>
+    <entry>Timestamp</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDFibreChannelFabricZoneServer"><title>Fibre Channel Fabric Zone Server (FZS)</title>
+
+<table id="TIDFibreChannelFabricZoneServer"><title>Fibre Channel Fabric Zone Server (FZS)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>fcfzs.gest.vendor</entry>
+    <entry>Vendor Specific State</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.gzc.flags</entry>
+    <entry>Capabilities</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.gzc.vendor</entry>
+    <entry>Vendor Specific Flags</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.maxres_size</entry>
+    <entry>Maximum/Residual Size</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.opcode</entry>
+    <entry>Opcode</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.reason</entry>
+    <entry>Reason Code</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.rjtdetail</entry>
+    <entry>Reason Code Explanation</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.rjtvendor</entry>
+    <entry>Vendor Specific Reason</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.zone.lun</entry>
+    <entry>LUN</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.zone.mbrid</entry>
+    <entry>Zone Member Identifier</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.zone.name</entry>
+    <entry>Zone Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.zone.namelen</entry>
+    <entry>Zone Name Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.zone.numattrs</entry>
+    <entry>Number of Zone Attribute Entries</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.zone.nummbrs</entry>
+    <entry>Number of Zone Members</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.zone.state</entry>
+    <entry>Zone State</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.zonembr.idlen</entry>
+    <entry>Zone Member Identifier Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.zonembr.idtype</entry>
+    <entry>Zone Member Identifier Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.zonembr.numattrs</entry>
+    <entry>Number of Zone Member Attribute Entries</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.zoneset.name</entry>
+    <entry>Zone Set Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.zoneset.namelen</entry>
+    <entry>Zone Set Name Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.zoneset.numattrs</entry>
+    <entry>Number of Zone Set Attribute Entries</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcfzs.zoneset.numzones</entry>
+    <entry>Number of Zones</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDFibreChannelNameServer"><title>Fibre Channel Name Server (FC-dNS)</title>
+
+<table id="TIDFibreChannelNameServer"><title>Fibre Channel Name Server (FC-dNS)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>fcdns.entry.numfc4desc</entry>
+    <entry>Number of FC4 Descriptors Registered</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.entry.objfmt</entry>
+    <entry>Name Entry Object Format</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.gssubtype</entry>
+    <entry>GS_Subtype</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.maxres_size</entry>
+    <entry>Maximum/Residual Size</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.opcode</entry>
+    <entry>Opcode</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.portip</entry>
+    <entry>Port IP Address</entry>
+    <entry>IPv4 address</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.req.areaid</entry>
+    <entry>Area ID Scope</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.req.class</entry>
+    <entry>Class of Service Supported</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.req.domainid</entry>
+    <entry>Domain ID Scope</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.req.fc4desc</entry>
+    <entry>FC-4 Descriptor</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.req.fc4desclen</entry>
+    <entry>FC-4 Descriptor Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.req.fc4feature</entry>
+    <entry>FC-4 Feature Bits</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.req.fc4type</entry>
+    <entry>FC-4 Type</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.req.fc4types</entry>
+    <entry>FC-4 TYPEs Supported</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.req.ip</entry>
+    <entry>IP Address</entry>
+    <entry>IPv6 address</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.req.nname</entry>
+    <entry>Node Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.req.portid</entry>
+    <entry>Port Identifier</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.req.portname</entry>
+    <entry>Port Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.req.porttype</entry>
+    <entry>Port Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.req.sname</entry>
+    <entry>Symbolic Port Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.req.snamelen</entry>
+    <entry>Symbolic Name Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.req.spname</entry>
+    <entry>Symbolic Port Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.req.spnamelen</entry>
+    <entry>Symbolic Port Name Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.cos</entry>
+    <entry>Class of Service Supported</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.fc4desc</entry>
+    <entry>FC-4 Descriptor</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.fc4desclen</entry>
+    <entry>FC-4 Descriptor Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.fc4features</entry>
+    <entry>FC-4 Features</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.fc4type</entry>
+    <entry>FC-4 Types Supported</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.fpname</entry>
+    <entry>Fabric Port Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.hrdaddr</entry>
+    <entry>Hard Address</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.ipa</entry>
+    <entry>Initial Process Associator</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.ipnode</entry>
+    <entry>Node IP Address</entry>
+    <entry>IPv6 address</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.ipport</entry>
+    <entry>Port IP Address</entry>
+    <entry>IPv6 address</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.nname</entry>
+    <entry>Node Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.ownerid</entry>
+    <entry>Owner Id</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.pname</entry>
+    <entry>Port Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.portid</entry>
+    <entry>Port Identifier</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.porttype</entry>
+    <entry>Port Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.reason</entry>
+    <entry>Reason Code</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.reasondet</entry>
+    <entry>Reason Code Explanantion</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.sname</entry>
+    <entry>Symbolic Node Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.snamelen</entry>
+    <entry>Symbolic Node Name Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.spname</entry>
+    <entry>Symbolic Port Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.spnamelen</entry>
+    <entry>Symbolic Port Name Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.rply.vendor</entry>
+    <entry>Vendor Unique Reject Code</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.zone.mbrtype</entry>
+    <entry>Zone Member Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcdns.zonename</entry>
+    <entry>Zone Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.zone.mbrid</entry>
+    <entry>Member Identifier</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDFibreChannelProtocolforSCSI"><title>Fibre Channel Protocol for SCSI (fcp)</title>
+
+<table id="TIDFibreChannelProtocolforSCSI"><title>Fibre Channel Protocol for SCSI (fcp)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>fcp.addlcdblen</entry>
+    <entry>Additional CDB Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcp.burstlen</entry>
+    <entry>Burst Length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcp.crn</entry>
+    <entry>Command Ref Num</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcp.data_ro</entry>
+    <entry>FCP_DATA_RO</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcp.dl</entry>
+    <entry>FCP_DL</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcp.lun</entry>
+    <entry>LUN</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcp.multilun</entry>
+    <entry>Multi-Level LUN</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcp.rddata</entry>
+    <entry>RDDATA</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcp.resid</entry>
+    <entry>FCP_RESID</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcp.rspcode</entry>
+    <entry>RSP_CODE</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcp.rspflags</entry>
+    <entry>FCP_RSP Flags</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcp.rsplen</entry>
+    <entry>FCP_RSP_LEN</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcp.snslen</entry>
+    <entry>FCP_SNS_LEN</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcp.status</entry>
+    <entry>SCSI Status</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcp.taskattr</entry>
+    <entry>Task Attribute</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcp.taskmgmt</entry>
+    <entry>Task Management Flags</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcp.type</entry>
+    <entry>Field to branch off to SCSI</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>fcp.wrdata</entry>
+    <entry>WRDATA</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDFibreChannelSWILS"><title>Fibre Channel SW_ILS (swils)</title>
+
+<table id="TIDFibreChannelSWILS"><title>Fibre Channel SW_ILS (swils)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>swils.aca.domainid</entry>
+    <entry>Known Domain ID</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.dia.sname</entry>
+    <entry>Switch Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.efp.aliastok</entry>
+    <entry>Alias Token</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.efp.domid</entry>
+    <entry>Domain ID</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.efp.mcastno</entry>
+    <entry>Mcast Grp#</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.efp.payloadlen</entry>
+    <entry>Payload Len</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.efp.psname</entry>
+    <entry>Principal Switch Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.efp.psprio</entry>
+    <entry>Principal Switch Priority</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.efp.rectype</entry>
+    <entry>Record Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.efp.sname</entry>
+    <entry>Switch Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.b2b</entry>
+    <entry>B2B Credit</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.cfe2e</entry>
+    <entry>Class F E2E Credit</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.cls1p</entry>
+    <entry>Class 1 Svc Param</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.cls1rsz</entry>
+    <entry>Class 1 Frame Size</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.cls2p</entry>
+    <entry>Class 2 Svc Param</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.cls3p</entry>
+    <entry>Class 3 Svc Param</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.clsfcs</entry>
+    <entry>Class F Max Concurrent Seq</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.clsfp</entry>
+    <entry>Class F Svc Param</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.clsfrsz</entry>
+    <entry>Max Class F Frame Size</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.compat1</entry>
+    <entry>Compatability Param 1</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.compat2</entry>
+    <entry>Compatability Param 2</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.compat3</entry>
+    <entry>Compatability Param 3</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.compat4</entry>
+    <entry>Compatability Param 4</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.edtov</entry>
+    <entry>E_D_TOV</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.fcmode</entry>
+    <entry>ISL Flow Ctrl Mode</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.fcplen</entry>
+    <entry>Flow Ctrl Param Len</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.flag</entry>
+    <entry>Flag</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.oseq</entry>
+    <entry>Class F Max Open Seq</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.ratov</entry>
+    <entry>R_A_TOV</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.reqepn</entry>
+    <entry>Req Eport Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.reqesn</entry>
+    <entry>Req Switch Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.elp.rev</entry>
+    <entry>Revision</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.esc.protocol</entry>
+    <entry>Protocol ID</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.esc.swvendor</entry>
+    <entry>Switch Vendor ID</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.esc.vendorid</entry>
+    <entry>Vendor ID</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.fspf.arnum</entry>
+    <entry>AR Number</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.fspf.auth</entry>
+    <entry>Authentication</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.fspf.authtype</entry>
+    <entry>Authentication Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.fspf.cmd</entry>
+    <entry>Command: </entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.fspf.origdomid</entry>
+    <entry>Originating Domain ID</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.fspf.ver</entry>
+    <entry>Version</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.hlo.deadint</entry>
+    <entry>Dead Interval (secs)</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.hlo.hloint</entry>
+    <entry>Hello Interval (secs)</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.hlo.options</entry>
+    <entry>Options</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.hlo.origpidx</entry>
+    <entry>Originating Port Idx</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.hlo.rcvdomid</entry>
+    <entry>Recipient Domain ID</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.ldr.linkcost</entry>
+    <entry>Link Cost</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.ldr.linkid</entry>
+    <entry>Link ID</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.ldr.linktype</entry>
+    <entry>Link Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.ldr.nbr_portidx</entry>
+    <entry>Neighbor Port Idx</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.ldr.out_portidx</entry>
+    <entry>Output Port Idx</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.ls.id</entry>
+    <entry>Link State Id</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.lsr.advdomid</entry>
+    <entry>Advertising Domain Id</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.lsr.incid</entry>
+    <entry>LS Incarnation Number</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.lsr.type</entry>
+    <entry>LSR Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.mr.activezonesetname</entry>
+    <entry>Active Zoneset Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.opcode</entry>
+    <entry>Cmd Code</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.rdi.len</entry>
+    <entry>Payload Len</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.rdi.reqsn</entry>
+    <entry>Req Switch Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.rjt.reason</entry>
+    <entry>Reason Code</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.rjt.reasonexpl</entry>
+    <entry>Reason Code Explanantion</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.rjt.vendor</entry>
+    <entry>Vendor Unique Error Code</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.rscn.addrfmt</entry>
+    <entry>Address Format</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.rscn.affectedport</entry>
+    <entry>Affected Port ID</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.rscn.detectfn</entry>
+    <entry>Detection Function</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.rscn.evtype</entry>
+    <entry>Event Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.rscn.nwwn</entry>
+    <entry>Node WWN</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>swils.rscn.portid</entry>
+    <entry>Port Id</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
 
-<table id="TIDFiberDistributedDataInterface"><title>Fiber Distributed Data Interface (fddi)</title>
-<tgroup cols="4">
-<thead>
   <row>
-    <entry>Field</>
-    <entry>Field Name</>
-    <entry>Type</>
-    <entry>Description</>
+    <entry>swils.rscn.portstate</entry>
+    <entry>Port State</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
 
+  <row>
+    <entry>swils.rscn.pwwn</entry>
+    <entry>Port WWN</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
-</thead>
-<tbody>
+
   <row>
-    <entry>fddi.addr</entry>
-    <entry>Source or Destination Address</entry>
-    <entry>6-byte Hardware (MAC) Address</entry>
-    <entry>Source or Destination Hardware Address</>
+    <entry>swils.sfc.opcode</entry>
+    <entry>Operation Request</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>fddi.dst</entry>
-    <entry>Destination</entry>
-    <entry>6-byte Hardware (MAC) Address</entry>
-    <entry>Destination Hardware Address</>
+    <entry>swils.sfc.zonename</entry>
+    <entry>Zone Set Name</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>fddi.fc</entry>
-    <entry>Frame Control</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>swils.zone.lun</entry>
+    <entry>LUN</entry>
+    <entry>Byte array</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>fddi.fc.clf</entry>
-    <entry>Class/Length/Format</entry>
+    <entry>swils.zone.mbrtype</entry>
+    <entry>Zone Member Type</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>fddi.fc.mac_subtype</entry>
-    <entry>MAC Subtype</entry>
+    <entry>swils.zone.protocol</entry>
+    <entry>Zone Protocol</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>fddi.fc.prio</entry>
-    <entry>Priority</entry>
+    <entry>swils.zone.reason</entry>
+    <entry>Zone Command Reason Code</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>Applies to MR, ACA, RCA, SFC, UFC</>
   </row>
 
   <row>
-    <entry>fddi.fc.smt_subtype</entry>
-    <entry>SMT Subtype</entry>
+    <entry>swils.zone.status</entry>
+    <entry>Zone Command Status</entry>
     <entry>Unsigned 8-bit integer</entry>
+    <entry>Applies to MR, ACA, RCA, SFC, UFC</>
+  </row>
+
+  <row>
+    <entry>swils.zone.zoneobjname</entry>
+    <entry>Zone Object Name</entry>
+    <entry>String</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>fddi.src</entry>
-    <entry>Source</entry>
-    <entry>6-byte Hardware (MAC) Address</entry>
+    <entry>swils.zone.zoneobjtype</entry>
+    <entry>Zone Object Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
@@ -16666,9 +19929,9 @@
 
   <row>
     <entry>gtpv1.tear_ind</entry>
-    <entry>Teardown indication</entry>
+    <entry>Teardown Indicator</entry>
     <entry>Boolean</entry>
-    <entry>Teardown Indication</>
+    <entry>Teardown Indicator</>
   </row>
 
   <row>
@@ -17370,6 +20633,117 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDHPExtendedLocal-LinkControl"><title>HP Extended Local-Link Control (hpext)</title>
+
+<table id="TIDHPExtendedLocal-LinkControl"><title>HP Extended Local-Link Control (hpext)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>hpext.dxsap</entry>
+    <entry>DXSAP</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>hpext.sxsap</entry>
+    <entry>SXSAP</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDHPRemoteMaintenanceProtocol"><title>HP Remote Maintenance Protocol (rmp)</title>
+
+<table id="TIDHPRemoteMaintenanceProtocol"><title>HP Remote Maintenance Protocol (rmp)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>rmp.filename</entry>
+    <entry>Filename</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>rmp.machtype</entry>
+    <entry>Machine Type</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>rmp.offset</entry>
+    <entry>Offset</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>rmp.retcode</entry>
+    <entry>Returncode</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>rmp.seqnum</entry>
+    <entry>Sequence Number</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>rmp.sessionid</entry>
+    <entry>Session ID</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>rmp.size</entry>
+    <entry>Size</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>rmp.type</entry>
+    <entry>Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>rmp.version</entry>
+    <entry>Version</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDHummingbirdNFSDaemon"><title>Hummingbird NFS Daemon (hclnfsd)</title>
 
 <table id="TIDHummingbirdNFSDaemon"><title>Hummingbird NFS Daemon (hclnfsd)</title>
@@ -17560,6 +20934,13 @@
   </row>
 
   <row>
+    <entry>hclnfsd.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
+  <row>
     <entry>hclnfsd.queuestatus</entry>
     <entry>Queue Status</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -17632,6 +21013,65 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDHyperSCSI"><title>HyperSCSI (hyperscsi)</title>
+
+<table id="TIDHyperSCSI"><title>HyperSCSI (hyperscsi)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>hyperscsi.cmd</entry>
+    <entry>HyperSCSI Command</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>hyperscsi.fragno</entry>
+    <entry>Fragment No</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>hyperscsi.lastfrag</entry>
+    <entry>Last Fragment</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>hyperscsi.reserved</entry>
+    <entry>Reserved</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>hyperscsi.tagno</entry>
+    <entry>Tag No</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>hyperscsi.version</entry>
+    <entry>HyperSCSI Version</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDHypertextTransferProtocol"><title>Hypertext Transfer Protocol (http)</title>
 
 <table id="TIDHypertextTransferProtocol"><title>Hypertext Transfer Protocol (http)</title>
@@ -17921,14 +21361,14 @@
   <row>
     <entry>wlan.fragment</entry>
     <entry>802.11 Fragment</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>802.11 Fragment</>
   </row>
 
   <row>
     <entry>wlan.fragment.error</entry>
     <entry>Defragmentation error</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>Defragmentation error due to illegal fragments</>
   </row>
 
@@ -18004,7 +21444,7 @@
 
   <row>
     <entry>wlan.wep.icv</entry>
-    <entry>WEP ICV (not verified)</entry>
+    <entry>WEP ICV</entry>
     <entry>Unsigned 32-bit integer</entry>
     <entry>WEP ICV</>
   </row>
@@ -18104,6 +21544,13 @@
   </row>
 
   <row>
+    <entry>wlan_mgt.fixed.capabilities.dsss_ofdm</entry>
+    <entry>DSSS-OFDM</entry>
+    <entry>Boolean</entry>
+    <entry>DSSS-OFDM Modulation</>
+  </row>
+
+  <row>
     <entry>wlan_mgt.fixed.capabilities.ess</entry>
     <entry>ESS capabilities</entry>
     <entry>Boolean</entry>
@@ -18139,6 +21586,13 @@
   </row>
 
   <row>
+    <entry>wlan_mgt.fixed.capabilities.short_slot_time</entry>
+    <entry>Short Slot Time</entry>
+    <entry>Boolean</entry>
+    <entry>Short Slot Time</>
+  </row>
+
+  <row>
     <entry>wlan_mgt.fixed.current_ap</entry>
     <entry>Current AP</entry>
     <entry>6-byte Hardware (MAC) Address</entry>
@@ -18226,6 +21680,37 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDIPOverFC"><title>IP Over FC (ipfc)</title>
+
+<table id="TIDIPOverFC"><title>IP Over FC (ipfc)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>ipfc.nh.da</entry>
+    <entry>Network DA</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipfc.nh.sa</entry>
+    <entry>Network SA</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDIPPayloadCompression"><title>IP Payload Compression (ipcomp)</title>
 
 <table id="TIDIPPayloadCompression"><title>IP Payload Compression (ipcomp)</title>
@@ -18319,6 +21804,180 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDIPXWAN"><title>IPX WAN (ipxwan)</title>
+
+<table id="TIDIPXWAN"><title>IPX WAN (ipxwan)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>ipxwan.accept_option</entry>
+    <entry>Accept Option</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipxwan.compression.type</entry>
+    <entry>Compression Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipxwan.extended_node_id</entry>
+    <entry>Extended Node ID</entry>
+    <entry>IPX network or server name</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipxwan.identifier</entry>
+    <entry>Identifier</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipxwan.nlsp_information.delay</entry>
+    <entry>Delay</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipxwan.nlsp_information.throughput</entry>
+    <entry>Throughput</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipxwan.nlsp_raw_throughput_data.delta_time</entry>
+    <entry>Delta Time</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipxwan.nlsp_raw_throughput_data.request_size</entry>
+    <entry>Request Size</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipxwan.node_id</entry>
+    <entry>Node ID</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipxwan.node_number</entry>
+    <entry>Node Number</entry>
+    <entry>6-byte Hardware (MAC) Address</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipxwan.num_options</entry>
+    <entry>Number of Options</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipxwan.option_data_len</entry>
+    <entry>Option Data Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipxwan.option_num</entry>
+    <entry>Option Number</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipxwan.packet_type</entry>
+    <entry>Packet Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipxwan.rip_sap_info_exchange.common_network_number</entry>
+    <entry>Common Network Number</entry>
+    <entry>IPX network or server name</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipxwan.rip_sap_info_exchange.router_name</entry>
+    <entry>Router Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipxwan.rip_sap_info_exchange.wan_link_delay</entry>
+    <entry>WAN Link Delay</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipxwan.routing_type</entry>
+    <entry>Routing Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ipxwan.sequence_number</entry>
+    <entry>Sequence Number</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDISDN"><title>ISDN (isdn)</title>
+
+<table id="TIDISDN"><title>ISDN (isdn)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>isdn.channel</entry>
+    <entry>Channel</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDISDNQ.921-UserAdaptationLayer"><title>ISDN Q.921-User Adaptation Layer (iua)</title>
 
 <table id="TIDISDNQ.921-UserAdaptationLayer"><title>ISDN Q.921-User Adaptation Layer (iua)</title>
@@ -18757,6 +22416,13 @@
   </row>
 
   <row>
+    <entry>isup.cause_indicator</entry>
+    <entry>Cause indicator</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>isup.cgs_message_type</entry>
     <entry>Circuit group supervision message type</entry>
     <entry>Unsigned 8-bit integer</entry>
@@ -19264,6 +22930,13 @@
   </row>
 
   <row>
+    <entry>isis.lsp.att</entry>
+    <entry>Attachment</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>isis.lsp.checksum</entry>
     <entry>Checksum</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -19299,6 +22972,27 @@
   </row>
 
   <row>
+    <entry>isis.lsp.is_type</entry>
+    <entry>Type of Intermediate System</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>isis.lsp.overload</entry>
+    <entry>Overload bit</entry>
+    <entry>Boolean</entry>
+    <entry>If set, this router will not be used by any decision process to calculate routes</>
+  </row>
+
+  <row>
+    <entry>isis.lsp.partition_repair</entry>
+    <entry>Partition Repair</entry>
+    <entry>Boolean</entry>
+    <entry>If set, this router supports the optional Partition Repair function</>
+  </row>
+
+  <row>
     <entry>isis.lsp.pdu_length</entry>
     <entry>PDU length</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -19452,14 +23146,14 @@
   <row>
     <entry>clnp.segment</entry>
     <entry>CLNP Segment</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>CLNP Segment</>
   </row>
 
   <row>
     <entry>clnp.segment.error</entry>
     <entry>Reassembly error</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>Reassembly error due to illegal segments</>
   </row>
 
@@ -19711,6 +23405,58 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDIntelANSprobe"><title>Intel ANS probe (ans)</title>
+
+<table id="TIDIntelANSprobe"><title>Intel ANS probe (ans)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>ans.app_id</entry>
+    <entry>Application ID</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Intel ANS Application ID</>
+  </row>
+
+  <row>
+    <entry>ans.rev_id</entry>
+    <entry>Revision ID</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Intel ANS Revision ID</>
+  </row>
+
+  <row>
+    <entry>ans.sender_id</entry>
+    <entry>Sender ID</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Intel ANS Sender ID</>
+  </row>
+
+  <row>
+    <entry>ans.seq_num</entry>
+    <entry>Sequence Number</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Intel ANS Sequence Number</>
+  </row>
+
+  <row>
+    <entry>ans.team_id</entry>
+    <entry>Team ID</entry>
+    <entry>6-byte Hardware (MAC) Address</entry>
+    <entry>Intel ANS Team ID</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDInter-Access-PointProtocol"><title>Inter-Access-Point Protocol (iapp)</title>
 
 <table id="TIDInter-Access-PointProtocol"><title>Inter-Access-Point Protocol (iapp)</title>
@@ -20516,14 +24262,14 @@
   <row>
     <entry>ip.fragment</entry>
     <entry>IP Fragment</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>IP Fragment</>
   </row>
 
   <row>
     <entry>ip.fragment.error</entry>
     <entry>Defragmentation error</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>Defragmentation error due to illegal fragments</>
   </row>
 
@@ -20701,14 +24447,14 @@
   <row>
     <entry>ipv6.fragment</entry>
     <entry>IPv6 Fragment</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>IPv6 Fragment</>
   </row>
 
   <row>
     <entry>ipv6.fragment.error</entry>
     <entry>Defragmentation error</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>Defragmentation error due to illegal fragments</>
   </row>
 
@@ -20755,34 +24501,6 @@
   </row>
 
   <row>
-    <entry>ipv6.mipv6_a_flag</entry>
-    <entry>Acknowledge (A) </entry>
-    <entry>Boolean</entry>
-    <entry></>
-  </row>
-
-  <row>
-    <entry>ipv6.mipv6_b_flag</entry>
-    <entry>Bicasting all (B) </entry>
-    <entry>Boolean</entry>
-    <entry></>
-  </row>
-
-  <row>
-    <entry>ipv6.mipv6_d_flag</entry>
-    <entry>Duplicate Address Detection (D) </entry>
-    <entry>Boolean</entry>
-    <entry></>
-  </row>
-
-  <row>
-    <entry>ipv6.mipv6_h_flag</entry>
-    <entry>Home Registration (H) </entry>
-    <entry>Boolean</entry>
-    <entry></>
-  </row>
-
-  <row>
     <entry>ipv6.mipv6_home_address</entry>
     <entry>Home Address </entry>
     <entry>IPv6 address</entry>
@@ -20790,90 +24508,13 @@
   </row>
 
   <row>
-    <entry>ipv6.mipv6_length</entry>
-    <entry>Option Length </entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
-  </row>
-
-  <row>
-    <entry>ipv6.mipv6_life_time</entry>
-    <entry>Life Time </entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
-  </row>
-
-  <row>
-    <entry>ipv6.mipv6_m_flag</entry>
-    <entry>MAP Registration (M) </entry>
-    <entry>Boolean</entry>
-    <entry></>
-  </row>
-
-  <row>
-    <entry>ipv6.mipv6_prefix_length</entry>
-    <entry>Prefix Length </entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
-  </row>
-
-  <row>
-    <entry>ipv6.mipv6_r_flag</entry>
-    <entry>Router (R) </entry>
-    <entry>Boolean</entry>
-    <entry></>
-  </row>
-
-  <row>
-    <entry>ipv6.mipv6_refresh</entry>
-    <entry>Refresh </entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
-  </row>
-
-  <row>
-    <entry>ipv6.mipv6_sequence_number</entry>
-    <entry>Sequence Number </entry>
-    <entry>Unsigned 16-bit integer</entry>
-    <entry></>
-  </row>
-
-  <row>
-    <entry>ipv6.mipv6_status</entry>
-    <entry>Status </entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
-  </row>
-
-  <row>
-    <entry>ipv6.mipv6_sub_alternative_COA</entry>
-    <entry>Alternative Care of Address </entry>
-    <entry>IPv6 address</entry>
-    <entry></>
-  </row>
-
-  <row>
-    <entry>ipv6.mipv6_sub_length</entry>
-    <entry>Sub-Option Length </entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
-  </row>
-
-  <row>
-    <entry>ipv6.mipv6_sub_type</entry>
-    <entry>Sub-Option Type </entry>
+    <entry>ipv6.mipv6_length</entry>
+    <entry>Option Length </entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ipv6.mipv6_sub_unique_ID</entry>
-    <entry>Unique Identifier </entry>
-    <entry>Unsigned 16-bit integer</entry>
-    <entry></>
-  </row>
-
-  <row>
     <entry>ipv6.mipv6_type</entry>
     <entry>Option Type </entry>
     <entry>Unsigned 8-bit integer</entry>
@@ -21096,7 +24737,7 @@
   <row>
     <entry>rmi.inputstream.message</entry>
     <entry>Input Stream Message</entry>
-    <entry>String</entry>
+    <entry>Unsigned 8-bit integer</entry>
     <entry>RMI Inputstream Message Token</>
   </row>
 
@@ -21110,14 +24751,14 @@
   <row>
     <entry>rmi.outputstream.message</entry>
     <entry>Output Stream Message</entry>
-    <entry>String</entry>
+    <entry>Unsigned 8-bit integer</entry>
     <entry>RMI Outputstream Message token</>
   </row>
 
   <row>
     <entry>rmi.protocol</entry>
     <entry>Protocol</entry>
-    <entry>String</entry>
+    <entry>Unsigned 8-bit integer</entry>
     <entry>RMI Protocol Type</>
   </row>
 
@@ -21253,6 +24894,13 @@
   </row>
 
   <row>
+    <entry>klm.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
+  <row>
     <entry>klm.servername</entry>
     <entry>server name</entry>
     <entry>String</entry>
@@ -22438,6 +26086,13 @@
   </row>
 
   <row>
+    <entry>ldap.sasl_buffer_length</entry>
+    <entry>SASL Buffer Length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>SASL Buffer Length</>
+  </row>
+
+  <row>
     <entry>ldap.search.basedn</entry>
     <entry>Base DN</entry>
     <entry>String</entry>
@@ -23359,6 +27014,13 @@
   </row>
 
   <row>
+    <entry>lmp.msg.endverifyack</entry>
+    <entry>EndVerifyAck Message</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>lmp.msg.hello</entry>
     <entry>HELLO Message</entry>
     <entry>Boolean</entry>
@@ -24027,6 +27689,72 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDMDSHeader"><title>MDS Header (mdshdr)</title>
+
+<table id="TIDMDSHeader"><title>MDS Header (mdshdr)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>mdshdr.dstidx</entry>
+    <entry>Dst Index</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mdshdr.eof</entry>
+    <entry>EOF</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mdshdr.plen</entry>
+    <entry>Packet Len</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mdshdr.sof</entry>
+    <entry>SOF</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mdshdr.span</entry>
+    <entry>SPAN Frame</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mdshdr.srcidx</entry>
+    <entry>Src Index</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mdshdr.vsan</entry>
+    <entry>VSAN</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDMMSMessageEncapsulation"><title>MMS Message Encapsulation (mmse)</title>
 
 <table id="TIDMMSMessageEncapsulation"><title>MMS Message Encapsulation (mmse)</title>
@@ -24369,6 +28097,28 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDMSNMessengerService"><title>MSN Messenger Service (msnms)</title>
+
+<table id="TIDMSNMessengerService"><title>MSN Messenger Service (msnms)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry><entry></entry>
+  </row>
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDMSNIPcolonMulticastSourceNotification0011"><title>MSNIP: Multicast Source Notification of Interest Protocol (msnip)</title>
 
 <table id="TIDMSNIPcolonMulticastSourceNotification0011"><title>MSNIP: Multicast Source Notification of Interest Protocol (msnip)</title>
@@ -25114,6 +28864,13 @@
   </row>
 
   <row>
+    <entry>m3ua.paramter_trailer</entry>
+    <entry>Trailer</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>m3ua.protocol_data_2_li</entry>
     <entry>Length indicator</entry>
     <entry>Unsigned 8-bit integer</entry>
@@ -25163,6 +28920,13 @@
   </row>
 
   <row>
+    <entry>m3ua.reason</entry>
+    <entry>Reason</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>m3ua.registration_result_identifier</entry>
     <entry>Local RK-identifier value</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -25205,6 +28969,20 @@
   </row>
 
   <row>
+    <entry>m3ua.si</entry>
+    <entry>Service indicator</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>m3ua.ssn</entry>
+    <entry>Subsystem number</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>m3ua.status_info</entry>
     <entry>Status info</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -25246,27 +29024,6 @@
     <entry></>
   </row>
 
-  <row>
-    <entry>m3ua_reason</entry>
-    <entry>Reason</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
-  </row>
-
-  <row>
-    <entry>m3ua_si</entry>
-    <entry>Service indicator</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
-  </row>
-
-  <row>
-    <entry>m3ua_ssn</entry>
-    <entry>Subsystem number</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
-  </row>
-
 </tbody></tgroup></table>
 </section>
 
@@ -25350,7 +29107,7 @@
   <row>
     <entry>m2pa.type</entry>
     <entry>Message Type</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
@@ -25488,6 +29245,20 @@
 </thead>
 <tbody>
   <row>
+    <entry>mtp3.ansi_dpc</entry>
+    <entry>DPC</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mtp3.ansi_opc</entry>
+    <entry>DPC</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>mtp3.dpc</entry>
     <entry>DPC</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -25581,6 +29352,142 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDMessageTransferPartLevel3Management"><title>Message Transfer Part Level 3 Management (mtp3mg)</title>
+
+<table id="TIDMessageTransferPartLevel3Management"><title>Message Transfer Part Level 3 Management (mtp3mg)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>mtp3mg.ansi_apc</entry>
+    <entry>Affected Point Code</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mtp3mg.apc</entry>
+    <entry>Affected Point Code (ITU)</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mtp3mg.apc.cluster</entry>
+    <entry>Affected Point Code cluster</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mtp3mg.apc.member</entry>
+    <entry>Affected Point Code member</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mtp3mg.apc.network</entry>
+    <entry>Affected Point Code network</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mtp3mg.cause</entry>
+    <entry>Cause</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Cause of user unavailability</>
+  </row>
+
+  <row>
+    <entry>mtp3mg.cbc</entry>
+    <entry>Change Back Code</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mtp3mg.fsn</entry>
+    <entry>Forward Sequence Number</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Forward Sequence Number of last accepted message</>
+  </row>
+
+  <row>
+    <entry>mtp3mg.h0</entry>
+    <entry>H0 (Message Group)</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Message group identifier</>
+  </row>
+
+  <row>
+    <entry>mtp3mg.h1</entry>
+    <entry>H1 (Message)</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Message type</>
+  </row>
+
+  <row>
+    <entry>mtp3mg.link</entry>
+    <entry>Link</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>CIC of BIC used to carry data</>
+  </row>
+
+  <row>
+    <entry>mtp3mg.slc</entry>
+    <entry>Signalling Link Code</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>SLC of affected link</>
+  </row>
+
+  <row>
+    <entry>mtp3mg.status</entry>
+    <entry>Status</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Congestion status</>
+  </row>
+
+  <row>
+    <entry>mtp3mg.test.h0</entry>
+    <entry>H0 (Message Group)</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Message group identifier</>
+  </row>
+
+  <row>
+    <entry>mtp3mg.test.h1</entry>
+    <entry>H1 (Message)</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>SLT message type</>
+  </row>
+
+  <row>
+    <entry>mtp3mg.test.length</entry>
+    <entry>Test length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Signalling link test pattern length</>
+  </row>
+
+  <row>
+    <entry>mtp3mg.user</entry>
+    <entry>User</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Unavailable user part</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDMicrosoftDistributedFileSystem"><title>Microsoft Distributed File System (dfs)</title>
 
 <table id="TIDMicrosoftDistributedFileSystem"><title>Microsoft Distributed File System (dfs)</title>
@@ -25655,6 +29562,13 @@
   </row>
 
   <row>
+    <entry>mapi.encrypted_data</entry>
+    <entry>Encrypted data</entry>
+    <entry>Byte array</entry>
+    <entry>Encrypted data</>
+  </row>
+
+  <row>
     <entry>mapi.hnd</entry>
     <entry>Context Handle</entry>
     <entry>Byte array</entry>
@@ -25690,13 +29604,6 @@
   </row>
 
   <row>
-    <entry>mapi.unknown_data</entry>
-    <entry>unknown encrypted data</entry>
-    <entry>Byte array</entry>
-    <entry>Unknown data. If you know what this is, contact ethereal developers.</>
-  </row>
-
-  <row>
     <entry>mapi.unknown_short</entry>
     <entry>Unknown short</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -26353,6 +30260,93 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDMicrosoftLocalSecurityArchitectureDir0012"><title>Microsoft Local Security Architecture (Directory Services) (lsa_ds)</title>
+
+<table id="TIDMicrosoftLocalSecurityArchitectureDir0012"><title>Microsoft Local Security Architecture (Directory Services) (lsa_ds)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>ls_ads.op_status</entry>
+    <entry>Operational status</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Current operational status</>
+  </row>
+
+  <row>
+    <entry>ls_ads.opnum</entry>
+    <entry>Operation</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Operation</>
+  </row>
+
+  <row>
+    <entry>ls_ads.upgrading</entry>
+    <entry>Upgrading</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Upgrade State</>
+  </row>
+
+  <row>
+    <entry>lsa_ds.dominfo.dnsname</entry>
+    <entry>DNS name</entry>
+    <entry>String</entry>
+    <entry>DNS Domain Name</>
+  </row>
+
+  <row>
+    <entry>lsa_ds.dominfo.flags</entry>
+    <entry>Flags</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Machine flags</>
+  </row>
+
+  <row>
+    <entry>lsa_ds.dominfo.forest</entry>
+    <entry>Forest name</entry>
+    <entry>String</entry>
+    <entry>DNS Forest Name</>
+  </row>
+
+  <row>
+    <entry>lsa_ds.dominfo.level</entry>
+    <entry>Level</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Information level of requested data</>
+  </row>
+
+  <row>
+    <entry>lsa_ds.dominfo.nbname</entry>
+    <entry>Netbios name</entry>
+    <entry>String</entry>
+    <entry>Netbios Domain Name</>
+  </row>
+
+  <row>
+    <entry>lsa_ds.rc</entry>
+    <entry>Return code</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>LSA_DS return status code</>
+  </row>
+
+  <row>
+    <entry>lsa_ds.role</entry>
+    <entry>Machine role</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Role of machine in domain</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDMicrosoftNetworkLogon"><title>Microsoft Network Logon (rpc_netlogon)</title>
 
 <table id="TIDMicrosoftNetworkLogon"><title>Microsoft Network Logon (rpc_netlogon)</title>
@@ -26620,6 +30614,104 @@
   </row>
 
   <row>
+    <entry>netlogon.dc.flags</entry>
+    <entry>Flags</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Domain Controller Flags</>
+  </row>
+
+  <row>
+    <entry>netlogon.dc.flags.closest</entry>
+    <entry>Closest</entry>
+    <entry>Boolean</entry>
+    <entry>If this is the closest server</>
+  </row>
+
+  <row>
+    <entry>netlogon.dc.flags.dns_controller</entry>
+    <entry>DNS Controller</entry>
+    <entry>Boolean</entry>
+    <entry>If this server is a DNS Controller</>
+  </row>
+
+  <row>
+    <entry>netlogon.dc.flags.dns_domain</entry>
+    <entry>DNS Domain</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>netlogon.dc.flags.dns_forest</entry>
+    <entry>DNS Forest</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>netlogon.dc.flags.ds</entry>
+    <entry>DS</entry>
+    <entry>Boolean</entry>
+    <entry>If this server is a DS</>
+  </row>
+
+  <row>
+    <entry>netlogon.dc.flags.gc</entry>
+    <entry>GC</entry>
+    <entry>Boolean</entry>
+    <entry>If this server is a GC</>
+  </row>
+
+  <row>
+    <entry>netlogon.dc.flags.good_timeserv</entry>
+    <entry>Good Timeserv</entry>
+    <entry>Boolean</entry>
+    <entry>If this is a Good TimeServer</>
+  </row>
+
+  <row>
+    <entry>netlogon.dc.flags.kdc</entry>
+    <entry>KDC</entry>
+    <entry>Boolean</entry>
+    <entry>If this is a KDC</>
+  </row>
+
+  <row>
+    <entry>netlogon.dc.flags.ldap</entry>
+    <entry>LDAP</entry>
+    <entry>Boolean</entry>
+    <entry>If this is an LDAP server</>
+  </row>
+
+  <row>
+    <entry>netlogon.dc.flags.ndnc</entry>
+    <entry>NDNC</entry>
+    <entry>Boolean</entry>
+    <entry>If this is an NDNC server</>
+  </row>
+
+  <row>
+    <entry>netlogon.dc.flags.pdc</entry>
+    <entry>PDC</entry>
+    <entry>Boolean</entry>
+    <entry>If this server is a PDC</>
+  </row>
+
+  <row>
+    <entry>netlogon.dc.flags.timeserv</entry>
+    <entry>Timeserv</entry>
+    <entry>Boolean</entry>
+    <entry>If this server is a TimeServer</>
+  </row>
+
+  <row>
+    <entry>netlogon.dc.flags.writable</entry>
+    <entry>Writable</entry>
+    <entry>Boolean</entry>
+    <entry>If this server can do updates to the database</>
+  </row>
+
+  <row>
     <entry>netlogon.dc.name</entry>
     <entry>DC Name</entry>
     <entry>String</entry>
@@ -26732,6 +30824,132 @@
   </row>
 
   <row>
+    <entry>netlogon.get_dcname.request.flags</entry>
+    <entry>Flags</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Flags for DSGetDCName request</>
+  </row>
+
+  <row>
+    <entry>netlogon.get_dcname.request.flags.avoid_self</entry>
+    <entry>Avoid Self</entry>
+    <entry>Boolean</entry>
+    <entry>Return another DC than the one we ask</>
+  </row>
+
+  <row>
+    <entry>netlogon.get_dcname.request.flags.background_only</entry>
+    <entry>Background Only</entry>
+    <entry>Boolean</entry>
+    <entry>If we want cached data, even if it may have expired</>
+  </row>
+
+  <row>
+    <entry>netlogon.get_dcname.request.flags.ds_preferred</entry>
+    <entry>DS Preferred</entry>
+    <entry>Boolean</entry>
+    <entry>Whether we prefer the call to return a w2k server (if available)</>
+  </row>
+
+  <row>
+    <entry>netlogon.get_dcname.request.flags.ds_required</entry>
+    <entry>DS Required</entry>
+    <entry>Boolean</entry>
+    <entry>Whether we require that the returned DC supports w2k or not</>
+  </row>
+
+  <row>
+    <entry>netlogon.get_dcname.request.flags.force_rediscovery</entry>
+    <entry>Force Rediscovery</entry>
+    <entry>Boolean</entry>
+    <entry>Whether to allow the server to returned cached information or not</>
+  </row>
+
+  <row>
+    <entry>netlogon.get_dcname.request.flags.gc_server_required</entry>
+    <entry>GC Required</entry>
+    <entry>Boolean</entry>
+    <entry>Whether we require that the returned DC is a Global Catalog server</>
+  </row>
+
+  <row>
+    <entry>netlogon.get_dcname.request.flags.good_timeserv_preferred</entry>
+    <entry>Timeserv Preferred</entry>
+    <entry>Boolean</entry>
+    <entry>If we prefer Windows Time Servers</>
+  </row>
+
+  <row>
+    <entry>netlogon.get_dcname.request.flags.ip_required</entry>
+    <entry>IP Required</entry>
+    <entry>Boolean</entry>
+    <entry>If we requre the IP of the DC in the reply</>
+  </row>
+
+  <row>
+    <entry>netlogon.get_dcname.request.flags.is_dns_name</entry>
+    <entry>Is DNS Name</entry>
+    <entry>Boolean</entry>
+    <entry>If the specified domain name is a DNS name</>
+  </row>
+
+  <row>
+    <entry>netlogon.get_dcname.request.flags.is_flat_name</entry>
+    <entry>Is Flat Name</entry>
+    <entry>Boolean</entry>
+    <entry>If the specified domain name is a NetBIOS name</>
+  </row>
+
+  <row>
+    <entry>netlogon.get_dcname.request.flags.kdc_required</entry>
+    <entry>KDC Required</entry>
+    <entry>Boolean</entry>
+    <entry>If we require that the returned server is a KDC</>
+  </row>
+
+  <row>
+    <entry>netlogon.get_dcname.request.flags.only_ldap_needed</entry>
+    <entry>Only LDAP Needed</entry>
+    <entry>Boolean</entry>
+    <entry>We just want an LDAP server, it does not have to be a DC</>
+  </row>
+
+  <row>
+    <entry>netlogon.get_dcname.request.flags.pdc_required</entry>
+    <entry>PDC Required</entry>
+    <entry>Boolean</entry>
+    <entry>Whether we require the returned DC to be the PDC</>
+  </row>
+
+  <row>
+    <entry>netlogon.get_dcname.request.flags.return_dns_name</entry>
+    <entry>Return DNS Name</entry>
+    <entry>Boolean</entry>
+    <entry>Only return a DNS name (or an error)</>
+  </row>
+
+  <row>
+    <entry>netlogon.get_dcname.request.flags.return_flat_name</entry>
+    <entry>Return Flat Name</entry>
+    <entry>Boolean</entry>
+    <entry>Only return a NetBIOS name (or an error)</>
+  </row>
+
+  <row>
+    <entry>netlogon.get_dcname.request.flags.timeserv_required</entry>
+    <entry>Timeserv Required</entry>
+    <entry>Boolean</entry>
+    <entry>If we require the retruned server to be a NTP serveruns WindowsTimeServicer</>
+  </row>
+
+  <row>
+    <entry>netlogon.get_dcname.request.flags.writable_required</entry>
+    <entry>Writable Required</entry>
+    <entry>Boolean</entry>
+    <entry>If we require that the return server is writable</>
+  </row>
+
+  <row>
     <entry>netlogon.group_desc</entry>
     <entry>Group Desc</entry>
     <entry>String</entry>
@@ -26753,6 +30971,13 @@
   </row>
 
   <row>
+    <entry>netlogon.guid</entry>
+    <entry>GUID</entry>
+    <entry>String</entry>
+    <entry>GUID (uuid for groups?)</>
+  </row>
+
+  <row>
     <entry>netlogon.handle</entry>
     <entry>Handle</entry>
     <entry>String</entry>
@@ -26991,6 +31216,13 @@
   </row>
 
   <row>
+    <entry>netlogon.num_trusts</entry>
+    <entry>Num Trusts</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>netlogon.oem_info</entry>
     <entry>OEM Info</entry>
     <entry>String</entry>
@@ -27047,6 +31279,13 @@
   </row>
 
   <row>
+    <entry>netlogon.parent_index</entry>
+    <entry>Parent Index</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Parent Index</>
+  </row>
+
+  <row>
     <entry>netlogon.passwd_history_len</entry>
     <entry>Passwd History Len</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -27166,8 +31405,8 @@
   </row>
 
   <row>
-    <entry>netlogon.sec_chn_type</entry>
-    <entry>Sec Chn Type</entry>
+    <entry>netlogon.sec_chan_type</entry>
+    <entry>Sec Chan Type</entry>
     <entry>Unsigned 16-bit integer</entry>
     <entry>Secure Channel Type</>
   </row>
@@ -27222,38 +31461,101 @@
   </row>
 
   <row>
-    <entry>netlogon.sync_context</entry>
-    <entry>Sync Context</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>Sync Context</>
+    <entry>netlogon.sync_context</entry>
+    <entry>Sync Context</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Sync Context</>
+  </row>
+
+  <row>
+    <entry>netlogon.system_flags</entry>
+    <entry>System Flags</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>netlogon.tc_connection_status</entry>
+    <entry>TC Connection Status</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>TC Connection Status</>
+  </row>
+
+  <row>
+    <entry>netlogon.time_limit</entry>
+    <entry>Time Limit</entry>
+    <entry>Time duration</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>netlogon.timestamp</entry>
+    <entry>Timestamp</entry>
+    <entry>Date/Time stamp</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>netlogon.trust.flags.in_forest</entry>
+    <entry>In Forest</entry>
+    <entry>Boolean</entry>
+    <entry>Whether this domain is a member of the same forest as the servers domain</>
+  </row>
+
+  <row>
+    <entry>netlogon.trust.flags.inbound</entry>
+    <entry>Inbound Trust</entry>
+    <entry>Boolean</entry>
+    <entry>Inbound trust. Whether the domain directly trusts the queried servers domain</>
+  </row>
+
+  <row>
+    <entry>netlogon.trust.flags.native_mode</entry>
+    <entry>Native Mode</entry>
+    <entry>Boolean</entry>
+    <entry>Whether the domain is a w2k native mode domain or not</>
+  </row>
+
+  <row>
+    <entry>netlogon.trust.flags.outbound</entry>
+    <entry>Outbound Trust</entry>
+    <entry>Boolean</entry>
+    <entry>Outbound Trust. Whether the domain is directly trusted by the servers domain</>
+  </row>
+
+  <row>
+    <entry>netlogon.trust.flags.primary</entry>
+    <entry>Primary</entry>
+    <entry>Boolean</entry>
+    <entry>Whether the domain is the primary domain for the queried server or not</>
   </row>
 
   <row>
-    <entry>netlogon.system_flags</entry>
-    <entry>System Flags</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>netlogon.trust.flags.tree_root</entry>
+    <entry>Tree Root</entry>
+    <entry>Boolean</entry>
+    <entry>Whether the domain is the root of the tree for the queried server</>
   </row>
 
   <row>
-    <entry>netlogon.tc_connection_status</entry>
-    <entry>TC Connection Status</entry>
+    <entry>netlogon.trust_attribs</entry>
+    <entry>Trust Attributes</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>TC Connection Status</>
+    <entry>Trust Attributes</>
   </row>
 
   <row>
-    <entry>netlogon.time_limit</entry>
-    <entry>Time Limit</entry>
-    <entry>Time duration</entry>
-    <entry></>
+    <entry>netlogon.trust_flags</entry>
+    <entry>Trust Flags</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Trust Flags</>
   </row>
 
   <row>
-    <entry>netlogon.timestamp</entry>
-    <entry>Timestamp</entry>
-    <entry>Date/Time stamp</entry>
-    <entry></>
+    <entry>netlogon.trust_type</entry>
+    <entry>Trust Type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Trust Type</>
   </row>
 
   <row>
@@ -27515,41 +31817,6 @@
   </row>
 
   <row>
-    <entry>nt.str.len</entry>
-    <entry>Length</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>Length of string in short integers</>
-  </row>
-
-  <row>
-    <entry>nt.str.max_len</entry>
-    <entry>Max Length</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>Max Length of string in short integers</>
-  </row>
-
-  <row>
-    <entry>nt.str.offset</entry>
-    <entry>Offset</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>Offset into string in short integers</>
-  </row>
-
-  <row>
-    <entry>nt.string.length</entry>
-    <entry>Length</entry>
-    <entry>Unsigned 16-bit integer</entry>
-    <entry>Length of string in bytes</>
-  </row>
-
-  <row>
-    <entry>nt.string.size</entry>
-    <entry>Size</entry>
-    <entry>Unsigned 16-bit integer</entry>
-    <entry>Size of string in bytes</>
-  </row>
-
-  <row>
     <entry>samr.access</entry>
     <entry>Access Mask</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -27760,6 +32027,20 @@
   </row>
 
   <row>
+    <entry>samr.lm_passchange_block</entry>
+    <entry>Encrypted Block</entry>
+    <entry>Byte array</entry>
+    <entry>Lan Manager Password Change Block</>
+  </row>
+
+  <row>
+    <entry>samr.lm_password_verifier</entry>
+    <entry>Verifier</entry>
+    <entry>Byte array</entry>
+    <entry>Lan Manager Password Verifier</>
+  </row>
+
+  <row>
     <entry>samr.lm_pwd_set</entry>
     <entry>LM Pwd Set</entry>
     <entry>Unsigned 8-bit integer</entry>
@@ -27788,13 +32069,6 @@
   </row>
 
   <row>
-    <entry>samr.mask</entry>
-    <entry>Mask</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>Mask</>
-  </row>
-
-  <row>
     <entry>samr.max_entries</entry>
     <entry>Max Entries</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -27823,6 +32097,48 @@
   </row>
 
   <row>
+    <entry>samr.nt_passchange_block</entry>
+    <entry>Encrypted Block</entry>
+    <entry>Byte array</entry>
+    <entry>NT Password Change Block</>
+  </row>
+
+  <row>
+    <entry>samr.nt_passchange_block_decrypted</entry>
+    <entry>Decrypted Block</entry>
+    <entry>Byte array</entry>
+    <entry>NT Password Change Decrypted Block</>
+  </row>
+
+  <row>
+    <entry>samr.nt_passchange_block_new_ntpassword</entry>
+    <entry>New NT Password</entry>
+    <entry>String</entry>
+    <entry>New NT Password</>
+  </row>
+
+  <row>
+    <entry>samr.nt_passchange_block_new_ntpassword_len</entry>
+    <entry>New NT Unicode Password length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>New NT Password Unicode Length</>
+  </row>
+
+  <row>
+    <entry>samr.nt_passchange_block_pseudorandom</entry>
+    <entry>Pseudorandom data</entry>
+    <entry>Byte array</entry>
+    <entry>Pseudorandom data</>
+  </row>
+
+  <row>
+    <entry>samr.nt_password_verifier</entry>
+    <entry>Verifier</entry>
+    <entry>Byte array</entry>
+    <entry>NT Password Verifier</>
+  </row>
+
+  <row>
     <entry>samr.nt_pwd_set</entry>
     <entry>NT Pwd Set</entry>
     <entry>Unsigned 8-bit integer</entry>
@@ -28145,6 +32461,13 @@
   </row>
 
   <row>
+    <entry>samr_access_mask.domain_lookup_alias_by_mem</entry>
+    <entry>Lookup alias</entry>
+    <entry>Boolean</entry>
+    <entry>Lookup alias</>
+  </row>
+
+  <row>
     <entry>samr_access_mask.domain_lookup_info1</entry>
     <entry>Lookup info1</entry>
     <entry>Boolean</entry>
@@ -28187,13 +32510,6 @@
   </row>
 
   <row>
-    <entry>samr_access_mask.domain_unknown_80</entry>
-    <entry>Unknown 0x80</entry>
-    <entry>Boolean</entry>
-    <entry>Unknown 0x80</>
-  </row>
-
-  <row>
     <entry>samr_access_mask.group_add_member</entry>
     <entry>Add member</entry>
     <entry>Boolean</entry>
@@ -29135,13 +33451,6 @@
   </row>
 
   <row>
-    <entry>srvsvc.server.type</entry>
-    <entry>Server Type</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>Server Type</>
-  </row>
-
-  <row>
     <entry>srvsvc.server_stat.avresponse</entry>
     <entry>Avresponse</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -29471,272 +33780,769 @@
   </row>
 
   <row>
-    <entry>srvsvc.tod.timezone</entry>
-    <entry>Timezone</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>srvsvc.tod.timezone</entry>
+    <entry>Timezone</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>srvsvc.tod.tinterval</entry>
+    <entry>Tinterval</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>srvsvc.tod.weekday</entry>
+    <entry>Weekday</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>srvsvc.tod.year</entry>
+    <entry>Year</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>srvsvc.transport</entry>
+    <entry>Transport</entry>
+    <entry>String</entry>
+    <entry>Transport Name</>
+  </row>
+
+  <row>
+    <entry>srvsvc.transport.address</entry>
+    <entry>Address</entry>
+    <entry>Byte array</entry>
+    <entry>Address of transport</>
+  </row>
+
+  <row>
+    <entry>srvsvc.transport.addresslen</entry>
+    <entry>Address Len</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Length of transport address</>
+  </row>
+
+  <row>
+    <entry>srvsvc.transport.name</entry>
+    <entry>Name</entry>
+    <entry>String</entry>
+    <entry>Name of transport</>
+  </row>
+
+  <row>
+    <entry>srvsvc.transport.networkaddress</entry>
+    <entry>Network Address</entry>
+    <entry>String</entry>
+    <entry>Network address for transport</>
+  </row>
+
+  <row>
+    <entry>srvsvc.transport.num_vcs</entry>
+    <entry>VCs</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Number of VCs for this transport</>
+  </row>
+
+  <row>
+    <entry>srvsvc.ulist_mtime</entry>
+    <entry>Ulist mtime</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Ulist mtime</>
+  </row>
+
+  <row>
+    <entry>srvsvc.update_immediately</entry>
+    <entry>Update Immediately</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Update Immediately</>
+  </row>
+
+  <row>
+    <entry>srvsvc.user</entry>
+    <entry>User</entry>
+    <entry>String</entry>
+    <entry>User Name</>
+  </row>
+
+  <row>
+    <entry>srvsvc.user_path</entry>
+    <entry>User Path</entry>
+    <entry>String</entry>
+    <entry>User Path</>
+  </row>
+
+  <row>
+    <entry>srvsvc.users</entry>
+    <entry>Users</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>User Count</>
+  </row>
+
+  <row>
+    <entry>srvsvc.version.major</entry>
+    <entry>Major Version</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Major Version</>
+  </row>
+
+  <row>
+    <entry>srvsvc.version.minor</entry>
+    <entry>Minor Version</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Minor Version</>
+  </row>
+
+  <row>
+    <entry>srvsvc.xactmemsize</entry>
+    <entry>Xact Mem Size</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Xact Mem Size</>
+  </row>
+
+  <row>
+    <entry>svrsvc.info_level</entry>
+    <entry>Info Level</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Info Level</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDMicrosoftSpoolSubsystem"><title>Microsoft Spool Subsystem (spoolss)</title>
+
+<table id="TIDMicrosoftSpoolSubsystem"><title>Microsoft Spool Subsystem (spoolss)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>secdescbuf.len</entry>
+    <entry>Length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Length</>
+  </row>
+
+  <row>
+    <entry>secdescbuf.max_len</entry>
+    <entry>Max len</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Max len</>
+  </row>
+
+  <row>
+    <entry>secdescbuf.undoc</entry>
+    <entry>Undocumented</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Undocumented</>
+  </row>
+
+  <row>
+    <entry>setprinterdataex.data</entry>
+    <entry>Data</entry>
+    <entry>Byte array</entry>
+    <entry>Data</>
+  </row>
+
+  <row>
+    <entry>setprinterdataex.max_len</entry>
+    <entry>Max len</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Max len</>
+  </row>
+
+  <row>
+    <entry>setprinterdataex.real_len</entry>
+    <entry>Real len</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Real len</>
+  </row>
+
+  <row>
+    <entry>spoolprinterinfo.devmode_ptr</entry>
+    <entry>Devmode pointer</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Devmode pointer</>
+  </row>
+
+  <row>
+    <entry>spoolprinterinfo.secdesc_ptr</entry>
+    <entry>Secdesc pointer</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Secdesc pointer</>
+  </row>
+
+  <row>
+    <entry>spoolss.Datatype</entry>
+    <entry>Datatype</entry>
+    <entry>String</entry>
+    <entry>Datatype</>
+  </row>
+
+  <row>
+    <entry>spoolss.access_mask.job_admin</entry>
+    <entry>Job admin</entry>
+    <entry>Boolean</entry>
+    <entry>Job admin</>
+  </row>
+
+  <row>
+    <entry>spoolss.access_mask.printer_admin</entry>
+    <entry>Printer admin</entry>
+    <entry>Boolean</entry>
+    <entry>Printer admin</>
+  </row>
+
+  <row>
+    <entry>spoolss.access_mask.printer_use</entry>
+    <entry>Printer use</entry>
+    <entry>Boolean</entry>
+    <entry>Printer use</>
+  </row>
+
+  <row>
+    <entry>spoolss.access_mask.server_admin</entry>
+    <entry>Server admin</entry>
+    <entry>Boolean</entry>
+    <entry>Server admin</>
+  </row>
+
+  <row>
+    <entry>spoolss.access_mask.server_enum</entry>
+    <entry>Server enum</entry>
+    <entry>Boolean</entry>
+    <entry>Server enum</>
+  </row>
+
+  <row>
+    <entry>spoolss.access_required</entry>
+    <entry>Access required</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Access required</>
+  </row>
+
+  <row>
+    <entry>spoolss.architecture</entry>
+    <entry>Architecture name</entry>
+    <entry>String</entry>
+    <entry>Architecture name</>
+  </row>
+
+  <row>
+    <entry>spoolss.buffer.data</entry>
+    <entry>Buffer data</entry>
+    <entry>Byte array</entry>
+    <entry>Contents of buffer</>
+  </row>
+
+  <row>
+    <entry>spoolss.buffer.size</entry>
+    <entry>Buffer size</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Size of buffer</>
+  </row>
+
+  <row>
+    <entry>spoolss.clientmajorversion</entry>
+    <entry>Client major version</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Client printer driver major version</>
+  </row>
+
+  <row>
+    <entry>spoolss.clientminorversion</entry>
+    <entry>Client minor version</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Client printer driver minor version</>
+  </row>
+
+  <row>
+    <entry>spoolss.configfile</entry>
+    <entry>Config file</entry>
+    <entry>String</entry>
+    <entry>Printer name</>
+  </row>
+
+  <row>
+    <entry>spoolss.datafile</entry>
+    <entry>Data file</entry>
+    <entry>String</entry>
+    <entry>Data file</>
+  </row>
+
+  <row>
+    <entry>spoolss.defaultdatatype</entry>
+    <entry>Default data type</entry>
+    <entry>String</entry>
+    <entry>Default data type</>
+  </row>
+
+  <row>
+    <entry>spoolss.dependentfiles</entry>
+    <entry>Dependent files</entry>
+    <entry>String</entry>
+    <entry>Dependent files</>
+  </row>
+
+  <row>
+    <entry>spoolss.devicemodectr.size</entry>
+    <entry>Devicemode ctr size</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Devicemode ctr size</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode</entry>
+    <entry>Devicemode</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Devicemode</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.bits_per_pel</entry>
+    <entry>Bits per pel</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Bits per pel</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.collate</entry>
+    <entry>Collate</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Collate</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.color</entry>
+    <entry>Color</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Color</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.copies</entry>
+    <entry>Copies</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Copies</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.default_source</entry>
+    <entry>Default source</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Default source</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.display_flags</entry>
+    <entry>Display flags</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Display flags</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.display_freq</entry>
+    <entry>Display frequency</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Display frequency</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.dither_type</entry>
+    <entry>Dither type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Dither type</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.driver_extra</entry>
+    <entry>Driver extra</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Driver extra</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.driver_extra_len</entry>
+    <entry>Driver extra length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Driver extra length</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.driver_version</entry>
+    <entry>Driver version</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Driver version</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.duplex</entry>
+    <entry>Duplex</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Duplex</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.fields</entry>
+    <entry>Fields</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Fields</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.fields.bits_per_pel</entry>
+    <entry>Bits per pel</entry>
+    <entry>Boolean</entry>
+    <entry>Bits per pel</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.fields.collate</entry>
+    <entry>Collate</entry>
+    <entry>Boolean</entry>
+    <entry>Collate</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.fields.color</entry>
+    <entry>Color</entry>
+    <entry>Boolean</entry>
+    <entry>Color</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.fields.copies</entry>
+    <entry>Copies</entry>
+    <entry>Boolean</entry>
+    <entry>Copies</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.fields.default_source</entry>
+    <entry>Default source</entry>
+    <entry>Boolean</entry>
+    <entry>Default source</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.fields.display_flags</entry>
+    <entry>Display flags</entry>
+    <entry>Boolean</entry>
+    <entry>Display flags</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.fields.display_frequency</entry>
+    <entry>Display frequency</entry>
+    <entry>Boolean</entry>
+    <entry>Display frequency</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.fields.dither_type</entry>
+    <entry>Dither type</entry>
+    <entry>Boolean</entry>
+    <entry>Dither type</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.fields.duplex</entry>
+    <entry>Duplex</entry>
+    <entry>Boolean</entry>
+    <entry>Duplex</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.fields.form_name</entry>
+    <entry>Form name</entry>
+    <entry>Boolean</entry>
+    <entry>Form name</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.fields.icm_intent</entry>
+    <entry>ICM intent</entry>
+    <entry>Boolean</entry>
+    <entry>ICM intent</>
+  </row>
+
+  <row>
+    <entry>spoolss.devmode.fields.icm_method</entry>
+    <entry>ICM method</entry>
+    <entry>Boolean</entry>
+    <entry>ICM method</>
   </row>
 
   <row>
-    <entry>srvsvc.tod.tinterval</entry>
-    <entry>Tinterval</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>spoolss.devmode.fields.log_pixels</entry>
+    <entry>Log pixels</entry>
+    <entry>Boolean</entry>
+    <entry>Log pixels</>
   </row>
 
   <row>
-    <entry>srvsvc.tod.weekday</entry>
-    <entry>Weekday</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>spoolss.devmode.fields.media_type</entry>
+    <entry>Media type</entry>
+    <entry>Boolean</entry>
+    <entry>Media type</>
   </row>
 
   <row>
-    <entry>srvsvc.tod.year</entry>
-    <entry>Year</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>spoolss.devmode.fields.nup</entry>
+    <entry>N-up</entry>
+    <entry>Boolean</entry>
+    <entry>N-up</>
   </row>
 
   <row>
-    <entry>srvsvc.transport</entry>
-    <entry>Transport</entry>
-    <entry>String</entry>
-    <entry>Transport Name</>
+    <entry>spoolss.devmode.fields.orientation</entry>
+    <entry>Orientation</entry>
+    <entry>Boolean</entry>
+    <entry>Orientation</>
   </row>
 
   <row>
-    <entry>srvsvc.transport.address</entry>
-    <entry>Address</entry>
-    <entry>Byte array</entry>
-    <entry>Address of transport</>
+    <entry>spoolss.devmode.fields.panning_height</entry>
+    <entry>Panning height</entry>
+    <entry>Boolean</entry>
+    <entry>Panning height</>
   </row>
 
   <row>
-    <entry>srvsvc.transport.addresslen</entry>
-    <entry>Address Len</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>Length of transport address</>
+    <entry>spoolss.devmode.fields.panning_width</entry>
+    <entry>Panning width</entry>
+    <entry>Boolean</entry>
+    <entry>Panning width</>
   </row>
 
   <row>
-    <entry>srvsvc.transport.name</entry>
-    <entry>Name</entry>
-    <entry>String</entry>
-    <entry>Name of transport</>
+    <entry>spoolss.devmode.fields.paper_length</entry>
+    <entry>Paper length</entry>
+    <entry>Boolean</entry>
+    <entry>Paper length</>
   </row>
 
   <row>
-    <entry>srvsvc.transport.networkaddress</entry>
-    <entry>Network Address</entry>
-    <entry>String</entry>
-    <entry>Network address for transport</>
+    <entry>spoolss.devmode.fields.paper_size</entry>
+    <entry>Paper size</entry>
+    <entry>Boolean</entry>
+    <entry>Paper size</>
   </row>
 
   <row>
-    <entry>srvsvc.transport.num_vcs</entry>
-    <entry>VCs</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>Number of VCs for this transport</>
+    <entry>spoolss.devmode.fields.paper_width</entry>
+    <entry>Paper width</entry>
+    <entry>Boolean</entry>
+    <entry>Paper width</>
   </row>
 
   <row>
-    <entry>srvsvc.ulist_mtime</entry>
-    <entry>Ulist mtime</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>Ulist mtime</>
+    <entry>spoolss.devmode.fields.pels_height</entry>
+    <entry>Pels height</entry>
+    <entry>Boolean</entry>
+    <entry>Pels height</>
   </row>
 
   <row>
-    <entry>srvsvc.update_immediately</entry>
-    <entry>Update Immediately</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>Update Immediately</>
+    <entry>spoolss.devmode.fields.pels_width</entry>
+    <entry>Pels width</entry>
+    <entry>Boolean</entry>
+    <entry>Pels width</>
   </row>
 
   <row>
-    <entry>srvsvc.user</entry>
-    <entry>User</entry>
-    <entry>String</entry>
-    <entry>User Name</>
+    <entry>spoolss.devmode.fields.position</entry>
+    <entry>Position</entry>
+    <entry>Boolean</entry>
+    <entry>Position</>
   </row>
 
   <row>
-    <entry>srvsvc.user_path</entry>
-    <entry>User Path</entry>
-    <entry>String</entry>
-    <entry>User Path</>
+    <entry>spoolss.devmode.fields.print_quality</entry>
+    <entry>Print quality</entry>
+    <entry>Boolean</entry>
+    <entry>Print quality</>
   </row>
 
   <row>
-    <entry>srvsvc.users</entry>
-    <entry>Users</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>User Count</>
+    <entry>spoolss.devmode.fields.scale</entry>
+    <entry>Scale</entry>
+    <entry>Boolean</entry>
+    <entry>Scale</>
   </row>
 
   <row>
-    <entry>srvsvc.version.major</entry>
-    <entry>Major Version</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>Major Version</>
+    <entry>spoolss.devmode.fields.tt_option</entry>
+    <entry>TT option</entry>
+    <entry>Boolean</entry>
+    <entry>TT option</>
   </row>
 
   <row>
-    <entry>srvsvc.version.minor</entry>
-    <entry>Minor Version</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>Minor Version</>
+    <entry>spoolss.devmode.fields.y_resolution</entry>
+    <entry>Y resolution</entry>
+    <entry>Boolean</entry>
+    <entry>Y resolution</>
   </row>
 
   <row>
-    <entry>srvsvc.xactmemsize</entry>
-    <entry>Xact Mem Size</entry>
+    <entry>spoolss.devmode.icm_intent</entry>
+    <entry>ICM intent</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>Xact Mem Size</>
+    <entry>ICM intent</>
   </row>
 
   <row>
-    <entry>svrsvc.info_level</entry>
-    <entry>Info Level</entry>
+    <entry>spoolss.devmode.icm_method</entry>
+    <entry>ICM method</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>Info Level</>
+    <entry>ICM method</>
   </row>
 
-</tbody></tgroup></table>
-</section>
-
-<section id="SIDMicrosoftSpoolSubsystem"><title>Microsoft Spool Subsystem (spoolss)</title>
-
-<table id="TIDMicrosoftSpoolSubsystem"><title>Microsoft Spool Subsystem (spoolss)</title>
-<tgroup cols="4">
-<thead>
   <row>
-    <entry>Field</>
-    <entry>Field Name</>
-    <entry>Type</>
-    <entry>Description</>
+    <entry>spoolss.devmode.log_pixels</entry>
+    <entry>Log pixels</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Log pixels</>
+  </row>
 
+  <row>
+    <entry>spoolss.devmode.media_type</entry>
+    <entry>Media type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Media type</>
   </row>
-</thead>
-<tbody>
+
   <row>
-    <entry>spoolss.Datatype</entry>
-    <entry>Datatype</entry>
-    <entry>String</entry>
-    <entry>Datatype</>
+    <entry>spoolss.devmode.orientation</entry>
+    <entry>Orientation</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Orientation</>
   </row>
 
   <row>
-    <entry>spoolss.access_mask.job_admin</entry>
-    <entry>Job admin</entry>
-    <entry>Boolean</entry>
-    <entry>Job admin</>
+    <entry>spoolss.devmode.panning_height</entry>
+    <entry>Panning height</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Panning height</>
   </row>
 
   <row>
-    <entry>spoolss.access_mask.printer_admin</entry>
-    <entry>Printer admin</entry>
-    <entry>Boolean</entry>
-    <entry>Printer admin</>
+    <entry>spoolss.devmode.panning_width</entry>
+    <entry>Panning width</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Panning width</>
   </row>
 
   <row>
-    <entry>spoolss.access_mask.printer_use</entry>
-    <entry>Printer use</entry>
-    <entry>Boolean</entry>
-    <entry>Printer use</>
+    <entry>spoolss.devmode.paper_length</entry>
+    <entry>Paper length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Paper length</>
   </row>
 
   <row>
-    <entry>spoolss.access_mask.server_admin</entry>
-    <entry>Server admin</entry>
-    <entry>Boolean</entry>
-    <entry>Server admin</>
+    <entry>spoolss.devmode.paper_size</entry>
+    <entry>Paper size</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Paper size</>
   </row>
 
   <row>
-    <entry>spoolss.access_mask.server_enum</entry>
-    <entry>Server enum</entry>
-    <entry>Boolean</entry>
-    <entry>Server enum</>
+    <entry>spoolss.devmode.paper_width</entry>
+    <entry>Paper width</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Paper width</>
   </row>
 
   <row>
-    <entry>spoolss.access_required</entry>
-    <entry>Access required</entry>
+    <entry>spoolss.devmode.pels_height</entry>
+    <entry>Pels height</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>Access REQUIRED</>
+    <entry>Pels height</>
   </row>
 
   <row>
-    <entry>spoolss.addform.level</entry>
-    <entry>Level</entry>
+    <entry>spoolss.devmode.pels_width</entry>
+    <entry>Pels width</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>Level</>
+    <entry>Pels width</>
   </row>
 
   <row>
-    <entry>spoolss.architecture</entry>
-    <entry>Architecture name</entry>
-    <entry>String</entry>
-    <entry>Architecture name</>
+    <entry>spoolss.devmode.print_quality</entry>
+    <entry>Print quality</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Print quality</>
   </row>
 
   <row>
-    <entry>spoolss.buffer.data</entry>
-    <entry>Buffer data</entry>
-    <entry>Byte array</entry>
-    <entry>Contents of buffer</>
+    <entry>spoolss.devmode.reserved1</entry>
+    <entry>Reserved1</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Reserved1</>
   </row>
 
   <row>
-    <entry>spoolss.buffer.size</entry>
-    <entry>Buffer size</entry>
+    <entry>spoolss.devmode.reserved2</entry>
+    <entry>Reserved2</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>Size of buffer</>
+    <entry>Reserved2</>
   </row>
 
   <row>
-    <entry>spoolss.clientmajorversion</entry>
-    <entry>Client major version</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>Client printer driver major version</>
+    <entry>spoolss.devmode.scale</entry>
+    <entry>Scale</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Scale</>
   </row>
 
   <row>
-    <entry>spoolss.clientminorversion</entry>
-    <entry>Client minor version</entry>
+    <entry>spoolss.devmode.size</entry>
+    <entry>Size</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>Client printer driver minor version</>
+    <entry>Size</>
   </row>
 
   <row>
-    <entry>spoolss.configfile</entry>
-    <entry>Config file</entry>
-    <entry>String</entry>
-    <entry>Printer name</>
+    <entry>spoolss.devmode.size2</entry>
+    <entry>Size2</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Size2</>
   </row>
 
   <row>
-    <entry>spoolss.datafile</entry>
-    <entry>Data file</entry>
-    <entry>String</entry>
-    <entry>Data file</>
+    <entry>spoolss.devmode.spec_version</entry>
+    <entry>Spec version</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Spec version</>
   </row>
 
   <row>
-    <entry>spoolss.defaultdatatype</entry>
-    <entry>Default data type</entry>
-    <entry>String</entry>
-    <entry>Default data type</>
+    <entry>spoolss.devmode.tt_option</entry>
+    <entry>TT option</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>TT option</>
   </row>
 
   <row>
-    <entry>spoolss.dependentfiles</entry>
-    <entry>Dependent files</entry>
-    <entry>String</entry>
-    <entry>Dependent files</>
+    <entry>spoolss.devmode.y_resolution</entry>
+    <entry>Y resolution</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Y resolution</>
   </row>
 
   <row>
@@ -29768,6 +34574,20 @@
   </row>
 
   <row>
+    <entry>spoolss.elapsed_time</entry>
+    <entry>Elapsed time</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Elapsed time</>
+  </row>
+
+  <row>
+    <entry>spoolss.end_time</entry>
+    <entry>End time</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>End time</>
+  </row>
+
+  <row>
     <entry>spoolss.enumforms.num</entry>
     <entry>Num</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -29810,13 +34630,20 @@
   </row>
 
   <row>
-    <entry>spoolss.enumprinterdata.index</entry>
+    <entry>spoolss.enumprinterdata.enumindex</entry>
     <entry>Enum index</entry>
     <entry>Unsigned 32-bit integer</entry>
     <entry>Index for start of enumeration</>
   </row>
 
   <row>
+    <entry>spoolss.enumprinterdata.value_len</entry>
+    <entry>Value length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Size of printerdata value</>
+  </row>
+
+  <row>
     <entry>spoolss.enumprinterdata.value_needed</entry>
     <entry>Value size needed</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -29831,6 +34658,76 @@
   </row>
 
   <row>
+    <entry>spoolss.enumprinterdataex.name</entry>
+    <entry>Name</entry>
+    <entry>String</entry>
+    <entry>Name</>
+  </row>
+
+  <row>
+    <entry>spoolss.enumprinterdataex.name_len</entry>
+    <entry>Name len</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Name len</>
+  </row>
+
+  <row>
+    <entry>spoolss.enumprinterdataex.name_offset</entry>
+    <entry>Name offset</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Name offset</>
+  </row>
+
+  <row>
+    <entry>spoolss.enumprinterdataex.num_values</entry>
+    <entry>Num values</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Number of values returned</>
+  </row>
+
+  <row>
+    <entry>spoolss.enumprinterdataex.val_dword.high</entry>
+    <entry>DWORD value (high)</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>DWORD value (high)</>
+  </row>
+
+  <row>
+    <entry>spoolss.enumprinterdataex.val_dword.low</entry>
+    <entry>DWORD value (low)</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>DWORD value (low)</>
+  </row>
+
+  <row>
+    <entry>spoolss.enumprinterdataex.value_len</entry>
+    <entry>Value len</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Value len</>
+  </row>
+
+  <row>
+    <entry>spoolss.enumprinterdataex.value_offset</entry>
+    <entry>Value offset</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Value offset</>
+  </row>
+
+  <row>
+    <entry>spoolss.enumprinterdataex.value_type</entry>
+    <entry>Value type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Value type</>
+  </row>
+
+  <row>
+    <entry>spoolss.enumprinters.flags</entry>
+    <entry>Flags</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Flags</>
+  </row>
+
+  <row>
     <entry>spoolss.enumprinters.flags.enum_connections</entry>
     <entry>Enum connections</entry>
     <entry>Boolean</entry>
@@ -29880,6 +34777,13 @@
   </row>
 
   <row>
+    <entry>spoolss.form</entry>
+    <entry>Data</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Data</>
+  </row>
+
+  <row>
     <entry>spoolss.form.flags</entry>
     <entry>Flags</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -29950,13 +34854,6 @@
   </row>
 
   <row>
-    <entry>spoolss.getform.level</entry>
-    <entry>Level</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>Level</>
-  </row>
-
-  <row>
     <entry>spoolss.helpfile</entry>
     <entry>Help file</entry>
     <entry>String</entry>
@@ -29971,6 +34868,13 @@
   </row>
 
   <row>
+    <entry>spoolss.job.bytesprinted</entry>
+    <entry>Job bytes printed</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Job bytes printed</>
+  </row>
+
+  <row>
     <entry>spoolss.job.id</entry>
     <entry>Job ID</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -29981,7 +34885,7 @@
     <entry>spoolss.job.pagesprinted</entry>
     <entry>Job pages printed</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>Job identification number</>
+    <entry>Job pages printed</>
   </row>
 
   <row>
@@ -29999,6 +34903,13 @@
   </row>
 
   <row>
+    <entry>spoolss.job.size</entry>
+    <entry>Job size</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Job size</>
+  </row>
+
+  <row>
     <entry>spoolss.job.status</entry>
     <entry>Job status</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -30083,6 +34994,13 @@
   </row>
 
   <row>
+    <entry>spoolss.job.totalbytes</entry>
+    <entry>Job total bytes</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Job total bytes</>
+  </row>
+
+  <row>
     <entry>spoolss.job.totalpages</entry>
     <entry>Job total pages</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -30090,6 +35008,27 @@
   </row>
 
   <row>
+    <entry>spoolss.keybuffer.data</entry>
+    <entry>Key Buffer data</entry>
+    <entry>Byte array</entry>
+    <entry>Contents of buffer</>
+  </row>
+
+  <row>
+    <entry>spoolss.keybuffer.size</entry>
+    <entry>Key Buffer size</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Size of buffer</>
+  </row>
+
+  <row>
+    <entry>spoolss.machinename</entry>
+    <entry>Machine name</entry>
+    <entry>String</entry>
+    <entry>Machine name</>
+  </row>
+
+  <row>
     <entry>spoolss.monitorname</entry>
     <entry>Monitor name</entry>
     <entry>String</entry>
@@ -30258,6 +35197,13 @@
   </row>
 
   <row>
+    <entry>spoolss.notifyname</entry>
+    <entry>Notify name</entry>
+    <entry>String</entry>
+    <entry>Notify name</>
+  </row>
+
+  <row>
     <entry>spoolss.offered</entry>
     <entry>Offered</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -30265,6 +35211,13 @@
   </row>
 
   <row>
+    <entry>spoolss.offset</entry>
+    <entry>Offset</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Offset of data</>
+  </row>
+
+  <row>
     <entry>spoolss.opnum</entry>
     <entry>Operation</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -30279,6 +35232,244 @@
   </row>
 
   <row>
+    <entry>spoolss.parameters</entry>
+    <entry>Parameters</entry>
+    <entry>String</entry>
+    <entry>Parameters</>
+  </row>
+
+  <row>
+    <entry>spoolss.portname</entry>
+    <entry>Port name</entry>
+    <entry>String</entry>
+    <entry>Port name</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.action</entry>
+    <entry>Action</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Action</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.build_version</entry>
+    <entry>Build version</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Build version</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.c_setprinter</entry>
+    <entry>Csetprinter</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Csetprinter</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.changeid</entry>
+    <entry>Change id</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Change id</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.cjobs</entry>
+    <entry>CJobs</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>CJobs</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.flags</entry>
+    <entry>Flags</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Flags</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.global_counter</entry>
+    <entry>Global counter</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Global counter</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.guid</entry>
+    <entry>GUID</entry>
+    <entry>String</entry>
+    <entry>GUID</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.major_version</entry>
+    <entry>Major version</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Major version</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.printer_errors</entry>
+    <entry>Printer errors</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Printer errors</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.session_ctr</entry>
+    <entry>Session counter</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Sessopm counter</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.total_bytes</entry>
+    <entry>Total bytes</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Total bytes</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.total_jobs</entry>
+    <entry>Total jobs</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Total jobs</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.total_pages</entry>
+    <entry>Total pages</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Total pages</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.unknown11</entry>
+    <entry>Unknown 11</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Unknown 11</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.unknown13</entry>
+    <entry>Unknown 13</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Unknown 13</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.unknown14</entry>
+    <entry>Unknown 14</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Unknown 14</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.unknown15</entry>
+    <entry>Unknown 15</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Unknown 15</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.unknown16</entry>
+    <entry>Unknown 16</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Unknown 16</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.unknown18</entry>
+    <entry>Unknown 18</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Unknown 18</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.unknown20</entry>
+    <entry>Unknown 20</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Unknown 20</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.unknown22</entry>
+    <entry>Unknown 22</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Unknown 22</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.unknown23</entry>
+    <entry>Unknown 23</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Unknown 23</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.unknown24</entry>
+    <entry>Unknown 24</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Unknown 24</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.unknown25</entry>
+    <entry>Unknown 25</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Unknown 25</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.unknown26</entry>
+    <entry>Unknown 26</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Unknown 26</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.unknown27</entry>
+    <entry>Unknown 27</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Unknown 27</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.unknown28</entry>
+    <entry>Unknown 28</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Unknown 28</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.unknown29</entry>
+    <entry>Unknown 29</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Unknown 29</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.unknown7</entry>
+    <entry>Unknown 7</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Unknown 7</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.unknown8</entry>
+    <entry>Unknown 8</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Unknown 8</>
+  </row>
+
+  <row>
+    <entry>spoolss.printer.unknown9</entry>
+    <entry>Unknown 9</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Unknown 9</>
+  </row>
+
+  <row>
     <entry>spoolss.printer_attributes</entry>
     <entry>Attributes</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -30398,34 +35589,90 @@
   </row>
 
   <row>
+    <entry>spoolss.printercomment</entry>
+    <entry>Printer comment</entry>
+    <entry>String</entry>
+    <entry>Printer comment</>
+  </row>
+
+  <row>
+    <entry>spoolss.printerdata</entry>
+    <entry>Data</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Data</>
+  </row>
+
+  <row>
     <entry>spoolss.printerdata.data</entry>
     <entry>Data</entry>
     <entry>Byte array</entry>
-    <entry>Data</>
+    <entry>Printer data</>
+  </row>
+
+  <row>
+    <entry>spoolss.printerdata.data.dword</entry>
+    <entry>DWORD data</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>DWORD data</>
+  </row>
+
+  <row>
+    <entry>spoolss.printerdata.data.sz</entry>
+    <entry>String data</entry>
+    <entry>String</entry>
+    <entry>String data</>
+  </row>
+
+  <row>
+    <entry>spoolss.printerdata.key</entry>
+    <entry>Key</entry>
+    <entry>String</entry>
+    <entry>Printer data key</>
   </row>
 
   <row>
     <entry>spoolss.printerdata.size</entry>
     <entry>Size</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>Size</>
+    <entry>Printer data size</>
   </row>
 
   <row>
     <entry>spoolss.printerdata.type</entry>
-    <entry>Printer data type</entry>
+    <entry>Type</entry>
     <entry>Unsigned 32-bit integer</entry>
     <entry>Printer data type</>
   </row>
 
   <row>
+    <entry>spoolss.printerdata.val_sz</entry>
+    <entry>SZ value</entry>
+    <entry>String</entry>
+    <entry>SZ value</>
+  </row>
+
+  <row>
     <entry>spoolss.printerdata.value</entry>
-    <entry>Printer data value</entry>
+    <entry>Value</entry>
     <entry>String</entry>
     <entry>Printer data value</>
   </row>
 
   <row>
+    <entry>spoolss.printerdesc</entry>
+    <entry>Printer description</entry>
+    <entry>String</entry>
+    <entry>Printer description</>
+  </row>
+
+  <row>
+    <entry>spoolss.printerlocation</entry>
+    <entry>Printer location</entry>
+    <entry>String</entry>
+    <entry>Printer location</>
+  </row>
+
+  <row>
     <entry>spoolss.printername</entry>
     <entry>Printer name</entry>
     <entry>String</entry>
@@ -30433,17 +35680,17 @@
   </row>
 
   <row>
-    <entry>spoolss.rc</entry>
-    <entry>Return code</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>SPOOLSS return code</>
+    <entry>spoolss.printprocessor</entry>
+    <entry>Print processor</entry>
+    <entry>String</entry>
+    <entry>Print processor</>
   </row>
 
   <row>
-    <entry>spoolss.relstr.offset</entry>
-    <entry>Relative string offset</entry>
+    <entry>spoolss.rc</entry>
+    <entry>Return code</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>Offset of relative string data</>
+    <entry>SPOOLSS return code</>
   </row>
 
   <row>
@@ -30692,13 +35939,6 @@
   </row>
 
   <row>
-    <entry>spoolss.setform.level</entry>
-    <entry>Level</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>Level</>
-  </row>
-
-  <row>
     <entry>spoolss.setjob.cmd</entry>
     <entry>Set job command</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -30706,6 +35946,13 @@
   </row>
 
   <row>
+    <entry>spoolss.setpfile</entry>
+    <entry>Separator file</entry>
+    <entry>String</entry>
+    <entry>Separator file</>
+  </row>
+
+  <row>
     <entry>spoolss.setprinter_cmd</entry>
     <entry>Command</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -30713,6 +35960,20 @@
   </row>
 
   <row>
+    <entry>spoolss.sharename</entry>
+    <entry>Share name</entry>
+    <entry>String</entry>
+    <entry>Share name</>
+  </row>
+
+  <row>
+    <entry>spoolss.start_time</entry>
+    <entry>Start time</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Start time</>
+  </row>
+
+  <row>
     <entry>spoolss.textstatus</entry>
     <entry>Text status</entry>
     <entry>String</entry>
@@ -30776,6 +36037,55 @@
   </row>
 
   <row>
+    <entry>spoolss.userlevel.build</entry>
+    <entry>Build</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Build</>
+  </row>
+
+  <row>
+    <entry>spoolss.userlevel.client</entry>
+    <entry>Client</entry>
+    <entry>String</entry>
+    <entry>Client</>
+  </row>
+
+  <row>
+    <entry>spoolss.userlevel.major</entry>
+    <entry>Major</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Major</>
+  </row>
+
+  <row>
+    <entry>spoolss.userlevel.minor</entry>
+    <entry>Minor</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Minor</>
+  </row>
+
+  <row>
+    <entry>spoolss.userlevel.processor</entry>
+    <entry>Processor</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Processor</>
+  </row>
+
+  <row>
+    <entry>spoolss.userlevel.size</entry>
+    <entry>Size</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Size</>
+  </row>
+
+  <row>
+    <entry>spoolss.userlevel.user</entry>
+    <entry>User</entry>
+    <entry>String</entry>
+    <entry>User</>
+  </row>
+
+  <row>
     <entry>spoolss.username</entry>
     <entry>User name</entry>
     <entry>String</entry>
@@ -31041,6 +36351,34 @@
   </row>
 
   <row>
+    <entry>browser.reset_cmd</entry>
+    <entry>ResetBrowserState Command</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>ResetBrowserState Command</>
+  </row>
+
+  <row>
+    <entry>browser.reset_cmd.demote</entry>
+    <entry>Demote LMB</entry>
+    <entry>Boolean</entry>
+    <entry>Demote LMB</>
+  </row>
+
+  <row>
+    <entry>browser.reset_cmd.flush</entry>
+    <entry>Flush Browse List</entry>
+    <entry>Boolean</entry>
+    <entry>Flush Browse List</>
+  </row>
+
+  <row>
+    <entry>browser.reset_cmd.stop_lmb</entry>
+    <entry>Stop Being LMB</entry>
+    <entry>Boolean</entry>
+    <entry>Stop Being LMB</>
+  </row>
+
+  <row>
     <entry>browser.response_computer_name</entry>
     <entry>Response Computer Name</entry>
     <entry>String</entry>
@@ -32299,6 +37637,233 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDMobileIPv6"><title>Mobile IPv6 (mipv6)</title>
+
+<table id="TIDMobileIPv6"><title>Mobile IPv6 (mipv6)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>mip6.acoa.acoa</entry>
+    <entry>Alternate care-of address</entry>
+    <entry>IPv6 address</entry>
+    <entry>Alternate Care-of address</>
+  </row>
+
+  <row>
+    <entry>mip6.ba.k_flag</entry>
+    <entry>Key Management Compatibility (K) flag</entry>
+    <entry>Boolean</entry>
+    <entry>Key Management Compatibility (K) flag</>
+  </row>
+
+  <row>
+    <entry>mip6.ba.lifetime</entry>
+    <entry>Lifetime</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Lifetime</>
+  </row>
+
+  <row>
+    <entry>mip6.ba.seqnr</entry>
+    <entry>Sequence number</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Sequence number</>
+  </row>
+
+  <row>
+    <entry>mip6.ba.status</entry>
+    <entry>Status</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Binding Acknowledgement status</>
+  </row>
+
+  <row>
+    <entry>mip6.bad.auth</entry>
+    <entry>Authenticator</entry>
+    <entry>Byte array</entry>
+    <entry>Care-of nonce index</>
+  </row>
+
+  <row>
+    <entry>mip6.be.haddr</entry>
+    <entry>Home Address</entry>
+    <entry>IPv6 address</entry>
+    <entry>Home Address</>
+  </row>
+
+  <row>
+    <entry>mip6.be.status</entry>
+    <entry>Status</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Binding Error status</>
+  </row>
+
+  <row>
+    <entry>mip6.bra.interval</entry>
+    <entry>Refresh interval</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Refresh interval</>
+  </row>
+
+  <row>
+    <entry>mip6.bu.a_flag</entry>
+    <entry>Acknowledge (A) flag</entry>
+    <entry>Boolean</entry>
+    <entry>Acknowledge (A) flag</>
+  </row>
+
+  <row>
+    <entry>mip6.bu.h_flag</entry>
+    <entry>Home Registration (H) flag</entry>
+    <entry>Boolean</entry>
+    <entry>Home Registration (H) flag</>
+  </row>
+
+  <row>
+    <entry>mip6.bu.k_flag</entry>
+    <entry>Key Management Compatibility (K) flag</entry>
+    <entry>Boolean</entry>
+    <entry>Key Management Compatibility (K) flag</>
+  </row>
+
+  <row>
+    <entry>mip6.bu.l_flag</entry>
+    <entry>Link-Local Compatibility (L) flag</entry>
+    <entry>Boolean</entry>
+    <entry>Home Registration (H) flag</>
+  </row>
+
+  <row>
+    <entry>mip6.bu.lifetime</entry>
+    <entry>Lifetime</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Lifetime</>
+  </row>
+
+  <row>
+    <entry>mip6.bu.seqnr</entry>
+    <entry>Sequence number</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Sequence number</>
+  </row>
+
+  <row>
+    <entry>mip6.cot.cookie</entry>
+    <entry>Care-of Init Cookie</entry>
+    <entry>Unsigned 64-bit integer</entry>
+    <entry>Care-of Init Cookie</>
+  </row>
+
+  <row>
+    <entry>mip6.cot.nindex</entry>
+    <entry>Care-of Nonce Index</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Care-of Nonce Index</>
+  </row>
+
+  <row>
+    <entry>mip6.cot.token</entry>
+    <entry>Care-of Keygen Token</entry>
+    <entry>Unsigned 64-bit integer</entry>
+    <entry>Care-of Keygen Token</>
+  </row>
+
+  <row>
+    <entry>mip6.coti.cookie</entry>
+    <entry>Care-of Init Cookie</entry>
+    <entry>Unsigned 64-bit integer</entry>
+    <entry>Care-of Init Cookie</>
+  </row>
+
+  <row>
+    <entry>mip6.csum</entry>
+    <entry>Checksum</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Header Checksum</>
+  </row>
+
+  <row>
+    <entry>mip6.hlen</entry>
+    <entry>Header length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Header length</>
+  </row>
+
+  <row>
+    <entry>mip6.hot.cookie</entry>
+    <entry>Home Init Cookie</entry>
+    <entry>Unsigned 64-bit integer</entry>
+    <entry>Home Init Cookie</>
+  </row>
+
+  <row>
+    <entry>mip6.hot.nindex</entry>
+    <entry>Home Nonce Index</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Home Nonce Index</>
+  </row>
+
+  <row>
+    <entry>mip6.hot.token</entry>
+    <entry>Home Keygen Token</entry>
+    <entry>Unsigned 64-bit integer</entry>
+    <entry>Home Keygen Token</>
+  </row>
+
+  <row>
+    <entry>mip6.hoti.cookie</entry>
+    <entry>Home Init Cookie</entry>
+    <entry>Unsigned 64-bit integer</entry>
+    <entry>Home Init Cookie</>
+  </row>
+
+  <row>
+    <entry>mip6.mhtype</entry>
+    <entry>Mobility Header Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Mobility Header Type</>
+  </row>
+
+  <row>
+    <entry>mip6.ni.cni</entry>
+    <entry>Care-of nonce index</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Care-of nonce index</>
+  </row>
+
+  <row>
+    <entry>mip6.ni.hni</entry>
+    <entry>Home nonce index</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Home nonce index</>
+  </row>
+
+  <row>
+    <entry>mip6.proto</entry>
+    <entry>Payload protocol</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Payload protocol</>
+  </row>
+
+  <row>
+    <entry>mip6.reserved</entry>
+    <entry>Reserved</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Reserved</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDModbusslashTCP"><title>Modbus/TCP (mbtcp)</title>
 
 <table id="TIDModbusslashTCP"><title>Modbus/TCP (mbtcp)</title>
@@ -32415,6 +37980,20 @@
   </row>
 
   <row>
+    <entry>mount.export.has_options</entry>
+    <entry>Has options</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Has options</>
+  </row>
+
+  <row>
+    <entry>mount.export.options</entry>
+    <entry>Options</entry>
+    <entry>String</entry>
+    <entry>Options</>
+  </row>
+
+  <row>
     <entry>mount.flavor</entry>
     <entry>Flavor</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -32562,12 +38141,173 @@
   </row>
 
   <row>
+    <entry>mount.procedure_sgi_v1</entry>
+    <entry>SGI V1 procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>SGI V1 Procedure</>
+  </row>
+
+  <row>
+    <entry>mount.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
+  <row>
+    <entry>mount.procedure_v2</entry>
+    <entry>V2 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V2 Procedure</>
+  </row>
+
+  <row>
+    <entry>mount.procedure_v3</entry>
+    <entry>V3 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V3 Procedure</>
+  </row>
+
+  <row>
     <entry>mount.status</entry>
     <entry>Status</entry>
     <entry>Unsigned 32-bit integer</entry>
     <entry>Status</>
   </row>
 
+  <row>
+    <entry>mount.statvfs.f_basetype</entry>
+    <entry>Type</entry>
+    <entry>String</entry>
+    <entry>File system type</>
+  </row>
+
+  <row>
+    <entry>mount.statvfs.f_bavail</entry>
+    <entry>Blocks Available</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Available fragment sized blocks</>
+  </row>
+
+  <row>
+    <entry>mount.statvfs.f_bfree</entry>
+    <entry>Blocks Free</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Free fragment sized blocks</>
+  </row>
+
+  <row>
+    <entry>mount.statvfs.f_blocks</entry>
+    <entry>Blocks</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Total fragment sized blocks</>
+  </row>
+
+  <row>
+    <entry>mount.statvfs.f_bsize</entry>
+    <entry>Block size</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>File system block size</>
+  </row>
+
+  <row>
+    <entry>mount.statvfs.f_favail</entry>
+    <entry>Files Available</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Available files/inodes</>
+  </row>
+
+  <row>
+    <entry>mount.statvfs.f_ffree</entry>
+    <entry>Files Free</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Free files/inodes</>
+  </row>
+
+  <row>
+    <entry>mount.statvfs.f_files</entry>
+    <entry>Files</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Total files/inodes</>
+  </row>
+
+  <row>
+    <entry>mount.statvfs.f_flag</entry>
+    <entry>Flags</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Flags bit-mask</>
+  </row>
+
+  <row>
+    <entry>mount.statvfs.f_flag.st_grpid</entry>
+    <entry>ST_GRPID</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mount.statvfs.f_flag.st_local</entry>
+    <entry>ST_LOCAL</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mount.statvfs.f_flag.st_nodev</entry>
+    <entry>ST_NODEV</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mount.statvfs.f_flag.st_nosuid</entry>
+    <entry>ST_NOSUID</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mount.statvfs.f_flag.st_notrunc</entry>
+    <entry>ST_NOTRUNC</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mount.statvfs.f_flag.st_rdonly</entry>
+    <entry>ST_RDONLY</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mount.statvfs.f_frsize</entry>
+    <entry>Fragment size</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>File system fragment size</>
+  </row>
+
+  <row>
+    <entry>mount.statvfs.f_fsid</entry>
+    <entry>File system ID</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>File system identifier</>
+  </row>
+
+  <row>
+    <entry>mount.statvfs.f_fstr</entry>
+    <entry>File system specific string</entry>
+    <entry>Byte array</entry>
+    <entry>File system specific string</>
+  </row>
+
+  <row>
+    <entry>mount.statvfs.f_namemax</entry>
+    <entry>Maximum file name length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Maximum file name length</>
+  </row>
+
 </tbody></tgroup></table>
 </section>
 
@@ -32749,98 +38489,339 @@
     <entry>msdp.not.error_sub</entry>
     <entry>Error subode</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry>Error subcode</>
+    <entry>Error subcode</>
+  </row>
+
+  <row>
+    <entry>msdp.not.ipv4</entry>
+    <entry>IPv4 address</entry>
+    <entry>IPv4 address</entry>
+    <entry>Group/RP/Source address in Notification messages</>
+  </row>
+
+  <row>
+    <entry>msdp.not.o</entry>
+    <entry>Open-bit</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>If clear, the connection will be closed</>
+  </row>
+
+  <row>
+    <entry>msdp.not.res</entry>
+    <entry>Reserved</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry>Reserved field in Notification messages</>
+  </row>
+
+  <row>
+    <entry>msdp.not.sprefix_len</entry>
+    <entry>Sprefix len</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Source prefix length in Notification messages</>
+  </row>
+
+  <row>
+    <entry>msdp.sa.entry_count</entry>
+    <entry>Entry Count</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>MSDP SA Entry Count</>
+  </row>
+
+  <row>
+    <entry>msdp.sa.group_addr</entry>
+    <entry>Group Address</entry>
+    <entry>IPv4 address</entry>
+    <entry>The group address the active source has sent data to</>
+  </row>
+
+  <row>
+    <entry>msdp.sa.reserved</entry>
+    <entry>Reserved</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry>Transmitted as zeros and ignored by a receiver</>
+  </row>
+
+  <row>
+    <entry>msdp.sa.rp_addr</entry>
+    <entry>RP Address</entry>
+    <entry>IPv4 address</entry>
+    <entry>Active source's RP address</>
+  </row>
+
+  <row>
+    <entry>msdp.sa.sprefix_len</entry>
+    <entry>Sprefix len</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>The route prefix length associated with source address</>
+  </row>
+
+  <row>
+    <entry>msdp.sa.src_addr</entry>
+    <entry>Source Address</entry>
+    <entry>IPv4 address</entry>
+    <entry>The IP address of the active source</>
+  </row>
+
+  <row>
+    <entry>msdp.sa_req.group_addr</entry>
+    <entry>Group Address</entry>
+    <entry>IPv4 address</entry>
+    <entry>The group address the MSDP peer is requesting</>
+  </row>
+
+  <row>
+    <entry>msdp.sa_req.res</entry>
+    <entry>Reserved</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Transmitted as zeros and ignored by a receiver</>
+  </row>
+
+  <row>
+    <entry>msdp.type</entry>
+    <entry>Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>MSDP TLV type</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDMySQLProtocol"><title>MySQL Protocol (mysql)</title>
+
+<table id="TIDMySQLProtocol"><title>MySQL Protocol (mysql)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>mysql.caps</entry>
+    <entry>Caps</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>MySQL Capabilities</>
+  </row>
+
+  <row>
+    <entry>mysql.caps.CP</entry>
+    <entry>Can use compression protocol</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mysql.caps.cd</entry>
+    <entry>Connect With Database</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mysql.caps.cu</entry>
+    <entry>Support the mysql_change_user()</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mysql.caps.fr</entry>
+    <entry>Found Rows</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mysql.caps.ia</entry>
+    <entry>an Interactive Client</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mysql.caps.ii</entry>
+    <entry>Ignore sigpipes</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mysql.caps.is</entry>
+    <entry>Ignore Spaces before (</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mysql.caps.lf</entry>
+    <entry>Long Flag</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mysql.caps.li</entry>
+    <entry>Can Use LOAD DATA LOCAL</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mysql.caps.lp</entry>
+    <entry>Long Password</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mysql.caps.ns</entry>
+    <entry>Dont Allow database.table.column</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mysql.caps.ob</entry>
+    <entry>ODBC Client</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mysql.caps.sl</entry>
+    <entry>Switch to SSL after handshake</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mysql.caps.ta</entry>
+    <entry>Client knows about transactions</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>mysql.charset</entry>
+    <entry>Charset</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>MySQL Charset</>
+  </row>
+
+  <row>
+    <entry>mysql.error_code</entry>
+    <entry>Error Code</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>MySQL Error CODE</>
+  </row>
+
+  <row>
+    <entry>mysql.max_packet</entry>
+    <entry>MAX Packet</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry>MySQL Max packet</>
+  </row>
+
+  <row>
+    <entry>mysql.opcode</entry>
+    <entry>Command</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>MySQL OPCODE</>
   </row>
 
   <row>
-    <entry>msdp.not.ipv4</entry>
-    <entry>IPv4 address</entry>
-    <entry>IPv4 address</entry>
-    <entry>Group/RP/Source address in Notification messages</>
+    <entry>mysql.packet_length</entry>
+    <entry>Packet Length</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry>MySQL packet length</>
   </row>
 
   <row>
-    <entry>msdp.not.o</entry>
-    <entry>Open-bit</entry>
+    <entry>mysql.packet_number</entry>
+    <entry>Packet Number</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry>If clear, the connection will be closed</>
+    <entry>MySQL Packet Number</>
   </row>
 
   <row>
-    <entry>msdp.not.res</entry>
-    <entry>Reserved</entry>
-    <entry>Unsigned 24-bit integer</entry>
-    <entry>Reserved field in Notification messages</>
+    <entry>mysql.parameter</entry>
+    <entry>Parameter</entry>
+    <entry>String</entry>
+    <entry>Parameter</>
   </row>
 
   <row>
-    <entry>msdp.not.sprefix_len</entry>
-    <entry>Sprefix len</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Source prefix length in Notification messages</>
+    <entry>mysql.password</entry>
+    <entry>Password</entry>
+    <entry>String</entry>
+    <entry>Login Password</>
   </row>
 
   <row>
-    <entry>msdp.sa.entry_count</entry>
-    <entry>Entry Count</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>MSDP SA Entry Count</>
+    <entry>mysql.payload</entry>
+    <entry>Payload</entry>
+    <entry>String</entry>
+    <entry>MySQL Payload</>
   </row>
 
   <row>
-    <entry>msdp.sa.group_addr</entry>
-    <entry>Group Address</entry>
-    <entry>IPv4 address</entry>
-    <entry>The group address the active source has sent data to</>
+    <entry>mysql.protocol</entry>
+    <entry>Protocol</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>MySQL Protocol</>
   </row>
 
   <row>
-    <entry>msdp.sa.reserved</entry>
-    <entry>Reserved</entry>
-    <entry>Unsigned 24-bit integer</entry>
-    <entry>Transmitted as zeros and ignored by a receiver</>
+    <entry>mysql.response_code</entry>
+    <entry>Response Code</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>MySQL Respone Code</>
   </row>
 
   <row>
-    <entry>msdp.sa.rp_addr</entry>
-    <entry>RP Address</entry>
-    <entry>IPv4 address</entry>
-    <entry>Active source's RP address</>
+    <entry>mysql.salt</entry>
+    <entry>Salt</entry>
+    <entry>String</entry>
+    <entry>Salt</>
   </row>
 
   <row>
-    <entry>msdp.sa.sprefix_len</entry>
-    <entry>Sprefix len</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>The route prefix length associated with source address</>
+    <entry>mysql.status</entry>
+    <entry>Status</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>MySQL Status</>
   </row>
 
   <row>
-    <entry>msdp.sa.src_addr</entry>
-    <entry>Source Address</entry>
-    <entry>IPv4 address</entry>
-    <entry>The IP address of the active source</>
+    <entry>mysql.thread_id</entry>
+    <entry>Thread ID</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>MySQL Thread ID</>
   </row>
 
   <row>
-    <entry>msdp.sa_req.group_addr</entry>
-    <entry>Group Address</entry>
-    <entry>IPv4 address</entry>
-    <entry>The group address the MSDP peer is requesting</>
+    <entry>mysql.unused</entry>
+    <entry>Unused</entry>
+    <entry>String</entry>
+    <entry>Unused</>
   </row>
 
   <row>
-    <entry>msdp.sa_req.res</entry>
-    <entry>Reserved</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Transmitted as zeros and ignored by a receiver</>
+    <entry>mysql.user</entry>
+    <entry>Username</entry>
+    <entry>String</entry>
+    <entry>Login Username</>
   </row>
 
   <row>
-    <entry>msdp.type</entry>
-    <entry>Type</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>MSDP TLV type</>
+    <entry>mysql.version</entry>
+    <entry>Version</entry>
+    <entry>String</entry>
+    <entry>MySQL Version</>
   </row>
 
 </tbody></tgroup></table>
@@ -32861,10 +38842,89 @@
 </thead>
 <tbody>
   <row>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry><entry></entry>
+    <entry>nfsacl.acl</entry>
+    <entry>ACL</entry>
+    <entry>No value</entry>
+    <entry>ACL</>
+  </row>
+
+  <row>
+    <entry>nfsacl.aclcnt</entry>
+    <entry>ACL count</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>ACL count</>
+  </row>
+
+  <row>
+    <entry>nfsacl.aclent</entry>
+    <entry>ACL Entry</entry>
+    <entry>No value</entry>
+    <entry>ACL</>
+  </row>
+
+  <row>
+    <entry>nfsacl.aclent.perm</entry>
+    <entry>Permissions</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Permissions</>
+  </row>
+
+  <row>
+    <entry>nfsacl.aclent.type</entry>
+    <entry>Type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Type</>
+  </row>
+
+  <row>
+    <entry>nfsacl.aclent.uid</entry>
+    <entry>UID</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>UID</>
+  </row>
+
+  <row>
+    <entry>nfsacl.dfaclcnt</entry>
+    <entry>Default ACL count</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Default ACL count</>
+  </row>
+
+  <row>
+    <entry>nfsacl.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
+  <row>
+    <entry>nfsacl.procedure_v2</entry>
+    <entry>V2 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V2 Procedure</>
+  </row>
+
+  <row>
+    <entry>nfsacl.procedure_v3</entry>
+    <entry>V3 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V3 Procedure</>
+  </row>
+
+  <row>
+    <entry>nfsacl.status2</entry>
+    <entry>Status</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Status</>
+  </row>
+
+  <row>
+    <entry>nfsacl.status3</entry>
+    <entry>Status</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Status</>
   </row>
+
 </tbody></tgroup></table>
 </section>
 
@@ -32883,10 +38943,12 @@
 </thead>
 <tbody>
   <row>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry><entry></entry>
+    <entry>nfsauth.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
   </row>
+
 </tbody></tgroup></table>
 </section>
 
@@ -33500,6 +39562,13 @@
   </row>
 
   <row>
+    <entry>nisplus.procedure_v3</entry>
+    <entry>V3 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V3 Procedure</>
+  </row>
+
+  <row>
     <entry>nisplus.server</entry>
     <entry>server</entry>
     <entry>No value</entry>
@@ -33705,6 +39774,13 @@
     <entry>NIS Callback Entry</>
   </row>
 
+  <row>
+    <entry>nispluscb.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
 </tbody></tgroup></table>
 </section>
 
@@ -33747,13 +39823,6 @@
 </thead>
 <tbody>
   <row>
-    <entry>dcerpc.negotiateflags</entry>
-    <entry>Flags</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
-  </row>
-
-  <row>
     <entry>ntlmssp.auth.domain</entry>
     <entry>Domain name</entry>
     <entry>String</entry>
@@ -33880,6 +39949,13 @@
   </row>
 
   <row>
+    <entry>ntlmssp.decrypted_payload</entry>
+    <entry>NTLM Decrypted Payload</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ntlmssp.identifier</entry>
     <entry>NTLMSSP identifier</entry>
     <entry>String</entry>
@@ -34020,6 +40096,13 @@
   </row>
 
   <row>
+    <entry>ntlmssp.negotiateflags</entry>
+    <entry>Flags</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ntlmssp.negotiatekeyexch</entry>
     <entry>Negotiate Key Exchange</entry>
     <entry>Boolean</entry>
@@ -34208,6 +40291,48 @@
     <entry></>
   </row>
 
+  <row>
+    <entry>ntlmssp.verf</entry>
+    <entry>NTLMSSP Verifier</entry>
+    <entry>No value</entry>
+    <entry>NTLMSSP Verifier</>
+  </row>
+
+  <row>
+    <entry>ntlmssp.verf.body</entry>
+    <entry>Verifier Body</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ntlmssp.verf.crc32</entry>
+    <entry>Verifier CRC32</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ntlmssp.verf.sequence</entry>
+    <entry>Verifier Sequence Number</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ntlmssp.verf.unknown1</entry>
+    <entry>Unknown 1</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ntlmssp.verf.vers</entry>
+    <entry>Version Number</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
 </tbody></tgroup></table>
 </section>
 
@@ -34391,6 +40516,55 @@
   </row>
 
   <row>
+    <entry>netbios.fragment</entry>
+    <entry>NetBIOS Fragment</entry>
+    <entry></entry>
+    <entry>NetBIOS Fragment</>
+  </row>
+
+  <row>
+    <entry>netbios.fragment.error</entry>
+    <entry>Defragmentation error</entry>
+    <entry></entry>
+    <entry>Defragmentation error due to illegal fragments</>
+  </row>
+
+  <row>
+    <entry>netbios.fragment.multipletails</entry>
+    <entry>Multiple tail fragments found</entry>
+    <entry>Boolean</entry>
+    <entry>Several tails were found when defragmenting the packet</>
+  </row>
+
+  <row>
+    <entry>netbios.fragment.overlap</entry>
+    <entry>Fragment overlap</entry>
+    <entry>Boolean</entry>
+    <entry>Fragment overlaps with other fragments</>
+  </row>
+
+  <row>
+    <entry>netbios.fragment.overlap.conflict</entry>
+    <entry>Conflicting data in fragment overlap</entry>
+    <entry>Boolean</entry>
+    <entry>Overlapping fragments contained conflicting data</>
+  </row>
+
+  <row>
+    <entry>netbios.fragment.toolongfragment</entry>
+    <entry>Fragment too long</entry>
+    <entry>Boolean</entry>
+    <entry>Fragment contained data past end of packet</>
+  </row>
+
+  <row>
+    <entry>netbios.fragments</entry>
+    <entry>NetBIOS Fragments</entry>
+    <entry>No value</entry>
+    <entry>NetBIOS Fragments</>
+  </row>
+
+  <row>
     <entry>netbios.hdr_len</entry>
     <entry>Header Length</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -35013,6 +41187,13 @@
   </row>
 
   <row>
+    <entry>ncp.access_date</entry>
+    <entry>Access Date</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.access_mode</entry>
     <entry>Access Mode</entry>
     <entry>Unsigned 8-bit integer</entry>
@@ -35371,7 +41552,7 @@
 
   <row>
     <entry>ncp.att_def16_sub_only</entry>
-    <entry>Subdirectories Only</entry>
+    <entry>Subdirectory</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
@@ -35441,7 +41622,7 @@
 
   <row>
     <entry>ncp.att_def32_sub_only</entry>
-    <entry>Subdirectories Only</entry>
+    <entry>Subdirectory</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
@@ -35546,7 +41727,7 @@
 
   <row>
     <entry>ncp.att_def_sub_only</entry>
-    <entry>Subdirectories Only</entry>
+    <entry>Subdirectory</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
@@ -35979,6 +42160,34 @@
   </row>
 
   <row>
+    <entry>ncp.bit10pingflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit10pingflags2</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit10pingpflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit10pingvflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit10rflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -35986,6 +42195,13 @@
   </row>
 
   <row>
+    <entry>ncp.bit10siflags</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit10vflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -36063,6 +42279,34 @@
   </row>
 
   <row>
+    <entry>ncp.bit11pingflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit11pingflags2</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit11pingpflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit11pingvflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit11rflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -36070,6 +42314,13 @@
   </row>
 
   <row>
+    <entry>ncp.bit11siflags</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit11vflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -36147,6 +42398,34 @@
   </row>
 
   <row>
+    <entry>ncp.bit12pingflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit12pingflags2</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit12pingpflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit12pingvflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit12rflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -36154,6 +42433,13 @@
   </row>
 
   <row>
+    <entry>ncp.bit12siflags</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit12vflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -36231,6 +42517,34 @@
   </row>
 
   <row>
+    <entry>ncp.bit13pingflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit13pingflags2</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit13pingpflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit13pingvflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit13rflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -36238,6 +42552,13 @@
   </row>
 
   <row>
+    <entry>ncp.bit13siflags</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit13vflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -36302,7 +42623,7 @@
 
   <row>
     <entry>ncp.bit14nflags</entry>
-    <entry>Prefer Referalls</entry>
+    <entry>Prefer Referrals</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
@@ -36315,6 +42636,34 @@
   </row>
 
   <row>
+    <entry>ncp.bit14pingflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit14pingflags2</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit14pingpflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit14pingvflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit14rflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -36322,6 +42671,13 @@
   </row>
 
   <row>
+    <entry>ncp.bit14siflags</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit14vflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -36379,7 +42735,7 @@
 
   <row>
     <entry>ncp.bit15nflags</entry>
-    <entry>Prefer Only Referalls</entry>
+    <entry>Prefer Only Referrals</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
@@ -36392,6 +42748,34 @@
   </row>
 
   <row>
+    <entry>ncp.bit15pingflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit15pingflags2</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit15pingpflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit15pingvflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit15rflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -36399,6 +42783,13 @@
   </row>
 
   <row>
+    <entry>ncp.bit15siflags</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit15vflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -36469,6 +42860,34 @@
   </row>
 
   <row>
+    <entry>ncp.bit16pingflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit16pingflags2</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit16pingpflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit16pingvflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit16rflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -36476,6 +42895,13 @@
   </row>
 
   <row>
+    <entry>ncp.bit16siflags</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit16vflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -36553,6 +42979,34 @@
   </row>
 
   <row>
+    <entry>ncp.bit1pingflags1</entry>
+    <entry>Supported Fields</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit1pingflags2</entry>
+    <entry>Sap Name</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit1pingpflags1</entry>
+    <entry>Root Most Master Replica</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit1pingvflags1</entry>
+    <entry>Checksum</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit1rflags</entry>
     <entry>Typeless</entry>
     <entry>Boolean</entry>
@@ -36560,6 +43014,13 @@
   </row>
 
   <row>
+    <entry>ncp.bit1siflags</entry>
+    <entry>Names</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit1vflags</entry>
     <entry>Naming</entry>
     <entry>Boolean</entry>
@@ -36595,50 +43056,85 @@
   </row>
 
   <row>
-    <entry>ncp.bit2infoflagsl</entry>
+    <entry>ncp.bit2infoflagsl</entry>
+    <entry>Entry ID</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit2l1flagsh</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit2l1flagsl</entry>
+    <entry>Entry ID</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit2lflags</entry>
+    <entry>List Containers</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit2nflags</entry>
+    <entry>Readable</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit2outflags</entry>
     <entry>Entry ID</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.bit2l1flagsh</entry>
-    <entry>Not Defined</entry>
+    <entry>ncp.bit2pingflags1</entry>
+    <entry>Depth</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.bit2l1flagsl</entry>
-    <entry>Entry ID</entry>
+    <entry>ncp.bit2pingflags2</entry>
+    <entry>Tree Name</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.bit2lflags</entry>
-    <entry>List Containers</entry>
+    <entry>ncp.bit2pingpflags1</entry>
+    <entry>Time Synchronized</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.bit2nflags</entry>
-    <entry>Readable</entry>
+    <entry>ncp.bit2pingvflags1</entry>
+    <entry>CRC32</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.bit2outflags</entry>
-    <entry>Entry ID</entry>
+    <entry>ncp.bit2rflags</entry>
+    <entry>Slashed</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.bit2rflags</entry>
-    <entry>Slashed</entry>
+    <entry>ncp.bit2siflags</entry>
+    <entry>Names and Values</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
@@ -36721,6 +43217,34 @@
   </row>
 
   <row>
+    <entry>ncp.bit3pingflags1</entry>
+    <entry>Revision</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit3pingflags2</entry>
+    <entry>OS Name</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit3pingpflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit3pingvflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit3rflags</entry>
     <entry>Dotted</entry>
     <entry>Boolean</entry>
@@ -36728,6 +43252,13 @@
   </row>
 
   <row>
+    <entry>ncp.bit3siflags</entry>
+    <entry>Effective Privileges</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit3vflags</entry>
     <entry>Present</entry>
     <entry>Boolean</entry>
@@ -36805,6 +43336,34 @@
   </row>
 
   <row>
+    <entry>ncp.bit4pingflags1</entry>
+    <entry>Flags</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit4pingflags2</entry>
+    <entry>Hardware Name</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit4pingpflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit4pingvflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit4rflags</entry>
     <entry>Tuned</entry>
     <entry>Boolean</entry>
@@ -36812,6 +43371,13 @@
   </row>
 
   <row>
+    <entry>ncp.bit4siflags</entry>
+    <entry>Value Info</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit4vflags</entry>
     <entry>Value Damaged</entry>
     <entry>Boolean</entry>
@@ -36889,6 +43455,34 @@
   </row>
 
   <row>
+    <entry>ncp.bit5pingflags1</entry>
+    <entry>Verification Flags</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit5pingflags2</entry>
+    <entry>Vendor Name</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit5pingpflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit5pingvflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit5rflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -36896,6 +43490,13 @@
   </row>
 
   <row>
+    <entry>ncp.bit5siflags</entry>
+    <entry>Abbreviated Value</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit5vflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -36973,6 +43574,34 @@
   </row>
 
   <row>
+    <entry>ncp.bit6pingflags1</entry>
+    <entry>Letter Version</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit6pingflags2</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit6pingpflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit6pingvflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit6rflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -36980,6 +43609,13 @@
   </row>
 
   <row>
+    <entry>ncp.bit6siflags</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit6vflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -37057,6 +43693,34 @@
   </row>
 
   <row>
+    <entry>ncp.bit7pingflags1</entry>
+    <entry>OS Version</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit7pingflags2</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit7pingpflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit7pingvflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit7rflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -37064,6 +43728,13 @@
   </row>
 
   <row>
+    <entry>ncp.bit7siflags</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit7vflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -37141,6 +43812,34 @@
   </row>
 
   <row>
+    <entry>ncp.bit8pingflags1</entry>
+    <entry>License Flags</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit8pingflags2</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit8pingpflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit8pingvflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit8rflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -37148,6 +43847,13 @@
   </row>
 
   <row>
+    <entry>ncp.bit8siflags</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit8vflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -37225,6 +43931,34 @@
   </row>
 
   <row>
+    <entry>ncp.bit9pingflags1</entry>
+    <entry>DS Time</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit9pingflags2</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit9pingpflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.bit9pingvflags1</entry>
+    <entry>Not Defined</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit9rflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -37232,6 +43966,13 @@
   </row>
 
   <row>
+    <entry>ncp.bit9siflags</entry>
+    <entry>Expanded Class</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.bit9vflags</entry>
     <entry>Not Defined</entry>
     <entry>Boolean</entry>
@@ -37687,6 +44428,13 @@
   </row>
 
   <row>
+    <entry>ncp.client_name</entry>
+    <entry>Client Name</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.client_record_area</entry>
     <entry>Client Record Area</entry>
     <entry>String</entry>
@@ -38625,15 +45373,15 @@
   </row>
 
   <row>
-    <entry>ncp.definded_name_spaces</entry>
-    <entry>Defined Name Spaces</entry>
+    <entry>ncp.defined_data_streams</entry>
+    <entry>Defined Data Streams</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.defined_data_streams</entry>
-    <entry>Defined Data Streams</entry>
+    <entry>ncp.defined_name_spaces</entry>
+    <entry>Defined Name Spaces</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
@@ -40599,6 +47347,13 @@
   </row>
 
   <row>
+    <entry>ncp.index_number</entry>
+    <entry>Index Number</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.info_count</entry>
     <entry>Info Count</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -41146,7 +47901,7 @@
 
   <row>
     <entry>ncp.ipref</entry>
-    <entry>Address Referal</entry>
+    <entry>Address Referral</entry>
     <entry>IPv4 address</entry>
     <entry></>
   </row>
@@ -41817,6 +48572,13 @@
   </row>
 
   <row>
+    <entry>ncp.loaded_name_spaces</entry>
+    <entry>Loaded Name Spaces</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.local_connection_id</entry>
     <entry>Local Connection ID</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -42421,7 +49183,7 @@
   <row>
     <entry>ncp.member_type</entry>
     <entry>Member Type</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
@@ -43084,6 +49846,13 @@
   </row>
 
   <row>
+    <entry>ncp.nds_ds_time</entry>
+    <entry>DS Time</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.nds_eflags</entry>
     <entry>Entry Flags</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -43168,34 +49937,6 @@
   </row>
 
   <row>
-    <entry>ncp.nds_flags.depth</entry>
-    <entry>Depth</entry>
-    <entry>Boolean</entry>
-    <entry>Return Depth?</>
-  </row>
-
-  <row>
-    <entry>ncp.nds_flags.flags</entry>
-    <entry>Flags</entry>
-    <entry>Boolean</entry>
-    <entry>Return Flags?</>
-  </row>
-
-  <row>
-    <entry>ncp.nds_flags.rev</entry>
-    <entry>Rev</entry>
-    <entry>Boolean</entry>
-    <entry>Return NDS Revision?</>
-  </row>
-
-  <row>
-    <entry>ncp.nds_flags.tree</entry>
-    <entry>Tree</entry>
-    <entry>Boolean</entry>
-    <entry>Return Tree?</>
-  </row>
-
-  <row>
     <entry>ncp.nds_info_type</entry>
     <entry>Info Type</entry>
     <entry>String</entry>
@@ -43217,6 +49958,20 @@
   </row>
 
   <row>
+    <entry>ncp.nds_letter_ver</entry>
+    <entry>Letter Version</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.nds_lic_flags</entry>
+    <entry>License Flags</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.nds_local_partition</entry>
     <entry>Local Partition ID</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -43287,6 +50042,13 @@
   </row>
 
   <row>
+    <entry>ncp.nds_num_objects</entry>
+    <entry>Number of Objects to Search</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.nds_number_of_changes</entry>
     <entry>Number of Attribute Changes</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -43294,6 +50056,13 @@
   </row>
 
   <row>
+    <entry>ncp.nds_os_ver</entry>
+    <entry>OS Version</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.nds_out_delimiter</entry>
     <entry>Output Delimiter</entry>
     <entry>String</entry>
@@ -43343,6 +50112,13 @@
   </row>
 
   <row>
+    <entry>ncp.nds_ping_version</entry>
+    <entry>Ping Version</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.nds_privileges</entry>
     <entry>Privileges</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -43364,8 +50140,8 @@
   </row>
 
   <row>
-    <entry>ncp.nds_referals</entry>
-    <entry>Referals</entry>
+    <entry>ncp.nds_referrals</entry>
+    <entry>Referrals</entry>
     <entry>Unsigned 32-bit integer</entry>
     <entry></>
   </row>
@@ -43393,7 +50169,7 @@
 
   <row>
     <entry>ncp.nds_reply_buf</entry>
-    <entry>Reply Buffer Size</entry>
+    <entry>NDS Reply Buffer Size</entry>
     <entry>Unsigned 32-bit integer</entry>
     <entry></>
   </row>
@@ -43546,6 +50322,13 @@
   </row>
 
   <row>
+    <entry>ncp.nds_search_scope</entry>
+    <entry>Search Scope</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.nds_status</entry>
     <entry>NDS Status</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -43567,20 +50350,6 @@
   </row>
 
   <row>
-    <entry>ncp.nds_string</entry>
-    <entry>Tree Name</entry>
-    <entry>String</entry>
-    <entry></>
-  </row>
-
-  <row>
-    <entry>ncp.nds_string_value</entry>
-    <entry>NDS String :</entry>
-    <entry>String</entry>
-    <entry></>
-  </row>
-
-  <row>
     <entry>ncp.nds_super</entry>
     <entry>Super Class</entry>
     <entry>String</entry>
@@ -43618,6 +50387,13 @@
   <row>
     <entry>ncp.nds_time_filter</entry>
     <entry>Time Filter</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.nds_tree_name</entry>
+    <entry>Tree Name</entry>
     <entry>String</entry>
     <entry></>
   </row>
@@ -43651,6 +50427,13 @@
   </row>
 
   <row>
+    <entry>ncp.nds_version</entry>
+    <entry>NDS Version</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.nds_vflags</entry>
     <entry>Value Flags</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -43687,14 +50470,14 @@
 
   <row>
     <entry>ncp.ndsfrag</entry>
-    <entry>Fragment Handle</entry>
+    <entry>NDS Fragment Handle</entry>
     <entry>Unsigned 32-bit integer</entry>
     <entry></>
   </row>
 
   <row>
     <entry>ncp.ndsfragsize</entry>
-    <entry>Fragment Size</entry>
+    <entry>NDS Fragment Size</entry>
     <entry>Unsigned 32-bit integer</entry>
     <entry></>
   </row>
@@ -43749,13 +50532,6 @@
   </row>
 
   <row>
-    <entry>ncp.ndsver</entry>
-    <entry>NDS Version</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
-  </row>
-
-  <row>
     <entry>ncp.ndsverb</entry>
     <entry>NDS Verb</entry>
     <entry>Unsigned 8-bit integer</entry>
@@ -45731,7 +52507,7 @@
 
   <row>
     <entry>ncp.ref_rec</entry>
-    <entry>Referal Record</entry>
+    <entry>Referral Record</entry>
     <entry>Unsigned 32-bit integer</entry>
     <entry></>
   </row>
@@ -45886,7 +52662,7 @@
   <row>
     <entry>ncp.req_frame_num</entry>
     <entry>Response to Request in Frame Number</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry></entry>
     <entry></>
   </row>
 
@@ -46668,22 +53444,57 @@
   </row>
 
   <row>
+    <entry>ncp.sattr_archive</entry>
+    <entry>Archive</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.sattr_execute_confirm</entry>
+    <entry>Execute Confirm</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.sattr_exonly</entry>
+    <entry>Execute-Only Files Allowed</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>ncp.sattr_hid</entry>
-    <entry>Hidden</entry>
+    <entry>Hidden Files Allowed</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.sattr_ronly</entry>
+    <entry>Read-Only Files Allowed</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.sattr_shareable</entry>
+    <entry>Shareable</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
     <entry>ncp.sattr_sub</entry>
-    <entry>Subdirectory</entry>
+    <entry>Subdirectories Only</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
     <entry>ncp.sattr_sys</entry>
-    <entry>System</entry>
+    <entry>System Files Allowed</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
@@ -46710,7 +53521,7 @@
   </row>
 
   <row>
-    <entry>ncp.search_att_execute_confrim</entry>
+    <entry>ncp.search_att_execute_confirm</entry>
     <entry>Execute Confirm</entry>
     <entry>Boolean</entry>
     <entry></>
@@ -46718,14 +53529,14 @@
 
   <row>
     <entry>ncp.search_att_execute_only</entry>
-    <entry>Execute Only</entry>
+    <entry>Execute-Only</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
     <entry>ncp.search_att_hidden</entry>
-    <entry>Hidden</entry>
+    <entry>Hidden Files Allowed</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
@@ -46739,7 +53550,7 @@
 
   <row>
     <entry>ncp.search_att_read_only</entry>
-    <entry>Read Only</entry>
+    <entry>Read-Only</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
@@ -46753,7 +53564,7 @@
 
   <row>
     <entry>ncp.search_att_sub</entry>
-    <entry>Subdirectory</entry>
+    <entry>Subdirectories Only</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
@@ -47971,7 +54782,7 @@
 
   <row>
     <entry>ncp.tcpref</entry>
-    <entry>Address Referal</entry>
+    <entry>Address Referral</entry>
     <entry>IPv4 address</entry>
     <entry></>
   </row>
@@ -47991,6 +54802,13 @@
   </row>
 
   <row>
+    <entry>ncp.time</entry>
+    <entry>Time from Request</entry>
+    <entry>Time duration</entry>
+    <entry>Time between request and response in seconds</>
+  </row>
+
+  <row>
     <entry>ncp.time_to_net</entry>
     <entry>Time To Net</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -48601,7 +55419,7 @@
 
   <row>
     <entry>ncp.udpref</entry>
-    <entry>Address Referal</entry>
+    <entry>Address Referral</entry>
     <entry>IPv4 address</entry>
     <entry></>
   </row>
@@ -49174,138 +55992,281 @@
   </row>
 
   <row>
-    <entry>ncp.write_curr_trans</entry>
-    <entry>Write Currently Transmitting Count</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>ncp.write_curr_trans</entry>
+    <entry>Write Currently Transmitting Count</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.write_didnt_need_but_req_ack</entry>
+    <entry>Write Didn't Need But Requested ACK Count</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.write_didnt_need_this_frag</entry>
+    <entry>Write Didn't Need This Fragment Count</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.write_dup_req</entry>
+    <entry>Write Duplicate Request Count</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.write_err</entry>
+    <entry>Write Error Count</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.write_got_an_ack0</entry>
+    <entry>Write Got An ACK Count 0</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.write_got_an_ack1</entry>
+    <entry>Write Got An ACK Count 1</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.write_held_off</entry>
+    <entry>Write Held Off Count</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.write_held_off_with_dup</entry>
+    <entry>Write Held Off With Duplicate Request</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.write_incon_packet_len</entry>
+    <entry>Write Inconsistent Packet Lengths Count</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.write_out_of_mem_for_ctl_nodes</entry>
+    <entry>Write Out Of Memory For Control Nodes Count</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.write_timeout</entry>
+    <entry>Write Time Out Count</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.write_too_many_buf_check</entry>
+    <entry>Write Too Many Buffers Checked Out Count</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.write_trash_dup_req</entry>
+    <entry>Write Trashed Duplicate Request Count</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.write_trash_packet</entry>
+    <entry>Write Trashed Packet Count</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.wrt_blck_cnt</entry>
+    <entry>Write Block Count</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.wrt_entire_blck</entry>
+    <entry>Write Entire Block Count</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.year</entry>
+    <entry>Year</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ncp.zero_ack_frag</entry>
+    <entry>Zero ACK Fragment Count</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDNetWareLinkServicesProtocol"><title>NetWare Link Services Protocol (nlsp)</title>
+
+<table id="TIDNetWareLinkServicesProtocol"><title>NetWare Link Services Protocol (nlsp)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>nlsp.header_length</entry>
+    <entry>PDU Header Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.write_didnt_need_but_req_ack</entry>
-    <entry>Write Didn't Need But Requested ACK Count</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>nlsp.hello.circuit_type</entry>
+    <entry>Circuit Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>(null)</>
   </row>
 
   <row>
-    <entry>ncp.write_didnt_need_this_frag</entry>
-    <entry>Write Didn't Need This Fragment Count</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>nlsp.hello.holding_timer</entry>
+    <entry>Holding Timer</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>(null)</>
   </row>
 
   <row>
-    <entry>ncp.write_dup_req</entry>
-    <entry>Write Duplicate Request Count</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>nlsp.hello.multicast</entry>
+    <entry>Multicast Routing</entry>
+    <entry>Boolean</entry>
+    <entry>If set, this router supports multicast routing</>
   </row>
 
   <row>
-    <entry>ncp.write_err</entry>
-    <entry>Write Error Count</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>nlsp.hello.priority</entry>
+    <entry>Priority</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>(null)</>
   </row>
 
   <row>
-    <entry>ncp.write_got_an_ack0</entry>
-    <entry>Write Got An ACK Count 0</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>nlsp.hello.state</entry>
+    <entry>State</entry>
+    <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.write_got_an_ack1</entry>
-    <entry>Write Got An ACK Count 1</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>nlsp.irpd</entry>
+    <entry>NetWare Link Services Protocol Discriminator</entry>
+    <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.write_held_off</entry>
-    <entry>Write Held Off Count</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>nlsp.lsp.attached_flag</entry>
+    <entry>Attached Flag</entry>
+    <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.write_held_off_with_dup</entry>
-    <entry>Write Held Off With Duplicate Request</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>nlsp.lsp.checksum</entry>
+    <entry>Checksum</entry>
+    <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.write_incon_packet_len</entry>
-    <entry>Write Inconsistent Packet Lengths Count</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>nlsp.lsp.lspdbol</entry>
+    <entry>LSP Database Overloaded</entry>
+    <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.write_out_of_mem_for_ctl_nodes</entry>
-    <entry>Write Out Of Memory For Control Nodes Count</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>nlsp.lsp.partition_repair</entry>
+    <entry>Partition Repair</entry>
+    <entry>Boolean</entry>
+    <entry>If set, this router supports the optional Partition Repair function</>
   </row>
 
   <row>
-    <entry>ncp.write_timeout</entry>
-    <entry>Write Time Out Count</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>nlsp.lsp.router_type</entry>
+    <entry>Router Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.write_too_many_buf_check</entry>
-    <entry>Write Too Many Buffers Checked Out Count</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>nlsp.major_version</entry>
+    <entry>Major Version</entry>
+    <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.write_trash_dup_req</entry>
-    <entry>Write Trashed Duplicate Request Count</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>nlsp.minor_version</entry>
+    <entry>Minor Version</entry>
+    <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.write_trash_packet</entry>
-    <entry>Write Trashed Packet Count</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>nlsp.nr</entry>
+    <entry>Multi-homed Non-routing Server</entry>
+    <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.wrt_blck_cnt</entry>
-    <entry>Write Block Count</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>nlsp.packet_length</entry>
+    <entry>Packet Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.wrt_entire_blck</entry>
-    <entry>Write Entire Block Count</entry>
+    <entry>nlsp.sequence_number</entry>
+    <entry>Sequence Number</entry>
     <entry>Unsigned 32-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>ncp.year</entry>
-    <entry>Year</entry>
+    <entry>nlsp.type</entry>
+    <entry>Packet Type</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
-  <row>
-    <entry>ncp.zero_ack_frag</entry>
-    <entry>Zero ACK Fragment Count</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
-  </row>
-
 </tbody></tgroup></table>
 </section>
 
@@ -51483,6 +58444,27 @@
   </row>
 
   <row>
+    <entry>nfs.procedure_v2</entry>
+    <entry>V2 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V2 Procedure</>
+  </row>
+
+  <row>
+    <entry>nfs.procedure_v3</entry>
+    <entry>V3 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V3 Procedure</>
+  </row>
+
+  <row>
+    <entry>nfs.procedure_v4</entry>
+    <entry>V4 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V4 Procedure</>
+  </row>
+
+  <row>
     <entry>nfs.r_addr</entry>
     <entry>r_addr</entry>
     <entry>Byte array</entry>
@@ -51976,6 +58958,34 @@
   </row>
 
   <row>
+    <entry>nlm.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
+  <row>
+    <entry>nlm.procedure_v2</entry>
+    <entry>V2 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V2 Procedure</>
+  </row>
+
+  <row>
+    <entry>nlm.procedure_v3</entry>
+    <entry>V3 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V3 Procedure</>
+  </row>
+
+  <row>
+    <entry>nlm.procedure_v4</entry>
+    <entry>V4 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V4 Procedure</>
+  </row>
+
+  <row>
     <entry>nlm.reclaim</entry>
     <entry>reclaim</entry>
     <entry>Boolean</entry>
@@ -52115,316 +59125,841 @@
   </row>
 
   <row>
-    <entry>statnotify.priv</entry>
-    <entry>Priv</entry>
-    <entry>Byte array</entry>
-    <entry>Client supplied opaque data</>
+    <entry>statnotify.priv</entry>
+    <entry>Priv</entry>
+    <entry>Byte array</entry>
+    <entry>Client supplied opaque data</>
+  </row>
+
+  <row>
+    <entry>statnotify.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
+  <row>
+    <entry>statnotify.state</entry>
+    <entry>State</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>New state of client that changed</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDNetworkStatusMonitorProtocol"><title>Network Status Monitor Protocol (stat)</title>
+
+<table id="TIDNetworkStatusMonitorProtocol"><title>Network Status Monitor Protocol (stat)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>stat.mon</entry>
+    <entry>Monitor</entry>
+    <entry>No value</entry>
+    <entry>Monitor Host</>
+  </row>
+
+  <row>
+    <entry>stat.mon_id.name</entry>
+    <entry>Monitor ID Name</entry>
+    <entry>String</entry>
+    <entry>Monitor ID Name</>
+  </row>
+
+  <row>
+    <entry>stat.my_id</entry>
+    <entry>My ID</entry>
+    <entry>No value</entry>
+    <entry>My_ID structure</>
+  </row>
+
+  <row>
+    <entry>stat.my_id.hostname</entry>
+    <entry>Hostname</entry>
+    <entry>String</entry>
+    <entry>My_ID Host to callback</>
+  </row>
+
+  <row>
+    <entry>stat.my_id.proc</entry>
+    <entry>Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>My_ID Procedure to callback</>
+  </row>
+
+  <row>
+    <entry>stat.my_id.prog</entry>
+    <entry>Program</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>My_ID Program to callback</>
+  </row>
+
+  <row>
+    <entry>stat.my_id.vers</entry>
+    <entry>Version</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>My_ID Version of callback</>
+  </row>
+
+  <row>
+    <entry>stat.name</entry>
+    <entry>Name</entry>
+    <entry>String</entry>
+    <entry>Name</>
+  </row>
+
+  <row>
+    <entry>stat.priv</entry>
+    <entry>Priv</entry>
+    <entry>Byte array</entry>
+    <entry>Private client supplied opaque data</>
+  </row>
+
+  <row>
+    <entry>stat.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
+  <row>
+    <entry>stat.stat_chge</entry>
+    <entry>Status Change</entry>
+    <entry>No value</entry>
+    <entry>Status Change structure</>
+  </row>
+
+  <row>
+    <entry>stat.stat_res</entry>
+    <entry>Status Result</entry>
+    <entry>No value</entry>
+    <entry>Status Result</>
+  </row>
+
+  <row>
+    <entry>stat.stat_res.res</entry>
+    <entry>Result</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Result</>
+  </row>
+
+  <row>
+    <entry>stat.stat_res.state</entry>
+    <entry>State</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>State</>
+  </row>
+
+  <row>
+    <entry>stat.state</entry>
+    <entry>State</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>State of local NSM</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDNetworkTimeProtocol"><title>Network Time Protocol (ntp)</title>
+
+<table id="TIDNetworkTimeProtocol"><title>Network Time Protocol (ntp)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>ntp.flags</entry>
+    <entry>Flags</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Flags (Leap/Version/Mode)</>
+  </row>
+
+  <row>
+    <entry>ntp.flags.li</entry>
+    <entry>Leap Indicator</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Leap Indicator</>
+  </row>
+
+  <row>
+    <entry>ntp.flags.mode</entry>
+    <entry>Mode</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Mode</>
+  </row>
+
+  <row>
+    <entry>ntp.flags.vn</entry>
+    <entry>Version number</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Version number</>
+  </row>
+
+  <row>
+    <entry>ntp.keyid</entry>
+    <entry>Key ID</entry>
+    <entry>Byte array</entry>
+    <entry>Key ID</>
+  </row>
+
+  <row>
+    <entry>ntp.mac</entry>
+    <entry>Message Authentication Code</entry>
+    <entry>Byte array</entry>
+    <entry>Message Authentication Code</>
+  </row>
+
+  <row>
+    <entry>ntp.org</entry>
+    <entry>Originate Time Stamp</entry>
+    <entry>Byte array</entry>
+    <entry>Originate Time Stamp</>
+  </row>
+
+  <row>
+    <entry>ntp.ppoll</entry>
+    <entry>Peer Polling Interval</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Peer Polling Interval</>
+  </row>
+
+  <row>
+    <entry>ntp.precision</entry>
+    <entry>Peer Clock Precision</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Peer Clock Precision</>
+  </row>
+
+  <row>
+    <entry>ntp.rec</entry>
+    <entry>Receive Time Stamp</entry>
+    <entry>Byte array</entry>
+    <entry>Receive Time Stamp</>
+  </row>
+
+  <row>
+    <entry>ntp.refid</entry>
+    <entry>Reference Clock ID</entry>
+    <entry>Byte array</entry>
+    <entry>Reference Clock ID</>
+  </row>
+
+  <row>
+    <entry>ntp.reftime</entry>
+    <entry>Reference Clock Update Time</entry>
+    <entry>Byte array</entry>
+    <entry>Reference Clock Update Time</>
+  </row>
+
+  <row>
+    <entry>ntp.rootdelay</entry>
+    <entry>Root Delay</entry>
+    <entry>Double-precision floating point</entry>
+    <entry>Root Delay</>
+  </row>
+
+  <row>
+    <entry>ntp.rootdispersion</entry>
+    <entry>Clock Dispersion</entry>
+    <entry>Double-precision floating point</entry>
+    <entry>Clock Dispersion</>
+  </row>
+
+  <row>
+    <entry>ntp.stratum</entry>
+    <entry>Peer Clock Stratum</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Peer Clock Stratum</>
+  </row>
+
+  <row>
+    <entry>ntp.xmt</entry>
+    <entry>Transmit Time Stamp</entry>
+    <entry>Byte array</entry>
+    <entry>Transmit Time Stamp</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDNovellDistributedPrintSystem"><title>Novell Distributed Print System (ndps)</title>
+
+<table id="TIDNovellDistributedPrintSystem"><title>Novell Distributed Print System (ndps)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>ndps.add_bytes</entry>
+    <entry>Address Bytes</entry>
+    <entry></entry>
+    <entry>Address Bytes</>
+  </row>
+
+  <row>
+    <entry>ndps.attribue_value</entry>
+    <entry>Value</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Value</>
+  </row>
+
+  <row>
+    <entry>ndps.auth_null</entry>
+    <entry>Auth Null</entry>
+    <entry>Byte array</entry>
+    <entry>Auth Null</>
+  </row>
+
+  <row>
+    <entry>ndps.connection</entry>
+    <entry>Connection</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Connection</>
+  </row>
+
+  <row>
+    <entry>ndps.context</entry>
+    <entry>Printer Name</entry>
+    <entry>String</entry>
+    <entry>Printer Name</>
+  </row>
+
+  <row>
+    <entry>ndps.cred_type</entry>
+    <entry>Credential Type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Credential Type</>
+  </row>
+
+  <row>
+    <entry>ndps.error_val</entry>
+    <entry>Return Status</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Return Status</>
+  </row>
+
+  <row>
+    <entry>ndps.ext_error</entry>
+    <entry>Extended Return Status</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Extended Return Status</>
+  </row>
+
+  <row>
+    <entry>ndps.items</entry>
+    <entry>Number of Items</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Number of Items</>
+  </row>
+
+  <row>
+    <entry>ndps.lower_range</entry>
+    <entry>Lower Range</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Lower Range</>
+  </row>
+
+  <row>
+    <entry>ndps.lower_range_n64</entry>
+    <entry>Lower Range</entry>
+    <entry>Byte array</entry>
+    <entry>Lower Range</>
+  </row>
+
+  <row>
+    <entry>ndps.n64</entry>
+    <entry>Value</entry>
+    <entry>Byte array</entry>
+    <entry>Value</>
+  </row>
+
+  <row>
+    <entry>ndps.ndps_abort</entry>
+    <entry>Abort?</entry>
+    <entry>Boolean</entry>
+    <entry>Abort?</>
+  </row>
+
+  <row>
+    <entry>ndps.ndps_address</entry>
+    <entry>Address</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Address</>
+  </row>
+
+  <row>
+    <entry>ndps.ndps_address_type</entry>
+    <entry>Address Type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Address Type</>
+  </row>
+
+  <row>
+    <entry>ndps.ndps_attrib_boolean</entry>
+    <entry>Value?</entry>
+    <entry>Boolean</entry>
+    <entry>Value?</>
+  </row>
+
+  <row>
+    <entry>ndps.ndps_attrib_type</entry>
+    <entry>Attribute Type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Attribute Type</>
+  </row>
+
+  <row>
+    <entry>ndps.ndps_car_name_or_oid</entry>
+    <entry>Cardinal Name or OID</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Cardinal Name or OID</>
+  </row>
+
+  <row>
+    <entry>ndps.ndps_car_or_oid</entry>
+    <entry>Cardinal or OID</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Cardinal or OID</>
+  </row>
+
+  <row>
+    <entry>ndps.ndps_dim_falg</entry>
+    <entry>Dimension Flag</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Dimension Flag</>
+  </row>
+
+  <row>
+    <entry>ndps.ndps_dim_value</entry>
+    <entry>Dimension Value Type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Dimension Value Type</>
+  </row>
+
+  <row>
+    <entry>ndps.ndps_doc_num</entry>
+    <entry>Document Number</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Document Number</>
+  </row>
+
+  <row>
+    <entry>ndps.ndps_edge_value</entry>
+    <entry>Edge Value</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Edge Value</>
+  </row>
+
+  <row>
+    <entry>ndps.ndps_event_object_identifier</entry>
+    <entry>Event Object Type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Event Object Type</>
+  </row>
+
+  <row>
+    <entry>ndps.ndps_event_type</entry>
+    <entry>Event Type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Event Type</>
   </row>
 
   <row>
-    <entry>statnotify.state</entry>
-    <entry>State</entry>
+    <entry>ndps.ndps_integer_or_oid</entry>
+    <entry>Integer or OID</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>New state of client that changed</>
+    <entry>Integer or OID</>
   </row>
 
-</tbody></tgroup></table>
-</section>
-
-<section id="SIDNetworkStatusMonitorProtocol"><title>Network Status Monitor Protocol (stat)</title>
-
-<table id="TIDNetworkStatusMonitorProtocol"><title>Network Status Monitor Protocol (stat)</title>
-<tgroup cols="4">
-<thead>
   <row>
-    <entry>Field</>
-    <entry>Field Name</>
-    <entry>Type</>
-    <entry>Description</>
+    <entry>ndps.ndps_item_count</entry>
+    <entry>Number of Items</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Number of Items</>
+  </row>
 
+  <row>
+    <entry>ndps.ndps_lang_id</entry>
+    <entry>Lanuage ID</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Language ID</>
   </row>
-</thead>
-<tbody>
+
   <row>
-    <entry>stat.mon</entry>
-    <entry>Monitor</entry>
-    <entry>No value</entry>
-    <entry>Monitor Host</>
+    <entry>ndps.ndps_lib_error</entry>
+    <entry>Lib Error</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Lib Error</>
   </row>
 
   <row>
-    <entry>stat.mon_id.name</entry>
-    <entry>Monitor ID Name</entry>
+    <entry>ndps.ndps_loc_object_name</entry>
+    <entry>Local Object Name</entry>
     <entry>String</entry>
-    <entry>Monitor ID Name</>
+    <entry>Local Object Name</>
   </row>
 
   <row>
-    <entry>stat.my_id</entry>
-    <entry>My ID</entry>
-    <entry>No value</entry>
-    <entry>My_ID structure</>
+    <entry>ndps.ndps_location_value</entry>
+    <entry>Location Value Type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Location Value Type</>
   </row>
 
   <row>
-    <entry>stat.my_id.hostname</entry>
-    <entry>Hostname</entry>
+    <entry>ndps.ndps_nameorid</entry>
+    <entry>Name or ID Type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Name or ID Type</>
+  </row>
+
+  <row>
+    <entry>ndps.ndps_object_name</entry>
+    <entry>Object Name</entry>
     <entry>String</entry>
-    <entry>My_ID Host to callback</>
+    <entry>Object Name</>
   </row>
 
   <row>
-    <entry>stat.my_id.proc</entry>
-    <entry>Procedure</entry>
+    <entry>ndps.ndps_other_error</entry>
+    <entry>Other Error</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>My_ID Procedure to callback</>
+    <entry>Other Error</>
   </row>
 
   <row>
-    <entry>stat.my_id.prog</entry>
-    <entry>Program</entry>
+    <entry>ndps.ndps_other_error_2</entry>
+    <entry>Other Error 2</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>My_ID Program to callback</>
+    <entry>Other Error 2</>
   </row>
 
   <row>
-    <entry>stat.my_id.vers</entry>
-    <entry>Version</entry>
+    <entry>ndps.ndps_persistence</entry>
+    <entry>Persistence</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>My_ID Version of callback</>
+    <entry>Persistence</>
   </row>
 
   <row>
-    <entry>stat.name</entry>
-    <entry>Name</entry>
+    <entry>ndps.ndps_printer_name</entry>
+    <entry>Printer Name</entry>
     <entry>String</entry>
-    <entry>Name</>
+    <entry>Printer Name</>
   </row>
 
   <row>
-    <entry>stat.priv</entry>
-    <entry>Priv</entry>
-    <entry>Byte array</entry>
-    <entry>Private client supplied opaque data</>
+    <entry>ndps.ndps_profile_id</entry>
+    <entry>Profile ID</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Profile ID</>
   </row>
 
   <row>
-    <entry>stat.stat_chge</entry>
-    <entry>Status Change</entry>
-    <entry>No value</entry>
-    <entry>Status Change structure</>
+    <entry>ndps.ndps_qual</entry>
+    <entry>Qualifier</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Qualifier</>
   </row>
 
   <row>
-    <entry>stat.stat_res</entry>
-    <entry>Status Result</entry>
-    <entry>No value</entry>
-    <entry>Status Result</>
+    <entry>ndps.ndps_qual_name_type</entry>
+    <entry>Qualified Name Type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Qualified Name Type</>
   </row>
 
   <row>
-    <entry>stat.stat_res.res</entry>
-    <entry>Result</entry>
+    <entry>ndps.ndps_realization</entry>
+    <entry>Realization Type</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>Result</>
+    <entry>Realization Type</>
   </row>
 
   <row>
-    <entry>stat.stat_res.state</entry>
-    <entry>State</entry>
+    <entry>ndps.ndps_session</entry>
+    <entry>Session</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>State</>
+    <entry>Session</>
   </row>
 
   <row>
-    <entry>stat.state</entry>
-    <entry>State</entry>
+    <entry>ndps.ndps_xydim_value</entry>
+    <entry>XY Dimension Value Type</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>State of local NSM</>
+    <entry>XY Dimension Value Type</>
   </row>
 
-</tbody></tgroup></table>
-</section>
+  <row>
+    <entry>ndps.object</entry>
+    <entry>Object ID</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Object ID</>
+  </row>
 
-<section id="SIDNetworkTimeProtocol"><title>Network Time Protocol (ntp)</title>
+  <row>
+    <entry>ndps.octet_string</entry>
+    <entry>Octet String</entry>
+    <entry></entry>
+    <entry>Octet String</>
+  </row>
 
-<table id="TIDNetworkTimeProtocol"><title>Network Time Protocol (ntp)</title>
-<tgroup cols="4">
-<thead>
   <row>
-    <entry>Field</>
-    <entry>Field Name</>
-    <entry>Type</>
-    <entry>Description</>
+    <entry>ndps.pa_name</entry>
+    <entry>Trustee Name</entry>
+    <entry>String</entry>
+    <entry>Trustee Name</>
+  </row>
 
+  <row>
+    <entry>ndps.packet_type</entry>
+    <entry>Packet Type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Packet Type</>
   </row>
-</thead>
-<tbody>
+
   <row>
-    <entry>ntp.flags</entry>
-    <entry>Flags</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Flags (Leap/Version/Mode)</>
+    <entry>ndps.rbuffer</entry>
+    <entry>Connection</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Connection</>
   </row>
 
   <row>
-    <entry>ntp.flags.li</entry>
-    <entry>Leap Indicator</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Leap Indicator</>
+    <entry>ndps.record_length</entry>
+    <entry>Record Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Record Length</>
   </row>
 
   <row>
-    <entry>ntp.flags.mode</entry>
-    <entry>Mode</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Mode</>
+    <entry>ndps.record_mark</entry>
+    <entry>Record Mark</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Record Mark</>
   </row>
 
   <row>
-    <entry>ntp.flags.vn</entry>
-    <entry>Version number</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Version number</>
+    <entry>ndps.rpc_acc</entry>
+    <entry>RPC Accept or Deny</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>RPC Accept or Deny</>
   </row>
 
   <row>
-    <entry>ntp.keyid</entry>
-    <entry>Key ID</entry>
-    <entry>Byte array</entry>
-    <entry>Key ID</>
+    <entry>ndps.rpc_acc_prob</entry>
+    <entry>Access Problem</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Access Problem</>
   </row>
 
   <row>
-    <entry>ntp.mac</entry>
-    <entry>Message Authentication Code</entry>
-    <entry>Byte array</entry>
-    <entry>Message Authentication Code</>
+    <entry>ndps.rpc_acc_res</entry>
+    <entry>RPC Accept Results</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>RPC Accept Results</>
   </row>
 
   <row>
-    <entry>ntp.org</entry>
-    <entry>Originate Time Stamp</entry>
-    <entry>Byte array</entry>
-    <entry>Originate Time Stamp</>
+    <entry>ndps.rpc_acc_stat</entry>
+    <entry>RPC Accept Status</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>RPC Accept Status</>
   </row>
 
   <row>
-    <entry>ntp.ppoll</entry>
-    <entry>Peer Polling Interval</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Peer Polling Interval</>
+    <entry>ndps.rpc_attr_prob</entry>
+    <entry>Attribute Problem</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Attribute Problem</>
   </row>
 
   <row>
-    <entry>ntp.precision</entry>
-    <entry>Peer Clock Precision</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Peer Clock Precision</>
+    <entry>ndps.rpc_doc_acc_prob</entry>
+    <entry>Document Access Problem</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Document Access Problem</>
   </row>
 
   <row>
-    <entry>ntp.rec</entry>
-    <entry>Receive Time Stamp</entry>
-    <entry>Byte array</entry>
-    <entry>Receive Time Stamp</>
+    <entry>ndps.rpc_obj_id_type</entry>
+    <entry>Object ID Type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Object ID Type</>
   </row>
 
   <row>
-    <entry>ntp.refid</entry>
-    <entry>Reference Clock ID</entry>
-    <entry>Byte array</entry>
-    <entry>Reference Clock ID</>
+    <entry>ndps.rpc_oid_struct_size</entry>
+    <entry>OID Struct Size</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>OID Struct Size</>
   </row>
 
   <row>
-    <entry>ntp.reftime</entry>
-    <entry>Reference Clock Update Time</entry>
-    <entry>Byte array</entry>
-    <entry>Reference Clock Update Time</>
+    <entry>ndps.rpc_print_prob</entry>
+    <entry>Printer Problem</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Printer Problem</>
   </row>
 
   <row>
-    <entry>ntp.rootdelay</entry>
-    <entry>Root Delay</entry>
-    <entry>Double-precision floating point</entry>
-    <entry>Root Delay</>
+    <entry>ndps.rpc_prob_type</entry>
+    <entry>Problem Type</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Problem Type</>
   </row>
 
   <row>
-    <entry>ntp.rootdispersion</entry>
-    <entry>Clock Dispersion</entry>
-    <entry>Double-precision floating point</entry>
-    <entry>Clock Dispersion</>
+    <entry>ndps.rpc_rej_stat</entry>
+    <entry>RPC Reject Status</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>RPC Reject Status</>
   </row>
 
   <row>
-    <entry>ntp.stratum</entry>
-    <entry>Peer Clock Stratum</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Peer Clock Stratum</>
+    <entry>ndps.rpc_sec_prob</entry>
+    <entry>Security Problem</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Security Problem</>
   </row>
 
   <row>
-    <entry>ntp.xmt</entry>
-    <entry>Transmit Time Stamp</entry>
-    <entry>Byte array</entry>
-    <entry>Transmit Time Stamp</>
+    <entry>ndps.rpc_sel_prob</entry>
+    <entry>Selection Problem</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Selection Problem</>
   </row>
 
-</tbody></tgroup></table>
-</section>
+  <row>
+    <entry>ndps.rpc_serv_prob</entry>
+    <entry>Service Problem</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Service Problem</>
+  </row>
 
-<section id="SIDNovellDistributedPrintSystem"><title>Novell Distributed Print System (ndps)</title>
+  <row>
+    <entry>ndps.rpc_update_prob</entry>
+    <entry>Update Problem</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Update Problem</>
+  </row>
 
-<table id="TIDNovellDistributedPrintSystem"><title>Novell Distributed Print System (ndps)</title>
-<tgroup cols="4">
-<thead>
   <row>
-    <entry>Field</>
-    <entry>Field Name</>
-    <entry>Type</>
-    <entry>Description</>
+    <entry>ndps.rpc_version</entry>
+    <entry>RPC Version</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>RPC Version</>
+  </row>
 
+  <row>
+    <entry>ndps.sbuffer</entry>
+    <entry>Server</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Server</>
   </row>
-</thead>
-<tbody>
+
   <row>
-    <entry>ndps.packet_type</entry>
-    <entry>Packet Type</entry>
+    <entry>ndps.scope</entry>
+    <entry>Scope</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>Packet Type</>
+    <entry>Scope</>
   </row>
 
   <row>
-    <entry>ndps.record_length</entry>
-    <entry>Record Length</entry>
-    <entry>Unsigned 16-bit integer</entry>
-    <entry>Record Length</>
+    <entry>ndps.server_name</entry>
+    <entry>Server Name</entry>
+    <entry>String</entry>
+    <entry>Server Name</>
   </row>
 
   <row>
-    <entry>ndps.record_mark</entry>
-    <entry>Record Mark</entry>
-    <entry>Boolean</entry>
-    <entry></>
+    <entry>ndps.tree</entry>
+    <entry>Tree</entry>
+    <entry>String</entry>
+    <entry>Tree</>
   </row>
 
   <row>
-    <entry>ndps.rpc_version</entry>
-    <entry>RPC Version</entry>
+    <entry>ndps.upper_range</entry>
+    <entry>Upper Range</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>RPC Version</>
+    <entry>Upper Range</>
+  </row>
+
+  <row>
+    <entry>ndps.upper_range_n64</entry>
+    <entry>Upper Range</entry>
+    <entry>Byte array</entry>
+    <entry>Upper Range</>
+  </row>
+
+  <row>
+    <entry>ndps.xdimension_n64</entry>
+    <entry>X Dimension</entry>
+    <entry>Byte array</entry>
+    <entry>X Dimension</>
   </row>
 
   <row>
     <entry>ndps.xid</entry>
-    <entry>Exhange ID</entry>
+    <entry>Exchange ID</entry>
     <entry>Unsigned 32-bit integer</entry>
     <entry>Exchange ID</>
   </row>
 
   <row>
+    <entry>ndps.xmax_n64</entry>
+    <entry>Maximum X Dimension</entry>
+    <entry>Byte array</entry>
+    <entry>Maximum X Dimension</>
+  </row>
+
+  <row>
+    <entry>ndps.xmin_n64</entry>
+    <entry>Minimum X Dimension</entry>
+    <entry>Byte array</entry>
+    <entry>Minimum X Dimension</>
+  </row>
+
+  <row>
+    <entry>ndps.ymax_n64</entry>
+    <entry>Maximum Y Dimension</entry>
+    <entry>Byte array</entry>
+    <entry>Maximum Y Dimension</>
+  </row>
+
+  <row>
+    <entry>ndps.ymin_n64</entry>
+    <entry>Minimum Y Dimension</entry>
+    <entry>Byte array</entry>
+    <entry>Minimum Y Dimension</>
+  </row>
+
+  <row>
     <entry>spx.ndps_error</entry>
     <entry>NDPS Error</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -52727,6 +60262,44 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDOpenBSDEncapsulatingdevice"><title>OpenBSD Encapsulating device (enc)</title>
+
+<table id="TIDOpenBSDEncapsulatingdevice"><title>OpenBSD Encapsulating device (enc)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>enc.af</entry>
+    <entry>Address Family</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Protocol (IPv4 vs IPv6)</>
+  </row>
+
+  <row>
+    <entry>enc.flags</entry>
+    <entry>Flags</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>ENC flags</>
+  </row>
+
+  <row>
+    <entry>enc.spi</entry>
+    <entry>SPI</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Security Parameter Index</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDOpenBSDPacketFilterlogfile"><title>OpenBSD Packet Filter log file (pflog)</title>
 
 <table id="TIDOpenBSDPacketFilterlogfile"><title>OpenBSD Packet Filter log file (pflog)</title>
@@ -52871,6 +60444,20 @@
   </row>
 
   <row>
+    <entry>pcnfsd.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
+  <row>
+    <entry>pcnfsd.procedure_v2</entry>
+    <entry>V2 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V2 Procedure</>
+  </row>
+
+  <row>
     <entry>pcnfsd.status</entry>
     <entry>Reply Status</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -52982,9 +60569,9 @@
 </tbody></tgroup></table>
 </section>
 
-<section id="SIDPPPChallengeHandshakeAuthenticationPr0012"><title>PPP Challenge Handshake Authentication Protocol (chap)</title>
+<section id="SIDPPPChallengeHandshakeAuthenticationPr0013"><title>PPP Challenge Handshake Authentication Protocol (chap)</title>
 
-<table id="TIDPPPChallengeHandshakeAuthenticationPr0012"><title>PPP Challenge Handshake Authentication Protocol (chap)</title>
+<table id="TIDPPPChallengeHandshakeAuthenticationPr0013"><title>PPP Challenge Handshake Authentication Protocol (chap)</title>
 <tgroup cols="4">
 <thead>
   <row>
@@ -53070,6 +60657,28 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDPPPIPv6ControlProtocol"><title>PPP IPv6 Control Protocol (ipv6cp)</title>
+
+<table id="TIDPPPIPv6ControlProtocol"><title>PPP IPv6 Control Protocol (ipv6cp)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry><entry></entry>
+  </row>
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDPPPLinkControlProtocol"><title>PPP Link Control Protocol (lcp)</title>
 
 <table id="TIDPPPLinkControlProtocol"><title>PPP Link Control Protocol (lcp)</title>
@@ -53489,6 +61098,34 @@
   </row>
 
   <row>
+    <entry>portmap.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
+  <row>
+    <entry>portmap.procedure_v2</entry>
+    <entry>V2 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V2 Procedure</>
+  </row>
+
+  <row>
+    <entry>portmap.procedure_v3</entry>
+    <entry>V3 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V3 Procedure</>
+  </row>
+
+  <row>
+    <entry>portmap.procedure_v4</entry>
+    <entry>V4 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V4 Procedure</>
+  </row>
+
+  <row>
     <entry>portmap.prog</entry>
     <entry>Program</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -53670,6 +61307,13 @@
   </row>
 
   <row>
+    <entry>pgm.hdr.cksum_bad</entry>
+    <entry>Bad Checksum</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>pgm.hdr.dport</entry>
     <entry>Destination Port</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -53824,72 +61468,247 @@
   </row>
 
   <row>
-    <entry>pgm.opts.ccdata.tstamp</entry>
-    <entry>Time Stamp</entry>
+    <entry>pgm.opts.ccdata.tstamp</entry>
+    <entry>Time Stamp</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.fragment.first_sqn</entry>
+    <entry>First Sequence Number</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.fragment.res</entry>
+    <entry>Reserved</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.fragment.total_length</entry>
+    <entry>Total Length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.join.min_join</entry>
+    <entry>Minimum Sequence Number</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.join.res</entry>
+    <entry>Reserved</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.len</entry>
+    <entry>Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.nak.list</entry>
+    <entry>List</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.nak.op</entry>
+    <entry>Reserved</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.nak_bo_ivl.bo_ivl</entry>
+    <entry>Back-off Interval</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.nak_bo_ivl.bo_ivl_sqn</entry>
+    <entry>Back-off Interval Sequence Number</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.nak_bo_ivl.res</entry>
+    <entry>Reserved</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.nak_bo_rng.max_bo_ivl</entry>
+    <entry>Max Back-off Interval</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.nak_bo_rng.min_bo_ivl</entry>
+    <entry>Min Back-off Interval</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.nak_bo_rng.res</entry>
+    <entry>Reserved</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.parity_prm.op</entry>
+    <entry>Parity Parameters</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.parity_prm.prm_grp</entry>
+    <entry>Transmission Group Size</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.redirect.afi</entry>
+    <entry>DLR AFI</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.redirect.dlr</entry>
+    <entry>DLR</entry>
+    <entry>IPv4 address</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.redirect.res</entry>
+    <entry>Reserved</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.redirect.res2</entry>
+    <entry>Reserved</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.tlen</entry>
+    <entry>Total Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.opts.type</entry>
+    <entry>Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.poll.backoff_ivl</entry>
+    <entry>Back-off Interval</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.poll.matching_bmask</entry>
+    <entry>Matching Bitmask</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.poll.path</entry>
+    <entry>Path NLA</entry>
+    <entry>IPv4 address</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>pgm.poll.pathafi</entry>
+    <entry>Path NLA AFI</entry>
     <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>pgm.opts.join.min_join</entry>
-    <entry>Minimum Sequence Number</entry>
+    <entry>pgm.poll.rand_str</entry>
+    <entry>Random String</entry>
     <entry>Unsigned 32-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>pgm.opts.join.res</entry>
+    <entry>pgm.poll.res</entry>
     <entry>Reserved</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
-  </row>
-
-  <row>
-    <entry>pgm.opts.len</entry>
-    <entry>Length</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>pgm.opts.nak.list</entry>
-    <entry>List</entry>
-    <entry>Byte array</entry>
+    <entry>pgm.poll.round</entry>
+    <entry>Round</entry>
+    <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>pgm.opts.nak.op</entry>
-    <entry>Reserved</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>pgm.poll.sqn</entry>
+    <entry>Sequence Number</entry>
+    <entry>Unsigned 32-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>pgm.opts.parity_prm.op</entry>
-    <entry>Parity Parameters</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>pgm.poll.subtype</entry>
+    <entry>Subtype</entry>
+    <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>pgm.opts.parity_prm.prm_grp</entry>
-    <entry>Transmission Group Size</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>pgm.polr.res</entry>
+    <entry>Reserved</entry>
+    <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>pgm.opts.tlen</entry>
-    <entry>Total Length</entry>
+    <entry>pgm.polr.round</entry>
+    <entry>Round</entry>
     <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>pgm.opts.type</entry>
-    <entry>Type</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>pgm.polr.sqn</entry>
+    <entry>Sequence Number</entry>
+    <entry>Unsigned 32-bit integer</entry>
     <entry></>
   </row>
 
@@ -54179,6 +61998,13 @@
   </row>
 
   <row>
+    <entry>q2931.call_ref_flag</entry>
+    <entry>Call reference flag</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>q2931.call_ref_len</entry>
     <entry>Call reference value length</entry>
     <entry>Unsigned 8-bit integer</entry>
@@ -54252,6 +62078,13 @@
   </row>
 
   <row>
+    <entry>q931.call_ref_flag</entry>
+    <entry>Call reference flag</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>q931.call_ref_len</entry>
     <entry>Call reference value length</entry>
     <entry>Unsigned 8-bit integer</entry>
@@ -54259,6 +62092,34 @@
   </row>
 
   <row>
+    <entry>q931.called_party_number.digits</entry>
+    <entry>Called party number digits</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>q931.calling_party_number.digits</entry>
+    <entry>Calling party number digits</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>q931.cause_value</entry>
+    <entry>Cause value</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>q931.connected_number.digits</entry>
+    <entry>Connected party number digits</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>q931.disc</entry>
     <entry>Protocol discriminator</entry>
     <entry>Unsigned 8-bit integer</entry>
@@ -54272,6 +62133,13 @@
     <entry></>
   </row>
 
+  <row>
+    <entry>q931.redirecting_number.digits</entry>
+    <entry>Redirecting party number digits</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
 </tbody></tgroup></table>
 </section>
 
@@ -55161,10 +63029,99 @@
 </thead>
 <tbody>
   <row>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry><entry></entry>
+    <entry>rstat.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
+  <row>
+    <entry>rstat.procedure_v2</entry>
+    <entry>V2 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V2 Procedure</>
+  </row>
+
+  <row>
+    <entry>rstat.procedure_v3</entry>
+    <entry>V3 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V3 Procedure</>
+  </row>
+
+  <row>
+    <entry>rstat.procedure_v4</entry>
+    <entry>V4 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V4 Procedure</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDRSYNCFileSynchroniser"><title>RSYNC File Synchroniser (rsync)</title>
+
+<table id="TIDRSYNCFileSynchroniser"><title>RSYNC File Synchroniser (rsync)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>rsync.command</entry>
+    <entry>Command String</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>rsync.data</entry>
+    <entry>rsync data</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>rsync.hdr_magic</entry>
+    <entry>Magic Header</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>rsync.hdr_version</entry>
+    <entry>Header Version</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>rsync.motd</entry>
+    <entry>Server MOTD String</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>rsync.query</entry>
+    <entry>Client Query String</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>rsync.response</entry>
+    <entry>Server Response String</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
+
 </tbody></tgroup></table>
 </section>
 
@@ -55269,35 +63226,35 @@
   <row>
     <entry>rx.flags.client_init</entry>
     <entry>Client Initiated</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Client Initiated</>
   </row>
 
   <row>
     <entry>rx.flags.free_packet</entry>
     <entry>Free Packet</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Free Packet</>
   </row>
 
   <row>
     <entry>rx.flags.last_packet</entry>
     <entry>Last Packet</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Last Packet</>
   </row>
 
   <row>
     <entry>rx.flags.more_packets</entry>
     <entry>More Packets</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>More Packets</>
   </row>
 
   <row>
     <entry>rx.flags.request_ack</entry>
     <entry>Request Ack</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Request Ack</>
   </row>
 
@@ -56699,9 +64656,9 @@
 </tbody></tgroup></table>
 </section>
 
-<section id="SIDRegistryServerAttributesManipulationI0013"><title>Registry Server Attributes Manipulation Interface (rs_attr)</title>
+<section id="SIDRegistryServerAttributesManipulationI0014"><title>Registry Server Attributes Manipulation Interface (rs_attr)</title>
 
-<table id="TIDRegistryServerAttributesManipulationI0013"><title>Registry Server Attributes Manipulation Interface (rs_attr)</title>
+<table id="TIDRegistryServerAttributesManipulationI0014"><title>Registry Server Attributes Manipulation Interface (rs_attr)</title>
 <tgroup cols="4">
 <thead>
   <row>
@@ -56998,14 +64955,14 @@
   <row>
     <entry>rpc.fragment</entry>
     <entry>RPC Fragment</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>RPC Fragment</>
   </row>
 
   <row>
     <entry>rpc.fragment.error</entry>
     <entry>Defragmentation error</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>Defragmentation error due to illegal fragments</>
   </row>
 
@@ -57094,6 +65051,13 @@
   </row>
 
   <row>
+    <entry>rpc.repframe</entry>
+    <entry>Reply Frame</entry>
+    <entry></entry>
+    <entry>Reply Frame</>
+  </row>
+
+  <row>
     <entry>rpc.reply.dup</entry>
     <entry>Duplicate Reply</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -57108,6 +65072,13 @@
   </row>
 
   <row>
+    <entry>rpc.reqframe</entry>
+    <entry>Request Frame</entry>
+    <entry></entry>
+    <entry>Request Frame</>
+  </row>
+
+  <row>
     <entry>rpc.state_accept</entry>
     <entry>Accept State</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -57173,6 +65144,163 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDRemoteProgramLoad"><title>Remote Program Load (rpl)</title>
+
+<table id="TIDRemoteProgramLoad"><title>Remote Program Load (rpl)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>rpl.adapterid</entry>
+    <entry>Adapter ID</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>RPL Adapter ID</>
+  </row>
+
+  <row>
+    <entry>rpl.bsmversion</entry>
+    <entry>BSM Version</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>RPL Version of BSM.obj</>
+  </row>
+
+  <row>
+    <entry>rpl.config</entry>
+    <entry>Configuration</entry>
+    <entry>Byte array</entry>
+    <entry>RPL Configuration</>
+  </row>
+
+  <row>
+    <entry>rpl.connclass</entry>
+    <entry>Connection Class</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>RPL Connection Class</>
+  </row>
+
+  <row>
+    <entry>rpl.corrval</entry>
+    <entry>Correlator Value</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>RPL Correlator Value</>
+  </row>
+
+  <row>
+    <entry>rpl.data</entry>
+    <entry>Data</entry>
+    <entry>Byte array</entry>
+    <entry>RPL Binary File Data</>
+  </row>
+
+  <row>
+    <entry>rpl.ec</entry>
+    <entry>EC</entry>
+    <entry>Byte array</entry>
+    <entry>RPL EC</>
+  </row>
+
+  <row>
+    <entry>rpl.equipment</entry>
+    <entry>Equipment</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>RPL Equipment - AX from INT 11h</>
+  </row>
+
+  <row>
+    <entry>rpl.flags</entry>
+    <entry>Flags</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>RPL Bit Significant Option Flags</>
+  </row>
+
+  <row>
+    <entry>rpl.laddress</entry>
+    <entry>Locate Address</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>RPL Locate Address</>
+  </row>
+
+  <row>
+    <entry>rpl.lmac</entry>
+    <entry>Loader MAC Address</entry>
+    <entry>6-byte Hardware (MAC) Address</entry>
+    <entry>RPL Loader MAC Address</>
+  </row>
+
+  <row>
+    <entry>rpl.maxframe</entry>
+    <entry>Maximum Frame Size</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>RPL Maximum Frame Size</>
+  </row>
+
+  <row>
+    <entry>rpl.memsize</entry>
+    <entry>Memory Size</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>RPL Memory Size - AX from INT 12h MINUS 32k MINUS the Boot ROM Size</>
+  </row>
+
+  <row>
+    <entry>rpl.respval</entry>
+    <entry>Response Code</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>RPL Response Code</>
+  </row>
+
+  <row>
+    <entry>rpl.sap</entry>
+    <entry>SAP</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>RPL SAP</>
+  </row>
+
+  <row>
+    <entry>rpl.sequence</entry>
+    <entry>Sequence Number</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>RPL Sequence Number</>
+  </row>
+
+  <row>
+    <entry>rpl.shortname</entry>
+    <entry>Short Name</entry>
+    <entry>Byte array</entry>
+    <entry>RPL BSM Short Name</>
+  </row>
+
+  <row>
+    <entry>rpl.smac</entry>
+    <entry>Set MAC Address</entry>
+    <entry>6-byte Hardware (MAC) Address</entry>
+    <entry>RPL Set MAC Address</>
+  </row>
+
+  <row>
+    <entry>rpl.type</entry>
+    <entry>Type</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>RPL Packet Type</>
+  </row>
+
+  <row>
+    <entry>rpl.xaddress</entry>
+    <entry>XFER Address</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>RPL Transfer Control Address</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDRemoteQuota"><title>Remote Quota (rquota)</title>
 
 <table id="TIDRemoteQuota"><title>Remote Quota (rquota)</title>
@@ -57265,6 +65393,13 @@
   </row>
 
   <row>
+    <entry>rquota.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
+  <row>
     <entry>rquota.rquota</entry>
     <entry>rquota</entry>
     <entry>No value</entry>
@@ -57340,6 +65475,13 @@
     <entry>Message</>
   </row>
 
+  <row>
+    <entry>rwall.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
 </tbody></tgroup></table>
 </section>
 
@@ -58024,10 +66166,26 @@
 </thead>
 <tbody>
   <row>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry><entry></entry>
+    <entry>sadmind.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
+  <row>
+    <entry>sadmind.procedure_v2</entry>
+    <entry>V2 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V2 Procedure</>
+  </row>
+
+  <row>
+    <entry>sadmind.procedure_v3</entry>
+    <entry>V3 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V3 Procedure</>
   </row>
+
 </tbody></tgroup></table>
 </section>
 
@@ -58131,7 +66289,7 @@
 
   <row>
     <entry>scsi.inquiry.devtype</entry>
-    <entry>Device Type</entry>
+    <entry>Peripheral Device Type</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
@@ -58158,6 +66316,13 @@
   </row>
 
   <row>
+    <entry>scsi.inquiry.qualifier</entry>
+    <entry>Peripheral Qualifier</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>scsi.inquiry.version</entry>
     <entry>Version</entry>
     <entry>Unsigned 8-bit integer</entry>
@@ -58473,92 +66638,303 @@
   </row>
 
   <row>
-    <entry>scsi.sns.info</entry>
-    <entry>Sense Info</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>scsi.sns.info</entry>
+    <entry>Sense Info</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>scsi.sns.key</entry>
+    <entry>Sense Key</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>scsi.sns.sksv</entry>
+    <entry>SKSV</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>scsi.spc.opcode</entry>
+    <entry>SPC-2 Opcode</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>scsi.spc2.addcdblen</entry>
+    <entry>Additional CDB Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>scsi.spc2.resv.key</entry>
+    <entry>Reservation Key</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>scsi.spc2.resv.scopeaddr</entry>
+    <entry>Scope Address</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>scsi.spc2.svcaction</entry>
+    <entry>Service Action</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>scsi.ssc.opcode</entry>
+    <entry>SSC-2 Opcode</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>ssci.mode.rac</entry>
+    <entry>Report a Check</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDSGIMountService"><title>SGI Mount Service (sgimount)</title>
+
+<table id="TIDSGIMountService"><title>SGI Mount Service (sgimount)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry><entry></entry>
+  </row>
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDSMBServerMessageBlockProtocol"><title>SMB (Server Message Block Protocol) (smb)</title>
+
+<table id="TIDSMBServerMessageBlockProtocol"><title>SMB (Server Message Block Protocol) (smb)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>nt.access_mask.access_sacl</entry>
+    <entry>Access SACL</entry>
+    <entry>Boolean</entry>
+    <entry>Access SACL</>
+  </row>
+
+  <row>
+    <entry>nt.access_mask.delete</entry>
+    <entry>Delete</entry>
+    <entry>Boolean</entry>
+    <entry>Delete</>
+  </row>
+
+  <row>
+    <entry>nt.access_mask.generic_all</entry>
+    <entry>Generic all</entry>
+    <entry>Boolean</entry>
+    <entry>Generic all</>
+  </row>
+
+  <row>
+    <entry>nt.access_mask.generic_execute</entry>
+    <entry>Generic execute</entry>
+    <entry>Boolean</entry>
+    <entry>Generic execute</>
+  </row>
+
+  <row>
+    <entry>nt.access_mask.generic_read</entry>
+    <entry>Generic read</entry>
+    <entry>Boolean</entry>
+    <entry>Generic read</>
+  </row>
+
+  <row>
+    <entry>nt.access_mask.generic_write</entry>
+    <entry>Generic write</entry>
+    <entry>Boolean</entry>
+    <entry>Generic write</>
+  </row>
+
+  <row>
+    <entry>nt.access_mask.maximum_allowed</entry>
+    <entry>Maximum allowed</entry>
+    <entry>Boolean</entry>
+    <entry>Maximum allowed</>
+  </row>
+
+  <row>
+    <entry>nt.access_mask.read_control</entry>
+    <entry>Read control</entry>
+    <entry>Boolean</entry>
+    <entry>Read control</>
+  </row>
+
+  <row>
+    <entry>nt.access_mask.specific_0</entry>
+    <entry>Specific access, bit 0</entry>
+    <entry>Boolean</entry>
+    <entry>Specific access, bit 0</>
+  </row>
+
+  <row>
+    <entry>nt.access_mask.specific_1</entry>
+    <entry>Specific access, bit 1</entry>
+    <entry>Boolean</entry>
+    <entry>Specific access, bit 1</>
+  </row>
+
+  <row>
+    <entry>nt.access_mask.specific_10</entry>
+    <entry>Specific access, bit 10</entry>
+    <entry>Boolean</entry>
+    <entry>Specific access, bit 10</>
+  </row>
+
+  <row>
+    <entry>nt.access_mask.specific_11</entry>
+    <entry>Specific access, bit 11</entry>
+    <entry>Boolean</entry>
+    <entry>Specific access, bit 11</>
+  </row>
+
+  <row>
+    <entry>nt.access_mask.specific_12</entry>
+    <entry>Specific access, bit 12</entry>
+    <entry>Boolean</entry>
+    <entry>Specific access, bit 12</>
+  </row>
+
+  <row>
+    <entry>nt.access_mask.specific_13</entry>
+    <entry>Specific access, bit 13</entry>
+    <entry>Boolean</entry>
+    <entry>Specific access, bit 13</>
+  </row>
+
+  <row>
+    <entry>nt.access_mask.specific_14</entry>
+    <entry>Specific access, bit 14</entry>
+    <entry>Boolean</entry>
+    <entry>Specific access, bit 14</>
+  </row>
+
+  <row>
+    <entry>nt.access_mask.specific_15</entry>
+    <entry>Specific access, bit 15</entry>
+    <entry>Boolean</entry>
+    <entry>Specific access, bit 15</>
+  </row>
+
+  <row>
+    <entry>nt.access_mask.specific_2</entry>
+    <entry>Specific access, bit 2</entry>
+    <entry>Boolean</entry>
+    <entry>Specific access, bit 2</>
   </row>
 
   <row>
-    <entry>scsi.sns.key</entry>
-    <entry>Sense Key</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>nt.access_mask.specific_3</entry>
+    <entry>Specific access, bit 3</entry>
+    <entry>Boolean</entry>
+    <entry>Specific access, bit 3</>
   </row>
 
   <row>
-    <entry>scsi.sns.sksv</entry>
-    <entry>SKSV</entry>
+    <entry>nt.access_mask.specific_4</entry>
+    <entry>Specific access, bit 4</entry>
     <entry>Boolean</entry>
-    <entry></>
+    <entry>Specific access, bit 4</>
   </row>
 
   <row>
-    <entry>scsi.spc.opcode</entry>
-    <entry>SPC-2 Opcode</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>nt.access_mask.specific_5</entry>
+    <entry>Specific access, bit 5</entry>
+    <entry>Boolean</entry>
+    <entry>Specific access, bit 5</>
   </row>
 
   <row>
-    <entry>scsi.spc2.addcdblen</entry>
-    <entry>Additional CDB Length</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>nt.access_mask.specific_6</entry>
+    <entry>Specific access, bit 6</entry>
+    <entry>Boolean</entry>
+    <entry>Specific access, bit 6</>
   </row>
 
   <row>
-    <entry>scsi.spc2.resv.key</entry>
-    <entry>Reservation Key</entry>
-    <entry>Byte array</entry>
-    <entry></>
+    <entry>nt.access_mask.specific_7</entry>
+    <entry>Specific access, bit 7</entry>
+    <entry>Boolean</entry>
+    <entry>Specific access, bit 7</>
   </row>
 
   <row>
-    <entry>scsi.spc2.resv.scopeaddr</entry>
-    <entry>Scope Address</entry>
-    <entry>Byte array</entry>
-    <entry></>
+    <entry>nt.access_mask.specific_8</entry>
+    <entry>Specific access, bit 8</entry>
+    <entry>Boolean</entry>
+    <entry>Specific access, bit 8</>
   </row>
 
   <row>
-    <entry>scsi.spc2.svcaction</entry>
-    <entry>Service Action</entry>
-    <entry>Unsigned 16-bit integer</entry>
-    <entry></>
+    <entry>nt.access_mask.specific_9</entry>
+    <entry>Specific access, bit 9</entry>
+    <entry>Boolean</entry>
+    <entry>Specific access, bit 9</>
   </row>
 
   <row>
-    <entry>scsi.ssc.opcode</entry>
-    <entry>SSC-2 Opcode</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>nt.access_mask.synchronise</entry>
+    <entry>Synchronise</entry>
+    <entry>Boolean</entry>
+    <entry>Synchronise</>
   </row>
 
   <row>
-    <entry>ssci.mode.rac</entry>
-    <entry>Report a Check</entry>
+    <entry>nt.access_mask.write_dac</entry>
+    <entry>Write DAC</entry>
     <entry>Boolean</entry>
-    <entry></>
+    <entry>Write DAC</>
   </row>
 
-</tbody></tgroup></table>
-</section>
-
-<section id="SIDSMBServerMessageBlockProtocol"><title>SMB (Server Message Block Protocol) (smb)</title>
-
-<table id="TIDSMBServerMessageBlockProtocol"><title>SMB (Server Message Block Protocol) (smb)</title>
-<tgroup cols="4">
-<thead>
   <row>
-    <entry>Field</>
-    <entry>Field Name</>
-    <entry>Type</>
-    <entry>Description</>
-
+    <entry>nt.access_mask.write_owner</entry>
+    <entry>Write owner</entry>
+    <entry>Boolean</entry>
+    <entry>Write owner</>
   </row>
-</thead>
-<tbody>
+
   <row>
     <entry>smb.access.append</entry>
     <entry>Append</entry>
@@ -58756,6 +67132,13 @@
   </row>
 
   <row>
+    <entry>smb.access_mask</entry>
+    <entry>Access required</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Access mask</>
+  </row>
+
+  <row>
     <entry>smb.account</entry>
     <entry>Account</entry>
     <entry>String</entry>
@@ -58954,7 +67337,7 @@
   <row>
     <entry>smb.cancel_to</entry>
     <entry>Cancel to</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry></entry>
     <entry>This packet is a cancellation of the packet in this frame</>
   </row>
 
@@ -59038,7 +67421,7 @@
   <row>
     <entry>smb.continuation_to</entry>
     <entry>Continuation to</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry></entry>
     <entry>This packet is a continuation to the packet in this frame</>
   </row>
 
@@ -59519,13 +67902,6 @@
   </row>
 
   <row>
-    <entry>smb.file_attribute.backup_semantics</entry>
-    <entry>Backup</entry>
-    <entry>Boolean</entry>
-    <entry>Does this object need/support backup semantics</>
-  </row>
-
-  <row>
     <entry>smb.file_attribute.compressed</entry>
     <entry>Compressed</entry>
     <entry>Boolean</entry>
@@ -59533,13 +67909,6 @@
   </row>
 
   <row>
-    <entry>smb.file_attribute.delete_on_close</entry>
-    <entry>Delete on Close</entry>
-    <entry>Boolean</entry>
-    <entry>Should this object be deleted on close?</>
-  </row>
-
-  <row>
     <entry>smb.file_attribute.device</entry>
     <entry>Device</entry>
     <entry>Boolean</entry>
@@ -59568,13 +67937,6 @@
   </row>
 
   <row>
-    <entry>smb.file_attribute.no_buffering</entry>
-    <entry>No Buffering</entry>
-    <entry>Boolean</entry>
-    <entry>May the server buffer this object?</>
-  </row>
-
-  <row>
     <entry>smb.file_attribute.normal</entry>
     <entry>Normal</entry>
     <entry>Boolean</entry>
@@ -59596,20 +67958,6 @@
   </row>
 
   <row>
-    <entry>smb.file_attribute.posix_semantics</entry>
-    <entry>Posix</entry>
-    <entry>Boolean</entry>
-    <entry>Does this object need/support POSIX semantics?</>
-  </row>
-
-  <row>
-    <entry>smb.file_attribute.random_access</entry>
-    <entry>Random Access</entry>
-    <entry>Boolean</entry>
-    <entry>Optimize for random access</>
-  </row>
-
-  <row>
     <entry>smb.file_attribute.read_only</entry>
     <entry>Read Only</entry>
     <entry>Boolean</entry>
@@ -59624,13 +67972,6 @@
   </row>
 
   <row>
-    <entry>smb.file_attribute.sequential_scan</entry>
-    <entry>Sequential Scan</entry>
-    <entry>Boolean</entry>
-    <entry>Optimize for sequential scan</>
-  </row>
-
-  <row>
     <entry>smb.file_attribute.sparse</entry>
     <entry>Sparse</entry>
     <entry>Boolean</entry>
@@ -59659,13 +68000,6 @@
   </row>
 
   <row>
-    <entry>smb.file_attribute.write_through</entry>
-    <entry>Write Through</entry>
-    <entry>Boolean</entry>
-    <entry>Does this object need write through?</>
-  </row>
-
-  <row>
     <entry>smb.file_data</entry>
     <entry>File Data</entry>
     <entry>Byte array</entry>
@@ -59988,6 +68322,13 @@
   </row>
 
   <row>
+    <entry>smb.group_id</entry>
+    <entry>Group ID</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>SMB-over-IPX Group ID</>
+  </row>
+
+  <row>
     <entry>smb.impersonation.level</entry>
     <entry>Impersonation</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -60044,6 +68385,13 @@
   </row>
 
   <row>
+    <entry>smb.key</entry>
+    <entry>Key</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>SMB-over-IPX Key</>
+  </row>
+
+  <row>
     <entry>smb.last_name_offset</entry>
     <entry>Last Name Offset</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -60984,14 +69332,14 @@
   <row>
     <entry>smb.response_in</entry>
     <entry>Response in</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry></entry>
     <entry>The response to this packet is in this packet</>
   </row>
 
   <row>
     <entry>smb.response_to</entry>
     <entry>Response to</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry></entry>
     <entry>This packet is a response to the packet in this frame</>
   </row>
 
@@ -61129,6 +69477,13 @@
   </row>
 
   <row>
+    <entry>smb.search_id</entry>
+    <entry>Search ID</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Search ID, handle for find operations</>
+  </row>
+
+  <row>
     <entry>smb.search_pattern</entry>
     <entry>Search Pattern</entry>
     <entry>String</entry>
@@ -61278,14 +69633,14 @@
   <row>
     <entry>smb.segment</entry>
     <entry>SMB Segment</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>SMB Segment</>
   </row>
 
   <row>
     <entry>smb.segment.error</entry>
     <entry>Defragmentation error</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>Defragmentation error due to illegal fragments</>
   </row>
 
@@ -61325,6 +69680,13 @@
   </row>
 
   <row>
+    <entry>smb.sequence_num</entry>
+    <entry>Sequence Number</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>SMB-over-IPX Sequence Number</>
+  </row>
+
+  <row>
     <entry>smb.server</entry>
     <entry>Server</entry>
     <entry>String</entry>
@@ -61514,6 +69876,13 @@
   </row>
 
   <row>
+    <entry>smb.sessid</entry>
+    <entry>Session ID</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>SMB-over-IPX Session ID</>
+  </row>
+
+  <row>
     <entry>smb.session_key</entry>
     <entry>Session Key</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -61565,8 +69934,8 @@
   <row>
     <entry>smb.sid</entry>
     <entry>SID</entry>
-    <entry>Unsigned 16-bit integer</entry>
-    <entry>SID: Search ID, handle for find operations</>
+    <entry>String</entry>
+    <entry>SID: Security Identifier</>
   </row>
 
   <row>
@@ -61893,14 +70262,14 @@
   <row>
     <entry>pipe.fragment</entry>
     <entry>Fragment</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>Pipe Fragment</>
   </row>
 
   <row>
     <entry>pipe.fragment.error</entry>
     <entry>Defragmentation error</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>Defragmentation error due to illegal fragments</>
   </row>
 
@@ -62085,840 +70454,1438 @@
 <tgroup cols="4">
 <thead>
   <row>
-    <entry>Field</>
-    <entry>Field Name</>
-    <entry>Type</>
-    <entry>Description</>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry><entry></entry>
+  </row>
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDSPRAY"><title>SPRAY (spray)</title>
+
+<table id="TIDSPRAY"><title>SPRAY (spray)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>spray.clock</entry>
+    <entry>clock</entry>
+    <entry>No value</entry>
+    <entry>Clock</>
+  </row>
+
+  <row>
+    <entry>spray.counter</entry>
+    <entry>counter</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Counter</>
+  </row>
+
+  <row>
+    <entry>spray.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
+  <row>
+    <entry>spray.sec</entry>
+    <entry>sec</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Seconds</>
+  </row>
+
+  <row>
+    <entry>spray.sprayarr</entry>
+    <entry>Data</entry>
+    <entry>Byte array</entry>
+    <entry>Sprayarr data</>
+  </row>
+
+  <row>
+    <entry>spray.usec</entry>
+    <entry>usec</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Microseconds</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDSS7SCCP-UserAdaptationLayer"><title>SS7 SCCP-User Adaptation Layer (sua)</title>
+
+<table id="TIDSS7SCCP-UserAdaptationLayer"><title>SS7 SCCP-User Adaptation Layer (sua)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>sua.affected_point_code_mask</entry>
+    <entry>Mask</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.affected_pointcode_dpc</entry>
+    <entry>Affected DPC</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.asp_capabilities_a_bit</entry>
+    <entry>Protocol Class 3</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.asp_capabilities_b_bit</entry>
+    <entry>Protocol Class 2</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.asp_capabilities_c_bit</entry>
+    <entry>Protocol Class 1</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.asp_capabilities_d_bit</entry>
+    <entry>Protocol Class 0</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.asp_capabilities_interworking</entry>
+    <entry>Interworking</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.asp_capabilities_reserved</entry>
+    <entry>Reserved</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.asp_capabilities_reserved_bits</entry>
+    <entry>Reserved Bits</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.asp_identifier</entry>
+    <entry>ASP Identifier</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.cause_user_cause</entry>
+    <entry>Cause</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.cause_user_user</entry>
+    <entry>User</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.congestion_level</entry>
+    <entry>Congestion Level</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.correlation_id</entry>
+    <entry>Correlation ID</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.credit</entry>
+    <entry>Credit</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.data</entry>
+    <entry>Data</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.deregistration_status</entry>
+    <entry>Deregistration status</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.destination_address_gt_bit</entry>
+    <entry>Include GT</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.destination_address_pc_bit</entry>
+    <entry>Include PC</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.destination_address_reserved_bits</entry>
+    <entry>Reserved Bits</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.destination_address_routing_indicator</entry>
+    <entry>Routing Indicator</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.destination_address_ssn_bit</entry>
+    <entry>Include SSN</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.destination_reference_number</entry>
+    <entry>Destination Reference Number</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.diagnostic_information</entry>
+    <entry>Diagnostic Information</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.drn_label_end</entry>
+    <entry>End</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.drn_label_start</entry>
+    <entry>Start</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.drn_label_value</entry>
+    <entry>Label Value</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.error_code</entry>
+    <entry>Error code</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.global_title_nature_of_address</entry>
+    <entry>Nature of Address</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.global_title_number_of_digits</entry>
+    <entry>Number of Digits</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.global_title_numbering_plan</entry>
+    <entry>Numbering Plan</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.global_title_signals</entry>
+    <entry>Global Title</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.global_title_translation_type</entry>
+    <entry>Translation Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.heartbeat_data</entry>
+    <entry>Heratbeat Data</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.hostname.name</entry>
+    <entry>Hostname</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.importance_inportance</entry>
+    <entry>Importance</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.importance_reserved</entry>
+    <entry>Reserved</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.info_string</entry>
+    <entry>Info string</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.ipv4_address</entry>
+    <entry>IP Version 4 address</entry>
+    <entry>IPv4 address</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.ipv6_address</entry>
+    <entry>IP Version 6 address</entry>
+    <entry>IPv6 address</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.local_routing_key_identifier</entry>
+    <entry>Local routing key identifier</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.message_class</entry>
+    <entry>Message Class</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
 
+  <row>
+    <entry>sua.message_length</entry>
+    <entry>Message Length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
   </row>
-</thead>
-<tbody>
+
   <row>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry><entry></entry>
+    <entry>sua.message_priority_priority</entry>
+    <entry>Message Priority</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
   </row>
-</tbody></tgroup></table>
-</section>
 
-<section id="SIDSPRAY"><title>SPRAY (spray)</title>
+  <row>
+    <entry>sua.message_priority_reserved</entry>
+    <entry>Reserved</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
 
-<table id="TIDSPRAY"><title>SPRAY (spray)</title>
-<tgroup cols="4">
-<thead>
   <row>
-    <entry>Field</>
-    <entry>Field Name</>
-    <entry>Type</>
-    <entry>Description</>
+    <entry>sua.message_type</entry>
+    <entry>Message Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
 
+  <row>
+    <entry>sua.network_appearance</entry>
+    <entry>Network Appearance</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
   </row>
-</thead>
-<tbody>
+
   <row>
-    <entry>spray.clock</entry>
-    <entry>clock</entry>
-    <entry>No value</entry>
-    <entry>Clock</>
+    <entry>sua.parameter_length</entry>
+    <entry>Parameter Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>spray.counter</entry>
-    <entry>counter</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>Counter</>
+    <entry>sua.parameter_padding</entry>
+    <entry>Padding</entry>
+    <entry>Byte array</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>spray.sec</entry>
-    <entry>sec</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>Seconds</>
+    <entry>sua.parameter_tag</entry>
+    <entry>Parameter Tag</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>spray.sprayarr</entry>
-    <entry>Data</entry>
+    <entry>sua.parameter_value</entry>
+    <entry>Parameter Value</entry>
     <entry>Byte array</entry>
-    <entry>Sprayarr data</>
+    <entry></>
   </row>
 
   <row>
-    <entry>spray.usec</entry>
-    <entry>usec</entry>
+    <entry>sua.point_code</entry>
+    <entry>Point Code</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>Microseconds</>
+    <entry></>
   </row>
 
-</tbody></tgroup></table>
-</section>
-
-<section id="SIDSS7SCCP-UserAdaptationLayer"><title>SS7 SCCP-User Adaptation Layer (sua)</title>
+  <row>
+    <entry>sua.protcol_class_reserved</entry>
+    <entry>Reserved</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
 
-<table id="TIDSS7SCCP-UserAdaptationLayer"><title>SS7 SCCP-User Adaptation Layer (sua)</title>
-<tgroup cols="4">
-<thead>
   <row>
-    <entry>Field</>
-    <entry>Field Name</>
-    <entry>Type</>
-    <entry>Description</>
+    <entry>sua.protocol_class_class</entry>
+    <entry>Protocol Class</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
 
+  <row>
+    <entry>sua.protocol_class_return_on_error_bit</entry>
+    <entry>Return On Error Bit</entry>
+    <entry>Boolean</entry>
+    <entry></>
   </row>
-</thead>
-<tbody>
+
   <row>
-    <entry>sua.affected_point_code.mask</entry>
-    <entry>Mask</entry>
+    <entry>sua.receive_sequence_number_number</entry>
+    <entry>Receive Sequence Number P(R)</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.affected_pointcode.dpc</entry>
-    <entry>Affected DPC</entry>
-    <entry>Unsigned 24-bit integer</entry>
+    <entry>sua.receive_sequence_number_reserved</entry>
+    <entry>Reserved</entry>
+    <entry>Byte array</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.asp_capabilities.a_bit</entry>
-    <entry>Protocol Class 3</entry>
+    <entry>sua.receive_sequence_number_spare_bit</entry>
+    <entry>Spare Bit</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.asp_capabilities.b_bit</entry>
-    <entry>Protocol Class 2</entry>
-    <entry>Boolean</entry>
+    <entry>sua.registration_status</entry>
+    <entry>Registration status</entry>
+    <entry>Unsigned 32-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.asp_capabilities.c_bit</entry>
-    <entry>Protocol Class 1</entry>
-    <entry>Boolean</entry>
+    <entry>sua.reserved</entry>
+    <entry>Reserved</entry>
+    <entry>Byte array</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.asp_capabilities.d_bit</entry>
-    <entry>Protocol Class 0</entry>
-    <entry>Boolean</entry>
+    <entry>sua.routing_context</entry>
+    <entry>Routing context</entry>
+    <entry>Unsigned 32-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.asp_capabilities.interworking</entry>
-    <entry>Interworking</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>sua.routing_key_identifier</entry>
+    <entry>Local Routing Key Identifier</entry>
+    <entry>Unsigned 32-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.asp_capabilities.reserved</entry>
+    <entry>sua.sccp_cause_reserved</entry>
     <entry>Reserved</entry>
     <entry>Byte array</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.asp_capabilities.reserved_bits</entry>
-    <entry>Reserved Bits</entry>
+    <entry>sua.sccp_cause_type</entry>
+    <entry>Cause Type</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.asp_identifier.id</entry>
-    <entry>ASP Identifier</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>sua.sccp_cause_value</entry>
+    <entry>Cause Value</entry>
+    <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.cause_user.cause</entry>
-    <entry>Cause</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>sua.segmentation_first_bit</entry>
+    <entry>First Segment Bit</entry>
+    <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.cause_user.user</entry>
-    <entry>User</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>sua.segmentation_number_of_remaining_segments</entry>
+    <entry>Number of Remaining Segments</entry>
+    <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.congestion_level.level</entry>
-    <entry>Congestion Level</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>sua.segmentation_reference</entry>
+    <entry>Segmentation Reference</entry>
+    <entry>Unsigned 24-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.correlation_id.identifier</entry>
-    <entry>Correlation ID</entry>
+    <entry>sua.sequence_control_sequence_control</entry>
+    <entry>Sequence Control</entry>
     <entry>Unsigned 32-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.credit.credit</entry>
-    <entry>Credit</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>sua.sequence_number_more_data_bit</entry>
+    <entry>More Data Bit</entry>
+    <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.data.padding</entry>
-    <entry>Padding</entry>
+    <entry>sua.sequence_number_receive_sequence_number</entry>
+    <entry>Receive Sequence Number P(R)</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.sequence_number_reserved</entry>
+    <entry>Reserved</entry>
     <entry>Byte array</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.deregistration_result.deregistration_status</entry>
-    <entry>Deregistration Status</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>sua.sequence_number_sent_sequence_number</entry>
+    <entry>Sent Sequence Number P(S)</entry>
+    <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.deregistration_result.routing_context</entry>
-    <entry>Routing Context</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>sua.sequence_number_spare_bit</entry>
+    <entry>Spare Bit</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.smi_reserved</entry>
+    <entry>Reserved</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.smi_smi</entry>
+    <entry>SMI</entry>
+    <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.destination_address.gt_bit</entry>
+    <entry>sua.source_address_gt_bit</entry>
     <entry>Include GT</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.destination_address.pc_bit</entry>
+    <entry>sua.source_address_pc_bit</entry>
     <entry>Include PC</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.destination_address.reserved_bits</entry>
+    <entry>sua.source_address_reserved_bits</entry>
     <entry>Reserved Bits</entry>
     <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.destination_address.routing_indicator</entry>
+    <entry>sua.source_address_routing_indicator</entry>
     <entry>Routing Indicator</entry>
     <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.destination_address.ssn_bit</entry>
+    <entry>sua.source_address_ssn_bit</entry>
     <entry>Include SSN</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.destination_reference_number</entry>
-    <entry>Destination Reference Number</entry>
+    <entry>sua.source_reference_number</entry>
+    <entry>Source Reference Number</entry>
     <entry>Unsigned 32-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.diagnostic_information.info</entry>
-    <entry>Diagnostic Information</entry>
+    <entry>sua.ss7_hop_counter_counter</entry>
+    <entry>SS7 Hop Counter</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.ss7_hop_counter_reserved</entry>
+    <entry>Reserved</entry>
     <entry>Byte array</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.diagnostic_information.padding</entry>
-    <entry>Padding</entry>
+    <entry>sua.ssn_number</entry>
+    <entry>Subsystem Number</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.ssn_reserved</entry>
+    <entry>Reserved</entry>
     <entry>Byte array</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.drn_label.end</entry>
+    <entry>sua.status_info</entry>
+    <entry>Status info</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.status_type</entry>
+    <entry>Status type</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sua.tid_label_end</entry>
     <entry>End</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.drn_label.start</entry>
+    <entry>sua.tid_label_start</entry>
     <entry>Start</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.drn_label.value</entry>
+    <entry>sua.tid_label_value</entry>
     <entry>Label Value</entry>
     <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.error_code.code</entry>
-    <entry>Error code</entry>
+    <entry>sua.traffic_mode_type</entry>
+    <entry>Traffic mode Type</entry>
     <entry>Unsigned 32-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.global_title.nature_of_address</entry>
-    <entry>Nature of Address</entry>
+    <entry>sua.version</entry>
+    <entry>Version</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDSSCOP"><title>SSCOP (sscop)</title>
+
+<table id="TIDSSCOP"><title>SSCOP (sscop)</title>
+<tgroup cols="4">
+<thead>
   <row>
-    <entry>sua.global_title.number_of_digits</entry>
-    <entry>Number of Digits</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry><entry></entry>
   </row>
+</tbody></tgroup></table>
+</section>
 
+<section id="SIDSSHProtocol"><title>SSH Protocol (ssh)</title>
+
+<table id="TIDSSHProtocol"><title>SSH Protocol (ssh)</title>
+<tgroup cols="4">
+<thead>
   <row>
-    <entry>sua.global_title.numbering_plan</entry>
-    <entry>Numbering Plan</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>ssh.compression_algorithms_client_to_server</entry>
+    <entry>compression_algorithms_client_to_server string</entry>
+    <entry>String</entry>
+    <entry>SSH compression_algorithms_client_to_server string</>
   </row>
 
   <row>
-    <entry>sua.global_title.padding</entry>
-    <entry>Padding</entry>
-    <entry>Byte array</entry>
-    <entry></>
+    <entry>ssh.compression_algorithms_client_to_server_length</entry>
+    <entry>compression_algorithms_client_to_server length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>SSH compression_algorithms_client_to_server length</>
   </row>
 
   <row>
-    <entry>sua.global_title.signals</entry>
-    <entry>Global Title</entry>
-    <entry>Byte array</entry>
-    <entry></>
+    <entry>ssh.compression_algorithms_server_to_client</entry>
+    <entry>compression_algorithms_server_to_client string</entry>
+    <entry>String</entry>
+    <entry>SSH compression_algorithms_server_to_client string</>
   </row>
 
   <row>
-    <entry>sua.global_title.translation_type</entry>
-    <entry>Translation Type</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>ssh.compression_algorithms_server_to_client_length</entry>
+    <entry>compression_algorithms_server_to_client length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>SSH compression_algorithms_server_to_client length</>
   </row>
 
   <row>
-    <entry>sua.heartbeat.data</entry>
-    <entry>Heratbeat Data</entry>
+    <entry>ssh.cookie</entry>
+    <entry>Cookie</entry>
     <entry>Byte array</entry>
-    <entry></>
+    <entry>SSH Cookie</>
   </row>
 
   <row>
-    <entry>sua.heartbeat.padding</entry>
-    <entry>Padding</entry>
+    <entry>ssh.encrypted_packet</entry>
+    <entry>Encrypted Packet</entry>
     <entry>Byte array</entry>
-    <entry></>
+    <entry>SSH Protocol Packet</>
   </row>
 
   <row>
-    <entry>sua.hostname.name</entry>
-    <entry>Hostname</entry>
+    <entry>ssh.encryption_algorithms_client_to_server</entry>
+    <entry>encryption_algorithms_client_to_server string</entry>
     <entry>String</entry>
-    <entry></>
+    <entry>SSH encryption_algorithms_client_to_server string</>
   </row>
 
   <row>
-    <entry>sua.hostname.padding</entry>
-    <entry>Padding</entry>
-    <entry>Byte array</entry>
-    <entry></>
+    <entry>ssh.encryption_algorithms_client_to_server_length</entry>
+    <entry>encryption_algorithms_client_to_server length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>SSH encryption_algorithms_client_to_server length</>
   </row>
 
   <row>
-    <entry>sua.importance.inportance</entry>
-    <entry>Importance</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>ssh.encryption_algorithms_server_to_client</entry>
+    <entry>encryption_algorithms_server_to_client string</entry>
+    <entry>String</entry>
+    <entry>SSH encryption_algorithms_server_to_client string</>
   </row>
 
   <row>
-    <entry>sua.importance.reserved</entry>
-    <entry>Reserved</entry>
-    <entry>Byte array</entry>
-    <entry></>
+    <entry>ssh.encryption_algorithms_server_to_client_length</entry>
+    <entry>encryption_algorithms_server_to_client length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>SSH encryption_algorithms_server_to_client length</>
   </row>
 
   <row>
-    <entry>sua.info_string.padding</entry>
-    <entry>Padding</entry>
-    <entry>Byte array</entry>
-    <entry></>
+    <entry>ssh.kex_algorithms</entry>
+    <entry>kex_algorithms string</entry>
+    <entry>String</entry>
+    <entry>SSH kex_algorithms string</>
   </row>
 
   <row>
-    <entry>sua.info_string.string</entry>
-    <entry>Info string</entry>
+    <entry>ssh.kex_algorithms_length</entry>
+    <entry>kex_algorithms length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>SSH kex_algorithms length</>
+  </row>
+
+  <row>
+    <entry>ssh.languages_client_to_server</entry>
+    <entry>languages_client_to_server string</entry>
     <entry>String</entry>
-    <entry></>
+    <entry>SSH languages_client_to_server string</>
   </row>
 
   <row>
-    <entry>sua.ipv4.address</entry>
-    <entry>IP Version 4 address</entry>
-    <entry>IPv4 address</entry>
-    <entry></>
+    <entry>ssh.languages_client_to_server_length</entry>
+    <entry>languages_client_to_server length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>SSH languages_client_to_server length</>
   </row>
 
   <row>
-    <entry>sua.ipv6.address</entry>
-    <entry>IP Version 6 address</entry>
-    <entry>IPv6 address</entry>
-    <entry></>
+    <entry>ssh.languages_server_to_client</entry>
+    <entry>languages_server_to_client string</entry>
+    <entry>String</entry>
+    <entry>SSH languages_server_to_client string</>
   </row>
 
   <row>
-    <entry>sua.light.error_code</entry>
-    <entry>Error Code</entry>
-    <entry>Unsigned 16-bit integer</entry>
-    <entry></>
+    <entry>ssh.languages_server_to_client_length</entry>
+    <entry>languages_server_to_client length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>SSH languages_server_to_client length</>
   </row>
 
   <row>
-    <entry>sua.light.message_length</entry>
-    <entry>Message length</entry>
+    <entry>ssh.mac_algorithms_client_to_server</entry>
+    <entry>mac_algorithms_client_to_server string</entry>
+    <entry>String</entry>
+    <entry>SSH mac_algorithms_client_to_server string</>
+  </row>
+
+  <row>
+    <entry>ssh.mac_algorithms_client_to_server_length</entry>
+    <entry>mac_algorithms_client_to_server length</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>SSH mac_algorithms_client_to_server length</>
   </row>
 
   <row>
-    <entry>sua.light.message_type</entry>
-    <entry>Message Type</entry>
-    <entry>Unsigned 16-bit integer</entry>
-    <entry></>
+    <entry>ssh.mac_algorithms_server_to_client</entry>
+    <entry>mac_algorithms_server_to_client string</entry>
+    <entry>String</entry>
+    <entry>SSH mac_algorithms_server_to_client string</>
   </row>
 
   <row>
-    <entry>sua.light.spare_1</entry>
-    <entry>Spare</entry>
+    <entry>ssh.mac_algorithms_server_to_client_length</entry>
+    <entry>mac_algorithms_server_to_client length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>SSH mac_algorithms_server_to_client length</>
+  </row>
+
+  <row>
+    <entry>ssh.mac_string</entry>
+    <entry>MAC String</entry>
+    <entry>String</entry>
+    <entry>SSH MAC String</>
+  </row>
+
+  <row>
+    <entry>ssh.message_code</entry>
+    <entry>Message Code</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>SSH Message Code</>
   </row>
 
   <row>
-    <entry>sua.light.spare_2</entry>
-    <entry>Spare</entry>
-    <entry>Unsigned 16-bit integer</entry>
-    <entry></>
+    <entry>ssh.packet_length</entry>
+    <entry>Packet Length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>SSH packet length</>
   </row>
 
   <row>
-    <entry>sua.light.subsystem_number</entry>
-    <entry>Subsystem number</entry>
-    <entry>Unsigned 16-bit integer</entry>
-    <entry></>
+    <entry>ssh.padding_length</entry>
+    <entry>Padding Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>SSH Packet Number</>
   </row>
 
   <row>
-    <entry>sua.light.version</entry>
-    <entry>Version</entry>
+    <entry>ssh.padding_string</entry>
+    <entry>Padding String</entry>
+    <entry>String</entry>
+    <entry>SSH Padding String</>
+  </row>
+
+  <row>
+    <entry>ssh.payload</entry>
+    <entry>Payload</entry>
+    <entry>Byte array</entry>
+    <entry>SSH Payload</>
+  </row>
+
+  <row>
+    <entry>ssh.protocol</entry>
+    <entry>Protocol</entry>
+    <entry>String</entry>
+    <entry>SSH Protocol</>
+  </row>
+
+  <row>
+    <entry>ssh.server_host_key_algorithms</entry>
+    <entry>server_host_key_algorithms string</entry>
+    <entry>String</entry>
+    <entry>SSH server_host_key_algorithms string</>
+  </row>
+
+  <row>
+    <entry>ssh.server_host_key_algorithms_length</entry>
+    <entry>server_host_key_algorithms length</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>SSH server_host_key_algorithms length</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDSecureSocketLayer"><title>Secure Socket Layer (ssl)</title>
+
+<table id="TIDSecureSocketLayer"><title>Secure Socket Layer (ssl)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>ssl.alert_message</entry>
+    <entry>Alert Message</entry>
+    <entry>No value</entry>
+    <entry>Alert message</>
+  </row>
+
+  <row>
+    <entry>ssl.alert_message.desc</entry>
+    <entry>Description</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>Alert message description</>
   </row>
 
   <row>
-    <entry>sua.message_class</entry>
-    <entry>Message Class</entry>
+    <entry>ssl.alert_message.level</entry>
+    <entry>Level</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>Alert message level</>
   </row>
 
   <row>
-    <entry>sua.message_length</entry>
-    <entry>Message Length</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>ssl.app_data</entry>
+    <entry>Application Data</entry>
+    <entry>No value</entry>
+    <entry>Payload is application data</>
   </row>
 
   <row>
-    <entry>sua.message_priority.priority</entry>
-    <entry>Message Priority</entry>
+    <entry>ssl.change_cipher_spec</entry>
+    <entry>Change Cipher Spec Message</entry>
+    <entry>No value</entry>
+    <entry>Signals a change in cipher specifications</>
+  </row>
+
+  <row>
+    <entry>ssl.handshake</entry>
+    <entry>Handshake Protocol</entry>
+    <entry>No value</entry>
+    <entry>Handshake protocol message</>
+  </row>
+
+  <row>
+    <entry>ssl.handshake.cert_type</entry>
+    <entry>Certificate type</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>Certificate type</>
   </row>
 
   <row>
-    <entry>sua.message_priority.reserved</entry>
-    <entry>Reserved</entry>
-    <entry>Byte array</entry>
-    <entry></>
+    <entry>ssl.handshake.cert_types</entry>
+    <entry>Certificate types</entry>
+    <entry>No value</entry>
+    <entry>List of certificate types</>
   </row>
 
   <row>
-    <entry>sua.message_type</entry>
-    <entry>Message Type</entry>
+    <entry>ssl.handshake.cert_types_count</entry>
+    <entry>Certificate types count</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>Count of certificate types</>
   </row>
 
   <row>
-    <entry>sua.network_appearance.appearance</entry>
-    <entry>Network Appearance</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>ssl.handshake.certificate</entry>
+    <entry>Certificate</entry>
+    <entry>Byte array</entry>
+    <entry>Certificate</>
   </row>
 
   <row>
-    <entry>sua.parameter_length</entry>
-    <entry>Parameter Length</entry>
+    <entry>ssl.handshake.certificate_length</entry>
+    <entry>Certificate Length</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry>Length of certificate</>
+  </row>
+
+  <row>
+    <entry>ssl.handshake.certificates</entry>
+    <entry>Certificates</entry>
+    <entry>No value</entry>
+    <entry>List of certificates</>
+  </row>
+
+  <row>
+    <entry>ssl.handshake.certificates_length</entry>
+    <entry>Certificates Length</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry>Length of certificates field</>
+  </row>
+
+  <row>
+    <entry>ssl.handshake.challenge</entry>
+    <entry>Challenge</entry>
+    <entry>No value</entry>
+    <entry>Challenge data used to authenticate server</>
+  </row>
+
+  <row>
+    <entry>ssl.handshake.challenge_length</entry>
+    <entry>Challenge Length</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry></>
+    <entry>Length of challenge field</>
   </row>
 
   <row>
-    <entry>sua.parameter_padding</entry>
-    <entry>Padding</entry>
-    <entry>Byte array</entry>
-    <entry></>
+    <entry>ssl.handshake.cipher_spec_len</entry>
+    <entry>Cipher Spec Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of cipher specs field</>
   </row>
 
   <row>
-    <entry>sua.parameter_tag</entry>
-    <entry>Parameter Tag</entry>
+    <entry>ssl.handshake.cipher_suites_length</entry>
+    <entry>Cipher Suites Length</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry></>
+    <entry>Length of cipher suites field</>
   </row>
 
   <row>
-    <entry>sua.parameter_value</entry>
-    <entry>Parameter Value</entry>
-    <entry>Byte array</entry>
-    <entry></>
+    <entry>ssl.handshake.cipherspec</entry>
+    <entry>Cipher Spec</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry>Cipher specification</>
+  </row>
+
+  <row>
+    <entry>ssl.handshake.ciphersuite</entry>
+    <entry>Cipher Suite</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Cipher suite</>
   </row>
 
   <row>
-    <entry>sua.point_code.mask</entry>
-    <entry>Mask</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>ssl.handshake.ciphersuites</entry>
+    <entry>Cipher Suites</entry>
+    <entry>No value</entry>
+    <entry>List of cipher suites supported by client</>
   </row>
 
   <row>
-    <entry>sua.point_code.pc</entry>
-    <entry>Point Code</entry>
-    <entry>Unsigned 24-bit integer</entry>
-    <entry></>
+    <entry>ssl.handshake.clear_key_data</entry>
+    <entry>Clear Key Data</entry>
+    <entry>No value</entry>
+    <entry>Clear portion of MASTER-KEY</>
   </row>
 
   <row>
-    <entry>sua.protcol_class.reserved</entry>
-    <entry>Reserved</entry>
-    <entry>Byte array</entry>
-    <entry></>
+    <entry>ssl.handshake.clear_key_length</entry>
+    <entry>Clear Key Data Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of clear key data</>
   </row>
 
   <row>
-    <entry>sua.protocol_class.class</entry>
-    <entry>Protocol Class</entry>
+    <entry>ssl.handshake.comp_method</entry>
+    <entry>Compression Method</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>Compression Method</>
   </row>
 
   <row>
-    <entry>sua.protocol_class.return_on_error_bit</entry>
-    <entry>Return On Error Bit</entry>
-    <entry>Boolean</entry>
-    <entry></>
+    <entry>ssl.handshake.comp_methods</entry>
+    <entry>Compression Methods</entry>
+    <entry>No value</entry>
+    <entry>List of compression methods supported by client</>
   </row>
 
   <row>
-    <entry>sua.receive_sequence_number.number</entry>
-    <entry>Receive Sequence Number P(R)</entry>
+    <entry>ssl.handshake.comp_methods_length</entry>
+    <entry>Compression Methods Length</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>Length of compression methods field</>
   </row>
 
   <row>
-    <entry>sua.receive_sequence_number.reserved</entry>
-    <entry>Reserved</entry>
-    <entry>Byte array</entry>
-    <entry></>
+    <entry>ssl.handshake.connection_id</entry>
+    <entry>Connection ID</entry>
+    <entry>No value</entry>
+    <entry>Server's challenge to client</>
   </row>
 
   <row>
-    <entry>sua.receive_sequence_number.spare_bit</entry>
-    <entry>Spare Bit</entry>
-    <entry>Boolean</entry>
-    <entry></>
+    <entry>ssl.handshake.connection_id_length</entry>
+    <entry>Connection ID Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of connection ID</>
   </row>
 
   <row>
-    <entry>sua.registration_result.local_routing_key_identifier</entry>
-    <entry>Local Routing Key Identifier</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>ssl.handshake.dname</entry>
+    <entry>Distinguished Name</entry>
+    <entry>Byte array</entry>
+    <entry>Distinguished name of a CA that server trusts</>
   </row>
 
   <row>
-    <entry>sua.registration_result.registration_status</entry>
-    <entry>Registration Status</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>ssl.handshake.dname_len</entry>
+    <entry>Distinguished Name Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of distinguished name</>
   </row>
 
   <row>
-    <entry>sua.registration_result.routing_context</entry>
-    <entry>Routing Context</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>ssl.handshake.dnames</entry>
+    <entry>Distinguished Names</entry>
+    <entry>No value</entry>
+    <entry>List of CAs that server trusts</>
   </row>
 
   <row>
-    <entry>sua.reserved</entry>
-    <entry>Reserved</entry>
-    <entry>Byte array</entry>
-    <entry></>
+    <entry>ssl.handshake.dnames_len</entry>
+    <entry>Distinguished Names Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of list of CAs that server trusts</>
   </row>
 
   <row>
-    <entry>sua.routing_context.context</entry>
-    <entry>Routing context</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>ssl.handshake.encrypted_key</entry>
+    <entry>Encrypted Key</entry>
+    <entry>No value</entry>
+    <entry>Secret portion of MASTER-KEY encrypted to server</>
   </row>
 
   <row>
-    <entry>sua.routing_key.identifier</entry>
-    <entry>Local Routing Key Identifier</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>ssl.handshake.encrypted_key_length</entry>
+    <entry>Encrypted Key Data Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of encrypted key data</>
   </row>
 
   <row>
-    <entry>sua.sccp_cause.reserved</entry>
-    <entry>Reserved</entry>
-    <entry>Byte array</entry>
-    <entry></>
+    <entry>ssl.handshake.key_arg</entry>
+    <entry>Key Argument</entry>
+    <entry>No value</entry>
+    <entry>Key Argument (e.g., Initialization Vector)</>
   </row>
 
   <row>
-    <entry>sua.sccp_cause.type</entry>
-    <entry>Cause Type</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>ssl.handshake.key_arg_length</entry>
+    <entry>Key Argument Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of key argument</>
   </row>
 
   <row>
-    <entry>sua.sccp_cause.value</entry>
-    <entry>Cause Value</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>ssl.handshake.length</entry>
+    <entry>Length</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry>Length of handshake message</>
   </row>
 
   <row>
-    <entry>sua.segmentation.first_bit</entry>
-    <entry>First Segment Bit</entry>
-    <entry>Boolean</entry>
-    <entry></>
+    <entry>ssl.handshake.md5_hash</entry>
+    <entry>MD5 Hash</entry>
+    <entry>No value</entry>
+    <entry>Hash of messages, master_secret, etc.</>
   </row>
 
   <row>
-    <entry>sua.segmentation.number_of_remaining_segments</entry>
-    <entry>Number of Remaining Segments</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>ssl.handshake.random</entry>
+    <entry>Random.bytes</entry>
+    <entry>No value</entry>
+    <entry>Random challenge used to authenticate server</>
   </row>
 
   <row>
-    <entry>sua.segmentation.reference</entry>
-    <entry>Segmentation Reference</entry>
-    <entry>Unsigned 24-bit integer</entry>
-    <entry></>
+    <entry>ssl.handshake.random_time</entry>
+    <entry>Random.gmt_unix_time</entry>
+    <entry>Date/Time stamp</entry>
+    <entry>Unix time field of random structure</>
   </row>
 
   <row>
-    <entry>sua.sequence_control.sequence_control</entry>
-    <entry>Sequence Control</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>ssl.handshake.session_id</entry>
+    <entry>Session ID</entry>
+    <entry>Byte array</entry>
+    <entry>Identifies the SSL session, allowing later resumption</>
   </row>
 
   <row>
-    <entry>sua.sequence_number.more_data_bit</entry>
-    <entry>More Data Bit</entry>
+    <entry>ssl.handshake.session_id_hit</entry>
+    <entry>Session ID Hit</entry>
     <entry>Boolean</entry>
-    <entry></>
+    <entry>Did the server find the client's Session ID?</>
   </row>
 
   <row>
-    <entry>sua.sequence_number.receive_sequence_number</entry>
-    <entry>Receive Sequence Number P(R)</entry>
+    <entry>ssl.handshake.session_id_length</entry>
+    <entry>Session ID Length</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>Length of session ID field</>
   </row>
 
   <row>
-    <entry>sua.sequence_number.reserved</entry>
-    <entry>Reserved</entry>
-    <entry>Byte array</entry>
-    <entry></>
+    <entry>ssl.handshake.sha_hash</entry>
+    <entry>SHA-1 Hash</entry>
+    <entry>No value</entry>
+    <entry>Hash of messages, master_secret, etc.</>
   </row>
 
   <row>
-    <entry>sua.sequence_number.sent_sequence_number</entry>
-    <entry>Sent Sequence Number P(S)</entry>
+    <entry>ssl.handshake.type</entry>
+    <entry>Handshake Message Type</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>SSLv2 handshake message type</>
   </row>
 
   <row>
-    <entry>sua.sequence_number.spare_bit</entry>
-    <entry>Spare Bit</entry>
-    <entry>Boolean</entry>
-    <entry></>
+    <entry>ssl.handshake.verify_data</entry>
+    <entry>Verify Data</entry>
+    <entry>No value</entry>
+    <entry>Opaque verification data</>
   </row>
 
   <row>
-    <entry>sua.smi.reserved</entry>
-    <entry>Reserved</entry>
-    <entry>Byte array</entry>
-    <entry></>
+    <entry>ssl.handshake.version</entry>
+    <entry>Version</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Maximum version supported by client</>
   </row>
 
   <row>
-    <entry>sua.smi.smi</entry>
-    <entry>SMI</entry>
+    <entry>ssl.pct_handshake.type</entry>
+    <entry>Handshake Message Type</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry></>
+    <entry>PCT handshake message type</>
   </row>
 
   <row>
-    <entry>sua.source_address.gt_bit</entry>
-    <entry>Include GT</entry>
-    <entry>Boolean</entry>
-    <entry></>
+    <entry>ssl.record</entry>
+    <entry>Record Layer</entry>
+    <entry>No value</entry>
+    <entry>Record layer</>
   </row>
 
   <row>
-    <entry>sua.source_address.pc_bit</entry>
-    <entry>Include PC</entry>
-    <entry>Boolean</entry>
-    <entry></>
+    <entry>ssl.record.content_type</entry>
+    <entry>Content Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Content type</>
   </row>
 
   <row>
-    <entry>sua.source_address.reserved_bits</entry>
-    <entry>Reserved Bits</entry>
-    <entry>Unsigned 16-bit integer</entry>
-    <entry></>
+    <entry>ssl.record.is_escape</entry>
+    <entry>Is Escape</entry>
+    <entry>Boolean</entry>
+    <entry>Indicates a security escape</>
   </row>
 
   <row>
-    <entry>sua.source_address.routing_indicator</entry>
-    <entry>Routing Indicator</entry>
+    <entry>ssl.record.length</entry>
+    <entry>Length</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry></>
+    <entry>Length of SSL record data</>
   </row>
 
   <row>
-    <entry>sua.source_address.ssn_bit</entry>
-    <entry>Include SSN</entry>
-    <entry>Boolean</entry>
-    <entry></>
+    <entry>ssl.record.padding_length</entry>
+    <entry>Padding Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Length of padding at end of record</>
   </row>
 
   <row>
-    <entry>sua.source_reference_number.number</entry>
-    <entry>Source Reference Number</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry></>
+    <entry>ssl.record.version</entry>
+    <entry>Version</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Record layer version.</>
   </row>
 
-  <row>
-    <entry>sua.ss7_hop_counter.counter</entry>
-    <entry>SS7 Hop Counter</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
-  </row>
+</tbody></tgroup></table>
+</section>
 
-  <row>
-    <entry>sua.ss7_hop_counter.reserved</entry>
-    <entry>Reserved</entry>
-    <entry>Byte array</entry>
-    <entry></>
-  </row>
+<section id="SIDSequencedPacketeXchange"><title>Sequenced Packet eXchange (spx)</title>
 
+<table id="TIDSequencedPacketeXchange"><title>Sequenced Packet eXchange (spx)</title>
+<tgroup cols="4">
+<thead>
   <row>
-    <entry>sua.ssn.number</entry>
-    <entry>Subsystem Number</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry></>
-  </row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
 
-  <row>
-    <entry>sua.ssn.reserved</entry>
-    <entry>Reserved</entry>
-    <entry>Byte array</entry>
-    <entry></>
   </row>
-
+</thead>
+<tbody>
   <row>
-    <entry>sua.status.info</entry>
-    <entry>Status info</entry>
+    <entry>spx.ack</entry>
+    <entry>Acknowledgment Number</entry>
     <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.status.type</entry>
-    <entry>Status type</entry>
+    <entry>spx.alloc</entry>
+    <entry>Allocation Number</entry>
     <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.tid_label.end</entry>
-    <entry>End</entry>
+    <entry>spx.ctl</entry>
+    <entry>Connection Control</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.tid_label.start</entry>
-    <entry>Start</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>spx.dst</entry>
+    <entry>Destination Connection ID</entry>
+    <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.tid_label.value</entry>
-    <entry>Label Value</entry>
+    <entry>spx.seq</entry>
+    <entry>Sequence Number</entry>
     <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.traffic_mode_type.type</entry>
-    <entry>Traffic mode Type</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry>spx.src</entry>
+    <entry>Source Connection ID</entry>
+    <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sua.version</entry>
-    <entry>Version</entry>
+    <entry>spx.type</entry>
+    <entry>Datastream type</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
@@ -62926,9 +71893,9 @@
 </tbody></tgroup></table>
 </section>
 
-<section id="SIDSSCOP"><title>SSCOP (sscop)</title>
+<section id="SIDServiceAdvertisementProtocol"><title>Service Advertisement Protocol (ipxsap)</title>
 
-<table id="TIDSSCOP"><title>SSCOP (sscop)</title>
+<table id="TIDServiceAdvertisementProtocol"><title>Service Advertisement Protocol (ipxsap)</title>
 <tgroup cols="4">
 <thead>
   <row>
@@ -62941,16 +71908,25 @@
 </thead>
 <tbody>
   <row>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry><entry></entry>
+    <entry>ipxsap.request</entry>
+    <entry>Request</entry>
+    <entry>Boolean</entry>
+    <entry>TRUE if SAP request</>
+  </row>
+
+  <row>
+    <entry>ipxsap.response</entry>
+    <entry>Response</entry>
+    <entry>Boolean</entry>
+    <entry>TRUE if SAP response</>
   </row>
+
 </tbody></tgroup></table>
 </section>
 
-<section id="SIDSecureSocketLayer"><title>Secure Socket Layer (ssl)</title>
+<section id="SIDServiceLocationProtocol"><title>Service Location Protocol (srvloc)</title>
 
-<table id="TIDSecureSocketLayer"><title>Secure Socket Layer (ssl)</title>
+<table id="TIDServiceLocationProtocol"><title>Service Location Protocol (srvloc)</title>
 <tgroup cols="4">
 <thead>
   <row>
@@ -62963,518 +71939,628 @@
 </thead>
 <tbody>
   <row>
-    <entry>ssl.alert_message</entry>
-    <entry>Alert Message</entry>
-    <entry>No value</entry>
-    <entry>Alert message</>
+    <entry>srvloc.attrreq.attrlist</entry>
+    <entry>Attribute List</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.alert_message.desc</entry>
-    <entry>Description</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Alert message description</>
+    <entry>srvloc.attrreq.attrlistlen</entry>
+    <entry>Attribute List Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.alert_message.level</entry>
-    <entry>Level</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Alert message level</>
+    <entry>srvloc.attrreq.prlist</entry>
+    <entry>Previous Response List</entry>
+    <entry>String</entry>
+    <entry>Previous Response List</>
   </row>
 
   <row>
-    <entry>ssl.app_data</entry>
-    <entry>Application Data</entry>
-    <entry>No value</entry>
-    <entry>Payload is application data</>
+    <entry>srvloc.attrreq.prlistlen</entry>
+    <entry>Previous Response List Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of Previous Response List</>
   </row>
 
   <row>
-    <entry>ssl.change_cipher_spec</entry>
-    <entry>Change Cipher Spec Message</entry>
-    <entry>No value</entry>
-    <entry>Signals a change in cipher specifications</>
+    <entry>srvloc.attrreq.scopelist</entry>
+    <entry>Scope List</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake</entry>
-    <entry>Handshake Protocol</entry>
-    <entry>No value</entry>
-    <entry>Handshake protocol message</>
+    <entry>srvloc.attrreq.scopelistlen</entry>
+    <entry>Scope List Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of the Scope List</>
   </row>
 
   <row>
-    <entry>ssl.handshake.cert_type</entry>
-    <entry>Certificate type</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Certificate type</>
+    <entry>srvloc.attrreq.slpspi</entry>
+    <entry>SLP SPI</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.cert_types</entry>
-    <entry>Certificate types</entry>
-    <entry>No value</entry>
-    <entry>List of certificate types</>
+    <entry>srvloc.attrreq.slpspilen</entry>
+    <entry>SLP SPI Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of the SLP SPI</>
   </row>
 
   <row>
-    <entry>ssl.handshake.cert_types_count</entry>
-    <entry>Certificate types count</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Count of certificate types</>
+    <entry>srvloc.attrreq.taglist</entry>
+    <entry>Tag List</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.certificate</entry>
-    <entry>Certificate</entry>
-    <entry>Byte array</entry>
-    <entry>Certificate</>
+    <entry>srvloc.attrreq.taglistlen</entry>
+    <entry>Tag List Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.certificate_length</entry>
-    <entry>Certificate Length</entry>
-    <entry>Unsigned 24-bit integer</entry>
-    <entry>Length of certificate</>
+    <entry>srvloc.attrreq.url</entry>
+    <entry>Service URL</entry>
+    <entry>String</entry>
+    <entry>URL of service</>
   </row>
 
   <row>
-    <entry>ssl.handshake.certificates</entry>
-    <entry>Certificates</entry>
-    <entry>No value</entry>
-    <entry>List of certificates</>
+    <entry>srvloc.attrreq.urllen</entry>
+    <entry>URL Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.certificates_length</entry>
-    <entry>Certificates Length</entry>
-    <entry>Unsigned 24-bit integer</entry>
-    <entry>Length of certificates field</>
+    <entry>srvloc.attrrply.attrlist</entry>
+    <entry>Attribute List</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.challenge</entry>
-    <entry>Challenge</entry>
-    <entry>No value</entry>
-    <entry>Challenge data used to authenticate server</>
+    <entry>srvloc.attrrply.attrlistlen</entry>
+    <entry>Attribute List Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of Attribute List</>
   </row>
 
   <row>
-    <entry>ssl.handshake.challenge_length</entry>
-    <entry>Challenge Length</entry>
+    <entry>srvloc.authblkv2.slpspi</entry>
+    <entry>SLP SPI</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>srvloc.authblkv2.slpspilen</entry>
+    <entry>SLP SPI Length</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>Length of challenge field</>
+    <entry>Length of the SLP SPI</>
   </row>
 
   <row>
-    <entry>ssl.handshake.cipher_spec_len</entry>
-    <entry>Cipher Spec Length</entry>
+    <entry>srvloc.authblkv2.timestamp</entry>
+    <entry>Timestamp</entry>
+    <entry>Date/Time stamp</entry>
+    <entry>Timestamp on Authentication Block</>
+  </row>
+
+  <row>
+    <entry>srvloc.authblkv2_bsd</entry>
+    <entry>BSD</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>Length of cipher specs field</>
+    <entry>Block Structure Descriptor</>
   </row>
 
   <row>
-    <entry>ssl.handshake.cipher_suites_length</entry>
-    <entry>Cipher Suites Length</entry>
+    <entry>srvloc.authblkv2_len</entry>
+    <entry>Length</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>Length of cipher suites field</>
+    <entry>Length of Authentication Block</>
   </row>
 
   <row>
-    <entry>ssl.handshake.cipherspec</entry>
-    <entry>Cipher Spec</entry>
-    <entry>Unsigned 24-bit integer</entry>
-    <entry>Cipher specification</>
+    <entry>srvloc.daadvert.attrlist</entry>
+    <entry>Attribute List</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.ciphersuite</entry>
-    <entry>Cipher Suite</entry>
+    <entry>srvloc.daadvert.attrlistlen</entry>
+    <entry>Attribute List Length</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>Cipher suite</>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.ciphersuites</entry>
-    <entry>Cipher Suites</entry>
-    <entry>No value</entry>
-    <entry>List of cipher suites supported by client</>
+    <entry>srvloc.daadvert.authcount</entry>
+    <entry>Auths</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Number of Authentication Blocks</>
   </row>
 
   <row>
-    <entry>ssl.handshake.clear_key_data</entry>
-    <entry>Clear Key Data</entry>
-    <entry>No value</entry>
-    <entry>Clear portion of MASTER-KEY</>
+    <entry>srvloc.daadvert.scopelist</entry>
+    <entry>Scope List</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.clear_key_length</entry>
-    <entry>Clear Key Data Length</entry>
+    <entry>srvloc.daadvert.scopelistlen</entry>
+    <entry>Scope List Length</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>Length of clear key data</>
+    <entry>Length of the Scope List</>
   </row>
 
   <row>
-    <entry>ssl.handshake.comp_method</entry>
-    <entry>Compression Method</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Compression Method</>
+    <entry>srvloc.daadvert.slpspi</entry>
+    <entry>SLP SPI</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.comp_methods</entry>
-    <entry>Compression Methods</entry>
-    <entry>No value</entry>
-    <entry>List of compression methods supported by client</>
+    <entry>srvloc.daadvert.slpspilen</entry>
+    <entry>SLP SPI Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of the SLP SPI</>
   </row>
 
   <row>
-    <entry>ssl.handshake.comp_methods_length</entry>
-    <entry>Compression Methods Length</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Length of compression methods field</>
+    <entry>srvloc.daadvert.timestamp</entry>
+    <entry>DAADVERT Timestamp</entry>
+    <entry>Date/Time stamp</entry>
+    <entry>Timestamp on DA Advert</>
   </row>
 
   <row>
-    <entry>ssl.handshake.connection_id</entry>
-    <entry>Connection ID</entry>
-    <entry>No value</entry>
-    <entry>Server's challenge to client</>
+    <entry>srvloc.daadvert.url</entry>
+    <entry>URL</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.connection_id_length</entry>
-    <entry>Connection ID Length</entry>
+    <entry>srvloc.daadvert.urllen</entry>
+    <entry>URL Length</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>Length of connection ID</>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.dname</entry>
-    <entry>Distinguished Name</entry>
-    <entry>Byte array</entry>
-    <entry>Distinguished name of a CA that server trusts</>
+    <entry>srvloc.err</entry>
+    <entry>Error Code</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.dname_len</entry>
-    <entry>Distinguished Name Length</entry>
+    <entry>srvloc.errv2</entry>
+    <entry>Error Code</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>Length of distinguished name</>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.dnames</entry>
-    <entry>Distinguished Names</entry>
-    <entry>No value</entry>
-    <entry>List of CAs that server trusts</>
+    <entry>srvloc.flags_v1</entry>
+    <entry>Flags</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.dnames_len</entry>
-    <entry>Distinguished Names Length</entry>
+    <entry>srvloc.flags_v1.attribute_auth</entry>
+    <entry>Attribute Authentication</entry>
+    <entry>Boolean</entry>
+    <entry>Can whole packet fit into a datagram?</>
+  </row>
+
+  <row>
+    <entry>srvloc.flags_v1.fresh</entry>
+    <entry>Fresh Registration</entry>
+    <entry>Boolean</entry>
+    <entry>Is this a new registration?</>
+  </row>
+
+  <row>
+    <entry>srvloc.flags_v1.monolingual</entry>
+    <entry>Monolingual</entry>
+    <entry>Boolean</entry>
+    <entry>Can whole packet fit into a datagram?</>
+  </row>
+
+  <row>
+    <entry>srvloc.flags_v1.overflow.</entry>
+    <entry>Overflow</entry>
+    <entry>Boolean</entry>
+    <entry>Can whole packet fit into a datagram?</>
+  </row>
+
+  <row>
+    <entry>srvloc.flags_v1.url_auth</entry>
+    <entry>URL Authentication</entry>
+    <entry>Boolean</entry>
+    <entry>Can whole packet fit into a datagram?</>
+  </row>
+
+  <row>
+    <entry>srvloc.flags_v2</entry>
+    <entry>Flags</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>Length of list of CAs that server trusts</>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.encrypted_key</entry>
-    <entry>Encrypted Key</entry>
-    <entry>No value</entry>
-    <entry>Secret portion of MASTER-KEY encrypted to server</>
+    <entry>srvloc.flags_v2.fresh</entry>
+    <entry>Fresh Registration</entry>
+    <entry>Boolean</entry>
+    <entry>Is this a new registration?</>
+  </row>
+
+  <row>
+    <entry>srvloc.flags_v2.overflow</entry>
+    <entry>Overflow</entry>
+    <entry>Boolean</entry>
+    <entry>Can whole packet fit into a datagram?</>
+  </row>
+
+  <row>
+    <entry>srvloc.flags_v2.reqmulti</entry>
+    <entry>Multicast requested</entry>
+    <entry>Boolean</entry>
+    <entry>Do we want multicast?</>
   </row>
 
   <row>
-    <entry>ssl.handshake.encrypted_key_length</entry>
-    <entry>Encrypted Key Data Length</entry>
-    <entry>Unsigned 16-bit integer</entry>
-    <entry>Length of encrypted key data</>
+    <entry>srvloc.function</entry>
+    <entry>Function</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.key_arg</entry>
-    <entry>Key Argument</entry>
-    <entry>No value</entry>
-    <entry>Key Argument (e.g., Initialization Vector)</>
+    <entry>srvloc.langtag</entry>
+    <entry>Lang Tag</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.key_arg_length</entry>
-    <entry>Key Argument Length</entry>
+    <entry>srvloc.langtaglen</entry>
+    <entry>Lang Tag Len</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>Length of key argument</>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.length</entry>
-    <entry>Length</entry>
+    <entry>srvloc.nextextoff</entry>
+    <entry>Next Extension Offset</entry>
     <entry>Unsigned 24-bit integer</entry>
-    <entry>Length of handshake message</>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.md5_hash</entry>
-    <entry>MD5 Hash</entry>
-    <entry>No value</entry>
-    <entry>Hash of messages, master_secret, etc.</>
+    <entry>srvloc.pktlen</entry>
+    <entry>Packet Length</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.random</entry>
-    <entry>Random.bytes</entry>
-    <entry>No value</entry>
-    <entry>Random challenge used to authenticate server</>
+    <entry>srvloc.saadvert.attrlist</entry>
+    <entry>Attribute List</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.random_time</entry>
-    <entry>Random.gmt_unix_time</entry>
-    <entry>Date/Time stamp</entry>
-    <entry>Unix time field of random structure</>
+    <entry>srvloc.saadvert.attrlistlen</entry>
+    <entry>Attribute List Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.session_id</entry>
-    <entry>Session ID</entry>
-    <entry>Byte array</entry>
-    <entry>Identifies the SSL session, allowing later resumption</>
+    <entry>srvloc.saadvert.authcount</entry>
+    <entry>Auths</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Number of Authentication Blocks</>
   </row>
 
   <row>
-    <entry>ssl.handshake.session_id_hit</entry>
-    <entry>Session ID Hit</entry>
-    <entry>Boolean</entry>
-    <entry>Did the server find the client's Session ID?</>
+    <entry>srvloc.saadvert.scopelist</entry>
+    <entry>Scope List</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.session_id_length</entry>
-    <entry>Session ID Length</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Length of session ID field</>
+    <entry>srvloc.saadvert.scopelistlen</entry>
+    <entry>Scope List Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of the Scope List</>
   </row>
 
   <row>
-    <entry>ssl.handshake.sha_hash</entry>
-    <entry>SHA-1 Hash</entry>
-    <entry>No value</entry>
-    <entry>Hash of messages, master_secret, etc.</>
+    <entry>srvloc.saadvert.url</entry>
+    <entry>URL</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.type</entry>
-    <entry>Handshake Message Type</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>SSLv2 handshake message type</>
+    <entry>srvloc.saadvert.urllen</entry>
+    <entry>URL Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.verify_data</entry>
-    <entry>Verify Data</entry>
-    <entry>No value</entry>
-    <entry>Opaque verification data</>
+    <entry>srvloc.srvdereq.scopelist</entry>
+    <entry>Scope List</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.handshake.version</entry>
-    <entry>Version</entry>
+    <entry>srvloc.srvdereq.scopelistlen</entry>
+    <entry>Scope List Length</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>Maximum version supported by client</>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.pct_handshake.type</entry>
-    <entry>Handshake Message Type</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>PCT handshake message type</>
+    <entry>srvloc.srvdereq.taglist</entry>
+    <entry>Tag List</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.record</entry>
-    <entry>Record Layer</entry>
-    <entry>No value</entry>
-    <entry>Record layer</>
+    <entry>srvloc.srvdereq.taglistlen</entry>
+    <entry>Tag List Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.record.content_type</entry>
-    <entry>Content Type</entry>
+    <entry>srvloc.srvreq.attrauthcount</entry>
+    <entry>Attr Auths</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry>Content type</>
+    <entry>Number of Attribute Authentication Blocks</>
   </row>
 
   <row>
-    <entry>ssl.record.is_escape</entry>
-    <entry>Is Escape</entry>
-    <entry>Boolean</entry>
-    <entry>Indicates a security escape</>
+    <entry>srvloc.srvreq.attrlist</entry>
+    <entry>Attribute List</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.record.length</entry>
-    <entry>Length</entry>
+    <entry>srvloc.srvreq.attrlistlen</entry>
+    <entry>Attribute List Length</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>Length of SSL record data</>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.record.padding_length</entry>
-    <entry>Padding Length</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Length of padding at end of record</>
+    <entry>srvloc.srvreq.predicate</entry>
+    <entry>Predicate</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ssl.record.version</entry>
-    <entry>Version</entry>
+    <entry>srvloc.srvreq.predicatelen</entry>
+    <entry>Predicate Length</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>Record layer version.</>
+    <entry>Length of the Predicate</>
   </row>
 
-</tbody></tgroup></table>
-</section>
-
-<section id="SIDSequencedPacketeXchange"><title>Sequenced Packet eXchange (spx)</title>
-
-<table id="TIDSequencedPacketeXchange"><title>Sequenced Packet eXchange (spx)</title>
-<tgroup cols="4">
-<thead>
   <row>
-    <entry>Field</>
-    <entry>Field Name</>
-    <entry>Type</>
-    <entry>Description</>
-
+    <entry>srvloc.srvreq.prlist</entry>
+    <entry>Previous Response List</entry>
+    <entry>String</entry>
+    <entry>Previous Response List</>
   </row>
-</thead>
-<tbody>
+
   <row>
-    <entry>spx.ack</entry>
-    <entry>Acknowledgment Number</entry>
+    <entry>srvloc.srvreq.prlistlen</entry>
+    <entry>Previous Response List Length</entry>
     <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of Previous Response List</>
+  </row>
+
+  <row>
+    <entry>srvloc.srvreq.scopelist</entry>
+    <entry>Scope List</entry>
+    <entry>String</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>spx.alloc</entry>
-    <entry>Allocation Number</entry>
+    <entry>srvloc.srvreq.scopelistlen</entry>
+    <entry>Scope List Length</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry></>
+    <entry>Length of the Scope List</>
   </row>
 
   <row>
-    <entry>spx.ctl</entry>
-    <entry>Connection Control</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>srvloc.srvreq.slpspi</entry>
+    <entry>SLP SPI</entry>
+    <entry>String</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>spx.dst</entry>
-    <entry>Destination Connection ID</entry>
+    <entry>srvloc.srvreq.slpspilen</entry>
+    <entry>SLP SPI Length</entry>
     <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of the SLP SPI</>
+  </row>
+
+  <row>
+    <entry>srvloc.srvreq.srvtype</entry>
+    <entry>Service Type</entry>
+    <entry>String</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>spx.seq</entry>
-    <entry>Sequence Number</entry>
+    <entry>srvloc.srvreq.srvtypelen</entry>
+    <entry>Service Type Length</entry>
     <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of Service Type List</>
+  </row>
+
+  <row>
+    <entry>srvloc.srvreq.srvtypelist</entry>
+    <entry>Service Type List</entry>
+    <entry>String</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>spx.src</entry>
-    <entry>Source Connection ID</entry>
+    <entry>srvloc.srvreq.urlcount</entry>
+    <entry>Number of URLs</entry>
     <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>spx.type</entry>
-    <entry>Datastream type</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>srvloc.srvtypereq.nameauthlist</entry>
+    <entry>Naming Authority List</entry>
+    <entry>String</entry>
     <entry></>
   </row>
 
-</tbody></tgroup></table>
-</section>
-
-<section id="SIDServiceAdvertisementProtocol"><title>Service Advertisement Protocol (ipxsap)</title>
+  <row>
+    <entry>srvloc.srvtypereq.nameauthlistlen</entry>
+    <entry>Naming Authority List Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of the Naming Authority List</>
+  </row>
 
-<table id="TIDServiceAdvertisementProtocol"><title>Service Advertisement Protocol (ipxsap)</title>
-<tgroup cols="4">
-<thead>
   <row>
-    <entry>Field</>
-    <entry>Field Name</>
-    <entry>Type</>
-    <entry>Description</>
+    <entry>srvloc.srvtypereq.prlist</entry>
+    <entry>Previous Response List</entry>
+    <entry>String</entry>
+    <entry>Previous Response List</>
+  </row>
 
+  <row>
+    <entry>srvloc.srvtypereq.prlistlen</entry>
+    <entry>Previous Response List Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of Previous Response List</>
   </row>
-</thead>
-<tbody>
+
   <row>
-    <entry>ipxsap.request</entry>
-    <entry>Request</entry>
-    <entry>Boolean</entry>
-    <entry>TRUE if SAP request</>
+    <entry>srvloc.srvtypereq.scopelist</entry>
+    <entry>Scope List</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>ipxsap.response</entry>
-    <entry>Response</entry>
-    <entry>Boolean</entry>
-    <entry>TRUE if SAP response</>
+    <entry>srvloc.srvtypereq.scopelistlen</entry>
+    <entry>Scope List Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of the Scope List</>
   </row>
 
-</tbody></tgroup></table>
-</section>
+  <row>
+    <entry>srvloc.srvtypereq.srvtypelen</entry>
+    <entry>Service Type Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of the Service Type</>
+  </row>
 
-<section id="SIDServiceLocationProtocol"><title>Service Location Protocol (srvloc)</title>
+  <row>
+    <entry>srvloc.srvtypereq.srvtypelistlen</entry>
+    <entry>Service Type List Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Length of the Service Type List</>
+  </row>
 
-<table id="TIDServiceLocationProtocol"><title>Service Location Protocol (srvloc)</title>
-<tgroup cols="4">
-<thead>
   <row>
-    <entry>Field</>
-    <entry>Field Name</>
-    <entry>Type</>
-    <entry>Description</>
+    <entry>srvloc.srvtyperply.srvtype</entry>
+    <entry>Service Type</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
 
+  <row>
+    <entry>srvloc.srvtyperply.srvtypelist</entry>
+    <entry>Service Type List</entry>
+    <entry>String</entry>
+    <entry></>
   </row>
-</thead>
-<tbody>
+
   <row>
-    <entry>srvloc.err</entry>
-    <entry>Error Code</entry>
+    <entry>srvloc.url.lifetime</entry>
+    <entry>URL lifetime</entry>
     <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>srvloc.flags</entry>
-    <entry>Flags</entry>
+    <entry>srvloc.url.numauths</entry>
+    <entry>Num Auths</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>srvloc.function</entry>
-    <entry>Function</entry>
+    <entry>srvloc.url.reserved</entry>
+    <entry>Reserved</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
+    <entry>srvloc.url.url</entry>
+    <entry>URL</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>srvloc.url.urllen</entry>
+    <entry>URL Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>srvloc.version</entry>
     <entry>Version</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
+  <row>
+    <entry>srvloc.xid</entry>
+    <entry>XID</entry>
+    <entry>Unsigned 24-bit integer</entry>
+    <entry>Transaction ID</>
+  </row>
+
 </tbody></tgroup></table>
 </section>
 
@@ -63849,117 +72935,474 @@
     <entry>sdp.session_attr</entry>
     <entry>Session Attribute (a)</entry>
     <entry>String</entry>
-    <entry>Session Attribute</>
+    <entry>Session Attribute</>
+  </row>
+
+  <row>
+    <entry>sdp.session_attr.field</entry>
+    <entry>Session Attribute Fieldname</entry>
+    <entry>String</entry>
+    <entry>Session Attribute Fieldname</>
+  </row>
+
+  <row>
+    <entry>sdp.session_attr.value</entry>
+    <entry>Session Attribute Value</entry>
+    <entry>String</entry>
+    <entry>Session Attribute Value</>
+  </row>
+
+  <row>
+    <entry>sdp.session_info</entry>
+    <entry>Session Information (i)</entry>
+    <entry>String</entry>
+    <entry>Session Information</>
+  </row>
+
+  <row>
+    <entry>sdp.session_name</entry>
+    <entry>Session Name (s)</entry>
+    <entry>String</entry>
+    <entry>Session Name</>
+  </row>
+
+  <row>
+    <entry>sdp.time</entry>
+    <entry>Time Description, active time (t)</entry>
+    <entry>String</entry>
+    <entry>Time Description, active time</>
+  </row>
+
+  <row>
+    <entry>sdp.time.start</entry>
+    <entry>Session Start Time</entry>
+    <entry>String</entry>
+    <entry>Session Start Time</>
+  </row>
+
+  <row>
+    <entry>sdp.time.stop</entry>
+    <entry>Session Stop Time</entry>
+    <entry>String</entry>
+    <entry>Session Stop Time</>
+  </row>
+
+  <row>
+    <entry>sdp.timezone</entry>
+    <entry>Time Zone Adjustments (z)</entry>
+    <entry>String</entry>
+    <entry>Time Zone Adjustments</>
+  </row>
+
+  <row>
+    <entry>sdp.timezone.offset</entry>
+    <entry>Timezone Offset</entry>
+    <entry>String</entry>
+    <entry>Timezone Offset</>
+  </row>
+
+  <row>
+    <entry>sdp.timezone.time</entry>
+    <entry>Timezone Time</entry>
+    <entry>String</entry>
+    <entry>Timezone Time</>
+  </row>
+
+  <row>
+    <entry>sdp.unknown</entry>
+    <entry>Unknown</entry>
+    <entry>String</entry>
+    <entry>Unknown</>
+  </row>
+
+  <row>
+    <entry>sdp.uri</entry>
+    <entry>URI of Description (u)</entry>
+    <entry>String</entry>
+    <entry>URI of Description</>
+  </row>
+
+  <row>
+    <entry>sdp.version</entry>
+    <entry>Session Description Protocol Version (v)</entry>
+    <entry>String</entry>
+    <entry>Session Description Protocol Version</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDSessionInitiationProtocol"><title>Session Initiation Protocol (sip)</title>
+
+<table id="TIDSessionInitiationProtocol"><title>Session Initiation Protocol (sip)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>sip.Accept</entry>
+    <entry>Accept</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Accept Header</>
+  </row>
+
+  <row>
+    <entry>sip.Accept-Encoding</entry>
+    <entry>Accept-Encoding</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Accept-Encoding Header</>
+  </row>
+
+  <row>
+    <entry>sip.Accept-Language</entry>
+    <entry>Accept-Language</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Accept-Language Header</>
+  </row>
+
+  <row>
+    <entry>sip.Alert-Info</entry>
+    <entry>Alert-Info</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Alert-Info Header</>
+  </row>
+
+  <row>
+    <entry>sip.Allow</entry>
+    <entry>Allow</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Allow Header</>
+  </row>
+
+  <row>
+    <entry>sip.Allow-Events</entry>
+    <entry>Allow-Events</entry>
+    <entry>String</entry>
+    <entry>RFC 3265: Allow-Events Header</>
+  </row>
+
+  <row>
+    <entry>sip.Authentication-Info</entry>
+    <entry>Authentication-Info</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Authentication-Info Header</>
+  </row>
+
+  <row>
+    <entry>sip.Authorization</entry>
+    <entry>Authorization</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Authorization Header</>
+  </row>
+
+  <row>
+    <entry>sip.CSeq</entry>
+    <entry>CSeq</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: CSeq Header</>
+  </row>
+
+  <row>
+    <entry>sip.Call-ID</entry>
+    <entry>Call-ID</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Call-ID Header</>
+  </row>
+
+  <row>
+    <entry>sip.Call-Info</entry>
+    <entry>Call-Info</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Call-Info Header</>
+  </row>
+
+  <row>
+    <entry>sip.Contact</entry>
+    <entry>Contact</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Contact Header</>
+  </row>
+
+  <row>
+    <entry>sip.Content-Disposition</entry>
+    <entry>Content-Disposition</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Content-Disposition Header</>
+  </row>
+
+  <row>
+    <entry>sip.Content-Encoding</entry>
+    <entry>Content-Encoding</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Content-Encoding Header</>
+  </row>
+
+  <row>
+    <entry>sip.Content-Language</entry>
+    <entry>Content-Language</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Content-Language Header</>
+  </row>
+
+  <row>
+    <entry>sip.Content-Length</entry>
+    <entry>Content-Length</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Content-Length Header</>
+  </row>
+
+  <row>
+    <entry>sip.Content-Type</entry>
+    <entry>Content-Type</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Content-Type Header</>
+  </row>
+
+  <row>
+    <entry>sip.Date</entry>
+    <entry>Date</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Date Header</>
+  </row>
+
+  <row>
+    <entry>sip.Error-Info</entry>
+    <entry>Error-Info</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Error-Info Header</>
+  </row>
+
+  <row>
+    <entry>sip.Event</entry>
+    <entry>Event</entry>
+    <entry>String</entry>
+    <entry>RFC 3265: Event Header</>
+  </row>
+
+  <row>
+    <entry>sip.Expires</entry>
+    <entry>Expires</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Expires Header</>
+  </row>
+
+  <row>
+    <entry>sip.From</entry>
+    <entry>From</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: From Header</>
+  </row>
+
+  <row>
+    <entry>sip.In-Reply-To</entry>
+    <entry>In-Reply-To</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: In-Reply-To Header</>
+  </row>
+
+  <row>
+    <entry>sip.MIME-Version</entry>
+    <entry>MIME-Version</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: MIME-Version Header</>
+  </row>
+
+  <row>
+    <entry>sip.Max-Forwards</entry>
+    <entry>Max-Forwards</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Max-Forwards Header</>
+  </row>
+
+  <row>
+    <entry>sip.Method</entry>
+    <entry>Method</entry>
+    <entry>String</entry>
+    <entry>SIP Method</>
+  </row>
+
+  <row>
+    <entry>sip.Min-Expires</entry>
+    <entry>Min-Expires</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Min-Expires Header</>
+  </row>
+
+  <row>
+    <entry>sip.Organization</entry>
+    <entry>Organization</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Organization Header</>
+  </row>
+
+  <row>
+    <entry>sip.Priority</entry>
+    <entry>Priority</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Priority Header</>
+  </row>
+
+  <row>
+    <entry>sip.Proxy-Authenticate</entry>
+    <entry>Proxy-Authenticate</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Proxy-Authenticate Header</>
+  </row>
+
+  <row>
+    <entry>sip.Proxy-Authorization</entry>
+    <entry>Proxy-Authorization</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Proxy-Authorization Header</>
+  </row>
+
+  <row>
+    <entry>sip.Proxy-Require</entry>
+    <entry>Proxy-Require</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Proxy-Require Header</>
+  </row>
+
+  <row>
+    <entry>sip.RAck</entry>
+    <entry>RAck</entry>
+    <entry>String</entry>
+    <entry>RFC 3262: RAck Header</>
+  </row>
+
+  <row>
+    <entry>sip.RSeq</entry>
+    <entry>RSeq</entry>
+    <entry>String</entry>
+    <entry>RFC 3262: RSeq Header</>
+  </row>
+
+  <row>
+    <entry>sip.Record-Route</entry>
+    <entry>Record-Route</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Record-Route Header</>
+  </row>
+
+  <row>
+    <entry>sip.Reply-To</entry>
+    <entry>Reply-To</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Reply-To Header</>
+  </row>
+
+  <row>
+    <entry>sip.Require</entry>
+    <entry>Require</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Require Header</>
   </row>
 
   <row>
-    <entry>sdp.session_attr.field</entry>
-    <entry>Session Attribute Fieldname</entry>
+    <entry>sip.Retry-After</entry>
+    <entry>Retry-After</entry>
     <entry>String</entry>
-    <entry>Session Attribute Fieldname</>
+    <entry>RFC 3261: Retry-After Header</>
   </row>
 
   <row>
-    <entry>sdp.session_attr.value</entry>
-    <entry>Session Attribute Value</entry>
+    <entry>sip.Route</entry>
+    <entry>Route</entry>
     <entry>String</entry>
-    <entry>Session Attribute Value</>
+    <entry>RFC 3261: Route Header</>
   </row>
 
   <row>
-    <entry>sdp.session_info</entry>
-    <entry>Session Information (i)</entry>
+    <entry>sip.Server</entry>
+    <entry>Server</entry>
     <entry>String</entry>
-    <entry>Session Information</>
+    <entry>RFC 3261: Server Header</>
   </row>
 
   <row>
-    <entry>sdp.session_name</entry>
-    <entry>Session Name (s)</entry>
+    <entry>sip.Status-Code</entry>
+    <entry>Status-Code</entry>
     <entry>String</entry>
-    <entry>Session Name</>
+    <entry>SIP Status Code</>
   </row>
 
   <row>
-    <entry>sdp.time</entry>
-    <entry>Time Description, active time (t)</entry>
+    <entry>sip.Subject</entry>
+    <entry>Subject</entry>
     <entry>String</entry>
-    <entry>Time Description, active time</>
+    <entry>RFC 3261: Subject Header</>
   </row>
 
   <row>
-    <entry>sdp.time.start</entry>
-    <entry>Session Start Time</entry>
+    <entry>sip.Subscription-State</entry>
+    <entry>Subscription-State</entry>
     <entry>String</entry>
-    <entry>Session Start Time</>
+    <entry>RFC 3265: Subscription-State Header</>
   </row>
 
   <row>
-    <entry>sdp.time.stop</entry>
-    <entry>Session Stop Time</entry>
+    <entry>sip.Supported</entry>
+    <entry>Supported</entry>
     <entry>String</entry>
-    <entry>Session Stop Time</>
+    <entry>RFC 3261: Supported Header</>
   </row>
 
   <row>
-    <entry>sdp.timezone</entry>
-    <entry>Time Zone Adjustments (z)</entry>
+    <entry>sip.Timestamp</entry>
+    <entry>Timestamp</entry>
     <entry>String</entry>
-    <entry>Time Zone Adjustments</>
+    <entry>RFC 3261: Timestamp Header</>
   </row>
 
   <row>
-    <entry>sdp.timezone.offset</entry>
-    <entry>Timezone Offset</entry>
+    <entry>sip.To</entry>
+    <entry>To</entry>
     <entry>String</entry>
-    <entry>Timezone Offset</>
+    <entry>RFC 3261: To Header</>
   </row>
 
   <row>
-    <entry>sdp.timezone.time</entry>
-    <entry>Timezone Time</entry>
+    <entry>sip.Unsupported</entry>
+    <entry>Unsupported</entry>
     <entry>String</entry>
-    <entry>Timezone Time</>
+    <entry>RFC 3261: Unsupported Header</>
   </row>
 
   <row>
-    <entry>sdp.unknown</entry>
-    <entry>Unknown</entry>
+    <entry>sip.User-Agent</entry>
+    <entry>User-Agent</entry>
     <entry>String</entry>
-    <entry>Unknown</>
+    <entry>RFC 3261: User-Agent Header</>
   </row>
 
   <row>
-    <entry>sdp.uri</entry>
-    <entry>URI of Description (u)</entry>
+    <entry>sip.Via</entry>
+    <entry>Via</entry>
     <entry>String</entry>
-    <entry>URI of Description</>
+    <entry>RFC 3261: Via Header</>
   </row>
 
   <row>
-    <entry>sdp.version</entry>
-    <entry>Session Description Protocol Version (v)</entry>
+    <entry>sip.WWW-Authenticate</entry>
+    <entry>WWW-Authenticate</entry>
     <entry>String</entry>
-    <entry>Session Description Protocol Version</>
+    <entry>RFC 3261: WWW-Authenticate Header</>
   </row>
 
-</tbody></tgroup></table>
-</section>
-
-<section id="SIDSessionInitiationProtocol"><title>Session Initiation Protocol (sip)</title>
-
-<table id="TIDSessionInitiationProtocol"><title>Session Initiation Protocol (sip)</title>
-<tgroup cols="4">
-<thead>
   <row>
-    <entry>Field</>
-    <entry>Field Name</>
-    <entry>Type</>
-    <entry>Description</>
-
+    <entry>sip.Warning</entry>
+    <entry>Warning</entry>
+    <entry>String</entry>
+    <entry>RFC 3261: Warning Header</>
   </row>
-</thead>
-<tbody>
+
   <row>
     <entry>sip.msg_hdr</entry>
     <entry>Message Header</entry>
@@ -64689,6 +74132,13 @@
 </thead>
 <tbody>
   <row>
+    <entry>sccp.called.ansi_pc</entry>
+    <entry>PC</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>sccp.called.cluster</entry>
     <entry>PC Cluster</entry>
     <entry>Unsigned 24-bit integer</entry>
@@ -64801,6 +74251,13 @@
   </row>
 
   <row>
+    <entry>sccp.calling.ansi_pc</entry>
+    <entry>PC</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>sccp.calling.cluster</entry>
     <entry>PC Cluster</entry>
     <entry>Unsigned 24-bit integer</entry>
@@ -65020,7 +74477,7 @@
   <row>
     <entry>sccp.optional_pointer</entry>
     <entry>Pointer to Optional parameter</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
@@ -65125,21 +74582,21 @@
   <row>
     <entry>sccp.variable_pointer1</entry>
     <entry>Pointer to first Mandatory Variable parameter</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
     <entry>sccp.variable_pointer2</entry>
     <entry>Pointer to second Mandatory Variable parameter</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
   <row>
     <entry>sccp.variable_pointer3</entry>
     <entry>Pointer to third Mandatory Variable parameter</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>Unsigned 16-bit integer</entry>
     <entry></>
   </row>
 
@@ -65161,6 +74618,13 @@
 </thead>
 <tbody>
   <row>
+    <entry>sccpmg.ansi_pc</entry>
+    <entry>Affected Point Code</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
     <entry>sccpmg.cluster</entry>
     <entry>Affected PC Cluster</entry>
     <entry>Unsigned 24-bit integer</entry>
@@ -66408,6 +75872,13 @@
   </row>
 
   <row>
+    <entry>slimp3.data_ack</entry>
+    <entry>Data Ack</entry>
+    <entry>Boolean</entry>
+    <entry>SLIMP3 Data Ack</>
+  </row>
+
+  <row>
     <entry>slimp3.data_req</entry>
     <entry>Data Request</entry>
     <entry>Boolean</entry>
@@ -66823,10 +76294,45 @@
   </row>
 
   <row>
+    <entry>spnego.krb5.confounder</entry>
+    <entry>krb5_confounder</entry>
+    <entry>Byte array</entry>
+    <entry>KRB5 Confounder</>
+  </row>
+
+  <row>
+    <entry>spnego.krb5.seal_alg</entry>
+    <entry>krb5_seal_alg</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>KRB5 Sealing Algorithm</>
+  </row>
+
+  <row>
+    <entry>spnego.krb5.sgn_alg</entry>
+    <entry>krb5_sgn_alg</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>KRB5 Signing Algorithm</>
+  </row>
+
+  <row>
+    <entry>spnego.krb5.sgn_cksum</entry>
+    <entry>krb5_sgn_cksum</entry>
+    <entry>Byte array</entry>
+    <entry>KRB5 Data Checksum</>
+  </row>
+
+  <row>
+    <entry>spnego.krb5.snd_seq</entry>
+    <entry>krb5_snd_seq</entry>
+    <entry>Byte array</entry>
+    <entry>KRB5 Encrypted Sequence Number</>
+  </row>
+
+  <row>
     <entry>spnego.krb5.tok_id</entry>
     <entry>krb5_tok_id</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>KRB5 Token Ids</>
+    <entry>KRB5 Token Id</>
   </row>
 
   <row>
@@ -66885,6 +76391,13 @@
     <entry>SPNEGO responseToken</>
   </row>
 
+  <row>
+    <entry>spnego.wraptoken</entry>
+    <entry>wrapToken</entry>
+    <entry>No value</entry>
+    <entry>SPNEGO wrapToken</>
+  </row>
+
 </tbody></tgroup></table>
 </section>
 
@@ -67093,7 +76606,7 @@
 
   <row>
     <entry>sctp.init.chunk.credit</entry>
-    <entry>Advertised reciever window credit (a_rwnd)</entry>
+    <entry>Advertised receiver window credit (a_rwnd)</entry>
     <entry>Unsigned 32-bit integer</entry>
     <entry></>
   </row>
@@ -67287,206 +76800,664 @@
     <entry></>
   </row>
 
-</tbody></tgroup></table>
-</section>
-
-<section id="SIDSyslogmessage"><title>Syslog message (syslog)</title>
-
-<table id="TIDSyslogmessage"><title>Syslog message (syslog)</title>
-<tgroup cols="4">
-<thead>
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDSynchronousDataLinkControlSDLC"><title>Synchronous Data Link Control (SDLC) (sdlc)</title>
+
+<table id="TIDSynchronousDataLinkControlSDLC"><title>Synchronous Data Link Control (SDLC) (sdlc)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>sdlc.address</entry>
+    <entry>Address Field</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Address</>
+  </row>
+
+  <row>
+    <entry>sdlc.control</entry>
+    <entry>Control Field</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Control field</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDSyslogmessage"><title>Syslog message (syslog)</title>
+
+<table id="TIDSyslogmessage"><title>Syslog message (syslog)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>syslog.facility</entry>
+    <entry>Facility</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Message facility</>
+  </row>
+
+  <row>
+    <entry>syslog.level</entry>
+    <entry>Level</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Message level</>
+  </row>
+
+  <row>
+    <entry>syslog.msg</entry>
+    <entry>Message</entry>
+    <entry>String</entry>
+    <entry>Message Text</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDSystemsNetworkArchitecture"><title>Systems Network Architecture (sna)</title>
+
+<table id="TIDSystemsNetworkArchitecture"><title>Systems Network Architecture (sna)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>sna.control.05.delay</entry>
+    <entry>Channel Delay</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.control.05.ptp</entry>
+    <entry>Point-to-point</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.control.05.type</entry>
+    <entry>Network Address Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.control.0e.type</entry>
+    <entry>Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.control.0e.value</entry>
+    <entry>Value</entry>
+    <entry>String</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.control.hprkey</entry>
+    <entry>Control Vector HPR Key</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.control.key</entry>
+    <entry>Control Vector Key</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.control.len</entry>
+    <entry>Control Vector Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.gds</entry>
+    <entry>GDS Variable</entry>
+    <entry>No value</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.gds.cont</entry>
+    <entry>Continuation Flag</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.gds.len</entry>
+    <entry>GDS Variable Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.gds.type</entry>
+    <entry>Type of Variable</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.frh</entry>
+    <entry>Transmission Priority Field</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.nhdr</entry>
+    <entry>Network Layer Packet Header</entry>
+    <entry>No value</entry>
+    <entry>NHDR</>
+  </row>
+
+  <row>
+    <entry>sna.nlp.nhdr.0</entry>
+    <entry>Network Layer Packet Header Byte 0</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.nhdr.1</entry>
+    <entry>Network Layer Packet Header Byte 1</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.nhdr.anr</entry>
+    <entry>Automatic Network Routing Entry</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.nhdr.fra</entry>
+    <entry>Function Routing Address Entry</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.nhdr.ft</entry>
+    <entry>Function Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.nhdr.slowdn1</entry>
+    <entry>Slowdown 1</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.nhdr.slowdn2</entry>
+    <entry>Slowdown 2</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.nhdr.sm</entry>
+    <entry>Switching Mode Field</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.nhdr.tpf</entry>
+    <entry>Transmission Priority Field</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.nhdr.tspi</entry>
+    <entry>Time Sensitive Packet Indicator</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr</entry>
+    <entry>RTP Transport Header</entry>
+    <entry>No value</entry>
+    <entry>THDR</>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.8</entry>
+    <entry>RTP Transport Packet Header Byte 8</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.9</entry>
+    <entry>RTP Transport Packet Header Byte 9</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.bsn</entry>
+    <entry>Byte Sequence Number</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.cqfi</entry>
+    <entry>Connection Qualifyer Field Indicator</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.dlf</entry>
+    <entry>Data Length Field</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.eomi</entry>
+    <entry>End Of Message Indicator</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.lmi</entry>
+    <entry>Last Message Indicator</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.offset</entry>
+    <entry>Data Offset/4</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Data Offset in Words</>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.0d.arb</entry>
+    <entry>ARB Flow Control</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.0d.dedicated</entry>
+    <entry>Dedicated RTP Connection</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.0d.reliable</entry>
+    <entry>Reliable Connection</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.0d.target</entry>
+    <entry>Target Resource ID Present</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.0d.version</entry>
+    <entry>Version</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.0e.4</entry>
+    <entry>Connection Setup Byte 4</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.0e.abspbeg</entry>
+    <entry>ABSP Begin</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.0e.abspend</entry>
+    <entry>ABSP End</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.0e.echo</entry>
+    <entry>Status Acknowledge Number</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.0e.gap</entry>
+    <entry>Gap Detected</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.0e.idle</entry>
+    <entry>RTP Idle Packet</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.0e.nabsp</entry>
+    <entry>Number Of ABSP</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.0e.rseq</entry>
+    <entry>Received Sequence Number</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.0e.stat</entry>
+    <entry>Status</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.0e.sync</entry>
+    <entry>Status Report Number</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.0f.bits</entry>
+    <entry>Client Bits</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.10.tcid</entry>
+    <entry>Transport Connection Identifier</entry>
+    <entry>Byte array</entry>
+    <entry>TCID</>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.12.sense</entry>
+    <entry>Sense Data</entry>
+    <entry>Byte array</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.14.rr.2</entry>
+    <entry>Return Route TG Descriptor Byte 2</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.14.rr.bfe</entry>
+    <entry>BF Entry Indicator</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.14.rr.key</entry>
+    <entry>Key</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
   <row>
-    <entry>Field</>
-    <entry>Field Name</>
-    <entry>Type</>
-    <entry>Description</>
-
+    <entry>sna.nlp.thdr.optional.14.rr.len</entry>
+    <entry>Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
   </row>
-</thead>
-<tbody>
+
   <row>
-    <entry>syslog.facility</entry>
-    <entry>Facility</entry>
+    <entry>sna.nlp.thdr.optional.14.rr.num</entry>
+    <entry>Number Of TG Control Vectors</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry>Message facility</>
+    <entry></>
   </row>
 
   <row>
-    <entry>syslog.level</entry>
-    <entry>Level</entry>
+    <entry>sna.nlp.thdr.optional.14.si.2</entry>
+    <entry>Switching Information Byte 2</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry>Message level</>
+    <entry></>
   </row>
 
   <row>
-    <entry>syslog.msg</entry>
-    <entry>Message</entry>
-    <entry>String</entry>
-    <entry>Message Text</>
+    <entry>sna.nlp.thdr.optional.14.si.alive</entry>
+    <entry>RTP Alive Timer</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
   </row>
 
-</tbody></tgroup></table>
-</section>
-
-<section id="SIDSystemsNetworkArchitecture"><title>Systems Network Architecture (sna)</title>
-
-<table id="TIDSystemsNetworkArchitecture"><title>Systems Network Architecture (sna)</title>
-<tgroup cols="4">
-<thead>
   <row>
-    <entry>Field</>
-    <entry>Field Name</>
-    <entry>Type</>
-    <entry>Description</>
-
+    <entry>sna.nlp.thdr.optional.14.si.dirsearch</entry>
+    <entry>Directory Search Required on Path Switch Indicator</entry>
+    <entry>Boolean</entry>
+    <entry></>
   </row>
-</thead>
-<tbody>
+
   <row>
-    <entry>sna.nlp.frh</entry>
-    <entry>Transmission Priority Field</entry>
+    <entry>sna.nlp.thdr.optional.14.si.key</entry>
+    <entry>Key</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.nhdr</entry>
-    <entry>Network Layer Packet Header</entry>
-    <entry>No value</entry>
-    <entry>Network Layer Packet Header (NHDR)</>
+    <entry>sna.nlp.thdr.optional.14.si.len</entry>
+    <entry>Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.nhdr.0</entry>
-    <entry>Network Layer Packet Header Byte 0</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Byte 0 of Network Layer Packet contains SM and TPF</>
+    <entry>sna.nlp.thdr.optional.14.si.limitres</entry>
+    <entry>Limited Resource Link Indicator</entry>
+    <entry>Boolean</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.nhdr.1</entry>
-    <entry>Network Layer Packet Header Bype 1</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Byte 1 of Network Layer Packet contains FT, Time Sensitive Packet Indicator and Congestion Indicator</>
+    <entry>sna.nlp.thdr.optional.14.si.maxpsize</entry>
+    <entry>Maximum Packet Size On Return Path</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.nhdr.anr</entry>
-    <entry>Automatic Network Routing Entry</entry>
-    <entry>Byte array</entry>
+    <entry>sna.nlp.thdr.optional.14.si.mnpsrscv</entry>
+    <entry>MNPS RSCV Retention Indicator</entry>
+    <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.nhdr.fra</entry>
-    <entry>Function Routing Address Entry</entry>
-    <entry>Byte array</entry>
+    <entry>sna.nlp.thdr.optional.14.si.mobility</entry>
+    <entry>Mobility Indicator</entry>
+    <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.nhdr.ft</entry>
-    <entry>Function Type</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>sna.nlp.thdr.optional.14.si.ncescope</entry>
+    <entry>NCE Scope Indicator</entry>
+    <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.nhdr.slowdn1</entry>
-    <entry>Slowdown 1</entry>
+    <entry>sna.nlp.thdr.optional.14.si.refifo</entry>
+    <entry>Resequencing (REFIFO) Indicator</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.nhdr.slowdn2</entry>
-    <entry>Slowdown 2</entry>
-    <entry>Boolean</entry>
+    <entry>sna.nlp.thdr.optional.14.si.switch</entry>
+    <entry>Path Switch Time</entry>
+    <entry>Unsigned 32-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.nhdr.sm</entry>
-    <entry>Switching Mode Field</entry>
+    <entry>sna.nlp.thdr.optional.22.2</entry>
+    <entry>Adaptive Rate Based Segment Byte 2</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.nhdr.tpf</entry>
-    <entry>Transmission Priority Field</entry>
+    <entry>sna.nlp.thdr.optional.22.3</entry>
+    <entry>Adaptive Rate Based Segment Byte 3</entry>
     <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.nhdr.tspi</entry>
-    <entry>Time Sensitive Packet Indicator</entry>
-    <entry>Boolean</entry>
+    <entry>sna.nlp.thdr.optional.22.arb</entry>
+    <entry>ARB Mode</entry>
+    <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.thdr</entry>
-    <entry>RTP Transport Header</entry>
-    <entry>No value</entry>
-    <entry>RTP Transport Header (THDR)</>
+    <entry>sna.nlp.thdr.optional.22.field1</entry>
+    <entry>Field 1</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.thdr.8</entry>
-    <entry>RTP Transport Packet Header Bype 8</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Byte 8 of RTP Transport Packet Header</>
+    <entry>sna.nlp.thdr.optional.22.field2</entry>
+    <entry>Field 2</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.thdr.9</entry>
-    <entry>RTP Transport Packet Header Bype 9</entry>
-    <entry>Unsigned 8-bit integer</entry>
-    <entry>Byte 9 of RTP Transport Packet Header</>
+    <entry>sna.nlp.thdr.optional.22.field3</entry>
+    <entry>Field 3</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.thdr.bsn</entry>
-    <entry>Byte Sequence Number</entry>
+    <entry>sna.nlp.thdr.optional.22.field4</entry>
+    <entry>Field 4</entry>
     <entry>Unsigned 32-bit integer</entry>
-    <entry>Byte Sequence Number</>
+    <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.thdr.cqfi</entry>
-    <entry>Connection Qualifyer Field Indicator</entry>
+    <entry>sna.nlp.thdr.optional.22.parity</entry>
+    <entry>Parity Indicator</entry>
     <entry>Boolean</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.thdr.dlf</entry>
-    <entry>Data Length Field</entry>
-    <entry>Unsigned 32-bit integer</entry>
-    <entry>Data Length Field</>
+    <entry>sna.nlp.thdr.optional.22.raa</entry>
+    <entry>Rate Adjustment Action</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.thdr.eomi</entry>
-    <entry>End Of Message Indicator</entry>
-    <entry>Boolean</entry>
+    <entry>sna.nlp.thdr.optional.22.raterep</entry>
+    <entry>Rate Reply Correlator</entry>
+    <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.thdr.lmi</entry>
-    <entry>Last Message Indicator</entry>
-    <entry>Boolean</entry>
+    <entry>sna.nlp.thdr.optional.22.ratereq</entry>
+    <entry>Rate Request Correlator</entry>
+    <entry>Unsigned 8-bit integer</entry>
     <entry></>
   </row>
 
   <row>
-    <entry>sna.nlp.thdr.offset</entry>
-    <entry>Data Offset/4</entry>
-    <entry>Unsigned 16-bit integer</entry>
-    <entry>Data Offset in words</>
+    <entry>sna.nlp.thdr.optional.22.type</entry>
+    <entry>Message Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.len</entry>
+    <entry>Optional Segment Length/4</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.nlp.thdr.optional.type</entry>
+    <entry>Optional Segment Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
   </row>
 
   <row>
@@ -67535,7 +77506,7 @@
     <entry>sna.nlp.thdr.tcid</entry>
     <entry>Transport Connection Identifier</entry>
     <entry>Byte array</entry>
-    <entry>Transport Connection Identifier (TCID)</>
+    <entry>TCID</>
   </row>
 
   <row>
@@ -67591,14 +77562,14 @@
     <entry>sna.rh.cebi</entry>
     <entry>Conditional End Bracket Indicator</entry>
     <entry>Boolean</entry>
-    <entry>Used to indicate the beginning or end of a group of exchanged requests and responses called a bracket. Only used on LU-LU sessions.</>
+    <entry></>
   </row>
 
   <row>
     <entry>sna.rh.csi</entry>
     <entry>Code Selection Indicator</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry>Specifies the encoding used for the associated FMD RU.</>
+    <entry></>
   </row>
 
   <row>
@@ -67633,14 +77604,14 @@
     <entry>sna.rh.edi</entry>
     <entry>Enciphered Data Indicator</entry>
     <entry>Boolean</entry>
-    <entry>Indicates that information in the associated RU is enciphered under session-level cryptography protocols.</>
+    <entry></>
   </row>
 
   <row>
     <entry>sna.rh.eri</entry>
     <entry>Exception Response Indicator</entry>
     <entry>Boolean</entry>
-    <entry>Used in conjunction with DR1I and DR2I to indicate, in a request, the form of response requested.</>
+    <entry></>
   </row>
 
   <row>
@@ -67661,7 +77632,7 @@
     <entry>sna.rh.pdi</entry>
     <entry>Padded Data Indicator</entry>
     <entry>Boolean</entry>
-    <entry>Indicates that the RU was padded at the end, before encipherment, to the next integral multiple of 8 bytes.</>
+    <entry></>
   </row>
 
   <row>
@@ -67682,14 +77653,14 @@
     <entry>sna.rh.rlwi</entry>
     <entry>Request Larger Window Indicator</entry>
     <entry>Boolean</entry>
-    <entry>Indicates whether a larger pacing window was requested.</>
+    <entry></>
   </row>
 
   <row>
     <entry>sna.rh.rri</entry>
     <entry>Request/Response Indicator</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry>Denotes whether this is a request or a response.</>
+    <entry></>
   </row>
 
   <row>
@@ -67710,7 +77681,7 @@
     <entry>sna.rh.sdi</entry>
     <entry>Sense Data Included</entry>
     <entry>Boolean</entry>
-    <entry>Indicates that a 4-byte sense data field is included in the associated RU.</>
+    <entry></>
   </row>
 
   <row>
@@ -67724,7 +77695,7 @@
     <entry>sna.th.0</entry>
     <entry>Transmission Header Byte 0</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry>Byte 0 of Tranmission Header contains FID, MPF, ODAI, and EFI as bitfields.</>
+    <entry>TH Byte 0</>
   </row>
 
   <row>
@@ -67759,7 +77730,7 @@
     <entry>sna.th.dcf</entry>
     <entry>Data Count Field</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>A binary count of the number of bytes in the BIU or BIU segment associated with the tranmission header. The count does not include any of the bytes in the transmission header.</>
+    <entry></>
   </row>
 
   <row>
@@ -67780,7 +77751,7 @@
     <entry>sna.th.efi</entry>
     <entry>Expedited Flow Indicator</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry>The EFI designates whether the PIU belongs to the normal or expedited flow.</>
+    <entry></>
   </row>
 
   <row>
@@ -67794,14 +77765,14 @@
     <entry>sna.th.ern</entry>
     <entry>Explicit Route Number</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry>The ERN in a TH identifies an explicit route direction of flow.</>
+    <entry></>
   </row>
 
   <row>
     <entry>sna.th.fid</entry>
     <entry>Format Identifer</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry>Format Identification</>
+    <entry></>
   </row>
 
   <row>
@@ -67829,7 +77800,7 @@
     <entry>sna.th.mpf</entry>
     <entry>Mapping Field</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry>The Mapping Field specifies whether the information field associated with the TH is a complete or partial BIU.</>
+    <entry></>
   </row>
 
   <row>
@@ -67864,7 +77835,7 @@
     <entry>sna.th.odai</entry>
     <entry>ODAI Assignment Indicator</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry>The ODAI indicates which node assigned the OAF'-DAF' values carried in the TH.</>
+    <entry></>
   </row>
 
   <row>
@@ -67885,7 +77856,7 @@
     <entry>sna.th.piubf</entry>
     <entry>PIU Blocking Field</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry>Specifies whether this frame contains a single PIU or multiple PIUs.</>
+    <entry></>
   </row>
 
   <row>
@@ -67906,14 +77877,14 @@
     <entry>sna.th.snf</entry>
     <entry>Sequence Number Field</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>The Sequence Number Field contains a numerical identifier for the associated BIU.</>
+    <entry></>
   </row>
 
   <row>
     <entry>sna.th.tg_nonfifo_ind</entry>
     <entry>Transmission Group Non-FIFO Indicator</entry>
     <entry>Boolean</entry>
-    <entry>Indicates whether or not FIFO discipline is to enforced in transmitting PIUs through the tranmission groups to prevent the PIUs getting out of sequence during transmission over the TGs.</>
+    <entry></>
   </row>
 
   <row>
@@ -67948,14 +77919,14 @@
     <entry>sna.th.vr_cwi</entry>
     <entry>Virtual Route Change Window Indicator</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>Used to change the window size of the virtual route by 1.</>
+    <entry>Change Window Indicator</>
   </row>
 
   <row>
     <entry>sna.th.vr_cwri</entry>
     <entry>Virtual Route Change Window Reply Indicator</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>Permits changing of the window size by 1 for PIUs received by the sender of this bit.</>
+    <entry></>
   </row>
 
   <row>
@@ -67969,21 +77940,21 @@
     <entry>sna.th.vr_rwi</entry>
     <entry>Virtual Route Reset Window Indicator</entry>
     <entry>Boolean</entry>
-    <entry>Indicates severe congestion in a node on the virtual route.</>
+    <entry></>
   </row>
 
   <row>
     <entry>sna.th.vr_snf_send</entry>
     <entry>Virtual Route Send Sequence Number Field</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry></>
+    <entry>Send Sequence Number Field</>
   </row>
 
   <row>
     <entry>sna.th.vr_sqti</entry>
     <entry>Virtual Route Sequence and Type Indicator</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>Specifies the PIU type.</>
+    <entry>Route Sequence and Type</>
   </row>
 
   <row>
@@ -68007,6 +77978,336 @@
     <entry></>
   </row>
 
+  <row>
+    <entry>sna.xid</entry>
+    <entry>XID</entry>
+    <entry>No value</entry>
+    <entry>XID Frame</>
+  </row>
+
+  <row>
+    <entry>sna.xid.0</entry>
+    <entry>XID Byte 0</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.format</entry>
+    <entry>XID Format</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.id</entry>
+    <entry>Node Identification</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.idblock</entry>
+    <entry>ID Block</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.idnum</entry>
+    <entry>ID Number</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.len</entry>
+    <entry>XID Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type</entry>
+    <entry>XID Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.10</entry>
+    <entry>XID Type 3 Byte 10</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.11</entry>
+    <entry>XID Type 3 Byte 11</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.12</entry>
+    <entry>XID Type 3 Byte 12</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.15</entry>
+    <entry>XID Type 3 Byte 15</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.8</entry>
+    <entry>Characteristics of XID sender</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.actpu</entry>
+    <entry>ACTPU suppression indicator</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.asend_bind</entry>
+    <entry>Adaptive BIND pacing support as sender</entry>
+    <entry>Boolean</entry>
+    <entry>Pacing support as sender</>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.asend_recv</entry>
+    <entry>Adaptive BIND pacing support as receiver</entry>
+    <entry>Boolean</entry>
+    <entry>Pacing support as receive</>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.branch</entry>
+    <entry>Branch Indicator</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.brnn</entry>
+    <entry>Option Set 1123 Indicator</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.cp</entry>
+    <entry>Control Point Services</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.cpchange</entry>
+    <entry>CP name change support</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.cpcp</entry>
+    <entry>CP-CP session support</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.dedsvc</entry>
+    <entry>Dedicated SVC Idicator</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.dlc</entry>
+    <entry>XID DLC</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.dlen</entry>
+    <entry>DLC Dependent Section Length</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.dlur</entry>
+    <entry>Dependent LU Requester Indicator</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.dlus</entry>
+    <entry>DLUS Served LU Registration Indicator</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.exbn</entry>
+    <entry>Extended HPR Border Node</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.gener_bind</entry>
+    <entry>Whole BIND PIU generated indicator</entry>
+    <entry>Boolean</entry>
+    <entry>Whole BIND PIU generated</>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.genodai</entry>
+    <entry>Generalized ODAI Usage Option</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.initself</entry>
+    <entry>INIT-SELF support</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.negcomp</entry>
+    <entry>Negotiation Complete</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.negcsup</entry>
+    <entry>Negotiation Complete Supported</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.nonact</entry>
+    <entry>Nonactivation Exchange</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.nwnode</entry>
+    <entry>Sender is network node</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.pacing</entry>
+    <entry>Qualifier for adaptive BIND pacing support</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.partg</entry>
+    <entry>Parallel TG Support</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.pbn</entry>
+    <entry>Peripheral Border Node</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.pucap</entry>
+    <entry>PU Capabilities</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.quiesce</entry>
+    <entry>Quiesce TG Request</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.recve_bind</entry>
+    <entry>Whole BIND PIU required indicator</entry>
+    <entry>Boolean</entry>
+    <entry>Whole BIND PIU required</>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.stand_bind</entry>
+    <entry>Stand-Alone BIND Support</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.state</entry>
+    <entry>XID exchange state indicator</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.tg</entry>
+    <entry>XID TG</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>sna.xid.type3.tgshare</entry>
+    <entry>TG Sharing Prohibited Indicator</entry>
+    <entry>Boolean</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDSystemsNetworkArchitectureXID"><title>Systems Network Architecture XID (sna_xid)</title>
+
+<table id="TIDSystemsNetworkArchitectureXID"><title>Systems Network Architecture XID (sna_xid)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry><entry></entry>
+  </row>
 </tbody></tgroup></table>
 </section>
 
@@ -68262,27 +78563,212 @@
     <entry>Description</>
 
   </row>
-</thead>
-<tbody>
+</thead>
+<tbody>
+  <row>
+    <entry>tds.channel</entry>
+    <entry>Channel</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Channel Number</>
+  </row>
+
+  <row>
+    <entry>tds.fragment</entry>
+    <entry>TDS Fragment</entry>
+    <entry></entry>
+    <entry>TDS Fragment</>
+  </row>
+
+  <row>
+    <entry>tds.fragment.error</entry>
+    <entry>Defragmentation error</entry>
+    <entry></entry>
+    <entry>Defragmentation error due to illegal fragments</>
+  </row>
+
+  <row>
+    <entry>tds.fragment.multipletails</entry>
+    <entry>Multiple tail fragments found</entry>
+    <entry>Boolean</entry>
+    <entry>Several tails were found when defragmenting the packet</>
+  </row>
+
+  <row>
+    <entry>tds.fragment.overlap</entry>
+    <entry>Segment overlap</entry>
+    <entry>Boolean</entry>
+    <entry>Fragment overlaps with other fragments</>
+  </row>
+
+  <row>
+    <entry>tds.fragment.overlap.conflict</entry>
+    <entry>Conflicting data in fragment overlap</entry>
+    <entry>Boolean</entry>
+    <entry>Overlapping fragments contained conflicting data</>
+  </row>
+
+  <row>
+    <entry>tds.fragment.toolongfragment</entry>
+    <entry>Segment too long</entry>
+    <entry>Boolean</entry>
+    <entry>Segment contained data past end of packet</>
+  </row>
+
+  <row>
+    <entry>tds.fragments</entry>
+    <entry>TDS Fragments</entry>
+    <entry>No value</entry>
+    <entry>TDS Fragments</>
+  </row>
+
+  <row>
+    <entry>tds.packet_number</entry>
+    <entry>Packet Number</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Packet Number</>
+  </row>
+
+  <row>
+    <entry>tds.size</entry>
+    <entry>Size</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Packet Size</>
+  </row>
+
+  <row>
+    <entry>tds.status</entry>
+    <entry>Status</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Frame status</>
+  </row>
+
+  <row>
+    <entry>tds.type</entry>
+    <entry>Type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Packet Type</>
+  </row>
+
+  <row>
+    <entry>tds.window</entry>
+    <entry>Window</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Window</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
+<section id="SIDTazmenSnifferProtocol"><title>Tazmen Sniffer Protocol (tzsp)</title>
+
+<table id="TIDTazmenSnifferProtocol"><title>Tazmen Sniffer Protocol (tzsp)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>tzsp.encap</entry>
+    <entry>Encapsulation</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Encapsulation</>
+  </row>
+
+  <row>
+    <entry>tzsp.reserved</entry>
+    <entry>Reserved</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Reserved</>
+  </row>
+
+  <row>
+    <entry>tzsp.version</entry>
+    <entry>Version</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Version</>
+  </row>
+
+  <row>
+    <entry>tzsp.wlan.channel</entry>
+    <entry>Channel</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Channel</>
+  </row>
+
+  <row>
+    <entry>tzsp.wlan.rate</entry>
+    <entry>Rate</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Rate</>
+  </row>
+
+  <row>
+    <entry>tzsp.wlan.signal</entry>
+    <entry>Signal</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>Signal</>
+  </row>
+
   <row>
-    <entry>netlib.last</entry>
-    <entry>Last Packet</entry>
+    <entry>tzsp.wlan.silence</entry>
+    <entry>Silence</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry>Last Packet Indicator</>
+    <entry>Silence</>
   </row>
 
   <row>
-    <entry>netlib.size</entry>
-    <entry>Size</entry>
+    <entry>tzsp.wlan.status</entry>
+    <entry>Status</entry>
     <entry>Unsigned 16-bit integer</entry>
-    <entry>Packet Size</>
+    <entry>Status</>
+  </row>
+
+  <row>
+    <entry>tzsp.wlan.status.fcs_err</entry>
+    <entry>FCS</entry>
+    <entry>Boolean</entry>
+    <entry>Frame check sequence</>
+  </row>
+
+  <row>
+    <entry>tzsp.wlan.status.mac_port</entry>
+    <entry>Port</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>MAC port</>
   </row>
 
   <row>
-    <entry>netlib.type</entry>
+    <entry>tzsp.wlan.status.msg_type</entry>
     <entry>Type</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry>Packet Type</>
+    <entry>Message type</>
+  </row>
+
+  <row>
+    <entry>tzsp.wlan.status.pcf</entry>
+    <entry>PCF</entry>
+    <entry>Boolean</entry>
+    <entry>Point Coordination Function</>
+  </row>
+
+  <row>
+    <entry>tzsp.wlan.status.undecrypted</entry>
+    <entry>Undecrypted</entry>
+    <entry>Boolean</entry>
+    <entry>Undecrypted</>
+  </row>
+
+  <row>
+    <entry>tzsp.wlan.time</entry>
+    <entry>Time</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Time</>
   </row>
 
 </tbody></tgroup></table>
@@ -68334,30 +78820,6 @@
 </tbody></tgroup></table>
 </section>
 
-<section id="SIDTimeServiceProviderInterfacer"><title>Time Service Provider Interfacer (dtsstime_req)</title>
-
-<table id="TIDTimeServiceProviderInterfacer"><title>Time Service Provider Interfacer (dtsstime_req)</title>
-<tgroup cols="4">
-<thead>
-  <row>
-    <entry>Field</>
-    <entry>Field Name</>
-    <entry>Type</>
-    <entry>Description</>
-
-  </row>
-</thead>
-<tbody>
-  <row>
-    <entry>dtsstime_req.opnum</entry>
-    <entry>Operation</entry>
-    <entry>Unsigned 16-bit integer</entry>
-    <entry>Operation</>
-  </row>
-
-</tbody></tgroup></table>
-</section>
-
 <section id="SIDTimeSynchronizationProtocol"><title>Time Synchronization Protocol (tsp)</title>
 
 <table id="TIDTimeSynchronizationProtocol"><title>Time Synchronization Protocol (tsp)</title>
@@ -68739,6 +79201,13 @@
   </row>
 
   <row>
+    <entry>tcp.analysis.ack_lost_segment</entry>
+    <entry>ACKed Lost Packet</entry>
+    <entry>No value</entry>
+    <entry>This frame ACKs a lost segment</>
+  </row>
+
+  <row>
     <entry>tcp.analysis.ack_rtt</entry>
     <entry>The RTT to ACK the segment was</entry>
     <entry>Time duration</entry>
@@ -68748,11 +79217,32 @@
   <row>
     <entry>tcp.analysis.acks_frame</entry>
     <entry>This is an ACK to the segment in frame</entry>
-    <entry>Unsigned 32-bit integer</entry>
+    <entry></entry>
     <entry>Which previous segment is this an ACK for</>
   </row>
 
   <row>
+    <entry>tcp.analysis.duplicate_ack</entry>
+    <entry>Duplicate ACK</entry>
+    <entry>No value</entry>
+    <entry>This is a duplicate ACK</>
+  </row>
+
+  <row>
+    <entry>tcp.analysis.duplicate_ack_frame</entry>
+    <entry>Duplicate to the ACK in frame</entry>
+    <entry></entry>
+    <entry>This is a duplicate to the ACK in frame #</>
+  </row>
+
+  <row>
+    <entry>tcp.analysis.duplicate_ack_num</entry>
+    <entry>Duplicate ACK #</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>This is duplicate ACK number #</>
+  </row>
+
+  <row>
     <entry>tcp.analysis.flags</entry>
     <entry>TCP Analysis Flags</entry>
     <entry>No value</entry>
@@ -68760,6 +79250,48 @@
   </row>
 
   <row>
+    <entry>tcp.analysis.keep_alive</entry>
+    <entry>Keep Alive</entry>
+    <entry>No value</entry>
+    <entry>This is a keep-alive segment</>
+  </row>
+
+  <row>
+    <entry>tcp.analysis.lost_segment</entry>
+    <entry>Previous Segment Lost</entry>
+    <entry>No value</entry>
+    <entry>A segment before this one was lost from the capture</>
+  </row>
+
+  <row>
+    <entry>tcp.analysis.retransmission</entry>
+    <entry>Retransmission</entry>
+    <entry>No value</entry>
+    <entry>This frame is a suspected TCP retransmission</>
+  </row>
+
+  <row>
+    <entry>tcp.analysis.zero_window</entry>
+    <entry>Zero Window</entry>
+    <entry>No value</entry>
+    <entry>This is a Zero-Window</>
+  </row>
+
+  <row>
+    <entry>tcp.analysis.zero_window_probe</entry>
+    <entry>Zero Window Probe</entry>
+    <entry>No value</entry>
+    <entry>This is a zero-window-probe</>
+  </row>
+
+  <row>
+    <entry>tcp.analysis.zero_window_violation</entry>
+    <entry>Zero Window Violation</entry>
+    <entry>No value</entry>
+    <entry>This is a zero-window violation, an attempt to write &gt;1 byte to a zero-window</>
+  </row>
+
+  <row>
     <entry>tcp.checksum</entry>
     <entry>Checksum</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -68865,6 +79397,111 @@
   </row>
 
   <row>
+    <entry>tcp.options.cc</entry>
+    <entry>TCP CC Option</entry>
+    <entry>Boolean</entry>
+    <entry>TCP CC Option</>
+  </row>
+
+  <row>
+    <entry>tcp.options.ccecho</entry>
+    <entry>TCP CC Echo Option</entry>
+    <entry>Boolean</entry>
+    <entry>TCP CC Echo Option</>
+  </row>
+
+  <row>
+    <entry>tcp.options.ccnew</entry>
+    <entry>TCP CC New Option</entry>
+    <entry>Boolean</entry>
+    <entry>TCP CC New Option</>
+  </row>
+
+  <row>
+    <entry>tcp.options.echo</entry>
+    <entry>TCP Echo Option</entry>
+    <entry>Boolean</entry>
+    <entry>TCP Sack Echo</>
+  </row>
+
+  <row>
+    <entry>tcp.options.echo_reply</entry>
+    <entry>TCP Echo Reply Option</entry>
+    <entry>Boolean</entry>
+    <entry>TCP Echo Reply Option</>
+  </row>
+
+  <row>
+    <entry>tcp.options.md5</entry>
+    <entry>TCP MD5 Option</entry>
+    <entry>Boolean</entry>
+    <entry>TCP MD5 Option</>
+  </row>
+
+  <row>
+    <entry>tcp.options.mss</entry>
+    <entry>TCP MSS Option</entry>
+    <entry>Boolean</entry>
+    <entry>TCP MSS Option</>
+  </row>
+
+  <row>
+    <entry>tcp.options.mss_val</entry>
+    <entry>TCP MSS Option Value</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>TCP MSS Option Value</>
+  </row>
+
+  <row>
+    <entry>tcp.options.sack</entry>
+    <entry>TCP Sack Option</entry>
+    <entry>Boolean</entry>
+    <entry>TCP Sack Option</>
+  </row>
+
+  <row>
+    <entry>tcp.options.sack_le</entry>
+    <entry>TCP Sack Left Edge</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>TCP Sack Left Edge</>
+  </row>
+
+  <row>
+    <entry>tcp.options.sack_perm</entry>
+    <entry>TCP Sack Perm Option</entry>
+    <entry>Boolean</entry>
+    <entry>TCP Sack Perm Option</>
+  </row>
+
+  <row>
+    <entry>tcp.options.sack_re</entry>
+    <entry>TCP Sack Right Edge</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>TCP Sack Right Edge</>
+  </row>
+
+  <row>
+    <entry>tcp.options.time_stamp</entry>
+    <entry>TCP Time Stamp Option</entry>
+    <entry>Boolean</entry>
+    <entry>TCP Time Stamp Option</>
+  </row>
+
+  <row>
+    <entry>tcp.options.wscale</entry>
+    <entry>TCP Window Scale Option</entry>
+    <entry>Boolean</entry>
+    <entry>TCP Window Option</>
+  </row>
+
+  <row>
+    <entry>tcp.options.wscale_val</entry>
+    <entry>TCP Windows Scale Option Value</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>TCP Window Scale Value</>
+  </row>
+
+  <row>
     <entry>tcp.port</entry>
     <entry>Source or Destination Port</entry>
     <entry>Unsigned 16-bit integer</entry>
@@ -68872,6 +79509,55 @@
   </row>
 
   <row>
+    <entry>tcp.segment</entry>
+    <entry>TCP Segment</entry>
+    <entry></entry>
+    <entry>TCP Segment</>
+  </row>
+
+  <row>
+    <entry>tcp.segment.error</entry>
+    <entry>Desegmentation error</entry>
+    <entry></entry>
+    <entry>Desegmentation error due to illegal segments</>
+  </row>
+
+  <row>
+    <entry>tcp.segment.multipletails</entry>
+    <entry>Multiple tail segments found</entry>
+    <entry>Boolean</entry>
+    <entry>Several tails were found when desegmenting the pdu</>
+  </row>
+
+  <row>
+    <entry>tcp.segment.overlap</entry>
+    <entry>Segment overlap</entry>
+    <entry>Boolean</entry>
+    <entry>Segment overlaps with other segments</>
+  </row>
+
+  <row>
+    <entry>tcp.segment.overlap.conflict</entry>
+    <entry>Conflicting data in segment overlap</entry>
+    <entry>Boolean</entry>
+    <entry>Overlapping segments contained conflicting data</>
+  </row>
+
+  <row>
+    <entry>tcp.segment.toolongfragment</entry>
+    <entry>Segment too long</entry>
+    <entry>Boolean</entry>
+    <entry>Segment contained data past end of the pdu</>
+  </row>
+
+  <row>
+    <entry>tcp.segments</entry>
+    <entry>TCP Segments</entry>
+    <entry>No value</entry>
+    <entry>TCP Segments</>
+  </row>
+
+  <row>
     <entry>tcp.seq</entry>
     <entry>Sequence number</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -69017,35 +79703,35 @@
   <row>
     <entry>tns.connect_flags.enablena</entry>
     <entry>NA services enabled</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>NA services enabled</>
   </row>
 
   <row>
     <entry>tns.connect_flags.ichg</entry>
     <entry>Interchange is involved</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Interchange is involved</>
   </row>
 
   <row>
     <entry>tns.connect_flags.nalink</entry>
     <entry>NA services linked in</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>NA services linked in</>
   </row>
 
   <row>
     <entry>tns.connect_flags.nareq</entry>
     <entry>NA services required</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>NA services required</>
   </row>
 
   <row>
     <entry>tns.connect_flags.wantna</entry>
     <entry>NA services wanted</entry>
-    <entry>Unsigned 8-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>NA services wanted</>
   </row>
 
@@ -69101,63 +79787,63 @@
   <row>
     <entry>tns.data_flag.c</entry>
     <entry>Confirmation</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Confirmation</>
   </row>
 
   <row>
     <entry>tns.data_flag.dic</entry>
     <entry>Do Immediate Confirmation</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Do Immediate Confirmation</>
   </row>
 
   <row>
     <entry>tns.data_flag.eof</entry>
     <entry>End of File</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>End of File</>
   </row>
 
   <row>
     <entry>tns.data_flag.more</entry>
     <entry>More Data to Come</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>More Data to Come</>
   </row>
 
   <row>
     <entry>tns.data_flag.rc</entry>
     <entry>Request Confirmation</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Request Confirmation</>
   </row>
 
   <row>
     <entry>tns.data_flag.reserved</entry>
     <entry>Reserved</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Reserved</>
   </row>
 
   <row>
     <entry>tns.data_flag.rts</entry>
     <entry>Request To Send</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Request To Send</>
   </row>
 
   <row>
     <entry>tns.data_flag.send</entry>
     <entry>Send Token</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Send Token</>
   </row>
 
   <row>
     <entry>tns.data_flag.sntt</entry>
     <entry>Send NT Trailer</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Send NT Trailer</>
   </row>
 
@@ -69227,112 +79913,112 @@
   <row>
     <entry>tns.ntp_flag.asio</entry>
     <entry>ASync IO Supported</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>ASync IO Supported</>
   </row>
 
   <row>
     <entry>tns.ntp_flag.cbio</entry>
     <entry>Callback IO supported</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Callback IO supported</>
   </row>
 
   <row>
     <entry>tns.ntp_flag.crel</entry>
     <entry>Confirmed release</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Confirmed release</>
   </row>
 
   <row>
     <entry>tns.ntp_flag.dfio</entry>
     <entry>Full duplex IO supported</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Full duplex IO supported</>
   </row>
 
   <row>
     <entry>tns.ntp_flag.dtest</entry>
     <entry>Data test</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Data Test</>
   </row>
 
   <row>
     <entry>tns.ntp_flag.grant</entry>
     <entry>Can grant connection to another</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Can grant connection to another</>
   </row>
 
   <row>
     <entry>tns.ntp_flag.handoff</entry>
     <entry>Can handoff connection to another</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Can handoff connection to another</>
   </row>
 
   <row>
     <entry>tns.ntp_flag.hangon</entry>
     <entry>Hangon to listener connect</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Hangon to listener connect</>
   </row>
 
   <row>
     <entry>tns.ntp_flag.pio</entry>
     <entry>Packet oriented IO</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Packet oriented IO</>
   </row>
 
   <row>
     <entry>tns.ntp_flag.sigio</entry>
     <entry>Generate SIGIO signal</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Generate SIGIO signal</>
   </row>
 
   <row>
     <entry>tns.ntp_flag.sigpipe</entry>
     <entry>Generate SIGPIPE signal</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Generate SIGPIPE signal</>
   </row>
 
   <row>
     <entry>tns.ntp_flag.sigurg</entry>
     <entry>Generate SIGURG signal</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Generate SIGURG signal</>
   </row>
 
   <row>
     <entry>tns.ntp_flag.srun</entry>
     <entry>Spawner running</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Spawner running</>
   </row>
 
   <row>
     <entry>tns.ntp_flag.tduio</entry>
     <entry>TDU based IO</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>TDU based IO</>
   </row>
 
   <row>
     <entry>tns.ntp_flag.testop</entry>
     <entry>Test operation</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Test operation</>
   </row>
 
   <row>
     <entry>tns.ntp_flag.urgentio</entry>
     <entry>Urgent IO supported</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Urgent IO supported</>
   </row>
 
@@ -69437,77 +80123,77 @@
   <row>
     <entry>tns.so_flag.ap</entry>
     <entry>Attention Processing</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Attention Processing</>
   </row>
 
   <row>
     <entry>tns.so_flag.bconn</entry>
     <entry>Broken Connect Notify</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Broken Connect Notify</>
   </row>
 
   <row>
     <entry>tns.so_flag.dc1</entry>
     <entry>Don't Care</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Don't Care</>
   </row>
 
   <row>
     <entry>tns.so_flag.dc2</entry>
     <entry>Don't Care</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Don't Care</>
   </row>
 
   <row>
     <entry>tns.so_flag.dio</entry>
     <entry>Direct IO to Transport</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Direct IO to Transport</>
   </row>
 
   <row>
     <entry>tns.so_flag.fd</entry>
     <entry>Full Duplex</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Full Duplex</>
   </row>
 
   <row>
     <entry>tns.so_flag.hc</entry>
     <entry>Header Checksum</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Header Checksum</>
   </row>
 
   <row>
     <entry>tns.so_flag.hd</entry>
     <entry>Half Duplex</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Half Duplex</>
   </row>
 
   <row>
     <entry>tns.so_flag.pc</entry>
     <entry>Packet Checksum</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Packet Checksum</>
   </row>
 
   <row>
     <entry>tns.so_flag.ra</entry>
     <entry>Can Receive Attention</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Can Receive Attention</>
   </row>
 
   <row>
     <entry>tns.so_flag.sa</entry>
     <entry>Can Send Attention</entry>
-    <entry>Unsigned 16-bit integer</entry>
+    <entry>Boolean</entry>
     <entry>Can Send Attention</>
   </row>
 
@@ -70692,6 +81378,51 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDWAPBinaryXML"><title>WAP Binary XML (wbxml)</title>
+
+<table id="TIDWAPBinaryXML"><title>WAP Binary XML (wbxml)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>wbxml.charset</entry>
+    <entry>Character Set</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>WBXML Character Set</>
+  </row>
+
+  <row>
+    <entry>wbxml.public_id.known</entry>
+    <entry>Public Identifier (known)</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>WBXML Known Public Identifier (integer)</>
+  </row>
+
+  <row>
+    <entry>wbxml.public_id.literal</entry>
+    <entry>Public Identifier (literal)</entry>
+    <entry>String</entry>
+    <entry>WBXML Literal Public Identifier (text string)</>
+  </row>
+
+  <row>
+    <entry>wbxml.version</entry>
+    <entry>Version</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>WBXML Version</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDWebCacheCoordinationProtocol"><title>Web Cache Coordination Protocol (wccp)</title>
 
 <table id="TIDWebCacheCoordinationProtocol"><title>Web Cache Coordination Protocol (wccp)</title>
@@ -70751,6 +81482,37 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDWellfleetBreathofLife"><title>Wellfleet Breath of Life (bofl)</title>
+
+<table id="TIDWellfleetBreathofLife"><title>Wellfleet Breath of Life (bofl)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>bofl.pdu</entry>
+    <entry>PDU</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>PDU; normally equals 0x01010000 or 0x01011111</>
+  </row>
+
+  <row>
+    <entry>bofl.sequence</entry>
+    <entry>Sequence</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>incremental counter</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDWellfleetCompression"><title>Wellfleet Compression (wcp)</title>
 
 <table id="TIDWellfleetCompression"><title>Wellfleet Compression (wcp)</title>
@@ -70943,6 +81705,37 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDWellfleetHDLC"><title>Wellfleet HDLC (whdlc)</title>
+
+<table id="TIDWellfleetHDLC"><title>Wellfleet HDLC (whdlc)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>wfleet_hdlc.address</entry>
+    <entry>Address</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+  <row>
+    <entry>wfleet_hdlc.command</entry>
+    <entry>Command</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry></>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDWho"><title>Who (who)</title>
 
 <table id="TIDWho"><title>Who (who)</title>
@@ -71209,6 +82002,13 @@
   </row>
 
   <row>
+    <entry>wsp.content_type.parameter.mac</entry>
+    <entry>MAC</entry>
+    <entry>String</entry>
+    <entry>MAC parameter (Content-Type: application/vnd.wap.connectivity-wbxml)</>
+  </row>
+
+  <row>
     <entry>wsp.content_type.parameter.name</entry>
     <entry>Name</entry>
     <entry>String</entry>
@@ -71223,6 +82023,13 @@
   </row>
 
   <row>
+    <entry>wsp.content_type.parameter.sec</entry>
+    <entry>SEC</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>SEC parameter (Content-Type: application/vnd.wap.connectivity-wbxml)</>
+  </row>
+
+  <row>
     <entry>wsp.content_type.parameter.start</entry>
     <entry>Start</entry>
     <entry>String</entry>
@@ -71492,7 +82299,7 @@
     <entry>wsp.header.shift</entry>
     <entry>Shift code</entry>
     <entry>Unsigned 8-bit integer</entry>
-    <entry>Shift code</>
+    <entry>Header code page shift code</>
   </row>
 
   <row>
@@ -72054,14 +82861,14 @@
   <row>
     <entry>wtp.fragment</entry>
     <entry>WTP Fragment</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>WTP Fragment</>
   </row>
 
   <row>
     <entry>wtp.fragment.error</entry>
     <entry>Defragmentation error</entry>
-    <entry>No value</entry>
+    <entry></entry>
     <entry>Defragmentation error due to illegal fragments</>
   </row>
 
@@ -72886,6 +83693,55 @@
     <entry>Packet Type</>
   </row>
 
+  <row>
+    <entry>x25.fragment</entry>
+    <entry>X.25 Fragment</entry>
+    <entry></entry>
+    <entry>X25 Fragment</>
+  </row>
+
+  <row>
+    <entry>x25.fragment.error</entry>
+    <entry>Defragmentation error</entry>
+    <entry></entry>
+    <entry>Defragmentation error due to illegal fragments</>
+  </row>
+
+  <row>
+    <entry>x25.fragment.multipletails</entry>
+    <entry>Multiple tail fragments found</entry>
+    <entry>Boolean</entry>
+    <entry>Several tails were found when defragmenting the packet</>
+  </row>
+
+  <row>
+    <entry>x25.fragment.overlap</entry>
+    <entry>Fragment overlap</entry>
+    <entry>Boolean</entry>
+    <entry>Fragment overlaps with other fragments</>
+  </row>
+
+  <row>
+    <entry>x25.fragment.overlap.conflict</entry>
+    <entry>Conflicting data in fragment overlap</entry>
+    <entry>Boolean</entry>
+    <entry>Overlapping fragments contained conflicting data</>
+  </row>
+
+  <row>
+    <entry>x25.fragment.toolongfragment</entry>
+    <entry>Fragment too long</entry>
+    <entry>Boolean</entry>
+    <entry>Fragment contained data past end of packet</>
+  </row>
+
+  <row>
+    <entry>x25.fragments</entry>
+    <entry>X.25 Fragments</entry>
+    <entry>No value</entry>
+    <entry>X.25 Fragments</>
+  </row>
+
 </tbody></tgroup></table>
 </section>
 
@@ -72920,6 +83776,44 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDX.29"><title>X.29 (x.29)</title>
+
+<table id="TIDX.29"><title>X.29 (x.29)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>x29.error_type</entry>
+    <entry>Error type</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>X.29 error PAD message error type</>
+  </row>
+
+  <row>
+    <entry>x29.inv_msg_code</entry>
+    <entry>Invalid message code</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>X.29 Error PAD message invalid message code</>
+  </row>
+
+  <row>
+    <entry>x29.msg_code</entry>
+    <entry>Message code</entry>
+    <entry>Unsigned 8-bit integer</entry>
+    <entry>X.29 PAD message code</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDX11"><title>X11 (x11)</title>
 
 <table id="TIDX11"><title>X11 (x11)</title>
@@ -75708,6 +86602,65 @@
 </tbody></tgroup></table>
 </section>
 
+<section id="SIDYahooYMSGMessengerProtocol"><title>Yahoo YMSG Messenger Protocol (ymsg)</title>
+
+<table id="TIDYahooYMSGMessengerProtocol"><title>Yahoo YMSG Messenger Protocol (ymsg)</title>
+<tgroup cols="4">
+<thead>
+  <row>
+    <entry>Field</>
+    <entry>Field Name</>
+    <entry>Type</>
+    <entry>Description</>
+
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry>ymsg.content</entry>
+    <entry>Content</entry>
+    <entry>String</entry>
+    <entry>Data portion of the packet</>
+  </row>
+
+  <row>
+    <entry>ymsg.len</entry>
+    <entry>Packet Length</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Packet Length</>
+  </row>
+
+  <row>
+    <entry>ymsg.service</entry>
+    <entry>Service</entry>
+    <entry>Unsigned 16-bit integer</entry>
+    <entry>Service Type</>
+  </row>
+
+  <row>
+    <entry>ymsg.session_id</entry>
+    <entry>Session ID</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Connection ID</>
+  </row>
+
+  <row>
+    <entry>ymsg.status</entry>
+    <entry>Status</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Message Type Flags</>
+  </row>
+
+  <row>
+    <entry>ymsg.version</entry>
+    <entry>Version</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>Packet version identifier</>
+  </row>
+
+</tbody></tgroup></table>
+</section>
+
 <section id="SIDYellowPagesBind"><title>Yellow Pages Bind (ypbind)</title>
 
 <table id="TIDYellowPagesBind"><title>Yellow Pages Bind (ypbind)</title>
@@ -75751,6 +86704,20 @@
   </row>
 
   <row>
+    <entry>ypbind.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
+  <row>
+    <entry>ypbind.procedure_v2</entry>
+    <entry>V2 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V2 Procedure</>
+  </row>
+
+  <row>
     <entry>ypbind.resp_type</entry>
     <entry>Response Type</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -75845,6 +86812,13 @@
   </row>
 
   <row>
+    <entry>yppasswd.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
+  <row>
     <entry>yppasswd.status</entry>
     <entry>status</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -75925,6 +86899,20 @@
   </row>
 
   <row>
+    <entry>ypserv.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
+  </row>
+
+  <row>
+    <entry>ypserv.procedure_v2</entry>
+    <entry>V2 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V2 Procedure</>
+  </row>
+
+  <row>
     <entry>ypserv.prog</entry>
     <entry>Program Number</entry>
     <entry>Unsigned 32-bit integer</entry>
@@ -75984,10 +86972,12 @@
 </thead>
 <tbody>
   <row>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry><entry></entry>
+    <entry>ypxfr.procedure_v1</entry>
+    <entry>V1 Procedure</entry>
+    <entry>Unsigned 32-bit integer</entry>
+    <entry>V1 Procedure</>
   </row>
+
 </tbody></tgroup></table>
 </section>

References:
- [Ethereal-dev] Minor doc updates
  - From: Brad Hards

Prev by Date: [Ethereal-dev] Minor doc updates
Next by Date: Re: [Ethereal-dev] Patch for mgcp-tap and new gui-tap
Previous by thread: [Ethereal-dev] Minor doc updates
Next by thread: [Ethereal-dev] FW: ethereal on IBM mainframe running ZOS
Index(es):
- Date
- Thread