1 files changed, 3 insertions, 3 deletions

diff --git a/src/Network/QueryResponse.hs b/src/Network/QueryResponse.hs
index 5083a87c..6fa301c7 100644
--- a/src/Network/QueryResponse.hs
+++ b/src/Network/QueryResponse.hs
@@ -71,7 +71,7 @@ sendQuery (Client net d err pending whoami _) meth q addr = do
         let (tid, tbl') = dispatchRegister (tableMethods d) mvar tbl
         writeTVar pending tbl'
         return tid
-    self <- whoami
+    self <- whoami (Just addr)
     sendMessage net addr (wrapQuery meth self addr q)
     mres <- timeout (methodTimeout meth) $ takeMVar mvar
     case mres of
@@ -97,7 +97,7 @@ data Client err meth tid addr x = forall tbl. Client
       -- | An action yielding this client\'s own address.  It is invoked once
       -- on each outbound and inbound packet.  It is valid for this to always
       -- return the same value.
-    , clientAddress :: IO addr
+    , clientAddress :: Maybe addr -> IO addr
       -- | Transform a query /tid/ value to an appropriate response /tid/
       -- value.  Normally, this would be the identity transformation, but if
       -- /tid/ includes a unique cryptographic nonce, then it should be
@@ -351,7 +351,7 @@ handleMessage (Client net d err pending whoami responseID) again = do
             IsQuery meth tid -> case lookupHandler d meth of
                                 Nothing -> reportMissingHandler err meth addr plain
                                 Just m  -> do
-                                  self <- whoami
+                                  self <- whoami (Just addr)
                                   tid' <- responseID tid
                                   either (reportParseError err)
                                          (>>= sendMessage net addr)