From 377f6397acbe8eb5ac85be5e141eb2572f01b13b Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 18 Apr 2004 16:37:16 +0000 Subject: [PATCH] switching to host / network ordering swapping git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/ftp.cpp | 8 ++++---- src/common/sckaddr.cpp | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp index 83f419d546..5edc4b2e8b 100644 --- a/src/common/ftp.cpp +++ b/src/common/ftp.cpp @@ -596,10 +596,10 @@ wxSocketClient *wxFTP::GetPort() wxSscanf(straddr, wxT("%d,%d,%d,%d,%d,%d"), &a[2],&a[3],&a[4],&a[5],&a[0],&a[1]); - wxUint32 hostaddr = (wxUint16)a[5] << 24 | - (wxUint16)a[4] << 16 | - (wxUint16)a[3] << 8 | - a[2]; + wxUint32 hostaddr = (wxUint16)a[2] << 24 | + (wxUint16)a[3] << 16 | + (wxUint16)a[4] << 8 | + a[5]; wxUint16 port = (wxUint16)a[0] << 8 | a[1]; wxIPV4address addr; diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index 3ac7e22d9f..f158a55768 100644 --- a/src/common/sckaddr.cpp +++ b/src/common/sckaddr.cpp @@ -211,10 +211,10 @@ wxString wxIPV4address::IPAddress() const unsigned long raw = GAddress_INET_GetHostAddress(m_address); return wxString::Format( _T("%u.%u.%u.%u"), - (unsigned char)(raw & 0xff), - (unsigned char)((raw>>8) & 0xff), + (unsigned char)((raw>>24) & 0xff), (unsigned char)((raw>>16) & 0xff), - (unsigned char)((raw>>24) & 0xff) + (unsigned char)((raw>>8) & 0xff), + (unsigned char)(raw & 0xff) ); } @@ -288,10 +288,10 @@ wxString wxIPV6address::IPAddress() const unsigned long raw = GAddress_INET_GetHostAddress(m_address); return wxString::Format( _T("%u.%u.%u.%u"), - (unsigned char)(raw & 0xff), - (unsigned char)((raw>>8) & 0xff), + (unsigned char)((raw>>24) & 0xff), (unsigned char)((raw>>16) & 0xff), - (unsigned char)((raw>>24) & 0xff) + (unsigned char)((raw>>8) & 0xff), + (unsigned char)(raw & 0xff) ); } -- 2.45.2