Merge branch 'test/rc/schema'

.gitignore

@@ -2,22 +2,23 @@
 pcapkit-*-tempdir/
 pcapkit-temp.html
 
-out
-*.js
-!out.js
-*.json
-!out.json
-*.plist
-!out.plist
-*.txt
-!out.txt
-*.xml
-!out.xml
-*.pcap
-!in.pcap
-*.cap
-*.dat
-*~orig*
+sample/out
+sample/*.js
+sample/!out.js
+sample/*.json
+sample/!out.json
+sample/*.plist
+sample/!out.plist
+sample/*.txt
+sample/!out.txt
+sample/*.xml
+sample/!out.xml
+sample/*.pcap
+sample/!in.pcap
+sample/*.cap
+sample/*.dat
+sample/*~orig*
+sample/*/
 
 src
 !requirements.txt
@@ -200,3 +201,95 @@ pip-selfcheck.json
 
 
 # End of https://www.gitignore.io/api/macos,python,visualstudiocode
+# Created by https://www.toptal.com/developers/gitignore/api/pycharm+all
+# Edit at https://www.toptal.com/developers/gitignore?templates=pycharm+all
+
+### PyCharm+all ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### PyCharm+all Patch ###
+# Ignore everything but code style settings and run configurations
+# that are supposed to be shared within teams.
+
+.idea/*
+
+!.idea/codeStyles
+!.idea/runConfigurations
+
+# End of https://www.toptal.com/developers/gitignore/api/pycharm+all

.vscode/settings.json

@@ -19,8 +19,10 @@
         "bufid",
         "bysource",
         "cbit",
+        "cbuf",
         "ccecho",
         "ccnew",
+        "cdat",
         "cflg",
         "chkreq",
         "Chksum",
@@ -66,6 +68,7 @@
         "EAPOL",
         "ECDSA",
         "echore",
+        "eddsa",
         "edep",
         "elen",
         "emojize",
@@ -220,6 +223,7 @@
         "qsfn",
         "qsnn",
         "qsopt",
+        "rcrd",
         "RCVBT",
         "reasm",
         "renm",
@@ -264,6 +268,7 @@
         "slen",
         "SMFDPD",
         "smvr",
+        "solt",
         "solv",
         "Sopt",
         "splt",
@@ -345,5 +350,8 @@
     ],
     "esbonio.sphinx.confDir": "${workspaceFolder}/doc/sphinx/source",
     "C_Cpp.errorSquiggles": "Enabled",
-    "restructuredtext.preview.name": "sphinx"
+    "restructuredtext.preview.name": "sphinx",
+    "esbonio.sphinx.forceFullBuild": false,
+    "esbonio.sphinx.numJobs": 0,
+    "restructuredtext.trace": "off"
 }

Makefile

@@ -2,7 +2,7 @@
 
 export PIPENV_VENV_IN_PROJECT=1
 
-SHELL := /usr/local/bin/bash
+SHELL := /opt/homebrew/bin/bash
 DIR   ?= .
 
 # get version string

doc/sphinx/source/pcapkit/protocols/application/httpv2.rst

@@ -146,7 +146,7 @@ Data Structures
    .. autoattribute:: stream_dependency
    .. autoattribute:: weight
 
-.. autoclass:: pcapkit.protocols.data.application.httpv2.RstStreamFrame(length, type, flags, sid, error)
+.. autoclass:: pcapkit.protocols.data.application.httpv2.RSTStreamFrame(length, type, flags, sid, error)
    :no-members:
    :show-inheritance:
 

doc/sphinx/source/pcapkit/protocols/internet/hip.rst

@@ -256,7 +256,7 @@ Data Structures
 
    .. autoattribute:: group_id
 
-.. autoclass:: pcapkit.protocols.data.internet.hip.DeffieHellmanParameter(type, critical, length, group_id, pub_len, pub_val)
+.. autoclass:: pcapkit.protocols.data.internet.hip.DiffieHellmanParameter(type, critical, length, group_id, pub_len, pub_val)
    :no-members:
    :show-inheritance:
 

doc/sphinx/source/pcapkit/protocols/internet/hopopt.rst

@@ -181,7 +181,7 @@ Data Structures
    .. autoattribute:: deltatlr
    .. autoattribute:: deltatls
 
-.. autoclass:: pcapkit.protocols.data.internet.hopopt.QuickStartOption(type, action, change, length, func, rate, ttl, nounce)
+.. autoclass:: pcapkit.protocols.data.internet.hopopt.QuickStartOption(type, action, change, length, func, rate, ttl, nonce)
    :no-members:
    :show-inheritance:
 
@@ -191,7 +191,7 @@ Data Structures
    .. autoattribute:: func
    .. autoattribute:: rate
    .. autoattribute:: ttl
-   .. autoattribute:: nounce
+   .. autoattribute:: nonce
 
 .. autoclass:: pcapkit.protocols.data.internet.hopopt.RPLOption(type, action, change, length, flags, id, rank)
    :no-members:
@@ -237,14 +237,14 @@ Data Structures
    .. autoattribute:: max
    .. autoattribute:: verification
 
-.. autoclass:: pcapkit.protocols.data.internet.hopopt.ILNPOption(type, action, change, length, nounce)
+.. autoclass:: pcapkit.protocols.data.internet.hopopt.ILNPOption(type, action, change, length, nonce)
    :no-members:
    :show-inheritance:
 
    :param \*args: Arbitrary positional arguments.
    :param \*\*kwargs: Arbitrary keyword arguments.
 
-   .. autoattribute:: nounce
+   .. autoattribute:: nonce
 
 .. autoclass:: pcapkit.protocols.data.internet.hopopt.LineIdentificationOption(type, action, change, length, line_id_len, line_id)
    :no-members:

doc/sphinx/source/pcapkit/protocols/internet/ipv4.rst

@@ -306,7 +306,7 @@ Data Structures
 
    .. autoattribute:: alert
 
-.. autoclass:: pcapkit.protocols.data.internet.ipv4.QSOption(code, length, type, func, rate, ttl, nounce)
+.. autoclass:: pcapkit.protocols.data.internet.ipv4.QSOption(code, length, type, func, rate, ttl, nonce)
    :no-members:
    :show-inheritance:
 
@@ -316,7 +316,7 @@ Data Structures
    .. autoattribute:: func
    .. autoattribute:: rate
    .. autoattribute:: ttl
-   .. autoattribute:: nounce
+   .. autoattribute:: nonce
 
 .. raw:: html
 

doc/sphinx/source/pcapkit/protocols/internet/ipv6_opts.rst

@@ -178,7 +178,7 @@ Data Structures
    .. autoattribute:: deltatlr
    .. autoattribute:: deltatls
 
-.. autoclass:: pcapkit.protocols.data.internet.ipv6_opts.QuickStartOption(type, action, change, length, func, rate, ttl, nounce)
+.. autoclass:: pcapkit.protocols.data.internet.ipv6_opts.QuickStartOption(type, action, change, length, func, rate, ttl, nonce)
    :no-members:
    :show-inheritance:
 
@@ -188,7 +188,7 @@ Data Structures
    .. autoattribute:: func
    .. autoattribute:: rate
    .. autoattribute:: ttl
-   .. autoattribute:: nounce
+   .. autoattribute:: nonce
 
 .. autoclass:: pcapkit.protocols.data.internet.ipv6_opts.RPLOption(type, action, change, length, flags, id, rank)
    :no-members:
@@ -234,14 +234,14 @@ Data Structures
    .. autoattribute:: max
    .. autoattribute:: verification
 
-.. autoclass:: pcapkit.protocols.data.internet.ipv6_opts.ILNPOption(type, action, change, length, nounce)
+.. autoclass:: pcapkit.protocols.data.internet.ipv6_opts.ILNPOption(type, action, change, length, nonce)
    :no-members:
    :show-inheritance:
 
    :param \*args: Arbitrary positional arguments.
    :param \*\*kwargs: Arbitrary keyword arguments.
 
-   .. autoattribute:: nounce
+   .. autoattribute:: nonce
 
 .. autoclass:: pcapkit.protocols.data.internet.ipv6_opts.LineIdentificationOption(type, action, change, length, line_id_len, line_id)
    :no-members:

doc/sphinx/source/pcapkit/protocols/transport/tcp.rst

@@ -308,7 +308,7 @@ Data Structures
 
    .. autoattribute:: digest
 
-.. autoclass:: pcapkit.protocols.data.transport.tcp.QuickStartResponse(kind, length, req_rate, ttl_diff, nounce)
+.. autoclass:: pcapkit.protocols.data.transport.tcp.QuickStartResponse(kind, length, req_rate, ttl_diff, nonce)
    :no-members:
    :show-inheritance:
 
@@ -317,7 +317,7 @@ Data Structures
 
    .. autoattribute:: req_rate
    .. autoattribute:: ttl_diff
-   .. autoattribute:: nounce
+   .. autoattribute:: nonce
 
 .. autoclass:: pcapkit.protocols.data.transport.tcp.UserTimeout(kind, length, timeout)
    :no-members:
@@ -396,7 +396,7 @@ Data Structures
    :param \*args: Arbitrary positional arguments.
    :param \*\*kwargs: Arbitrary keyword arguments.
 
-.. autoclass:: pcapkit.protocols.data.transport.tcp.MPTCPJoinSYN(kind, length, subtype, connection, backup, addr_id, token, nounce)
+.. autoclass:: pcapkit.protocols.data.transport.tcp.MPTCPJoinSYN(kind, length, subtype, connection, backup, addr_id, token, nonce)
    :no-members:
    :show-inheritance:
 
@@ -407,9 +407,9 @@ Data Structures
    .. autoattribute:: backup
    .. autoattribute:: addr_id
    .. autoattribute:: token
-   .. autoattribute:: nounce
+   .. autoattribute:: nonce
 
-.. autoclass:: pcapkit.protocols.data.transport.tcp.MPTCPJoinSYNACK(kind, length, subtype, connection, backup, addr_id, hmac, nounce)
+.. autoclass:: pcapkit.protocols.data.transport.tcp.MPTCPJoinSYNACK(kind, length, subtype, connection, backup, addr_id, hmac, nonce)
    :no-members:
    :show-inheritance:
 
@@ -420,7 +420,7 @@ Data Structures
    .. autoattribute:: backup
    .. autoattribute:: addr_id
    .. autoattribute:: hmac
-   .. autoattribute:: nounce
+   .. autoattribute:: nonce
 
 .. autoclass:: pcapkit.protocols.data.transport.tcp.MPTCPJoinACK(kind, length, subtype, connection, hmac)
    :no-members: