TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 16:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix lookup issue on TCPObject. Also sync with working code.

Browse source
This commit is contained in:
James Urquhart 2016-10-28 18:31:47 +01:00
parent 458bc27ea4
commit 5b1bb6547a
4 changed files with 145 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/app/mainLoop.cpp
View file

@ -320,7 +320,7 @@ void StandardMainLoop::init()
Sampler::init(); Sampler::init();
// Hook in for UDP notification // Hook in for UDP notification
Net::smPacketReceive.notify(GNet, &NetInterface::processPacketReceiveEvent); Net::getPacketReceiveEvent().notify(GNet, &NetInterface::processPacketReceiveEvent);
#ifdef TORQUE_DEBUG_GUARD #ifdef TORQUE_DEBUG_GUARD
Memory::flagCurrentAllocs( Memory::FLAG_Static ); Memory::flagCurrentAllocs( Memory::FLAG_Static );

12
Engine/source/app/net/tcpObject.cpp
View file

@ -215,9 +215,9 @@ TCPObject::TCPObject()
if(gTCPCount == 1) if(gTCPCount == 1)
{ {
Net::smConnectionAccept.notify(processConnectedAcceptEvent); Net::getConnectionAcceptedEvent().notify(processConnectedAcceptEvent);
Net::smConnectionReceive.notify(processConnectedReceiveEvent); Net::getConnectionReceiveEvent().notify(processConnectedReceiveEvent);
Net::smConnectionNotify.notify(processConnectedNotifyEvent); Net::getConnectionNotifyEvent().notify(processConnectedNotifyEvent);
} }
} }
@ -230,9 +230,9 @@ TCPObject::~TCPObject()
if(gTCPCount == 0) if(gTCPCount == 0)
{ {
Net::smConnectionAccept.remove(processConnectedAcceptEvent); Net::getConnectionAcceptedEvent().remove(processConnectedAcceptEvent);
Net::smConnectionReceive.remove(processConnectedReceiveEvent); Net::getConnectionReceiveEvent().remove(processConnectedReceiveEvent);
Net::smConnectionNotify.remove(processConnectedNotifyEvent); Net::getConnectionNotifyEvent().remove(processConnectedNotifyEvent);
} }
} }

176
Engine/source/platform/platformNet.cpp
View file

