summaryrefslogtreecommitdiffstats
path: root/source/OSSupport
diff options
context:
space:
mode:
authormadmaxoft <madmaxoft@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-03-05 14:35:19 +0100
committermadmaxoft <madmaxoft@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-03-05 14:35:19 +0100
commitfcdc68fd8e777fa4c852acf7e471de914e4d7ee7 (patch)
treebf1dc6ab80930c8bee3d08375539517fc6a2845b /source/OSSupport
parentFixed logic in socketthreads connecting (diff)
downloadcuberite-fcdc68fd8e777fa4c852acf7e471de914e4d7ee7.tar
cuberite-fcdc68fd8e777fa4c852acf7e471de914e4d7ee7.tar.gz
cuberite-fcdc68fd8e777fa4c852acf7e471de914e4d7ee7.tar.bz2
cuberite-fcdc68fd8e777fa4c852acf7e471de914e4d7ee7.tar.lz
cuberite-fcdc68fd8e777fa4c852acf7e471de914e4d7ee7.tar.xz
cuberite-fcdc68fd8e777fa4c852acf7e471de914e4d7ee7.tar.zst
cuberite-fcdc68fd8e777fa4c852acf7e471de914e4d7ee7.zip
Diffstat (limited to 'source/OSSupport')
-rw-r--r--source/OSSupport/Socket.cpp29
-rw-r--r--source/OSSupport/Socket.h7
-rw-r--r--source/OSSupport/SocketThreads.cpp2
3 files changed, 22 insertions, 16 deletions
diff --git a/source/OSSupport/Socket.cpp b/source/OSSupport/Socket.cpp
index 2412852d5..efc20284f 100644
--- a/source/OSSupport/Socket.cpp
+++ b/source/OSSupport/Socket.cpp
@@ -265,37 +265,40 @@ bool cSocket::Listen(int a_Backlog)
-cSocket cSocket::Accept()
+cSocket cSocket::AcceptIPv4(void)
{
sockaddr_in from;
- socklen_t fromlen=sizeof(from);
+ socklen_t fromlen = sizeof(from);
- cSocket SClient = accept(m_Socket, (sockaddr*)&from, &fromlen);
+ cSocket SClient = accept(m_Socket, (sockaddr *)&from, &fromlen);
if (SClient.IsValid() && (from.sin_addr.s_addr != 0)) // Get IP in string form
{
SClient.m_IPString = inet_ntoa(from.sin_addr);
}
-
return SClient;
}
-
-/*
-int cSocket::Connect(SockAddr_In & a_Address)
+
+cSocket cSocket::AcceptIPv6(void)
{
- sockaddr_in local;
+ sockaddr_in6 from;
+ socklen_t fromlen = sizeof(from);
- local.sin_family = a_Address.Family;
- local.sin_addr.s_addr = a_Address.Address;
- local.sin_port = htons((u_short)a_Address.Port);
+ cSocket SClient = accept(m_Socket, (sockaddr *)&from, &fromlen);
- return connect(m_Socket, (sockaddr *)&local, sizeof(local));
+ // Get IP in string form:
+ if (SClient.IsValid())
+ {
+ char buffer[INET6_ADDRSTRLEN];
+ inet_ntop(AF_INET6, &(from.sin6_addr), buffer, sizeof(buffer));
+ SClient.m_IPString.assign(buffer);
+ }
+ return SClient;
}
-*/
diff --git a/source/OSSupport/Socket.h b/source/OSSupport/Socket.h
index 7c051d229..ddaf7d8c0 100644
--- a/source/OSSupport/Socket.h
+++ b/source/OSSupport/Socket.h
@@ -77,8 +77,11 @@ public:
/// Sets the socket to listen for incoming connections. Returns true if successful.
bool Listen(int a_Backlog = DEFAULT_BACKLOG);
- /// Accepts an incoming connection. Blocks if none available.
- cSocket Accept();
+ /// Accepts an IPv4 incoming connection. Blocks if none available.
+ cSocket AcceptIPv4(void);
+
+ /// Accepts an IPv6 incoming connection. Blocks if none available.
+ cSocket AcceptIPv6(void);
/// Connects to a localhost socket on the specified port using IPv4; returns true if successful.
bool ConnectToLocalhostIPv4(unsigned short a_Port);
diff --git a/source/OSSupport/SocketThreads.cpp b/source/OSSupport/SocketThreads.cpp
index b008cf2d2..3e505616c 100644
--- a/source/OSSupport/SocketThreads.cpp
+++ b/source/OSSupport/SocketThreads.cpp
@@ -461,7 +461,7 @@ bool cSocketThreads::cSocketThread::Start(void)
}
// Finish connecting the control socket by accepting connection from the thread's socket
- cSocket tmp = m_ControlSocket2.Accept();
+ cSocket tmp = m_ControlSocket2.AcceptIPv4();
if (!tmp.IsValid())
{
LOGERROR("Cannot link Control sockets for a cSocketThread (\"%s\"); continuing, but server may be unreachable from now on.", cSocket::GetLastErrorString().c_str());