Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 05:53:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup naming

Browse source
This commit is contained in:
ZappoMan 2013-08-12 13:40:21 -07:00
parent 4ea0de1637
commit ce0c868c89
5 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/shared/src/NetworkPacket.cpp
View file

@ -17,13 +17,13 @@ NetworkPacket::NetworkPacket() : _packetLength(0) {
}
NetworkPacket::NetworkPacket(const NetworkPacket& packet) {
memcpy(&_senderAddress, &packet.getSenderAddress(), sizeof(_senderAddress));
memcpy(&_address, &packet.getAddress(), sizeof(_address));
_packetLength = packet.getLength();
memcpy(&_packetData[0], packet.getData(), _packetLength);
}
NetworkPacket::NetworkPacket(sockaddr& senderAddress, unsigned char* packetData, ssize_t packetLength) {
memcpy(&_senderAddress, &senderAddress, sizeof(_senderAddress));
NetworkPacket::NetworkPacket(sockaddr& address, unsigned char* packetData, ssize_t packetLength) {
memcpy(&_address, &address, sizeof(_address));
_packetLength = packetLength;
memcpy(&_packetData[0], packetData, packetLength);
};

11
libraries/shared/src/NetworkPacket.h
View file

@ -19,20 +19,19 @@
class NetworkPacket {
public:
NetworkPacket(sockaddr& senderAddress, unsigned char* packetData, ssize_t packetLength);
NetworkPacket(sockaddr& address, unsigned char* packetData, ssize_t packetLength);
NetworkPacket(const NetworkPacket& packet);
NetworkPacket();
//~NetworkPacket();
sockaddr& getSenderAddress() { return _senderAddress; };
sockaddr& getAddress() { return _address; };
ssize_t getLength() const { return _packetLength; };
unsigned char* getData() { return &_packetData[0]; };
const sockaddr& getSenderAddress() const { return _senderAddress; };
const unsigned char* getData() const { return &_packetData[0]; };
const sockaddr& getAddress() const { return _address; };
const unsigned char* getData() const { return &_packetData[0]; };
private:
sockaddr _senderAddress;
sockaddr _address;
ssize_t _packetLength;
unsigned char _packetData[MAX_PACKET_SIZE];
};

2
libraries/shared/src/NodeList.cpp
View file

@ -439,7 +439,7 @@ void NodeList::addNodeToList(Node* newNode) {
notifyHooksOfAddedNode(newNode);
}
unsigned NodeList::broadcastToNodes(unsigned char *broadcastData, size_t dataBytes, const char* nodeTypes, int numNodeTypes) {
unsigned NodeList::broadcastToNodes(unsigned char* broadcastData, size_t dataBytes, const char* nodeTypes, int numNodeTypes) {
unsigned n = 0;
for(NodeList::iterator node = begin(); node != end(); node++) {
// only send to the NodeTypes we are asked to send to.

6
libraries/shared/src/PacketReceiver.cpp
View file

@ -10,14 +10,14 @@
#include "PacketReceiver.h"
void PacketReceiver::queuePacket(sockaddr& senderAddress, unsigned char* packetData, ssize_t packetLength) {
_packets.push_back(NetworkPacket(senderAddress, packetData, packetLength));
void PacketReceiver::queuePacket(sockaddr& address, unsigned char* packetData, ssize_t packetLength) {
_packets.push_back(NetworkPacket(address, packetData, packetLength));
}
bool PacketReceiver::process() {
while (_packets.size() > 0) {
NetworkPacket& packet = _packets.front();
processPacket(packet.getSenderAddress(), packet.getData(), packet.getLength());
processPacket(packet.getAddress(), packet.getData(), packet.getLength());
_packets.erase(_packets.begin());
}
return true; // keep running till they terminate us

2
libraries/shared/src/PacketReceiver.h
View file

@ -29,6 +29,4 @@ private:
std::vector<NetworkPacket> _packets;
};
extern "C" void* PacketReceiverThreadEntry(void* arg);
#endif // __shared__PacketReceiver__