Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates to IANA registries #38

Closed
wants to merge 3 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
242 changes: 125 additions & 117 deletions draft-tuexen-opsawg-pcapng.xml
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,8 @@ Section Header
</artwork>
</figure>

<t>The following codes can always be present in any optional field:</t>
<t>The first three codes can always be present in any optional field. Codes 2-14 can only be present in Interface Description Blocks (see <xref target="section_idb"/>). Codes 15-17 are valid only in Section Header Blocks (see <xref target="section_shb">). Codes 18-20 are valid in Name Resolution Blocks (see <xref target="section_nrb" />):
:</t>

<texttable anchor="optionsall" title="Common Options">
<ttcol align="left">Name</ttcol>
Expand All @@ -495,6 +496,84 @@ Section Header
<c>opt_custom</c>
<c>2988/2989/19372/19373</c>
<c>variable</c>

<c>if_name</c>
<c>2</c>
<c>Variable</c>

<c>if_description</c>
<c>3</c>
<c>Variable</c>

<c>if_IPv4addr</c>
<c>4</c>
<c>8</c>

<c>if_IPv6addr</c>
<c>5</c>
<c>17</c>

<c>if_MACaddr</c>
<c>6</c>
<c>6</c>

<c>if_EUIaddr</c>
<c>7</c>
<c>8</c>

<c>if_speed</c>
<c>8</c>
<c>8</c>

<c>if_tsresol</c>
<c>9</c>
<c>1</c>

<c>if_tzone</c>
<c>10</c>
<c>4</c>

<c>if_filter</c>
<c>11</c>
<c>variable</c>

<c>if_os</c>
<c>12</c>
<c>variable</c>

<c>if_fcslen</c>
<c>13</c>
<c>1</c>

<c>if_tsoffset</c>
<c>14</c>
<c>8</c>

<c>shb_hardware</c>
<c>15</c>
<c>variable</c>

<c>shb_os</c>
<c>16</c>
<c>variable</c>

<c>shb_userappl</c>
<c>17</c>
<c>variable</c>

<c>ns_dnsname</c>
<c>18</c>
<c>Variable</c>

<c>ns_dnsIP4addr</c>
<c>19</c>
<c>4</c>

<c>ns_dnsIP6addr</c>
<c>20</c>
<c>16</c>
</texttable>

</texttable>

<t>
Expand Down Expand Up @@ -764,27 +843,9 @@ Section Header
skipping a block or option does not work should the minor version
number be changed.</t>

<t>Aside from the options defined in <xref target="section_opt"/>, the
<t>Options defined in <xref target="section_opt"/> can be used, specifically the
following options are valid within this block:</t>

<texttable anchor="options_shb" title="Section Header Block Options">
<ttcol align="left">Name</ttcol>
<ttcol align="left">Code</ttcol>
<ttcol align="left">Length</ttcol>

<c>shb_hardware</c>
<c>2</c>
<c>variable</c>

<c>shb_os</c>
<c>3</c>
<c>variable</c>

<c>shb_userappl</c>
<c>4</c>
<c>variable</c>
</texttable>

<t>
<list hangIndent="8" style="hanging">

Expand Down Expand Up @@ -896,66 +957,7 @@ Section Header
</list>
</t>

<t>In addition to the options defined in <xref target="section_opt"/>,
the following options are valid within this block:</t>

<texttable anchor="optionsifb" title="Interface Description Block Options">
<ttcol align="left">Name</ttcol>
<ttcol align="left">Code</ttcol>
<ttcol align="left">Length</ttcol>

<c>if_name</c>
<c>2</c>
<c>Variable</c>

<c>if_description</c>
<c>3</c>
<c>Variable</c>

<c>if_IPv4addr</c>
<c>4</c>
<c>8</c>

<c>if_IPv6addr</c>
<c>5</c>
<c>17</c>

<c>if_MACaddr</c>
<c>6</c>
<c>6</c>

<c>if_EUIaddr</c>
<c>7</c>
<c>8</c>

<c>if_speed</c>
<c>8</c>
<c>8</c>

<c>if_tsresol</c>
<c>9</c>
<c>1</c>

<c>if_tzone</c>
<c>10</c>
<c>4</c>

<c>if_filter</c>
<c>11</c>
<c>variable</c>

<c>if_os</c>
<c>12</c>
<c>variable</c>

<c>if_fcslen</c>
<c>13</c>
<c>1</c>

