- public final Hashtable[] resent;
-
- public Message(Stream stream, Envelope envelope) throws Malformed {
- super(stream, null, false);
- Vec resent = new Vec(), traces = new Vec();
- this.envelope = Envelope.augment(envelope, headers);
- this.to = headers.gets("To") == null ? this.envelope.to : Address.parse(headers.gets("To"));
- this.from = headers.gets("From") == null ? this.envelope.from : Address.parse(headers.gets("From"));
- this.replyto = headers.gets("Reply-To") == null ? null : Address.parse(headers.gets("Reply-To"));
- this.subject = headers.gets("Subject");
- this.messageid = headers.gets("Message-Id");
- this.cc = Address.list(headers.gets("Cc"));
- this.bcc = Address.list(headers.gets("BCc"));
- this.date = parseDate(headers.gets("Date"));
- resent.copyInto(this.resent = new Hashtable[resent.size()]);
- traces.copyInto(this.traces = new Trace[traces.size()]);
+
+ public static Message newMessage(Fountain in) throws Malformed { return new Message(in); }
+
+ // FIXME
+ public static Message newMessage(Fountain in, Address from, Address to) throws Malformed {
+ StringBuffer sb = new StringBuffer();
+ if (from != null) sb.append("Return-Path: " + from.toString(true) + "\r\n");
+ Stream stream = in.getStream();
+ while(true) {
+ String s = stream.readln();
+ if (s == null || s.length() == 0) {
+ if (to != null) sb.append("Envelope-To: " + to.toString(true) + "\r\n");
+ sb.append("\r\n");
+ break;
+ }
+ if (to != null && s.toLowerCase().startsWith("envelope-to:")) continue;
+ if (s.toLowerCase().startsWith("return-path:")) continue;
+ sb.append(s);
+ sb.append("\r\n");
+ }
+ for(String s = stream.readln(); s != null; s = stream.readln()) {
+ sb.append(s);
+ sb.append("\r\n");
+ }
+ return new Message(new Fountain.StringFountain(sb.toString()));
+ }
+
+ private Message(Fountain in) throws Malformed {
+ super(in);
+ this.envelopeTo = headers.get("Envelope-To") != null ? Address.parse(headers.get("Envelope-To")) : null;
+ this.envelopeFrom = headers.get("Return-Path") != null ? Address.parse(headers.get("Return-Path")) : null;
+ this.to = headers.get("To") != null ? Address.parse(headers.get("To")) : this.envelopeTo;
+ this.from = headers.get("From") != null ? Address.parse(headers.get("From")) : this.envelopeFrom;
+ this.replyto = headers.get("Reply-To") == null ? null : Address.parse(headers.get("Reply-To"));
+ this.subject = headers.get("Subject");
+ this.messageid = headers.get("Message-Id");
+ this.cc = Address.list(headers.get("Cc"));
+ this.bcc = Address.list(headers.get("Bcc"));
+ this.date = parseDate(headers.get("Date")) == null ? new Date() : parseDate(headers.get("Date"));
+ this.arrival = this.date; // FIXME wrong; grab this from traces?