From 46a03a3ea3c26a65e4428bc9de036a01487aeda3 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 17 Oct 2003 17:34:54 +0000 Subject: First go at refactoring for PathSpecs --- src/Main.java | 23 ++++--- src/org/noreply/fancydress/type3/HalfPath.java | 51 -------------- src/org/noreply/fancydress/type3/Message.java | 30 ++++++++ src/org/noreply/fancydress/type3/Packet.java | 13 ++-- src/org/noreply/fancydress/type3/Path.java | 10 +-- src/org/noreply/fancydress/type3/PathSpec.java | 95 ++++++++++++++++++++++++++ src/org/noreply/fancydress/type3/Payload.java | 49 +++++-------- 7 files changed, 167 insertions(+), 104 deletions(-) create mode 100644 src/org/noreply/fancydress/type3/Message.java create mode 100644 src/org/noreply/fancydress/type3/PathSpec.java diff --git a/src/Main.java b/src/Main.java index b86a8b4..da89a50 100644 --- a/src/Main.java +++ b/src/Main.java @@ -13,17 +13,18 @@ public class Main { /* Start the parser */ try { DirectoryParser parser = new DirectoryParser(new DirectoryLexer(new FileReader(argv[0]))); - DirectoryMessage m = (DirectoryMessage)parser.parse().value; - Directory dir = new Directory(m, false); - Path path = new Path(dir,"test1 : tonga"); - RoutingDestination address = new RoutingSMTP("peter@palfrader.org"); - Payload payload = new Payload(); - Packet packet = new Packet(path, address, payload); - MMTP.send(packet); - /* - FileOutputStream w = new FileOutputStream("out"); - w.write(packet.asOctets()); - */ + DirectoryMessage dm = (DirectoryMessage)parser.parse().value; + Directory dir = new Directory(dm, false); + PathSpec path = new PathSpec(dir,"test1 : tonga", false); + + RoutingSMTP destination = new RoutingSMTP("peter@palfrader.org"); + String body = "FROM:Peter\n" + + "SUBJECT:test fancydress\n" + + "\n" + + "blubb\n"; + + Message message = new Message(path, destination, body); + message.send(); } catch (Exception e) { e.printStackTrace(); diff --git a/src/org/noreply/fancydress/type3/HalfPath.java b/src/org/noreply/fancydress/type3/HalfPath.java index 14d4af6..73dfb84 100644 --- a/src/org/noreply/fancydress/type3/HalfPath.java +++ b/src/org/noreply/fancydress/type3/HalfPath.java @@ -1,62 +1,11 @@ /* $Id$ */ package org.noreply.fancydress.type3; -import org.noreply.fancydress.directory.*; -import org.noreply.fancydress.status.*; -import org.noreply.fancydress.type3.routing.*; -import java.util.*; - public class HalfPath { private Hop[] hops; public HalfPath(Hop[] hops) { this.hops = hops; } - - private String[] tokenize(String path) throws Mix3Exception { - ArrayList nicks = new ArrayList(); - int indexFrom = 0; - int indexOf; - - while ((indexOf = path.indexOf(',', indexFrom)) != -1) { - String v = path.substring(indexFrom, indexOf).trim(); - if (v.equals("")) - throw new Mix3Exception("Invalid path."); - nicks.add( v ); - indexFrom = indexOf + 1; - } - String v = path.substring(indexFrom).trim(); - if (v.equals("")) - throw new Mix3Exception("Invalid path."); - nicks.add( v ); - - String[] result = new String[nicks.size()]; - for (int i=0; iFoo,Bar,?:Baz,*2,~1". + * + * FIXME: right now we don't do any random foo. + * + * @param path given path + */ + public PathSpec(Directory dir, String pathSpec, boolean singleLeg) throws Mix3Exception { + this.pathSpec = pathSpec; + + int crossover = pathSpec.indexOf(':'); + if (crossover < 0) + throw new Mix3Exception("Path is not a valid path: no crossover point specified."); + + Hop[] leg1 = parseHalfPath(dir, pathSpec.substring(0, crossover)); + Hop[] leg2 = parseHalfPath(dir, pathSpec.substring(crossover+1)); + singlePath = new Path(leg1, leg2); + } + + /** + * Return a path constructed from this PathSpec + * + * @param dir a directory + * @return path + */ + public Path getPath() throws Mix3Exception { + return singlePath; + } +} + diff --git a/src/org/noreply/fancydress/type3/Payload.java b/src/org/noreply/fancydress/type3/Payload.java index 16b1b57..73027cd 100644 --- a/src/org/noreply/fancydress/type3/Payload.java +++ b/src/org/noreply/fancydress/type3/Payload.java @@ -8,34 +8,10 @@ import org.noreply.fancydress.misc.Util; import org.noreply.fancydress.type3.routing.*; public class Payload { - byte[] thisPayload; - - public Payload() { - RoutingSMTP route = new RoutingSMTP("peter@palfrader.org"); - String body = "FROM:Peter\n" + - "SUBJECT:test fancydress\n" + - "\n" + - "blubb\n"; - - /* - // Encode a String into bytes - String inputString = "blahblahblah??"; - byte[] input = inputString.getBytes("UTF-8"); - - // Compress the bytes - byte[] output = new byte[100]; - Deflater compresser = new Deflater(); - compresser.setInput(input); - compresser.finish(); - int compressedDataLength = compresser.deflate(output); - - // Decompress the bytes - Inflater decompresser = new Inflater(); - decompresser.setInput(output, 0, compressedDataLength); - byte[] result = new byte[100]; - int resultLength = decompresser.inflate(result); - decompresser.end(); - */ + byte[][] payloads; + RoutingDestination[] route; + + public Payload(RoutingDestination route, String body) { try { PipedOutputStream poMessage = new PipedOutputStream(); PipedInputStream piMessage = new PipedInputStream( poMessage ); @@ -77,18 +53,29 @@ public class Payload { if (pos != 28*1024) throw new Error("did not fill in 28k bytes"); - thisPayload = payload; + payloads = new byte[1][]; + payloads[0] = payload; } catch (Exception e) { throw new Error(e); }; + this.route = new RoutingDestination[1]; + this.route[0] = route; // Return a singleton payload containing: // Flag 0 | Int(15,LEN(M_C)) | Hash(M_C | PADDING) | M_C | PADDING } - public byte[] asOctets() { - return thisPayload; + public int numPackets() { + return payloads.length; + } + + public byte[] getPayload(int i) { + return payloads[i]; + } + + public RoutingDestination getRoute(int i) { + return route[i]; } } -- cgit v1.2.3