Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switching to host / network ordering swapping

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-04-18 16:37:16 +00:00
parent 3b8d819f30
commit 377f6397ac
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/ftp.cpp
View File

@@ -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;

12
src/common/sckaddr.cpp
View File

@@ -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)
);
}