ryansnewell
/
mcserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Socket: Removed the absurd function returning localhost addr, now using INADDR_LOOPBACK 

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1596 0a769ca7-a7f5-676a-18bf-c427514a06d6
master
madmaxoft@gmail.com 2013-06-15 20:24:22 +00:00
parent 9dfff6810c
commit 360c579105
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/OSSupport/Socket.cpp
View File

@ -193,20 +193,6 @@ cSocket cSocket::CreateSocket(eFamily a_Family)
unsigned long cSocket::INTERNET_ADDRESS_LOCALHOST(void)
{
static unsigned long LocalHost = 0;
if (LocalHost == 0)
{
LocalHost = inet_addr("127.0.0.1"); // GCC won't accept this as a global var assignment
}
return LocalHost;
}
bool cSocket::BindToAnyIPv4(unsigned short a_Port) bool cSocket::BindToAnyIPv4(unsigned short a_Port)
{ {
sockaddr_in local; sockaddr_in local;
@ -246,7 +232,7 @@ bool cSocket::BindToLocalhostIPv4(unsigned short a_Port)
memset(&local, 0, sizeof(local)); memset(&local, 0, sizeof(local));
local.sin_family = AF_INET;; local.sin_family = AF_INET;;
local.sin_addr.s_addr = INTERNET_ADDRESS_LOCALHOST(); local.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
local.sin_port = htons((u_short)a_Port); local.sin_port = htons((u_short)a_Port);
return (bind(m_Socket, (sockaddr*)&local, sizeof(local)) == 0); return (bind(m_Socket, (sockaddr*)&local, sizeof(local)) == 0);
@ -337,7 +323,7 @@ bool cSocket::ConnectToLocalhostIPv4(unsigned short a_Port)
{ {
sockaddr_in server; sockaddr_in server;
server.sin_family = AF_INET; server.sin_family = AF_INET;
server.sin_addr.s_addr = INTERNET_ADDRESS_LOCALHOST(); server.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
server.sin_port = htons(a_Port); server.sin_port = htons(a_Port);
return (connect(m_Socket, (sockaddr *)&server, sizeof(server)) == 0); return (connect(m_Socket, (sockaddr *)&server, sizeof(server)) == 0);
} }

1
source/OSSupport/Socket.h
View File

@ -61,7 +61,6 @@ public:
static bool IsValidSocket(xSocket a_Socket); static bool IsValidSocket(xSocket a_Socket);
static unsigned long INTERNET_ADDRESS_LOCALHOST(void); // 127.0.0.1 represented in network byteorder; must be a function due to GCC :(
static const unsigned short ANY_PORT = 0; // When given to Bind() functions, they will find a free port static const unsigned short ANY_PORT = 0; // When given to Bind() functions, they will find a free port
static const int DEFAULT_BACKLOG = 10; static const int DEFAULT_BACKLOG = 10;