<c>if_tsoffset</c>
<c>14</c>
<c>8</c>
</texttable>
<t>This options that may be present are enumerated in <xref target="section_opt"/>, but are described here:

<t>
<list hangIndent="8" style="hanging">
Expand Down Expand Up @@ -1541,26 +1543,8 @@ Section Header
options (formatted according to the rules defined in <xref
target="section_opt"/>) can be present.</t>

<t>In addition to the options defined in <xref target="section_opt"/>,
the following options are valid within this block:</t>

<texttable anchor="options_nrb" title="Name Resolution Block Options">
<ttcol align="left">Name</ttcol>
<ttcol align="left">Code</ttcol>
<ttcol align="left">Length</ttcol>

<c>ns_dnsname</c>
<c>2</c>
<c>Variable</c>

<c>ns_dnsIP4addr</c>
<c>3</c>
<c>4</c>

<c>ns_dnsIP6addr</c>
<c>4</c>
<c>16</c>
</texttable>
<t>Options defined in <xref target="section_opt"/> can be used, specifically the
following options are valid within this block:</t>

<t>
<list hangIndent="8" style="hanging">
Expand Down Expand Up @@ -1913,12 +1897,18 @@ Section Header
+---------------------------------------------------------------+
| Block Total Length |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
| Encr. Type | |
+-+-+-+-+-+-+-+-+ |
| |
| Encrypted Data |
| Security Parameters Index (SPI -- 64 bits) |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
| Payload Data* (variable) |
~ ~
| |
| variable length, octet-aligned |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
| | Padding (0-255 bytes) |
+-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+
| | Pad Length |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
| Integrity Check Value-ICV (variable) |
~ ~
| |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
| Block Total Length |
Expand All @@ -1940,8 +1930,8 @@ Section Header
probably contain other fields, depending on the encryption
algorithm. To be defined precisely.</t>

<t>Encrypted Data: data of this block. Once decrypted, it
originates other blocks.</t>
<t>Encrypted Data: data of this block. The contents are expected to
be additional blocks recursively included, possibly including a new SHR.</t>

</list>
</t>
Expand Down Expand Up @@ -2217,11 +2207,28 @@ Section Header
</section>

<section title="IANA Considerations">
<t>TBD.</t>
<t>The following IANA Registries exist</t>

<t>[Open issue: decide whether the block types, option types, NRB Record
types, etc. should be IANA registries. And if so, what the IANA policy
for each should be (see RFC 5226)]</t>
<section anchor="option_type_registry" title="Option Type">
The Block Type registry is under First Come-First Served.
It starts with the following entries:
</section>

<section anchor="name_resolution_registry" title="Name Resolution Block Records Type">
The Name Resolution Block Records is under Specification Required.
It starts with the following entries:
</section>

<section anchor="link_type_code_registry" title="LinkType Codes">

<t>The LinkType field is inherited from the Tcpdump (libpcap) Group, the
current maintainers of the libpcap source code. The Tcpdump Group
operated on a Expert Review basis, with specification preferred, but
not required.</t>

<t>The LinkType field should continue to operate on an Expert Review
basis, with the Tcpdump Workers Group continuing to act as Expert Review.
</t>

<section anchor="section_block_code_registry" title="Standardized Block Type Codes">

Expand All @@ -2233,10 +2240,8 @@ Section Header
local use by the application.</t>

<t>All the remaining Block Type codes (0x00000000 to 0x7FFFFFFF) are
standardized by this document. Requests for new Block Type codes
should be sent to the <eref
target="https://www.winpcap.org/mailman/listinfo/pcap-ng-format">pcap-
ng-format mailing list</eref>.</t>
standardized by this document. The Block Types are to be allocated
on a First-Come/First-Served basis.</t>

<t>The following is a list of the Standardized Block Type Codes:</t>

Expand Down Expand Up @@ -2458,9 +2463,12 @@ Section Header
boundary. The format of the link-layer headers depends on
the LinkType field specified in the Interface Description
Block (see <xref target="section_idb"/>) and it is specified
in the entry for that format in the <eref
in the entry for that (DLT_*) format in the <eref
target="http://www.tcpdump.org/linktypes.html">the
tcpdump.org link-layer header types registry</eref>.</t>
tcpdump.org link-layer header types registry</eref>.
</t>
<t>XXX The existing, common, Link Types should be described in this
document, so that it is stand-alone</t>

<t>Options: optionally, a list of options (formatted according to
the rules defined in <xref target="section_opt"/>) can be present.</t>
Expand Down