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

spath: drop old header code #3909

Merged
merged 2 commits into from
Oct 21, 2020
Merged

Conversation

lukedirtwalker
Copy link
Collaborator

@lukedirtwalker lukedirtwalker commented Oct 21, 2020

Drops all code supporting the legacy header format. Also since the Path struct
is now that simple it is passed by value instead of pointer.


This change is Reviewable

Drops all code supporting the legacy header format. Also since the Path struct
is now that simple it is passed by value instead of pointer.
Copy link
Contributor

@matzf matzf left a comment

Choose a reason for hiding this comment

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

Reviewed 71 of 71 files at r1.
Reviewable status: all files reviewed, 4 unresolved discussions (waiting on @lukedirtwalker)


go/cs/beaconing/handler_test.go, line 284 at r1 (raw file):

func testPath(ingressIfid common.IFIDType) spath.Path {
	return spath.Path{}

Is this not needed anymore? It seems to be called with different args in the tests above.


go/lib/snet/path.go, line 125 at r1 (raw file):

		Raw:  append(p.spath.Raw[:0:0], p.spath.Raw...),
		Type: p.spath.Type,
	}

return p.spath.Copy()


go/lib/snet/path/path.go, line 63 at r1 (raw file):

		Raw:  append(p.SPath.Raw[:0:0], p.SPath.Raw...),
		Type: p.SPath.Type,
	}

Or just return p.SPath.Copy()?


go/lib/svc/svc.go, line 208 at r1 (raw file):

		Raw:  append(path.Raw[:0:0], path.Raw...),
		Type: path.Type,
	}

Same here, path = path.Copy()?


go/pkg/traceroute/traceroute.go, line 294 at r1 (raw file):

			IA:   pkt.Source.IA,
			Host: &net.UDPAddr{IP: pkt.Destination.Host.IP()},
			Path: spath.Path{Raw: append(pkt.Path.Raw[:0:0], pkt.Path.Raw...), Type: pkt.Path.Type},

Path: pkt.Path.Copy()

Copy link
Collaborator Author

@lukedirtwalker lukedirtwalker left a comment

Choose a reason for hiding this comment

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

Reviewable status: all files reviewed, 4 unresolved discussions (waiting on @matzf)


go/cs/beaconing/handler_test.go, line 284 at r1 (raw file):

Previously, matzf (Matthias Frei) wrote…

Is this not needed anymore? It seems to be called with different args in the tests above.

No, I removed it. In v1 we checked something on the path, which we no longer do in v2.


go/lib/snet/path.go, line 125 at r1 (raw file):

Previously, matzf (Matthias Frei) wrote…

return p.spath.Copy()

Done.


go/lib/snet/path/path.go, line 63 at r1 (raw file):

Previously, matzf (Matthias Frei) wrote…

Or just return p.SPath.Copy()?

Done.


go/lib/svc/svc.go, line 208 at r1 (raw file):

Previously, matzf (Matthias Frei) wrote…

Same here, path = path.Copy()?

Done.


go/pkg/traceroute/traceroute.go, line 294 at r1 (raw file):

Previously, matzf (Matthias Frei) wrote…

Path: pkt.Path.Copy()

Done.

Copy link
Contributor

@matzf matzf left a comment

Choose a reason for hiding this comment

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

Reviewed 5 of 5 files at r2.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

Copy link
Collaborator Author

@lukedirtwalker lukedirtwalker left a comment

Choose a reason for hiding this comment

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

Reviewed 66 of 71 files at r1, 5 of 5 files at r2.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@lukedirtwalker lukedirtwalker merged commit c312887 into scionproto:master Oct 21, 2020
@lukedirtwalker lukedirtwalker deleted the spathOS branch October 21, 2020 11:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants