diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-10-12 16:51:32 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-10-12 16:51:32 +0000 |
| commit | 03e65c78d1bc08bdaee86cf09a4dd8735b6a9fdd (patch) | |
| tree | dcae9e046b80a64e638a741c148fcdec03bc0801 /signet/Server.cpp | |
| parent | 2e4b02a9410fc51dc0c97bd4a9fd0b8c45bda27f (diff) | |
| download | sigen-03e65c78d1bc08bdaee86cf09a4dd8735b6a9fdd.tar.gz sigen-03e65c78d1bc08bdaee86cf09a4dd8735b6a9fdd.tar.xz sigen-03e65c78d1bc08bdaee86cf09a4dd8735b6a9fdd.zip | |
[FIX] Fleshing out Signet more
[DEL] Unused top-level directories
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@275 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'signet/Server.cpp')
| -rw-r--r-- | signet/Server.cpp | 37 |
1 files changed, 34 insertions, 3 deletions
diff --git a/signet/Server.cpp b/signet/Server.cpp index a5d9aca4..332c305f 100644 --- a/signet/Server.cpp +++ b/signet/Server.cpp @@ -20,7 +20,6 @@ // Signet includes #include "Room.h" -#include "ServerConnectionHandler.h" // KDE includes #include <KConfig> @@ -28,9 +27,9 @@ #include <KGlobal> Signet::Server::Server(QObject* parent) : - QObject(parent) + ConnectionHandler(parent) { - m_handler->connectToMaster(KGlobal::config()->group("Master Server")); + connectToMaster(KGlobal::config()->group("Master Server")); } void Signet::Server::createRoom(const QString& room) @@ -58,3 +57,35 @@ void Signet::Server::joinRoom(Client* client, const QString& roomName) // TODO: Let the client know about the error. } } + +void Signet::Server::connectToMaster(const KConfigGroup& group) +{ + // TODO: Get the information from the configuration + // TODO: Connect to the master +// QHostAddress masterAddress; +// int port; +// QString key; +// int timeout; +// if (config->hasGroup("Master Server")) +// { +// const KConfigGroup& group = config->group("Master Server"); +// QString address = group.readEntry("Address", ""); +// if (!masterAddress.setAddress(address)) +// qFatal(QString("Invalid address for the master server: %1").arg(address)); +// port = group.readEntry("Port", -1); +// if (port < 0) +// qFatal(QString("Invalid port for the master server: %1").arg(port)); +// key = group.readEntry("Key", ""); +// timeout = group.readEntry("Timeout", 30000); +// } +// else +// { +// // TODO: Configuration not complete +// } +// // TODO: Proxy support? +// m_masterServer->connectToHost(masterAddress, port); +// if (!m_masterServer->waitForConnect(timeout)) +// { +// // TODO: Connect failed +// } +} |