@ -157,7 +157,25 @@ NetSocket NetSocket::INVALID = NetSocket::fromHandle(-1);
template<class T> class ReservedSocketList template<class T> class ReservedSocketList
{ {
public: public:
Vector<T> mSocketList; struct EntryType
{
T value;
bool used;
EntryType() : value(-1), used(false) { ; }
bool operator==(const EntryType &e1)
{
return value == e1.value && used == e1.used;
}
bool operator!=(const EntryType &e1)
{
return !(value == e1.value && used == e1.used);
}
};
Vector<EntryType> mSocketList;
Mutex *mMutex; Mutex *mMutex;
ReservedSocketList() ReservedSocketList()
@ -349,15 +367,20 @@ template<class T> NetSocket ReservedSocketList<T>::reserve(SOCKET reserveId, boo
handle.lock(mMutex, true); handle.lock(mMutex, true);
} }
S32 idx = mSocketList.find_next(-1); S32 idx = mSocketList.find_next(EntryType());
if (idx == -1) if (idx == -1)
{ {
mSocketList.push_back(reserveId); EntryType entry;
entry.value = reserveId;
entry.used = true;
mSocketList.push_back(entry);
return NetSocket::fromHandle(mSocketList.size() - 1); return NetSocket::fromHandle(mSocketList.size() - 1);
} }
else else
{ {
mSocketList[idx] = reserveId; EntryType &entry = mSocketList[idx];
entry.used = true;
entry.value = reserveId;
} }
return NetSocket::fromHandle(idx); return NetSocket::fromHandle(idx);
@ -374,7 +397,7 @@ template<class T> void ReservedSocketList<T>::remove(NetSocket socketToRemove, b
if ((U32)socketToRemove.getHandle() >= (U32)mSocketList.size()) if ((U32)socketToRemove.getHandle() >= (U32)mSocketList.size())
return; return;
mSocketList[socketToRemove.getHandle()] = -1; mSocketList[socketToRemove.getHandle()] = EntryType();
} }
template<class T> T ReservedSocketList<T>::activate(NetSocket socketToActivate, int family, bool useUDP, bool clearOnFail) template<class T> T ReservedSocketList<T>::activate(NetSocket socketToActivate, int family, bool useUDP, bool clearOnFail)
@ -388,7 +411,11 @@ template<class T> T ReservedSocketList<T>::activate(NetSocket socketToActivate,
if ((U32)socketToActivate.getHandle() >= (U32)mSocketList.size()) if ((U32)socketToActivate.getHandle() >= (U32)mSocketList.size())
return -1; return -1;
T socketFd = mSocketList[socketToActivate.getHandle()]; EntryType &entry = mSocketList[socketToActivate.getHandle()];
if (!entry.used)
return -1;
T socketFd = entry.value;
if (socketFd == -1) if (socketFd == -1)
{ {
socketFd = ::socket(family, typeID, protocol); socketFd = ::socket(family, typeID, protocol);
@ -403,7 +430,8 @@ template<class T> T ReservedSocketList<T>::activate(NetSocket socketToActivate,
} }
else else
{ {
mSocketList[socketToActivate.getHandle()] = socketFd; entry.used = true;
entry.value = socketFd;
return socketFd; return socketFd;
} }
} }
@ -419,13 +447,34 @@ template<class T> T ReservedSocketList<T>::resolve(NetSocket socketToResolve)
if ((U32)socketToResolve.getHandle() >= (U32)mSocketList.size()) if ((U32)socketToResolve.getHandle() >= (U32)mSocketList.size())
return -1; return -1;
return mSocketList[socketToResolve.getHandle()]; EntryType &entry = mSocketList[socketToResolve.getHandle()];
return entry.used ? entry.value : -1;
} }
ConnectionNotifyEvent Net::smConnectionNotify; static ConnectionNotifyEvent* smConnectionNotify = NULL;
ConnectionAcceptedEvent Net::smConnectionAccept; static ConnectionAcceptedEvent* smConnectionAccept = NULL;
ConnectionReceiveEvent Net::smConnectionReceive; static ConnectionReceiveEvent* smConnectionReceive = NULL;
PacketReceiveEvent Net::smPacketReceive; static PacketReceiveEvent* smPacketReceive = NULL;
ConnectionNotifyEvent& Net::getConnectionNotifyEvent()
{
return *smConnectionNotify;
}
ConnectionAcceptedEvent& Net::getConnectionAcceptedEvent()
{
return *smConnectionAccept;
}
ConnectionReceiveEvent& Net::getConnectionReceiveEvent()
{
return *smConnectionReceive;
}
PacketReceiveEvent& Net::getPacketReceiveEvent()
{
return *smPacketReceive;
}
// Multicast stuff // Multicast stuff
bool Net::smMulticastEnabled = true; bool Net::smMulticastEnabled = true;
@ -528,6 +577,12 @@ bool Net::init()
#endif #endif
PlatformNetState::initCount++; PlatformNetState::initCount++;
smConnectionNotify = new ConnectionNotifyEvent();
smConnectionAccept = new ConnectionAcceptedEvent();
smConnectionReceive = new ConnectionReceiveEvent();
smPacketReceive = new PacketReceiveEvent();
Process::notify(&Net::process, PROCESS_NET_ORDER); Process::notify(&Net::process, PROCESS_NET_ORDER);
return(true); return(true);
@ -543,6 +598,12 @@ void Net::shutdown()
closePort(); closePort();
PlatformNetState::initCount--; PlatformNetState::initCount--;
// Destroy event handlers
delete smConnectionNotify;
delete smConnectionAccept;
delete smConnectionReceive;
delete smPacketReceive;
#if defined(TORQUE_USE_WINSOCK) #if defined(TORQUE_USE_WINSOCK)
if(!PlatformNetState::initCount) if(!PlatformNetState::initCount)
{ {
@ -628,7 +689,7 @@ NetSocket Net::openListenPort(U16 port, NetAddress::Type addressType)
Net::Error error = NoError; Net::Error error = NoError;
NetAddress address; NetAddress address;
if (!Net::getListenAddress(addressType, &address)) if (Net::getListenAddress(addressType, &address) != Net::NoError)
error = Net::WrongProtocolType; error = Net::WrongProtocolType;
NetSocket handleFd = NetSocket::INVALID; NetSocket handleFd = NetSocket::INVALID;
@ -767,14 +828,24 @@ NetSocket Net::openConnectTo(const char *addressString)
{ {
// need to do an asynchronous name lookup. first, add the socket // need to do an asynchronous name lookup. first, add the socket
// to the polled list // to the polled list
char addressString[256]; char addr[256];
Net::addressToString(&address, addressString); int port = 0;
addPolledSocket(handleFd, InvalidSocketHandle, PolledSocket::NameLookupRequired, addressString, address.port); int actualFamily = AF_UNSPEC;
// queue the lookup if (PlatformNetState::extractAddressParts(addressString, addr, port, actualFamily))
gNetAsync.queueLookup(addressString, handleFd); {
addPolledSocket(handleFd, InvalidSocketHandle, PolledSocket::NameLookupRequired, addr, port);
// queue the lookup
gNetAsync.queueLookup(addressString, handleFd);
}
else
{
closeSocket(handleFd);
handleFd = NetSocket::INVALID;
}
} }
else else
{ {
closeSocket(handleFd);
handleFd = NetSocket::INVALID; handleFd = NetSocket::INVALID;
} }
@ -802,20 +873,31 @@ void Net::closeConnectTo(NetSocket handleFd)
closeSocket(handleFd); closeSocket(handleFd);
} }
Net::Error Net::sendtoSocket(NetSocket handleFd, const U8 *buffer, S32 bufferSize) Net::Error Net::sendtoSocket(NetSocket handleFd, const U8 *buffer, S32 bufferSize, S32 *outBufferWritten)
{ {
if(Journal::IsPlaying()) if(Journal::IsPlaying())
{ {
U32 e; U32 e;
S32 outBytes;
Journal::Read(&e); Journal::Read(&e);
Journal::Read(&outBytes);
if (outBufferWritten)
*outBufferWritten = outBytes;
return (Net::Error) e; return (Net::Error) e;
} }
Net::Error e = send(handleFd, buffer, bufferSize); S32 outBytes = 0;
Net::Error e = send(handleFd, buffer, bufferSize, &outBytes);
if(Journal::IsRecording()) if (Journal::IsRecording())
{
Journal::Write(U32(e)); Journal::Write(U32(e));
Journal::Write(outBytes);
}
if (outBufferWritten)
*outBufferWritten = outBytes;
return e; return e;
} }
@ -854,7 +936,7 @@ bool Net::openPort(S32 port, bool doBind)
if (Net::smIpv4Enabled) if (Net::smIpv4Enabled)
{ {
if (Net::getListenAddress(NetAddress::IPAddress, &address)) if (Net::getListenAddress(NetAddress::IPAddress, &address) == Net::NoError)
{ {
address.port = port; address.port = port;
socketFd = ::socket(AF_INET, SOCK_DGRAM, protocol); socketFd = ::socket(AF_INET, SOCK_DGRAM, protocol);
@ -900,7 +982,7 @@ bool Net::openPort(S32 port, bool doBind)
if (Net::smIpv6Enabled) if (Net::smIpv6Enabled)
{ {
if (Net::getListenAddress(NetAddress::IPV6Address, &address)) if (Net::getListenAddress(NetAddress::IPV6Address, &address) == Net::NoError)
{ {
address.port = port; address.port = port;
socketFd = ::socket(AF_INET6, SOCK_DGRAM, protocol); socketFd = ::socket(AF_INET6, SOCK_DGRAM, protocol);
@ -1062,7 +1144,7 @@ void Net::process()
{ {
Con::errorf("Error getting socket options: %s", strerror(errno)); Con::errorf("Error getting socket options: %s", strerror(errno));
Net::smConnectionNotify.trigger(currentSock->handleFd, Net::ConnectFailed); smConnectionNotify->trigger(currentSock->handleFd, Net::ConnectFailed);
removeSock = true; removeSock = true;
} }
else else
@ -1079,13 +1161,13 @@ void Net::process()
break; break;
currentSock->state = PolledSocket::Connected; currentSock->state = PolledSocket::Connected;
Net::smConnectionNotify.trigger(currentSock->handleFd, Net::Connected); smConnectionNotify->trigger(currentSock->handleFd, Net::Connected);
} }
else else
{ {
// some kind of error // some kind of error
Con::errorf("Error connecting: %s", strerror(errno)); Con::errorf("Error connecting: %s", strerror(errno));
Net::smConnectionNotify.trigger(currentSock->handleFd, Net::ConnectFailed); smConnectionNotify->trigger(currentSock->handleFd, Net::ConnectFailed);
removeSock = true; removeSock = true;
} }
} }
@ -1102,7 +1184,7 @@ void Net::process()
{ {
// got some data, post it // got some data, post it
readBuff.size = bytesRead; readBuff.size = bytesRead;
Net::smConnectionReceive.trigger(currentSock->handleFd, readBuff); smConnectionReceive->trigger(currentSock->handleFd, readBuff);
} }
else else
{ {
@ -1111,7 +1193,7 @@ void Net::process()
Con::errorf("Unexpected error on socket: %s", strerror(errno)); Con::errorf("Unexpected error on socket: %s", strerror(errno));
// zero bytes read means EOF // zero bytes read means EOF
Net::smConnectionNotify.trigger(currentSock->handleFd, Net::Disconnected); smConnectionNotify->trigger(currentSock->handleFd, Net::Disconnected);
removeSock = true; removeSock = true;
} }
@ -1119,7 +1201,7 @@ void Net::process()
else if (err != Net::NoError && err != Net::WouldBlock) else if (err != Net::NoError && err != Net::WouldBlock)
{ {
Con::errorf("Error reading from socket: %s", strerror(errno)); Con::errorf("Error reading from socket: %s", strerror(errno));
Net::smConnectionNotify.trigger(currentSock->handleFd, Net::Disconnected); smConnectionNotify->trigger(currentSock->handleFd, Net::Disconnected);
removeSock = true; removeSock = true;
} }
break; break;
@ -1194,17 +1276,18 @@ void Net::process()
if (::connect(currentSock->fd, ai_addr, if (::connect(currentSock->fd, ai_addr,
ai_addrlen) == -1) ai_addrlen) == -1)
{ {
if (errno == EINPROGRESS) err = PlatformNetState::getLastError();
if (err != Net::WouldBlock)
{ {
newState = Net::DNSResolved; Con::errorf("Error connecting to %s: %u",
currentSock->state = PolledSocket::ConnectionPending; currentSock->remoteAddr, err);
newState = Net::ConnectFailed;
removeSock = true;
} }
else else
{ {
Con::errorf("Error connecting to %s: %s", newState = Net::DNSResolved;
currentSock->remoteAddr, strerror(errno)); currentSock->state = PolledSocket::ConnectionPending;
newState = Net::ConnectFailed;
removeSock = true;
} }
} }
else else
@ -1215,7 +1298,7 @@ void Net::process()
} }
} }
Net::smConnectionNotify.trigger(currentSock->handleFd, newState); smConnectionNotify->trigger(currentSock->handleFd, newState);
break; break;
case PolledSocket::Listening: case PolledSocket::Listening:
NetAddress incomingAddy; NetAddress incomingAddy;
@ -1225,7 +1308,7 @@ void Net::process()
{ {
setBlocking(incomingHandleFd, false); setBlocking(incomingHandleFd, false);
addPolledSocket(incomingHandleFd, PlatformNetState::smReservedSocketList.resolve(incomingHandleFd), Connected); addPolledSocket(incomingHandleFd, PlatformNetState::smReservedSocketList.resolve(incomingHandleFd), Connected);
Net::smConnectionAccept.trigger(currentSock->handleFd, incomingHandleFd, incomingAddy); smConnectionAccept->trigger(currentSock->handleFd, incomingHandleFd, incomingAddy);
} }
break; break;
} }
@ -1283,7 +1366,7 @@ void Net::processListenSocket(NetSocket socketHandle)
tmpBuffer.size = bytesRead; tmpBuffer.size = bytesRead;
Net::smPacketReceive.trigger(srcAddress, tmpBuffer); smPacketReceive->trigger(srcAddress, tmpBuffer);
} }
} }
@ -1458,7 +1541,7 @@ Net::Error Net::setBlocking(NetSocket handleFd, bool blockingIO)
return PlatformNetState::getLastError(); return PlatformNetState::getLastError();
} }
bool Net::getListenAddress(const NetAddress::Type type, NetAddress *address, bool forceDefaults) Net::Error Net::getListenAddress(const NetAddress::Type type, NetAddress *address, bool forceDefaults)
{ {
if (type == NetAddress::IPAddress) if (type == NetAddress::IPAddress)
{ {
@ -1468,7 +1551,7 @@ bool Net::getListenAddress(const NetAddress::Type type, NetAddress *address, boo
address->type = type; address->type = type;
address->port = PlatformNetState::defaultPort; address->port = PlatformNetState::defaultPort;
*((U32*)address->address.ipv4.netNum) = INADDR_ANY; *((U32*)address->address.ipv4.netNum) = INADDR_ANY;
return true; return Net::NoError;
} }
else else
{ {
@ -1480,7 +1563,7 @@ bool Net::getListenAddress(const NetAddress::Type type, NetAddress *address, boo
address->type = type; address->type = type;
address->port = PlatformNetState::defaultPort; address->port = PlatformNetState::defaultPort;
*((U32*)address->address.ipv4.netNum) = INADDR_BROADCAST; *((U32*)address->address.ipv4.netNum) = INADDR_BROADCAST;
return true; return Net::NoError;
} }
else if (type == NetAddress::IPV6Address) else if (type == NetAddress::IPV6Address)
{ {
@ -1494,7 +1577,7 @@ bool Net::getListenAddress(const NetAddress::Type type, NetAddress *address, boo
addr.sin6_addr = in6addr_any; addr.sin6_addr = in6addr_any;
IPSocket6ToNetAddress(&addr, address); IPSocket6ToNetAddress(&addr, address);
return true; return Net::NoError;
} }
else else
{ {
@ -1513,7 +1596,7 @@ bool Net::getListenAddress(const NetAddress::Type type, NetAddress *address, boo
} }
else else
{ {
return false; return Net::WrongProtocolType;
} }
} }
@ -1537,7 +1620,7 @@ void Net::getIdealListenAddress(NetAddress *address)
} }
} }
Net::Error Net::send(NetSocket handleFd, const U8 *buffer, S32 bufferSize) Net::Error Net::send(NetSocket handleFd, const U8 *buffer, S32 bufferSize, S32 *outBytesWritten)
{ {
SOCKET socketFd = PlatformNetState::smReservedSocketList.resolve(handleFd); SOCKET socketFd = PlatformNetState::smReservedSocketList.resolve(handleFd);
if (socketFd == InvalidSocketHandle) if (socketFd == InvalidSocketHandle)
@ -1552,6 +1635,9 @@ Net::Error Net::send(NetSocket handleFd, const U8 *buffer, S32 bufferSize)
Con::errorf("Could not write to socket. Error: %s",strerror(errno)); Con::errorf("Could not write to socket. Error: %s",strerror(errno));
#endif #endif
if (outBytesWritten)
*outBytesWritten = bytesWritten;
return PlatformNetState::getLastError(); return PlatformNetState::getLastError();
} }

