More integration #4 #10

src/context.cpp

@@ -76,6 +76,10 @@ void Context::send(const Uint8 code, const std::string & message) {
     network.send(code, message);
 }
 
+void Context::setServerIP(const Uint32 ip) {
+	network.setServerInfo(ip);
+}
+
 /**
  * Create and replace the current Context in the application
  * Closely related to the Factory design pattern

src/context.hpp

@@ -56,6 +56,7 @@ class Context {
 	void addCenteredWidget(gcn::Widget *widget);
 	void setNextContext(const ContextName newContext);
     void send(const Uint8 code, const std::string & message);
+	void setServerIP(const Uint32 ip);
 
 private:
 	static gcn::Container *parent;

src/main.cpp

@@ -22,7 +22,6 @@
 #include "settings.hpp"
 #include "sound.hpp"
 #include "utils.hpp"
-#include "network.hpp"
 #include "context.hpp"
 #include "views/menu.hpp"
 
@@ -155,8 +154,6 @@ int main(int argc, char* argv[]) {
 
 	SDL_setFramerate(&fpsMgr, 30);
 
-	NetworkManager network;
-
 	Context::setParent(&top);
 	currentContext = Context::getNextContext(ContextName::MAIN_MENU);
 
@@ -211,12 +208,13 @@ void loop(gcn::SDLInput &input) {
 	SDL_Event event;
 
 	for (;;) {
+		// Change context if necessary
 		ContextName next = currentContext->getNextContextName();
 		if (next != currentContext->getName()) {
 			currentContext = Context::getNextContext(next);
 		}
 
-		// do something
+		// handle user events
 		while (SDL_PollEvent(&event) == 1) {
 			if (event.type == SDL_QUIT)
 				return;
@@ -225,6 +223,8 @@ void loop(gcn::SDLInput &input) {
 
 			input.pushInput(event);
 		}
+		// Handle received messages
+		currentContext->receive();
 
 		gui->logic();
 

src/network.cpp

@@ -78,20 +78,19 @@ void NetworkManager::setServerInfo(Uint32 ip) {
     SDLNet_Write16(SERVER_PORT, &serverInfo.port);
 }
 
+/**
+ * Extract message code from a packet
+ * \param p packet to handle
+ */
 Uint8 NetworkManager::getCode(UDPpacket *p) {
     return p->data[0];
 }
 
+/**
+ * Extract payload from a packet
+ * \param p packet to handle
+ */
 string NetworkManager::getMessage(UDPpacket *p) {
     string message(reinterpret_cast<char*>(p->data+1));
     return message;
 }
-
-/**
- * Send the broadcast message to try to find a server on the local network
- * \param ip server address (IPv4), defaults to broadcast if none supplied
- */
-void NetworkManager::findServer(Uint32 ip) {
-    setServerInfo(ip);
-    send(HELLO_MSG, "HELLO");
-}

src/network.hpp

