[minion-cvs] Integrate and new path selection logic; rename FWD to F...

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion/server
In directory moria.mit.edu:/tmp/cvs-serv15175/src/minion/lib/mixminion/server

Modified Files:
	PacketHandler.py 
Log Message:
Integrate and new path selection logic; rename FWD to FWD_IPv4; start
work on reverse directory lookup; clean dead code from directory; add
new MMTPHostInfo routing type; have ServerInfo decide whom it can
relay to and how.



Index: PacketHandler.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/PacketHandler.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- PacketHandler.py	9 Oct 2003 03:55:07 -0000	1.27
+++ PacketHandler.py	9 Oct 2003 15:26:16 -0000	1.28
@@ -212,7 +212,7 @@
 
         # If we're not an exit node, make sure that what we recognize our
         # routing type.
-        if rt not in (Packet.SWAP_FWD_TYPE, Packet.FWD_TYPE):
+        if rt not in (Packet.SWAP_FWD_IPV4_TYPE, Packet.FWD_IPV4_TYPE):
             raise ContentError("Unrecognized Mixminion routing type")
 
         # Decrypt header 2.
@@ -222,7 +222,7 @@
         # If we're the swap node, (1) decrypt the payload with a hash of
         # header2... (2) decrypt header2 with a hash of the payload...
         # (3) and swap the headers.
-        if rt == Packet.SWAP_FWD_TYPE:
+        if Packet.typeIsSwap(rt):
             hkey = Crypto.lioness_keys_from_header(header2)
             payload = Crypto.lioness_decrypt(payload, hkey)