mirror of
https://github.com/deavminet/dnetd
synced 2024-09-21 17:53:39 +02:00
That should make linking work now
This commit is contained in:
parent
7cd4b4af8d
commit
998f8060bf
@ -85,6 +85,8 @@ void main(string[] args)
|
|||||||
|
|
||||||
/* Start the server (TODO: This should start Meyer) */
|
/* Start the server (TODO: This should start Meyer) */
|
||||||
dserver.startServer();
|
dserver.startServer();
|
||||||
|
|
||||||
|
dserver.startOutboundLinks(serverLinks);
|
||||||
}
|
}
|
||||||
catch(JSONException e)
|
catch(JSONException e)
|
||||||
{
|
{
|
||||||
|
@ -396,7 +396,7 @@ public class DConnection : Thread
|
|||||||
|
|
||||||
/* Add to the meyer system (this connectio) */
|
/* Add to the meyer system (this connectio) */
|
||||||
import dnetd.dlink : DLink;
|
import dnetd.dlink : DLink;
|
||||||
DLink newLink = new DLink(server, serverNameIncoming, null);
|
DLink newLink = new DLink(server, serverNameIncoming, null, this);
|
||||||
bool linkSuccessful = server.getMeyer().attachLink(serverNameIncoming, newLink);
|
bool linkSuccessful = server.getMeyer().attachLink(serverNameIncoming, newLink);
|
||||||
gprintln("Whether or not the link worked out (could be config error or possibly duplicate link): "~to!(string)(linkSuccessful));
|
gprintln("Whether or not the link worked out (could be config error or possibly duplicate link): "~to!(string)(linkSuccessful));
|
||||||
|
|
||||||
|
@ -256,7 +256,7 @@ public final class DMeyer
|
|||||||
/* TODO: Open connections to all servers we are yet to open a connection to (check the `links` array) */
|
/* TODO: Open connections to all servers we are yet to open a connection to (check the `links` array) */
|
||||||
|
|
||||||
|
|
||||||
this.links = links;
|
//this.links = links;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -164,7 +164,7 @@ public class DServer : Thread
|
|||||||
start();
|
start();
|
||||||
|
|
||||||
/* Start outbound server linking */
|
/* Start outbound server linking */
|
||||||
startOutboundLinks();
|
//startOutboundLinks();
|
||||||
gprintln("poes");
|
gprintln("poes");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -174,12 +174,12 @@ public class DServer : Thread
|
|||||||
* establish an outbound connection and therefore
|
* establish an outbound connection and therefore
|
||||||
* connection handler for each of them
|
* connection handler for each of them
|
||||||
*/
|
*/
|
||||||
private void startOutboundLinks()
|
public void startOutboundLinks(DLink[] linksTest)
|
||||||
{
|
{
|
||||||
DLink[] serverLinks = meyerSS.getLinks();
|
//DLink[] serverLinks = meyerSS.getLinks();
|
||||||
|
|
||||||
/* Start all DLink outbound handlers (TODO: Move to DServer) */
|
/* Start all DLink outbound handlers (TODO: Move to DServer) */
|
||||||
foreach(DLink link; serverLinks)
|
foreach(DLink link; linksTest)
|
||||||
{
|
{
|
||||||
link.start();
|
link.start();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user