@@ -19,7 +19,6 @@ class NetworkManager final {
     NetworkManager();
     ~NetworkManager();
     void send(Uint8 code, const std::string & message);
-    void findServer(Uint32 ip = INADDR_BROADCAST);
     void setServerInfo(Uint32 ip);
     std::vector<UDPpacket*> & receive();
 

src/ui/serverlistelement.hpp

@@ -19,7 +19,6 @@
 
 struct ServerInfo {
 	Uint32 ip;
-	Uint16 port;
 	std::string name;
 	Uint8 levelMin;
 	Uint8 levelMax;

src/utils.cpp

@@ -154,4 +154,20 @@ namespace linbound {
 		return result;
 	}
 
+	vector<string> split(const string & str, const char delim) {
+		vector<string> result;
+		size_t currentIndex = 0;
+		size_t end = str.find(delim);
+
+		while (end != string::npos) {
+			result.push_back(str.substr(currentIndex, end - currentIndex));
+
+			currentIndex = end + 1;
+			end = str.find(delim, currentIndex);
+		}
+		result.push_back(str.substr(currentIndex));
+
+		return result;
+	}
+
 }

src/utils.hpp

@@ -18,6 +18,7 @@
 
 #include <SDL2/SDL.h>
 #include <string>
+#include <vector>
 #include <guisan.hpp>
 
 #include "config.hpp"
@@ -32,6 +33,7 @@ namespace linbound {
     int getVersion();
     std::string prettifyIP(Uint32 address);
 	Uint32 stringToIP(const std::string &input);
+	std::vector<std::string> split(const std::string &str, const char delim);
 }
 
 #endif 

src/views/serverlist.cpp

@@ -7,7 +7,6 @@
  */
 
 #include <SDL2/SDL_image.h>
-#include <SDL2/SDL_net.h>
 #include "../protocol.hpp"
 #include "../utils.hpp"
 #include "serverlist.hpp"
@@ -59,7 +58,7 @@ void ServerList::action(const gcn::ActionEvent & actionEvent) {
 		input_ip.setVisible(true);
 	}
 	else if (actionEvent.getId() == "rescan") {
-		scanNetwork();
+		sendRequest();
 	}
 	else if (actionEvent.getId() == "connect") {
 		currentIP = linbound::stringToIP(input_ip.getText());
@@ -101,6 +100,7 @@ void ServerList::processMessage(const Uint8 code, const string & message) {
 	switch (code) {
 	case SERVER_INFO:
 		// Analyze message and create button, store in vector
+		serversFound.push_back(makeInfo(message));
 		break;
 	case LOGIN_MSG: {
 		// Analyze message, warn of errors
@@ -135,31 +135,29 @@ void ServerList::addWidgets() {
 	addCenteredWidget(&input_ip);
 }
 
-/**
- * Send a broadcast message to find other servers
- */
-void ServerList::scanNetwork() {
-	// TBD
-
-	state = State::RECEIVING_BC;
-    lastChangeTime = SDL_GetTicks();
-}
-
 /**
  * Try to see if a server exists at a given IP
  * \param ip IPv4 as an Uint32, fetched from the user
  */
 void ServerList::sendRequest(Uint32 ip) {
-	// Create message
+	// Set IP
+	setServerIP(ip);
 
 	// Send it
+	send(HELLO_MSG, "HELLO");
 
-	state = State::RECEIVING_IP;
+	if (ip == INADDR_BROADCAST) {
+		state = State::RECEIVING_BC;
+	}
+	else {
+		state = State::RECEIVING_IP;
+	}
     lastChangeTime = SDL_GetTicks();
 }
 
 void ServerList::login(Uint32 ip, const string & login, const string & password) {
     // Set IP in NetworkManager
+	setServerIP(ip);
 
     string message = login + '\3' + password; // yup, in clear
 
@@ -169,3 +167,17 @@ void ServerList::login(Uint32 ip, const string & login, const string & password)
 	state = State::LOGIN;
     lastChangeTime = SDL_GetTicks();
 }
+
+ServerInfo ServerList::makeInfo(const std::string & message) {
+	ServerInfo result;
+	vector<string> pieces = linbound::split(message, '\3');
+
+	if (pieces.size() >= 4) {
+		result.name = pieces[0];
+		result.levelMin = static_cast<Uint8>(pieces[1].at(0));
+		result.levelMax = static_cast<Uint8>(pieces[2].at(0));
+		result.busy = static_cast<Uint8>(pieces[3].at(0));
+	}
+
+	return result;
+}

src/views/serverlist.hpp

@@ -13,6 +13,7 @@
 #include <vector>
 #include <guisan.hpp>
 #include <SDL2/SDL.h>
+#include <SDL2/SDL_net.h>
 #include "../context.hpp"
 #include "../ui/loginwindow.hpp"
 #include "../ui/serverlistelement.hpp"
@@ -63,9 +64,9 @@ class ServerList : public Context, public gcn::ActionListener {
 	std::vector<ServerInfo> serversFound;
 
 	void addWidgets();
-	void scanNetwork();
-	void sendRequest(Uint32 ip);
+	void sendRequest(Uint32 ip = INADDR_BROADCAST);
 	void login(Uint32 ip, const std::string &login, const std::string &password);
+	ServerInfo makeInfo(const std::string &message);
 };
 
 #endif // !_H_SERVERLIST_