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.

Sign up for GitHub

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

Jump to bottom

Fix hardcoded AF_INET for IPv6 address handling #2416

Merged
merged 1 commit into from
Jul 12, 2019
Merged

Fix hardcoded AF_INET for IPv6 address handling #2416

merged 1 commit into from
Jul 12, 2019

Conversation

herrwagner
Copy link
Contributor

Providing fix for hardcoded AF_INET argument in parseIP function call for "destinations". This leads to issues with IPv6 addresses thus they handled as IPv4.

This patch provides a solution equivalent as its is used for "services":
https://github.com/herrwagner/libnetwork/blob/217bc0e7296b474afb5318b609dee673e819a00e/ipvs/netlink.go#L323-L334

@GordonTheTurtle
Copy link

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "2289-fix-ipv6-hardcode" [email protected]:herrwagner/libnetwork.git somewhere
$ cd somewhere
$ git commit --amend -s --no-edit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

arkodg
arkodg approved these changes Jul 11, 2019
View reviewed changes
Copy link
Contributor

@arkodg arkodg 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 fixing this @herrwagner
LGTM

PTAL : @euanh @selansen

selansen
selansen approved these changes Jul 12, 2019
View reviewed changes
Copy link
Collaborator

@selansen selansen left a comment

Choose a reason for hiding this comment

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

LGTM

@selansen selansen merged commit 14f9d75 into moby:master Jul 12, 2019
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Jul 30, 2019
@thaJeztah
bump libnetwork to 09cdcc8c0eab3946c2d70e8f6225b05baf1e90d1
6f234db 
full diff: moby/libnetwork@83d30db...09cdcc8

changes included:

- moby/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling
- moby/libnetwork#2411 Macvlan network handles netlabel.Internal wrong
  - fixes moby/libnetwork#2410 Macvlan network handles netlabel.Internal wrong
- moby/libnetwork#2414 Allow network with --config-from to be --internal
  - fixes moby/libnetwork#2413 Network with --config-from does not honor --internal
- moby/libnetwork#2351 Use fewer modprobes
  - relates to moby#38930 Use fewer modprobes
- moby/libnetwork#2415 Support dockerd and system restarts for ipvlan and macvlan networks
  - carry of moby/libnetwork#2295 phantom ip/mac vlan network after a powercycle
  - fixes moby/libnetwork#1743 Phantom docker network

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah mentioned this pull request Jul 30, 2019
Merged
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Jul 31, 2019
@thaJeztah
bump libnetwork to 09cdcc8c0eab3946c2d70e8f6225b05baf1e90d1
c53fd30 
full diff: moby/libnetwork@83d30db...09cdcc8

changes included:

- moby/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling
- moby/libnetwork#2411 Macvlan network handles netlabel.Internal wrong
  - fixes moby/libnetwork#2410 Macvlan network handles netlabel.Internal wrong
- moby/libnetwork#2414 Allow network with --config-from to be --internal
  - fixes moby/libnetwork#2413 Network with --config-from does not honor --internal
- moby/libnetwork#2351 Use fewer modprobes
  - relates to moby/moby#38930 Use fewer modprobes
- moby/libnetwork#2415 Support dockerd and system restarts for ipvlan and macvlan networks
  - carry of moby/libnetwork#2295 phantom ip/mac vlan network after a powercycle
  - fixes moby/libnetwork#1743 Phantom docker network

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Upstream-commit: 6f234db9fef23c591d8376f96db062e7107b658f
Component: engine
@icefed icefed mentioned this pull request Aug 15, 2019
Closed
@aojea aojea mentioned this pull request Aug 19, 2019
Closed
@uablrek uablrek mentioned this pull request Aug 20, 2019
Closed
@thaJeztah thaJeztah mentioned this pull request Aug 22, 2019
Merged
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Sep 3, 2019
@thaJeztah
bump lib network to 92d1fbe1eb0883cf11d283cea8e658275146411d
bab58c1 
full diff: moby/libnetwork@09cdcc8...92d1fbe

relevant changes included (omitting some changes that were added _and_ reverted in this bump):

- moby/libnetwork#2433 Fix parseIP error when parseIP before get AddressFamily
  - fixes moby/libnetwork#2431 parseIP Error ip=[172 17 0 2 0 0 0 0 0 0 0 0 0 0 0 0]
  - moby/libnetwork#2289
  - this was a regression introduced in moby/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling
- moby/libnetwork#2440 Bump hashicorp go-sockaddr v1.0.2, go-multierror v1.0.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah mentioned this pull request Sep 3, 2019
Merged
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Sep 3, 2019
@thaJeztah
bump lib network to 92d1fbe1eb0883cf11d283cea8e658275146411d
86a524a 
full diff: moby/libnetwork@09cdcc8...92d1fbe

relevant changes included (omitting some changes that were added _and_ reverted in this bump):

- moby/libnetwork#2433 Fix parseIP error when parseIP before get AddressFamily
  - fixes moby/libnetwork#2431 parseIP Error ip=[172 17 0 2 0 0 0 0 0 0 0 0 0 0 0 0]
  - moby/libnetwork#2289
  - this was a regression introduced in moby/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling
- moby/libnetwork#2440 Bump hashicorp go-sockaddr v1.0.2, go-multierror v1.0.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Upstream-commit: bab58c19246bfaad9bbff8dd88f1b6a224b8dc22
Component: engine
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Sep 16, 2019
@thaJeztah
bump libnetwork to 09cdcc8c0eab3946c2d70e8f6225b05baf1e90d1
b6190c2 
full diff: moby/libnetwork@83d30db...09cdcc8

changes included:

- moby/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling
- moby/libnetwork#2411 Macvlan network handles netlabel.Internal wrong
  - fixes moby/libnetwork#2410 Macvlan network handles netlabel.Internal wrong