14
Engine/source/platform/platformNet.h
View file

@ -204,10 +204,10 @@ struct Net
static const S32 MaxPacketDataSize = MAXPACKETSIZE; static const S32 MaxPacketDataSize = MAXPACKETSIZE;
static ConnectionNotifyEvent smConnectionNotify; static ConnectionNotifyEvent& getConnectionNotifyEvent();
static ConnectionAcceptedEvent smConnectionAccept; static ConnectionAcceptedEvent& getConnectionAcceptedEvent();
static ConnectionReceiveEvent smConnectionReceive; static ConnectionReceiveEvent& getConnectionReceiveEvent();
static PacketReceiveEvent smPacketReceive; static PacketReceiveEvent& getPacketReceiveEvent();
static bool smMulticastEnabled; static bool smMulticastEnabled;
static bool smIpv4Enabled; static bool smIpv4Enabled;
@ -232,7 +232,7 @@ struct Net
static NetSocket openListenPort(U16 port, NetAddress::Type = NetAddress::IPAddress); static NetSocket openListenPort(U16 port, NetAddress::Type = NetAddress::IPAddress);
static NetSocket openConnectTo(const char *stringAddress); // does the DNS resolve etc. static NetSocket openConnectTo(const char *stringAddress); // does the DNS resolve etc.
static void closeConnectTo(NetSocket socket); static void closeConnectTo(NetSocket socket);
static Error sendtoSocket(NetSocket socket, const U8 *buffer, S32 bufferSize); static Error sendtoSocket(NetSocket socket, const U8 *buffer, S32 bufferSize, S32 *bytesWritten=NULL);
static bool compareAddresses(const NetAddress *a1, const NetAddress *a2); static bool compareAddresses(const NetAddress *a1, const NetAddress *a2);
static Net::Error stringToAddress(const char *addressString, NetAddress *address, bool hostLookup=true, int family=0); static Net::Error stringToAddress(const char *addressString, NetAddress *address, bool hostLookup=true, int family=0);
@ -242,7 +242,7 @@ struct Net
static NetSocket openSocket(); static NetSocket openSocket();
static Error closeSocket(NetSocket socket); static Error closeSocket(NetSocket socket);
static Error send(NetSocket socket, const U8 *buffer, S32 bufferSize); static Error send(NetSocket socket, const U8 *buffer, S32 bufferSize, S32 *outBytesWritten=NULL);
static Error recv(NetSocket socket, U8 *buffer, S32 bufferSize, S32 *bytesRead); static Error recv(NetSocket socket, U8 *buffer, S32 bufferSize, S32 *bytesRead);
static Error connect(NetSocket socket, const NetAddress *address); static Error connect(NetSocket socket, const NetAddress *address);
@ -255,7 +255,7 @@ struct Net
static Error setBlocking(NetSocket socket, bool blockingIO); static Error setBlocking(NetSocket socket, bool blockingIO);
/// Gets the desired default listen address for a specified address type /// Gets the desired default listen address for a specified address type
static bool getListenAddress(const NetAddress::Type type, NetAddress *address, bool forceDefaults=false); static Net::Error getListenAddress(const NetAddress::Type type, NetAddress *address, bool forceDefaults=false);
static void getIdealListenAddress(NetAddress *address); static void getIdealListenAddress(NetAddress *address);
// Multicast for ipv6 local net browsing // Multicast for ipv6 local net browsing