lesderid
/
salty-ircd
1
0
Fork 1
Code Issues 6 Pull Requests Releases Wiki Activity

Refactor

This commit is contained in:
Les De Ridder 2017-03-11 17:45:49 +01:00
parent 730b2af803
commit cd76e303c8
No known key found for this signature in database
GPG Key ID: 5EC132DFA85DB372
3 changed files with 72 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/ircd/app.d
View File

@ -1,37 +1,10 @@
module ircd.app;
import std.stdio;
import std.algorithm;
import std.range;
import core.time;
import vibe.core.core;
import ircd.message;
import ircd.connection;
import ircd.server;
shared static this()
{
Connection[] connections = [];
runTask(delegate()
{
while(true)
{
foreach(connection; connections)
{
connection.send(Message(null, "PING", [connection.nick]));
}
sleep(10.seconds);
}
});
listenTCP(6667, delegate(TCPConnection connection)
{
auto c = new Connection(connection);
connections ~= c;
c.handle();
connections = connections.filter!(a => a != c).array;
},"127.0.0.1");
auto server = new Server();
server.listen();
}

13
source/ircd/connection.d
View File

@ -6,13 +6,13 @@ import std.string;
import vibe.core.core;
import vibe.stream.operations;
import ircd.packageVersion;
import ircd.message;
import ircd.server;
class Connection
{
private TCPConnection _connection;
private Server _server;
//TODO: Make into auto-properties (via template)
string nick;
@ -21,9 +21,10 @@ class Connection
bool connected;
this(TCPConnection connection)
this(TCPConnection connection, Server server)
{
_connection = connection;
_server = server;
}
void send(Message message)
@ -56,9 +57,9 @@ class Connection
writeln("unused: " ~ message.parameters[2]);
send(Message("localhost", "001", [nick, "Welcome to the Internet Relay Network " ~ nick ~ "!" ~ user ~ "@hostname"], true));
send(Message("localhost", "002", [nick, "Your host is localhost, running version salty-ircd-" ~ packageVersion], true));
send(Message("localhost", "003", [nick, "This server was created " ~ packageTimestampISO], true));
send(Message("localhost", "004", [nick, "localhost", "salty-ircd-" ~ packageVersion, "w", "snt"]));
send(Message("localhost", "002", [nick, "Your host is " ~ _server.name ~ ", running version " ~ _server.versionString], true));
send(Message("localhost", "003", [nick, "This server was created " ~ _server.creationDate], true));
send(Message("localhost", "004", [nick, _server.name, _server.versionString, "w", "snt"]));
break;
case "PING":
send(Message(null, "PONG", [message.parameters[0]], true));

62
source/ircd/server.d Normal file
View File

@ -0,0 +1,62 @@
module ircd.server;
import std.stdio;
import std.algorithm;
import std.range;
import std.conv;
import std.socket;
import core.time;
import vibe.core.core;
import ircd.packageVersion;
import ircd.message;
import ircd.connection;
class Server
{
Connection[] connections;
enum creationDate = packageTimestampISO.until('T').text; //TODO: Also show time when RFC-strictness is off
enum versionString = "salty-ircd-" ~ packageVersion;
string name;
this()
{
name = Socket.hostName;
runTask(&pingLoop);
}
private void pingLoop()
{
while(true)
{
foreach(connection; connections)
{
connection.send(Message(null, "PING", [connection.nick]));
}
sleep(10.seconds);
}
}
private void acceptConnection(TCPConnection tcpConnection)
{
auto connection = new Connection(tcpConnection, this);
connections ~= connection;
connection.handle();
connections = connections.filter!(c => c != connection).array;
}
void listen(ushort port = 6667)
{
listenTCP(port, &acceptConnection);
}
void listen(ushort port, string address)
{
listenTCP(port, &acceptConnection, address);
}
}