some fixes

server/Event.py

@@ -2,7 +2,15 @@ import md5
 import Queue
 from logger import Logger
 
-class IllegalEventException(Exception):
+class EventException(Exception): 
+    def __init__(self, msg):
+        self.msg = msg
+
+class IllegalEventException(EventException):
+    def __init__(self, msg):
+        self.msg = msg
+
+class IllegalStateException(EventException):
     def __init__(self, msg):
         self.msg = msg
 
@@ -18,6 +26,7 @@ class Event(object):
         self.address = address
         self.data = data
         self.receiveTime = receiveTime
+	self.prepared = False
 
     def prepare(self):
         self.port = self.address[1]
@@ -34,7 +43,7 @@ class Event(object):
 
     def process(self):
         if not self.prepared:
-            self.prepare()
+            raise IllegalStateException("try to process a non-prepared event")
 
         if not Event.entries.has_key(self.dynid):
             raise IllegalEventException("unknown dynid in event %s" % str(self))
@@ -64,6 +73,4 @@ class Event(object):
             Logger.log("Dns Queue overrun, drop event for %s" % str(entry))
 
     def __str__(self):
-        if not self.prepared:
-            self.prepare()
         return "%s from %s:%d" % (self.data, self.address, self.port)