tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix logging in IPAddress::init_sockaddr.

Browse Source 
GitOrigin-RevId: 7b41388afda9d508ef23f98cee1fa0499b8b4bf9
This commit is contained in:
levlam 2018-04-30 16:30:50 +03:00
parent 0fb07d3376
commit c5fecc1359
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tdutils/td/utils/port/IPAddress.cpp
View File

@ -182,16 +182,15 @@ Status IPAddress::init_sockaddr(sockaddr *addr, socklen_t len) {
if (addr->sa_family == AF_INET6) { if (addr->sa_family == AF_INET6) {
CHECK(len == sizeof(ipv6_addr_)); CHECK(len == sizeof(ipv6_addr_));
std::memcpy(&ipv6_addr_, reinterpret_cast<sockaddr_in6 *>(addr), sizeof(ipv6_addr_)); std::memcpy(&ipv6_addr_, reinterpret_cast<sockaddr_in6 *>(addr), sizeof(ipv6_addr_));
LOG(INFO) << "Have ipv6 address " << get_ip_str() << " with port " << get_port();
} else if (addr->sa_family == AF_INET) { } else if (addr->sa_family == AF_INET) {
CHECK(len == sizeof(ipv4_addr_)); CHECK(len == sizeof(ipv4_addr_));
std::memcpy(&ipv4_addr_, reinterpret_cast<sockaddr_in *>(addr), sizeof(ipv4_addr_)); std::memcpy(&ipv4_addr_, reinterpret_cast<sockaddr_in *>(addr), sizeof(ipv4_addr_));
LOG(INFO) << "Have ipv4 address " << get_ip_str() << " with port " << get_port();
} else { } else {
return Status::Error(PSLICE() << "Unknown " << tag("sa_family", addr->sa_family)); return Status::Error(PSLICE() << "Unknown " << tag("sa_family", addr->sa_family));
} }
is_valid_ = true; is_valid_ = true;
LOG(INFO) << "Have address " << get_ip_str() << " with port " << get_port();
return Status::OK(); return Status::OK();
} }
@ -256,19 +255,15 @@ Slice IPAddress::get_ip_str() const {
return Slice("0.0.0.0"); return Slice("0.0.0.0");
} }
const void *addr;
switch (get_address_family()) { switch (get_address_family()) {
case AF_INET6: case AF_INET6:
addr = &ipv6_addr_.sin6_addr; return ::td::get_ip_str(AF_INET6, &ipv6_addr_.sin6_addr);
break;
case AF_INET: case AF_INET:
addr = &ipv4_addr_.sin_addr; return ::td::get_ip_str(AF_INET, &ipv4_addr_.sin_addr);
break;
default: default:
UNREACHABLE(); UNREACHABLE();
return Slice(); return Slice();
} }
return ::td::get_ip_str(get_address_family(), addr);
} }
int IPAddress::get_port() const { int IPAddress::get_port() const {