From 5b9675f0504e65ccee46b1ecc304d14e4f0da770 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 15 Apr 2019 18:37:53 +0300 Subject: merge of fixes with trunk --- protocols/JabberG/src/jabber_byte.cpp | 2 +- protocols/JabberG/src/jabber_file.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'protocols') diff --git a/protocols/JabberG/src/jabber_byte.cpp b/protocols/JabberG/src/jabber_byte.cpp index c72ebaaea6..fe2aaed8fd 100644 --- a/protocols/JabberG/src/jabber_byte.cpp +++ b/protocols/JabberG/src/jabber_byte.cpp @@ -211,7 +211,7 @@ void CJabberProto::ByteSendThread(JABBER_BYTE_TRANSFER *jbt) if (localAddr == nullptr) { sockaddr_in sin = {}; sin.sin_family = AF_INET; - sin.sin_addr.S_un.S_addr = nlb.dwExternalIP; + sin.sin_addr.S_un.S_addr = htonl(nlb.dwExternalIP); localAddr = Netlib_AddressToString(&sin); } diff --git a/protocols/JabberG/src/jabber_file.cpp b/protocols/JabberG/src/jabber_file.cpp index f9909972f0..1cb53aa248 100644 --- a/protocols/JabberG/src/jabber_file.cpp +++ b/protocols/JabberG/src/jabber_file.cpp @@ -288,7 +288,7 @@ void __cdecl CJabberProto::FileServerThread(filetransfer *ft) if (myAddr == nullptr) { sockaddr_in sin = {}; sin.sin_family = AF_INET; - sin.sin_addr.S_un.S_addr = nlb.dwExternalIP; + sin.sin_addr.S_un.S_addr = htonl(nlb.dwExternalIP); myAddr = Netlib_AddressToString(&sin); } -- cgit v1.2.3