提交 d7098c91 编写于 作者: O openharmony_ci 提交者: Gitee

!8 lwip_getaddrinfo接口中ai_addrlen应按V4和V6类型填写

Merge pull request !8 from 刘建东/master
...@@ -378,6 +378,7 @@ lwip_getaddrinfo(const char *nodename, const char *servname, ...@@ -378,6 +378,7 @@ lwip_getaddrinfo(const char *nodename, const char *servname,
sa6->sin6_port = lwip_htons((u16_t)port_nr); sa6->sin6_port = lwip_htons((u16_t)port_nr);
sa6->sin6_scope_id = ip6_addr_zone(ip_2_ip6(&addr)); sa6->sin6_scope_id = ip6_addr_zone(ip_2_ip6(&addr));
ai->ai_family = AF_INET6; ai->ai_family = AF_INET6;
ai->ai_addrlen = sizeof(struct sockaddr_in6);
#endif /* LWIP_IPV6 */ #endif /* LWIP_IPV6 */
} else { } else {
#if LWIP_IPV4 #if LWIP_IPV4
...@@ -388,6 +389,7 @@ lwip_getaddrinfo(const char *nodename, const char *servname, ...@@ -388,6 +389,7 @@ lwip_getaddrinfo(const char *nodename, const char *servname,
sa4->sin_len = sizeof(struct sockaddr_in); sa4->sin_len = sizeof(struct sockaddr_in);
sa4->sin_port = lwip_htons((u16_t)port_nr); sa4->sin_port = lwip_htons((u16_t)port_nr);
ai->ai_family = AF_INET; ai->ai_family = AF_INET;
ai->ai_addrlen = sizeof(struct sockaddr_in);
#endif /* LWIP_IPV4 */ #endif /* LWIP_IPV4 */
} }
...@@ -403,7 +405,6 @@ lwip_getaddrinfo(const char *nodename, const char *servname, ...@@ -403,7 +405,6 @@ lwip_getaddrinfo(const char *nodename, const char *servname,
MEMCPY(ai->ai_canonname, nodename, namelen); MEMCPY(ai->ai_canonname, nodename, namelen);
ai->ai_canonname[namelen] = 0; ai->ai_canonname[namelen] = 0;
} }
ai->ai_addrlen = sizeof(struct sockaddr_storage);
ai->ai_addr = (struct sockaddr *)sa; ai->ai_addr = (struct sockaddr *)sa;
*res = ai; *res = ai;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册