Stop readTablePropXM() from Attempting to Read XM Payloads #131
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ad is false, only Class, Type, and Length will be read. Also, XM.Value & XM.Mask will contain the zero value.
… too many table props to be read.
ybubnov
reviewed
Apr 14, 2018
|
|
||
| if err != nil { | ||
| return | ||
| if hasPayload { |
There was a problem hiding this comment.
Is it possible to determine if OXM has payload by analyzing its length? So the caller won't need to pas hasPayload flag?
I mean precisely this:
if length != 0 {
m, err := encoding.ReadFrom(r, &xm.Value)
n += m
if err != nil {
return err
}
}There was a problem hiding this comment.
It's not possible. The Length when hasPayload == false indicates the length that a hypothetical payload for the given XM type should be.
ybubnov
reviewed
Apr 14, 2018
ofp/match.go
Outdated
| @@ -294,7 +293,7 @@ func readAllXM(r io.Reader, xms *[]XM) (int64, error) { | |||
|
|
|||
| // ReadFrom implements io.ReaderFrom interface. It deserializes | |||
| // the OpenFlow extensible match from the given reader. | |||
| func (xm *XM) ReadFrom(r io.Reader) (n int64, err error) { | |||
| func (xm *XM) ReadFrom(r io.Reader, hasPayload bool) (n int64, err error) { | |||
There was a problem hiding this comment.
It would be nice to determine the necessity to read payload by the length field of OXM. If it is not possible for some reason, I would recommend to create another method for passing this flag:
func (xm *XM) readFrom(r io.Reader, hasPayload bool) (int64, error) { /* ... */ }
func (xm *XM) ReadFrom(r io.Reader) (int64, error) {
return xm.readFrom(r, true)
}This is necessary to make XM implement io.ReaderFrom interface.
|
Awesome, thanks for the PR! |
…perly implement the io.ReaderFrom interface. Also changed usages of XM.readFrom(hasPayload=true) to use XM.ReadFrom().
ybubnov
approved these changes
Apr 16, 2018
ybubnov
added
reviewed/looks-good-to-me
reviewed/merge-on-green
and removed
status/needs-rework
labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #130