sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-03-01 00:08:15 +00:00
Code Issues Releases Wiki Activity

socket: socket::set_sockaddr() for IPv4 addresses in IPv6 builds (#7196)

Browse Source
This commit is contained in:
David Woodhouse 2024-08-06 02:50:36 +01:00 committed by GitHub
parent 6b141102d6
commit 3ba9caa118
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
esphome/components/socket/socket.cpp
View File

@ -19,6 +19,7 @@ std::unique_ptr<Socket> socket_ip(int type, int protocol) {
socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const std::string &ip_address, uint16_t port) { socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const std::string &ip_address, uint16_t port) {
#if USE_NETWORK_IPV6 #if USE_NETWORK_IPV6
if (ip_address.find(':') != std::string::npos) {
if (addrlen < sizeof(sockaddr_in6)) { if (addrlen < sizeof(sockaddr_in6)) {
errno = EINVAL; errno = EINVAL;
return 0; return 0;
@ -28,15 +29,12 @@ socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const std::stri
server->sin6_family = AF_INET6; server->sin6_family = AF_INET6;
server->sin6_port = htons(port); server->sin6_port = htons(port);
if (ip_address.find('.') != std::string::npos) {
server->sin6_addr.un.u32_addr[3] = inet_addr(ip_address.c_str());
} else {
ip6_addr_t ip6; ip6_addr_t ip6;
inet6_aton(ip_address.c_str(), &ip6); inet6_aton(ip_address.c_str(), &ip6);
memcpy(server->sin6_addr.un.u32_addr, ip6.addr, sizeof(ip6.addr)); memcpy(server->sin6_addr.un.u32_addr, ip6.addr, sizeof(ip6.addr));
}
return sizeof(sockaddr_in6); return sizeof(sockaddr_in6);
#else }
#endif /* USE_NETWORK_IPV6 */
if (addrlen < sizeof(sockaddr_in)) { if (addrlen < sizeof(sockaddr_in)) {
errno = EINVAL; errno = EINVAL;
return 0; return 0;
@ -47,7 +45,6 @@ socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const std::stri
server->sin_addr.s_addr = inet_addr(ip_address.c_str()); server->sin_addr.s_addr = inet_addr(ip_address.c_str());
server->sin_port = htons(port); server->sin_port = htons(port);
return sizeof(sockaddr_in); return sizeof(sockaddr_in);
#endif /* USE_NETWORK_IPV6 */
} }
socklen_t set_sockaddr_any(struct sockaddr *addr, socklen_t addrlen, uint16_t port) { socklen_t set_sockaddr_any(struct sockaddr *addr, socklen_t addrlen, uint16_t port) {