starlingx
/
metal
Code Issues Proposed changes

Merge "fix zero sin6_scope_id issue"

This commit is contained in:
Zuul 2019-04-04 21:39:15 +00:00 committed by Gerrit Code Review
parent c0fb1056d2 cddb075f04
commit 39f77671d1
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mtce-common/src/common/msgClass.cpp
View File

@ -68,6 +68,25 @@ int msgClassAddr::initAddr(const char* address, int port, int proto)
memset(&hints, 0, sizeof(struct addrinfo));
hints.ai_family = AF_INET6;
rc = getaddrinfo(this->address_str, NULL, &hints, &res);
if (!rc) {
// It is to resolve the issue of devstack found on Ubuntu Bionic. To
// avoid impacting normal StarlingX, add below control gate to only
// enable the code on Ubuntu Bionic.
if (getenv("UBUNTU_BIONIC")) {
/* check if returned ipv6 address is correct*/
if (res->ai_addr->sa_family == AF_INET6) {
struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)res->ai_addr;
if ((in6->sin6_scope_id == 0) &&
(in6->sin6_addr.s6_addr[0] == 0xFE) &&
((in6->sin6_addr.s6_addr[1] & 0xC0) == 0x80))
{
/* ipv6 link-local address should has non-zero sin6_scope_id */
ilog("link-local ipv6 address has zero sin6_scope_id, switch to ipv4\n");
rc = 1;
}
}
}
}
if(rc)
{
dlog("IPv6 address resolution failed, rc=%d", rc);