Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved networking code into high cohesion functions

Browse Source
This commit is contained in:
Kayne Ruse
2013-12-02 17:54:47 +11:00
parent 865620b4a8
commit f6a4674a2f
3 changed files with 63 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/server_application.cpp
+55 -44
View File
@@ -124,58 +124,19 @@ void ServerApplication::Quit() {
void ServerApplication::HandlePacket(NetworkPacket packet) {
switch(packet.meta.type) {
case NetworkPacket::Type::BROADCAST_REQUEST:
//send back the server's name
packet.meta.type = NetworkPacket::Type::BROADCAST_RESPONSE;
snprintf(packet.serverInfo.name, PACKET_STRING_SIZE, "%s", config["server.name"].c_str());
network.Send(&packet.meta.srcAddress, &packet, sizeof(NetworkPacket));
HandleBroadcastRequest(packet);
break;
case NetworkPacket::Type::JOIN_REQUEST: {
//TODO: prevent duplicate logins from the same address?
//create the new client, filling it with the correct info
Client newClient;
newClient.address = packet.meta.srcAddress;
//push the new client
clientMap[Client::counter] = newClient;
//send the client their info
packet.meta.type = NetworkPacket::Type::JOIN_RESPONSE;
packet.clientInfo.index = Client::counter;
network.Send(&newClient.address, &packet, sizeof(NetworkPacket));
//finished this routine
Client::counter++;
cout << "connect, total: " << clientMap.size() << endl;
}
case NetworkPacket::Type::JOIN_REQUEST:
HandleJoinRequest(packet);
break;
case NetworkPacket::Type::DISCONNECT:
//disconnect the specified client
network.Send(&clientMap[packet.clientInfo.index].address, &packet, sizeof(NetworkPacket));
clientMap.erase(packet.clientInfo.index);
//remove players?
cout << "disconnect, total: " << clientMap.size() << endl;
break;
case NetworkPacket::Type::SYNCHRONIZE:
//TODO
HandleDisconnect(packet);
break;
case NetworkPacket::Type::SHUTDOWN:
//end the server
running = false;
//disconnect all clients
packet.meta.type = NetworkPacket::Type::DISCONNECT;
for (auto& it : clientMap) {
network.Send(&it.second.address, &packet, sizeof(NetworkPacket));
}
cout << "shutting down" << endl;
HandleShutdown(packet);
break;
//handle errors
@@ -184,3 +145,53 @@ void ServerApplication::HandlePacket(NetworkPacket packet) {
break;
}
}
void ServerApplication::HandleBroadcastRequest(NetworkPacket packet) {
//send back the server's name
packet.meta.type = NetworkPacket::Type::BROADCAST_RESPONSE;
snprintf(packet.serverInfo.name, PACKET_STRING_SIZE, "%s", config["server.name"].c_str());
network.Send(&packet.meta.srcAddress, &packet, sizeof(NetworkPacket));
}
void ServerApplication::HandleJoinRequest(NetworkPacket packet) {
//TODO: prevent duplicate logins from the same address?
//create the new client, filling it with the correct info
Client newClient;
newClient.address = packet.meta.srcAddress;
//push the new client
clientMap[Client::counter] = newClient;
//send the client their info
packet.meta.type = NetworkPacket::Type::JOIN_RESPONSE;
packet.clientInfo.index = Client::counter;
network.Send(&newClient.address, &packet, sizeof(NetworkPacket));
//finished this routine
Client::counter++;
cout << "connect, total: " << clientMap.size() << endl;
}
void ServerApplication::HandleDisconnect(NetworkPacket packet) {
//disconnect the specified client
network.Send(&clientMap[packet.clientInfo.index].address, &packet, sizeof(NetworkPacket));
clientMap.erase(packet.clientInfo.index);
//TODO: remove players?
cout << "disconnect, total: " << clientMap.size() << endl;
}
void ServerApplication::HandleShutdown(NetworkPacket packet) {
//end the server
running = false;
//disconnect all clients
packet.meta.type = NetworkPacket::Type::DISCONNECT;
for (auto& it : clientMap) {
network.Send(&it.second.address, &packet, sizeof(NetworkPacket));
}
cout << "shutting down" << endl;
}
server/server_application.hpp
+6
View File
@@ -56,6 +56,12 @@ public:
private:
void HandlePacket(NetworkPacket);
//high cohesion utility functions
void HandleBroadcastRequest(NetworkPacket);
void HandleJoinRequest(NetworkPacket);
void HandleDisconnect(NetworkPacket);
void HandleShutdown(NetworkPacket);
//networking
UDPNetworkUtility network;