{"action":"created","comment":{"url":"https://api.github.com/repos/docker/docker/pulls/comments/79287845","id":79287845,"diff_hunk":"@@ -690,8 +690,21 @@ func initBridgeDriver(controller libnetwork.NetworkController, config *Config) e\n \n \tipamV4Conf = &libnetwork.IpamConf{AuxAddresses: make(map[string]string)}\n \n-\tnw, nw6List, err := netutils.ElectInterfaceAddresses(bridgeName)\n+\tnw, nwList, nw6List, err := netutils.ElectInterfaceAddresses(bridgeName)\n \tif err == nil {\n+\t\tif config.bridgeConfig.FixedCIDR != \"\" {\n+\t\t\t_, fCIDR, err := net.ParseCIDR(config.bridgeConfig.FixedCIDR)\n+\t\t\tif err != nil {\n+\t\t\t\treturn err","path":"daemon/daemon_unix.go","position":null,"original_position":10,"commit_id":"16882eaf88246fb097eaccd81a46ef6388022210","original_commit_id":"75bff91625a7d9a28c5ce8574b182e97eefd3074","user":{"login":"yongtang","id":6932348,"avatar_url":"https://avatars.githubusercontent.com/u/6932348?v=3","gravatar_id":"","url":"https://api.github.com/users/yongtang","html_url":"https://github.com/yongtang","followers_url":"https://api.github.com/users/yongtang/followers","following_url":"https://api.github.com/users/yongtang/following{/other_user}","gists_url":"https://api.github.com/users/yongtang/gists{/gist_id}","starred_url":"https://api.github.com/users/yongtang/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yongtang/subscriptions","organizations_url":"https://api.github.com/users/yongtang/orgs","repos_url":"https://api.github.com/users/yongtang/repos","events_url":"https://api.github.com/users/yongtang/events{/privacy}","received_events_url":"https://api.github.com/users/yongtang/received_events","type":"User","site_admin":false},"body":"Fixed.","created_at":"2016-09-17T17:02:53Z","updated_at":"2016-09-17T17:02:54Z","html_url":"https://github.com/docker/docker/pull/26659#discussion_r79287845","pull_request_url":"https://api.github.com/repos/docker/docker/pulls/26659","_links":{"self":{"href":"https://api.github.com/repos/docker/docker/pulls/comments/79287845"},"html":{"href":"https://github.com/docker/docker/pull/26659#discussion_r79287845"},"pull_request":{"href":"https://api.github.com/repos/docker/docker/pulls/26659"}}},"pull_request":{"url":"https://api.github.com/repos/docker/docker/pulls/26659","id":85665075,"html_url":"https://github.com/docker/docker/pull/26659","diff_url":"https://github.com/docker/docker/pull/26659.diff","patch_url":"https://github.com/docker/docker/pull/26659.patch","issue_url":"https://api.github.com/repos/docker/docker/issues/26659","number":26659,"state":"open","locked":false,"title":"Fix issue for `--fixed-cidr` when bridge has multiple addresses","user":{"login":"yongtang","id":6932348,"avatar_url":"https://avatars.githubusercontent.com/u/6932348?v=3","gravatar_id":"","url":"https://api.github.com/users/yongtang","html_url":"https://github.com/yongtang","followers_url":"https://api.github.com/users/yongtang/followers","following_url":"https://api.github.com/users/yongtang/following{/other_user}","gists_url":"https://api.github.com/users/yongtang/gists{/gist_id}","starred_url":"https://api.github.com/users/yongtang/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yongtang/subscriptions","organizations_url":"https://api.github.com/users/yongtang/orgs","repos_url":"https://api.github.com/users/yongtang/repos","events_url":"https://api.github.com/users/yongtang/events{/privacy}","received_events_url":"https://api.github.com/users/yongtang/received_events","type":"User","site_admin":false},"body":"**- What I did**\r\n\r\nThis fix tries to address the issue raised in #26341 where multiple addresses in a bridge may cause `--fixed-cidr` to not have the correct addresses.\r\n\r\nThe issue is that `netutils.ElectInterfaceAddresses(bridgeName)` only returns the first IPv4 address.\r\n\r\n**- How I did it**\r\n\r\nThis fix (together with the PR created in libnetwork https://github.com/docker/libnetwork/pull/1452) changes `ElectInterfaceAddresses()` and `addresses()` so that all IPv4 addresses are returned. This will allow the possibility of selectively choose the address needed.\r\n\r\nIn `daemon_unix.go`, bridge address is chosen by comparing with the `--fixed-cidr` first, thus resolve the issue in #26341.\r\n\r\n**- How to verify it**\r\nThis fix is tested manually, as is described in #26341:\r\n```\r\nbrctl addbr cbr0\r\nip addr add 10.111.111.111/20 dev cbr0 label cbr0:main\r\nip addr add 10.222.222.222/12 dev cbr0 label cbr0:docker\r\nip link set cbr0 up\r\ndocker daemon --bridge=cbr0 --iptables=false --ip-masq=false --fixed-cidr=10.222.222.222/24\r\ndocker run --rm busybox ip route get 8.8.8.8 | grep -Po 'src.*'\r\nsrc 10.222.222.0\r\n```\r\n\r\n**- Description for the changelog**\r\n\r\n**- A picture of a cute animal (not mandatory but encouraged)**\r\n\r\nThis fix fixes #26341.\r\n\r\nThis fix is related to libnetwork PR https://github.com/docker/libnetwork/pull/1452\r\n\r\nSigned-off-by: Yong Tang <yong.tang.github@outlook.com>","created_at":"2016-09-17T05:56:21Z","updated_at":"2016-09-17T17:02:54Z","closed_at":null,"merged_at":null,"merge_commit_sha":"79c625f1d9e45c001b88cf8c7075df7770ebfd5b","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/docker/docker/pulls/26659/commits","review_comments_url":"https://api.github.com/repos/docker/docker/pulls/26659/comments","review_comment_url":"https://api.github.com/repos/docker/docker/pulls/comments{/number}","comments_url":"https://api.github.com/repos/docker/docker/issues/26659/comments","statuses_url":"https://api.github.com/repos/docker/docker/statuses/16882eaf88246fb097eaccd81a46ef6388022210","head":{"label":"yongtang:26341-fixed-cidr-multiple-addresses-bridge","ref":"26341-fixed-cidr-multiple-addresses-bridge","sha":"16882eaf88246fb097eaccd81a46ef6388022210","user":{"login":"yongtang","id":6932348,"avatar_url":"https://avatars.githubusercontent.com/u/6932348?v=3","gravatar_id":"","url":"https://api.github.com/users/yongtang","html_url":"https://github.com/yongtang","followers_url":"https://api.github.com/users/yongtang/followers","following_url":"https://api.github.com/users/yongtang/following{/other_user}","gists_url":"https://api.github.com/users/yongtang/gists{/gist_id}","starred_url":"https://api.github.com/users/yongtang/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yongtang/subscriptions","organizations_url":"https://api.github.com/users/yongtang/orgs","repos_url":"https://api.github.com/users/yongtang/repos","events_url":"https://api.github.com/users/yongtang/events{/privacy}","received_events_url":"https://api.github.com/users/yongtang/received_events","type":"User","site_admin":false},"repo":{"id":53518876,"name":"docker","full_name":"yongtang/docker","owner":{"login":"yongtang","id":6932348,"avatar_url":"https://avatars.githubusercontent.com/u/6932348?v=3","gravatar_id":"","url":"https://api.github.com/users/yongtang","html_url":"https://github.com/yongtang","followers_url":"https://api.github.com/users/yongtang/followers","following_url":"https://api.github.com/users/yongtang/following{/other_user}","gists_url":"https://api.github.com/users/yongtang/gists{/gist_id}","starred_url":"https://api.github.com/users/yongtang/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yongtang/subscriptions","organizations_url":"https://api.github.com/users/yongtang/orgs","repos_url":"https://api.github.com/users/yongtang/repos","events_url":"https://api.github.com/users/yongtang/events{/privacy}","received_events_url":"https://api.github.com/users/yongtang/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/yongtang/docker","description":"Docker - the open-source application container engine","fork":true,"url":"https://api.github.com/repos/yongtang/docker","forks_url":"https://api.github.com/repos/yongtang/docker/forks","keys_url":"https://api.github.com/repos/yongtang/docker/keys{/key_id}","collaborators_url":"https://api.github.com/repos/yongtang/docker/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/yongtang/docker/teams","hooks_url":"https://api.github.com/repos/yongtang/docker/hooks","issue_events_url":"https://api.github.com/repos/yongtang/docker/issues/events{/number}","events_url":"https://api.github.com/repos/yongtang/docker/events","assignees_url":"https://api.github.com/repos/yongtang/docker/assignees{/user}","branches_url":"https://api.github.com/repos/yongtang/docker/branches{/branch}","tags_url":"https://api.github.com/repos/yongtang/docker/tags","blobs_url":"https://api.github.com/repos/yongtang/docker/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/yongtang/docker/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/yongtang/docker/git/refs{/sha}","trees_url":"https://api.github.com/repos/yongtang/docker/git/trees{/sha}","statuses_url":"https://api.github.com/repos/yongtang/docker/statuses/{sha}","languages_url":"https://api.github.com/repos/yongtang/docker/languages","stargazers_url":"https://api.github.com/repos/yongtang/docker/stargazers","contributors_url":"https://api.github.com/repos/yongtang/docker/contributors","subscribers_url":"https://api.github.com/repos/yongtang/docker/subscribers","subscription_url":"https://api.github.com/repos/yongtang/docker/subscription","commits_url":"https://api.github.com/repos/yongtang/docker/commits{/sha}","git_commits_url":"https://api.github.com/repos/yongtang/docker/git/commits{/sha}","comments_url":"https://api.github.com/repos/yongtang/docker/comments{/number}","issue_comment_url":"https://api.github.com/repos/yongtang/docker/issues/comments{/number}","contents_url":"https://api.github.com/repos/yongtang/docker/contents/{+path}","compare_url":"https://api.github.com/repos/yongtang/docker/compare/{base}...{head}","merges_url":"https://api.github.com/repos/yongtang/docker/merges","archive_url":"https://api.github.com/repos/yongtang/docker/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/yongtang/docker/downloads","issues_url":"https://api.github.com/repos/yongtang/docker/issues{/number}","pulls_url":"https://api.github.com/repos/yongtang/docker/pulls{/number}","milestones_url":"https://api.github.com/repos/yongtang/docker/milestones{/number}","notifications_url":"https://api.github.com/repos/yongtang/docker/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/yongtang/docker/labels{/name}","releases_url":"https://api.github.com/repos/yongtang/docker/releases{/id}","deployments_url":"https://api.github.com/repos/yongtang/docker/deployments","created_at":"2016-03-09T17:51:45Z","updated_at":"2016-03-09T17:51:56Z","pushed_at":"2016-09-17T16:43:26Z","git_url":"git://github.com/yongtang/docker.git","ssh_url":"git@github.com:yongtang/docker.git","clone_url":"https://github.com/yongtang/docker.git","svn_url":"https://github.com/yongtang/docker","homepage":"http://www.docker.com","size":99220,"stargazers_count":0,"watchers_count":0,"language":"Go","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":0,"forks":1,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"docker:master","ref":"master","sha":"4a0419f536ce3a7b1eade67440cfc84d6e486caf","user":{"login":"docker","id":5429470,"avatar_url":"https://avatars.githubusercontent.com/u/5429470?v=3","gravatar_id":"","url":"https://api.github.com/users/docker","html_url":"https://github.com/docker","followers_url":"https://api.github.com/users/docker/followers","following_url":"https://api.github.com/users/docker/following{/other_user}","gists_url":"https://api.github.com/users/docker/gists{/gist_id}","starred_url":"https://api.github.com/users/docker/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/docker/subscriptions","organizations_url":"https://api.github.com/users/docker/orgs","repos_url":"https://api.github.com/users/docker/repos","events_url":"https://api.github.com/users/docker/events{/privacy}","received_events_url":"https://api.github.com/users/docker/received_events","type":"Organization","site_admin":false},"repo":{"id":7691631,"name":"docker","full_name":"docker/docker","owner":{"login":"docker","id":5429470,"avatar_url":"https://avatars.githubusercontent.com/u/5429470?v=3","gravatar_id":"","url":"https://api.github.com/users/docker","html_url":"https://github.com/docker","followers_url":"https://api.github.com/users/docker/followers","following_url":"https://api.github.com/users/docker/following{/other_user}","gists_url":"https://api.github.com/users/docker/gists{/gist_id}","starred_url":"https://api.github.com/users/docker/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/docker/subscriptions","organizations_url":"https://api.github.com/users/docker/orgs","repos_url":"https://api.github.com/users/docker/repos","events_url":"https://api.github.com/users/docker/events{/privacy}","received_events_url":"https://api.github.com/users/docker/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/docker/docker","description":"Docker - the open-source application container engine","fork":false,"url":"https://api.github.com/repos/docker/docker","forks_url":"https://api.github.com/repos/docker/docker/forks","keys_url":"https://api.github.com/repos/docker/docker/keys{/key_id}","collaborators_url":"https://api.github.com/repos/docker/docker/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/docker/docker/teams","hooks_url":"https://api.github.com/repos/docker/docker/hooks","issue_events_url":"https://api.github.com/repos/docker/docker/issues/events{/number}","events_url":"https://api.github.com/repos/docker/docker/events","assignees_url":"https://api.github.com/repos/docker/docker/assignees{/user}","branches_url":"https://api.github.com/repos/docker/docker/branches{/branch}","tags_url":"https://api.github.com/repos/docker/docker/tags","blobs_url":"https://api.github.com/repos/docker/docker/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/docker/docker/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/docker/docker/git/refs{/sha}","trees_url":"https://api.github.com/repos/docker/docker/git/trees{/sha}","statuses_url":"https://api.github.com/repos/docker/docker/statuses/{sha}","languages_url":"https://api.github.com/repos/docker/docker/languages","stargazers_url":"https://api.github.com/repos/docker/docker/stargazers","contributors_url":"https://api.github.com/repos/docker/docker/contributors","subscribers_url":"https://api.github.com/repos/docker/docker/subscribers","subscription_url":"https://api.github.com/repos/docker/docker/subscription","commits_url":"https://api.github.com/repos/docker/docker/commits{/sha}","git_commits_url":"https://api.github.com/repos/docker/docker/git/commits{/sha}","comments_url":"https://api.github.com/repos/docker/docker/comments{/number}","issue_comment_url":"https://api.github.com/repos/docker/docker/issues/comments{/number}","contents_url":"https://api.github.com/repos/docker/docker/contents/{+path}","compare_url":"https://api.github.com/repos/docker/docker/compare/{base}...{head}","merges_url":"https://api.github.com/repos/docker/docker/merges","archive_url":"https://api.github.com/repos/docker/docker/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/docker/docker/downloads","issues_url":"https://api.github.com/repos/docker/docker/issues{/number}","pulls_url":"https://api.github.com/repos/docker/docker/pulls{/number}","milestones_url":"https://api.github.com/repos/docker/docker/milestones{/number}","notifications_url":"https://api.github.com/repos/docker/docker/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/docker/docker/labels{/name}","releases_url":"https://api.github.com/repos/docker/docker/releases{/id}","deployments_url":"https://api.github.com/repos/docker/docker/deployments","created_at":"2013-01-18T18:10:57Z","updated_at":"2016-09-17T15:59:51Z","pushed_at":"2016-09-17T16:43:28Z","git_url":"git://github.com/docker/docker.git","ssh_url":"git@github.com:docker/docker.git","clone_url":"https://github.com/docker/docker.git","svn_url":"https://github.com/docker/docker","homepage":"http://www.docker.com","size":210567,"stargazers_count":35050,"watchers_count":35050,"language":"Go","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":10306,"mirror_url":null,"open_issues_count":2000,"forks":10306,"open_issues":2000,"watchers":35050,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/docker/docker/pulls/26659"},"html":{"href":"https://github.com/docker/docker/pull/26659"},"issue":{"href":"https://api.github.com/repos/docker/docker/issues/26659"},"comments":{"href":"https://api.github.com/repos/docker/docker/issues/26659/comments"},"review_comments":{"href":"https://api.github.com/repos/docker/docker/pulls/26659/comments"},"review_comment":{"href":"https://api.github.com/repos/docker/docker/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/docker/docker/pulls/26659/commits"},"statuses":{"href":"https://api.github.com/repos/docker/docker/statuses/16882eaf88246fb097eaccd81a46ef6388022210"}}}}
{"actor":{"display_login":"yongtang"}}