Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-11 11:13:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

another rename to Socket callbacks

Browse source
This commit is contained in:
Stephen Birarda 2015-07-22 10:16:26 -07:00
parent 7f53eda0d9
commit fb7130120a
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ice-server/src/IceServer.cpp
View file

@ -36,10 +36,10 @@ IceServer::IceServer(int argc, char* argv[]) :
// set processPacket as the verified packet callback for the udt::Socket
using std::placeholders::_1;
_serverSocket.setVerifiedPacketHandler(std::bind(&IceServer::processPacket, this, _1));
_serverSocket.setPacketHandler(std::bind(&IceServer::processPacket, this, _1));
// set packetVersionMatch as the verify packet operator for the udt::Socket
_serverSocket.setPacketVerificationHandler(std::bind(&IceServer::packetVersionMatch, this, _1));
_serverSocket.setPacketFilterOperator(std::bind(&IceServer::packetVersionMatch, this, _1));
// setup our timer to clear inactive peers
QTimer* inactivePeerTimer = new QTimer(this);

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

@ -99,10 +99,10 @@ LimitedNodeList::LimitedNodeList(unsigned short socketListenPort, unsigned short
// set &PacketReceiver::handleVerifiedPacket as the verified packet callback for the udt::Socket
using std::placeholders::_1;
_nodeSocket.setVerifiedPacketHandler(std::bind(&PacketReceiver::handleVerifiedPacket, _packetReceiver, _1));
_nodeSocket.setPacketHandler(std::bind(&PacketReceiver::handleVerifiedPacket, _packetReceiver, _1));
// set our isPacketVerified method as the verify operator for the udt::Socket
_nodeSocket.setPacketVerificationHandler(std::bind(&LimitedNodeList::isPacketVerified, this, _1));
_nodeSocket.setPacketFilterOperator(std::bind(&LimitedNodeList::isPacketVerified, this, _1));
_packetStatTimer.start();

6
libraries/networking/src/udt/Socket.cpp
View file

@ -89,10 +89,10 @@ void Socket::readPendingDatagrams() {
auto packet = Packet::fromReceivedPacket(std::move(buffer), packetSizeWithHeader, senderSockAddr);
// call our verification operator to see if this packet is verified
if (_unfilteredSockAddrs.contains(senderSockAddr) || !_packetVerificationHandler || _packetVerificationHandler(*packet)) {
if (_verifiedPacketHandler) {
if (_unfilteredSockAddrs.contains(senderSockAddr) || !_packetFilterOperator || _packetFilterOperator(*packet)) {
if (_packetHandler) {
// call the verified packet callback to let it handle this packet
return _verifiedPacketHandler(std::move(packet));
return _packetHandler(std::move(packet));
}
}
}

12
libraries/networking/src/udt/Socket.h
View file

@ -24,8 +24,8 @@
namespace udt {
using PacketVerificationHandler = std::function<bool(const Packet&)>;
using VerifiedPacketHandler = std::function<void(std::unique_ptr<Packet>)>;
using PacketFilterOperator = std::function<bool(const Packet&)>;
using PacketHandler = std::function<void(std::unique_ptr<Packet>)>;
class Socket : public QObject {
Q_OBJECT
@ -43,8 +43,8 @@ public:
void bind(const QHostAddress& address, quint16 port = 0) { _udpSocket.bind(address, port); }
void rebind();
void setPacketVerificationHandler(PacketVerificationHandler handler) { _packetVerificationHandler = handler; }
void setVerifiedPacketHandler(VerifiedPacketHandler handler) { _verifiedPacketHandler = handler; }
void setPacketFilterOperator(PacketFilterOperator filterOperator) { _packetFilterOperator = filterOperator; }
void setPacketHandler(PacketHandler handler) { _packetHandler = handler; }
void setBufferSizes(int numBytes);
@ -55,8 +55,8 @@ private slots:
private:
QUdpSocket _udpSocket { this };
PacketVerificationHandler _packetVerificationHandler;
VerifiedPacketHandler _verifiedPacketHandler;
PacketFilterOperator _packetFilterOperator;
PacketHandler _packetHandler;
QSet<HifiSockAddr> _unfilteredSockAddrs;
};