diff options
Diffstat (limited to 'src/org/noreply/fancydress/type3/Path.java')
| -rw-r--r-- | src/org/noreply/fancydress/type3/Path.java | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/src/org/noreply/fancydress/type3/Path.java b/src/org/noreply/fancydress/type3/Path.java index af0a6f3..8f492ec 100644 --- a/src/org/noreply/fancydress/type3/Path.java +++ b/src/org/noreply/fancydress/type3/Path.java @@ -2,6 +2,7 @@ package org.noreply.fancydress.type3; import org.noreply.fancydress.crypto.*; +import org.noreply.fancydress.status.*; import org.noreply.fancydress.directory.*; import org.noreply.fancydress.misc.Util; import org.noreply.fancydress.type3.routing.*; @@ -11,23 +12,13 @@ public class Path { HalfPath first; HalfPath second; - public Path(Directory dir) throws Exception { - Hop[] hops1 = new Hop[4]; - Hop[] hops2 = new Hop[2]; + public Path(Directory dir, String path) throws Exception { + int crossover = path.indexOf(':'); + if (crossover < 0) + throw new Mix3Exception("Path is not a valid path: no crossover point specified."); - Server test = dir.getServer("test1"); - ServerDescriptor desc = test.getDescriptor(); - - Routing route1 = new RoutingIP4(InetAddress.getByName("172.22.118.2"), 48099, test.getKeyID()); - hops1[0] = new Hop(route1, desc.getPacketKey()); - hops1[1] = new Hop(route1, desc.getPacketKey()); - hops1[2] = new Hop(route1, desc.getPacketKey()); - hops1[3] = new Hop(route1, desc.getPacketKey()); - hops2[0] = new Hop(route1, desc.getPacketKey()); - hops2[1] = new Hop(route1, desc.getPacketKey()); - - first = new HalfPath(hops1); - second = new HalfPath(hops2); + first = new HalfPath(dir, path.substring(0, crossover)); + second = new HalfPath(dir, path.substring(crossover+1)); } public HalfPath getFirstHalf() { |