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

Reconcile 'content' and 'payload' #1703

Merged
merged 2 commits into from Aug 28, 2018
Merged

Reconcile 'content' and 'payload' #1703

merged 2 commits into from Aug 28, 2018

Conversation

martinthomson
Copy link
Member

@martinthomson martinthomson commented Aug 27, 2018

I did a complete pass through and it wasn't that bad. As we agreed,
payload is the bytes that we protect, content is the more abstract
notion of what needs to be communicated (for which we use frames). That
was already mostly right, apart from a few places.

Oh, and I didn't mention this, but I think that it's worth saying it. This isn't in the definitions section. We don't need to load that down with these little editorial conventions. We do that and it becomes unusable.

Closes #1676.

I did a complete pass through and it wasn't that bad.  As we agreed,
payload is the bytes that we protect, content is the more abstract
notion of what needs to be communicated (for which we use frames).  That
was already mostly right, apart from a few places.

Closes #1676.
@martinthomson martinthomson added editorial An issue that does not affect the design of the protocol; does not require consensus. -transport labels Aug 27, 2018
Copy link
Contributor

@MikeBishop MikeBishop left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this.

@@ -1109,7 +1109,7 @@ Stateless Reset do not contain frames.
| Frame N (*) ...
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
~~~
{: #packet-frames title="Contents of Protected Payload"}
{: #packet-frames title="QUIC Payload"}

Protected payloads MUST contain at least one frame, and MAY contain multiple
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You removed the term "protected payload" from the title of the figure, but not from the following paragraph.

@@ -566,8 +566,8 @@ wishes to perform a stateless retry (see {{stateless-retry}}).

A Retry packet (shown in {{retry-format}}) only uses the invariant portion of
the long packet header {{QUIC-INVARIANTS}}; that is, the fields up to and
including the Destination and Source Connection ID fields. The contents of the
Retry packet are not protected. Like Version Negotiation, a Retry packet
including the Destination and Source Connection ID fields. The Payload of a
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could go either way, but I'd lean toward not capitalizing this usage, or saying "The Payload field"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I realized that we say that it has a Payload here, then say that it doesn't in the next sentence, so I changed this more.

@martinthomson martinthomson force-pushed the payload-content branch 2 times, most recently from 3e798ec to f78d9f8 Compare August 28, 2018 00:10
@martinthomson martinthomson merged commit a1264b2 into master Aug 28, 2018
@martinthomson martinthomson deleted the payload-content branch August 28, 2018 05:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-transport editorial An issue that does not affect the design of the protocol; does not require consensus.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants