From cc077a3971c2e3821db766f8f79894f63c2add89 Mon Sep 17 00:00:00 2001 From: levlam Date: Tue, 11 Sep 2018 19:40:53 +0300 Subject: [PATCH] Fix IPAddress::get_ipv4 usages. GitOrigin-RevId: 6d87c9347aaa40957b1e524f889cf9fe8b179bb1 --- tdnet/td/net/Socks5.cpp | 4 ++-- tdutils/td/utils/port/IPAddress.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tdnet/td/net/Socks5.cpp b/tdnet/td/net/Socks5.cpp index 6f154a14e..ca4105681 100644 --- a/tdnet/td/net/Socks5.cpp +++ b/tdnet/td/net/Socks5.cpp @@ -101,7 +101,7 @@ void Socks5::send_ip_address() { request += '\x00'; if (ip_address_.is_ipv4()) { request += '\x01'; - auto ipv4 = ip_address_.get_ipv4(); + auto ipv4 = ntohl(ip_address_.get_ipv4()); request += static_cast(ipv4 & 255); request += static_cast((ipv4 >> 8) & 255); request += static_cast((ipv4 >> 16) & 255); @@ -136,7 +136,7 @@ Status Socks5::wait_ip_address_response() { } it.advance(1, c_slice); if (c != '\0') { - return Status::Error("byte must be zero"); + return Status::Error("Byte must be zero"); } it.advance(1, c_slice); size_t total_size = 6; diff --git a/tdutils/td/utils/port/IPAddress.cpp b/tdutils/td/utils/port/IPAddress.cpp index 881e91b82..dc641ec99 100644 --- a/tdutils/td/utils/port/IPAddress.cpp +++ b/tdutils/td/utils/port/IPAddress.cpp @@ -210,7 +210,7 @@ bool IPAddress::is_ipv6() const { uint32 IPAddress::get_ipv4() const { CHECK(is_valid()); CHECK(is_ipv4()); - return ntohl(ipv4_addr_.sin_addr.s_addr); + return htonl(ipv4_addr_.sin_addr.s_addr); } Slice IPAddress::get_ipv6() const {