Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 03:37:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

sendPacketList first implementation

Browse source
This commit is contained in:
Atlante45 2015-07-13 12:58:26 -07:00
parent 77bff0c4f2
commit 7a160db8dd
3 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
libraries/networking/src/LimitedNodeList.cpp
View file

@ -255,9 +255,7 @@ qint64 LimitedNodeList::sendUnreliablePacket(const NLPacket& packet, const Node&
} }
// use the node's active socket as the destination socket // use the node's active socket as the destination socket
auto destinationSockAddr = destinationNode.getActiveSocket(); return sendUnreliablePacket(packet, *destinationNode.getActiveSocket());
return sendUnreliablePacket(packet, *destinationSockAddr);
} }
qint64 LimitedNodeList::sendUnreliablePacket(const NLPacket& packet, const HifiSockAddr& sockAddr) { qint64 LimitedNodeList::sendUnreliablePacket(const NLPacket& packet, const HifiSockAddr& sockAddr) {
@ -271,9 +269,7 @@ qint64 LimitedNodeList::sendPacket(std::unique_ptr<NLPacket> packet, const Node&
} }
// use the node's active socket as the destination socket // use the node's active socket as the destination socket
auto destinationSockAddr = destinationNode.getActiveSocket(); return sendPacket(std::move(packet), *destinationNode.getActiveSocket());
return sendPacket(std::move(packet), *destinationSockAddr);
} }
qint64 LimitedNodeList::sendPacket(std::unique_ptr<NLPacket> packet, const HifiSockAddr& sockAddr) { qint64 LimitedNodeList::sendPacket(std::unique_ptr<NLPacket> packet, const HifiSockAddr& sockAddr) {
@ -285,19 +281,26 @@ qint64 LimitedNodeList::sendPacketList(NLPacketList& packetList, const Node& des
// we don't have a socket to send to, return 0 // we don't have a socket to send to, return 0
return 0; return 0;
} }
return sendPacketList(packetList, *destinationNode.getActiveSocket());
// use the node's active socket as the destination socket
auto destinationSockAddr = destinationNode.getActiveSocket();
return sendPacketList(packetList, *destinationSockAddr);
} }
qint64 LimitedNodeList::sendPacketList(NLPacketList& packetList, const HifiSockAddr& sockAddr) { qint64 LimitedNodeList::sendPacketList(NLPacketList& packetList, const HifiSockAddr& sockAddr) {
// for (auto packet : packetList) { qint64 bytesSent{ 0 };
// auto& packets = packetList._packets;
// } while (!packets.empty()) {
bytesSent += sendPacket(std::move(packets.front()), sockAddr);
packets.pop_front();
}
assert(false); return 0; return bytesSent;
}
qint64 LimitedNodeList::sendPacket(std::unique_ptr<NLPacket> packet, const Node& destinationNode,
const HifiSockAddr& overridenSockAddr) {
// use the node's active socket as the destination socket if there is no overriden socket address
auto& destinationSockAddr = (overridenSockAddr.isNull()) ? *destinationNode.getActiveSocket()
: overridenSockAddr;
return sendPacket(std::move(packet), destinationSockAddr);
} }
PacketSequenceNumber LimitedNodeList::getNextSequenceNumberForPacket(const QUuid& nodeUUID, PacketType::Value packetType) { PacketSequenceNumber LimitedNodeList::getNextSequenceNumberForPacket(const QUuid& nodeUUID, PacketType::Value packetType) {

5
libraries/networking/src/LimitedNodeList.h
View file

@ -270,9 +270,8 @@ protected:
void sendPacketToIceServer(PacketType::Value packetType, const HifiSockAddr& iceServerSockAddr, const QUuid& clientID, void sendPacketToIceServer(PacketType::Value packetType, const HifiSockAddr& iceServerSockAddr, const QUuid& clientID,
const QUuid& peerRequestID = QUuid()); const QUuid& peerRequestID = QUuid());
qint64 sendPacket(std::unique_ptr<NLPacket> packet, const SharedNodePointer& destinationNode, qint64 sendPacket(std::unique_ptr<NLPacket> packet, const Node& destinationNode,
const HifiSockAddr& overridenSockAddr) const HifiSockAddr& overridenSockAddr);
{ assert(false); return 0; }
QUuid _sessionUUID; QUuid _sessionUUID;

2
libraries/networking/src/NLPacketList.h
View file

@ -41,6 +41,8 @@ protected:
virtual qint64 readData(char* data, qint64 maxSize) { return 0; } virtual qint64 readData(char* data, qint64 maxSize) { return 0; }
private: private:
friend class LimitedNodeList;
NLPacketList(const NLPacketList& other) = delete; NLPacketList(const NLPacketList& other) = delete;
NLPacketList& operator=(const NLPacketList& other) = delete; NLPacketList& operator=(const NLPacketList& other) = delete;