Changed channel to a class.

I believe this interface is better to work with. Later I'll add the
"send message" interfaces to the channel class.
This commit is contained in:
Nicolás Ortega Froysa 2018-09-04 15:52:10 +02:00
parent 93fa26aa1a
commit 15067ab4ec
No known key found for this signature in database
GPG Key ID: FEC70E3BAE2E69BF
4 changed files with 89 additions and 43 deletions

View File

@ -26,12 +26,26 @@
namespace neocomm { namespace neocomm {
/** class channel {
* @brief Object to contain channel information. public:
*/ channel(const std::string &name, dht::DhtRunner *network);
struct channel { ~channel();
dht::InfoHash key; //!< The sha1 hash of the channel name.
std::future<size_t> token; //!< Token used to leave channel. inline std::string get_name() const {
std::list<struct message> messages; //!< Messages received by channel. return name;
}
//inline dht::InfoHash get_key() const {
//return key;
//}
//inline size_t get_token() {
//return token.get();
//}
private:
const std::string name;
const dht::InfoHash key;
dht::DhtRunner *network;
std::future<size_t> token;
std::list<struct message> messages;
}; };
} }

View File

@ -21,7 +21,7 @@
#include "neocomm/channel.hpp" #include "neocomm/channel.hpp"
#include <opendht.h> #include <opendht.h>
#include <map> #include <vector>
namespace neocomm { namespace neocomm {
@ -64,18 +64,12 @@ public:
*/ */
void export_nodes(const std::string &file_path); // TODO void export_nodes(const std::string &file_path); // TODO
/** channel *join_channel(const std::string &name);
* @brief Join a channel. channel *get_channel(const std::string &name);
*
* @param name The name of the channel to join.
*/
void join_channel(const std::string &name);
/**
* @brief Leave an already joined channel.
*
* @param name Name of the channel.
*/
void leave_channel(const std::string &name); void leave_channel(const std::string &name);
inline void leave_channel(channel *chan) {
leave_channel(chan->get_name());
}
/** /**
* @brief Get the current alias for the user. * @brief Get the current alias for the user.
@ -95,18 +89,9 @@ public:
} }
private: private:
inline struct channel *get_channel(
const std::string &name) {
for(auto &i : channels)
{
if(i.first == name)
return &i.second;
}
return nullptr;
}
std::string alias; std::string alias;
dht::DhtRunner network; dht::DhtRunner network;
std::map<std::string, struct channel> channels; std::vector<channel*> channels;
}; };
} }

36
src/channel.cpp Normal file
View File

@ -0,0 +1,36 @@
/*
* Copyright (C) 2018 Ortega Froysa, Nicolás <nortega@themusicinnoise.net>
* Author: Ortega Froysa, Nicolás <nortega@themusicinnoise.net>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "neocomm/channel.hpp"
using namespace neocomm;
channel::channel(const std::string &name,
dht::DhtRunner *network) :
name(name), key(dht::InfoHash::get(name)),
network(network) {
token = network->listen<struct message>(key,
[&](struct message &&msg) {
messages.push_back(msg);
return true;
});
}
channel::~channel() {
network->cancelListen(key, token.get());
}

View File

@ -31,22 +31,33 @@ node::~node() {
network.join(); network.join();
} }
void node::join_channel(const std::string &name) { channel *node::join_channel(const std::string &name) {
// don't do anything if already joined
if(get_channel(name)) if(get_channel(name))
return; return nullptr;
channels[name].key = dht::InfoHash::get(name);
channels[name].token = network.listen<struct message>( channels.push_back(new channel(name, &network));
channels[name].key, return channels.back();
[&](struct message &&msg) { }
channels[name].messages.push_back(msg);
return true; channel *node::get_channel(const std::string &name) {
}); for(auto i : channels)
{
if(i->get_name() == name)
return i;
}
return nullptr;
} }
void node::leave_channel(const std::string &name) { void node::leave_channel(const std::string &name) {
if(not get_channel(name)) for(auto i = channels.begin();
i not_eq channels.end(); ++i)
{
if((*i)->get_name() == name)
{
delete *i;
channels.erase(i);
return; return;
network.cancelListen(channels[name].key, }
channels[name].token.get()); }
channels.erase(name);
} }