- moby/libnetwork#2414 Allow network with --config-from to be --internal
  - fixes moby/libnetwork#2413 Network with --config-from does not honor --internal
- moby/libnetwork#2351 Use fewer modprobes
  - relates to moby#38930 Use fewer modprobes
- moby/libnetwork#2415 Support dockerd and system restarts for ipvlan and macvlan networks
  - carry of moby/libnetwork#2295 phantom ip/mac vlan network after a powercycle
  - fixes moby/libnetwork#1743 Phantom docker network

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 6f234db)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Sep 16, 2019
@thaJeztah
bump lib network to 92d1fbe1eb0883cf11d283cea8e658275146411d
44ca36c 
full diff: moby/libnetwork@09cdcc8...92d1fbe

relevant changes included (omitting some changes that were added _and_ reverted in this bump):

- moby/libnetwork#2433 Fix parseIP error when parseIP before get AddressFamily
  - fixes moby/libnetwork#2431 parseIP Error ip=[172 17 0 2 0 0 0 0 0 0 0 0 0 0 0 0]
  - moby/libnetwork#2289
  - this was a regression introduced in moby/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling
- moby/libnetwork#2440 Bump hashicorp go-sockaddr v1.0.2, go-multierror v1.0.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit bab58c1)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Sep 17, 2019
@thaJeztah
bump libnetwork to 09cdcc8c0eab3946c2d70e8f6225b05baf1e90d1
509f4b5 
full diff: moby/libnetwork@83d30db...09cdcc8

changes included:

- moby/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling
- moby/libnetwork#2411 Macvlan network handles netlabel.Internal wrong
  - fixes moby/libnetwork#2410 Macvlan network handles netlabel.Internal wrong
- moby/libnetwork#2414 Allow network with --config-from to be --internal
  - fixes moby/libnetwork#2413 Network with --config-from does not honor --internal
- moby/libnetwork#2351 Use fewer modprobes
  - relates to moby/moby#38930 Use fewer modprobes
- moby/libnetwork#2415 Support dockerd and system restarts for ipvlan and macvlan networks
  - carry of moby/libnetwork#2295 phantom ip/mac vlan network after a powercycle
  - fixes moby/libnetwork#1743 Phantom docker network

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 6f234db9fef23c591d8376f96db062e7107b658f)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Upstream-commit: b6190c2713623ab455d29da4771b684e4eafc63f
Component: engine
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Sep 17, 2019
@thaJeztah
bump lib network to 92d1fbe1eb0883cf11d283cea8e658275146411d
4a5ccdb 
full diff: moby/libnetwork@09cdcc8...92d1fbe

relevant changes included (omitting some changes that were added _and_ reverted in this bump):

- moby/libnetwork#2433 Fix parseIP error when parseIP before get AddressFamily
  - fixes moby/libnetwork#2431 parseIP Error ip=[172 17 0 2 0 0 0 0 0 0 0 0 0 0 0 0]
  - moby/libnetwork#2289
  - this was a regression introduced in moby/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling
- moby/libnetwork#2440 Bump hashicorp go-sockaddr v1.0.2, go-multierror v1.0.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit bab58c19246bfaad9bbff8dd88f1b6a224b8dc22)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Upstream-commit: 44ca36c7cff269fbf53b98c73b1eea36a17bdf3a
Component: engine
burnMyDread pushed a commit to burnMyDread/moby that referenced this pull request Oct 21, 2019
@thaJeztah @burnMyDread
bump libnetwork to 09cdcc8c0eab3946c2d70e8f6225b05baf1e90d1
2372b13 
full diff: moby/libnetwork@83d30db...09cdcc8

changes included:

- moby/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling
- moby/libnetwork#2411 Macvlan network handles netlabel.Internal wrong
  - fixes moby/libnetwork#2410 Macvlan network handles netlabel.Internal wrong
- moby/libnetwork#2414 Allow network with --config-from to be --internal
  - fixes moby/libnetwork#2413 Network with --config-from does not honor --internal
- moby/libnetwork#2351 Use fewer modprobes
  - relates to moby#38930 Use fewer modprobes
- moby/libnetwork#2415 Support dockerd and system restarts for ipvlan and macvlan networks
  - carry of moby/libnetwork#2295 phantom ip/mac vlan network after a powercycle
  - fixes moby/libnetwork#1743 Phantom docker network

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: zach <[email protected]>
burnMyDread pushed a commit to burnMyDread/moby that referenced this pull request Oct 21, 2019
@thaJeztah @burnMyDread
bump lib network to 92d1fbe1eb0883cf11d283cea8e658275146411d
a6903bc 
full diff: moby/libnetwork@09cdcc8...92d1fbe

relevant changes included (omitting some changes that were added _and_ reverted in this bump):

- moby/libnetwork#2433 Fix parseIP error when parseIP before get AddressFamily
  - fixes moby/libnetwork#2431 parseIP Error ip=[172 17 0 2 0 0 0 0 0 0 0 0 0 0 0 0]
  - moby/libnetwork#2289
  - this was a regression introduced in moby/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling
- moby/libnetwork#2440 Bump hashicorp go-sockaddr v1.0.2, go-multierror v1.0.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: zach <[email protected]>
@uablrek uablrek mentioned this pull request Jan 20, 2020
Closed
@andrewsykim andrewsykim mentioned this pull request Jan 30, 2020
Merged
@alexandreChichmanian alexandreChichmanian mentioned this pull request Feb 14, 2020
Closed
@lbernail lbernail mentioned this pull request Apr 25, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@selansen selansen selansen approved these changes

@arkodg arkodg arkodg approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@herrwagner @GordonTheTurtle @arkodg @selansen