Increment IP addrress safely #258
Merged
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
|
Hmm, unit tests failed. |
|
Oh, sorry, it was my mistake. Fixed it. |
mogren
approved these changes
Dec 15, 2018
| {"increment", net.IPv4(10, 0, 0, 1), net.IPv4(10, 0, 0, 2).To4(), false}, | ||
| {"carry up 1", net.IPv4(10, 0, 0, 255), net.IPv4(10, 0, 1, 0).To4(), false}, | ||
| {"carry up 2", net.IPv4(10, 0, 255, 255), net.IPv4(10, 1, 0, 0).To4(), false}, | ||
| {"overflow", net.IPv4(255, 255, 255, 255), nil, true}, |
pkg/networkutils/network.go
Outdated
| gw.IP[3] = gw.IP[3] + 1 | ||
| gw, err := incrementIPv4Addr(ipnet.IP) | ||
| if err != nil { | ||
| return errors.Wrapf(err, "eni network setup: faild to define gateway address from %v", ipnet.IP) |
There was a problem hiding this comment.
Thank you 👍 Fixed it to failed
To define gateway address, current code increments network address. However, the code does not care endian and overflow. (Since it increments network address, overflow should not happens, though.) This patch introduces incrementIPv4Addr() and increments the address safely.
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.
To define gateway address, current code increments network
address. However, the code does not care endian and overflow. (Since
it increments network address, overflow should not happen, though.)
This patch introduces incrementIPv4Addr() and increments the address
safely.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.