[minion-cvs] Configurable, smart retry logic; lots of refactoring; m...

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/etc
In directory moria.mit.edu:/tmp/cvs-serv3319/etc

Modified Files:
	mixminiond.conf 
Log Message:
Configurable, smart retry logic; lots of refactoring; more tests.

mixminiond.conf, ServerQueue, Modules, ServerMain, test:
- Add more sophisticated, more configurable retry logic

Modules, ServerQueue, ServerMain, test:
- Refactor queueDeliveryMessage to not have a bogus 'addr' argument.

ServerMain:
- Change OutgoingQueue to contain instances of RelayedPacket, not 2-tuples of
  (IPv4Info, Packet).

ServerQueue:
- Remove dead code

test:
- Test payloads for drop messages.
- Test retry logic on server queues.
- Tests for DeliveryPacket methods
- Tests for connection padding and key renegotiation
- Use new queueDeliveryMessage interface
- Fix bug that generated server descs of the form "5 days days"



Index: mixminiond.conf
===================================================================
RCS file: /home/minion/cvsroot/src/minion/etc/mixminiond.conf,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- mixminiond.conf	7 Jan 2003 04:05:24 -0000	1.18
+++ mixminiond.conf	13 Jan 2003 06:35:52 -0000	1.19
@@ -177,6 +177,23 @@
 Allow: *
 
 [Outgoing/MMTP]
+#   How often should we try to deliver packets if the recipient can't be found
+#   or delivery fails for some other transient reason?
+#
+#   Note: No matter how frequent a retry interval you specify, we only retry
+#   messages every time a MixInterval has elapsed.  Thus, if you say "every 5
+#   minutes for 1 day", but MixInterval is 30 minutes, we only retry every
+#   half hour.
+#
+#   By default, we retry every 30 minutes the first day, and every 7 hours
+#   for the next 5 days thereafter.
+#Retry: every 30 minutes for 1 day, every 7 hours for 5 days
+#
+#   You can specify more complex retry intervals.  Uncomment this line to
+#   retry after 30 minutes, then after 1 hour, then after 2 hours, then every
+#   4 hours for a week, then every day for half a month.
+#Retry: 1 hour, 2 hours, every 4 hours for 1 week, every 1 day for .5 months
+
 # OTHER VALUES FOR THESE OPTIONS ARE NOT YET SUPPORTED
 Enabled: yes
 Allow: *
@@ -195,6 +212,7 @@
 #ReturnAddress: <"From:" address to use>
 #RemoveContact: <Address to use as a contact>
 #SMTPServer: localhost
+#Retry: every 7 hours for 6 days
 
 ###############
 #   Uncomment this section to enable delivery of SMTP messages via a local
@@ -217,7 +235,8 @@
 #         server at SERVER.  If you do not want to receive anonymous
 #         messages, please contact ADMIN.  For more information about
 #         anonymity, see URL.
-
+#
+#Retry: every 7 hours for 6 days
 
 #################
 #   Uncomment this section to enable delivery of SMTP messages via the Type II
@@ -234,3 +253,5 @@
 #   Server (or comma-separated list of servers) to use as our relay.
 #Server: lcs
 #SubjectLine: Type III Anonymous message
+#
+#Retry: every 7 hours for 6 days