michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: remove IP CONFIG checks in lwm2m_parse_peerinfo()

Browse source 
CONFIG_NET_IPV* checks are not needed in lwm2m_parse_peerinfo().
The functions used are always available.  Worse, having these checks
forces the need to enable CONFIG_NET_IPV4 or IPV6 when it's not really
needed (LwM2M could be using an offloaded IP stack).

Fixes: https://github.com/zephyrproject-rtos/zephyr/issues/17401

Signed-off-by: Michael Scott <mike@foundries.io>
This commit is contained in:
Michael Scott 2019-07-08 10:35:32 -07:00 • committed by Jukka Rissanen
commit 88642ef2eb
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
subsys/net/lib/lwm2m/lwm2m_engine.c
View file

@ -4096,21 +4096,15 @@ int lwm2m_parse_peerinfo(char *url, struct sockaddr *addr, bool *use_dtls)
(void)memset(addr, 0, sizeof(*addr));
/* try and set IP address directly */
ret = -EINVAL;
#if defined(CONFIG_NET_IPV6)
addr->sa_family = AF_INET6;
ret = net_addr_pton(AF_INET6, url + off,
&((struct sockaddr_in6 *)addr)->sin6_addr);
#endif /* CONFIG_NET_IPV6 */
#if defined(CONFIG_NET_IPV4)
/* Try to parse again using AF_INET */
if (ret < 0) {
addr->sa_family = AF_INET;
ret = net_addr_pton(AF_INET, url + off,
&((struct sockaddr_in *)addr)->sin_addr);
}
#endif /* CONFIG_NET_IPV4 */
if (ret < 0) {
#if defined(CONFIG_DNS_RESOLVER)
@ -4118,8 +4112,10 @@ int lwm2m_parse_peerinfo(char *url, struct sockaddr *addr, bool *use_dtls)
hints.ai_family = AF_UNSPEC;
#elif defined(CONFIG_NET_IPV6)
hints.ai_family = AF_INET6;
#else
#elif defined(CONFIG_NET_IPV4)
hints.ai_family = AF_INET;
#else
hints.ai_family = AF_UNSPEC;
#endif /* defined(CONFIG_NET_IPV6) && defined(CONFIG_NET_IPV4) */
hints.ai_socktype = SOCK_DGRAM;
ret = getaddrinfo(url + off, NULL, &hints, &res);