2 files changed, 14 insertions, 8 deletions

diff --git a/dht-client.cabal b/dht-client.cabal
index 3832eb65..a389a6e3 100644
--- a/dht-client.cabal
+++ b/dht-client.cabal
@@ -300,7 +300,7 @@ executable dhtd
   if flag(thread-debug)
     build-depends: time
     cpp-options:   -DTHREAD_DEBUG -DRENDERFLUSH
-  ghc-options:         -rtsopts  -fdefer-typed-holes -threaded
+  ghc-options:       -g -prof  -rtsopts  -fdefer-typed-holes -threaded
 
 executable testcookie
   buildable:           False
diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index d8ba19eb..82aa8f12 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -623,13 +623,19 @@ freshCryptoSession  sessions
         lossyEsc    <- newTVar $ U.listArray (0,255) [0 .. 255]
         losslessEsc <- newTVar $ U.listArray (0,255) [0 .. 255]
         outHooks <- emptySTMRangeMap
-        mapM_ ($ outHooks) -- TODO: combine into larger ranges for faster lookup
-            [ insertWhereItGoes (A.listArray (2,2)   [sendKillHook])
-            , insertWhereItGoes (A.listArray (16,16) [sendLossless{-Ping-}])
-            , insertWhereItGoes (A.listArray (24,25) [sendOnlineHook,sendLossless{-Offline-}])
-            , insertWhereItGoes (A.listArray (48,51) [sendNickHook,sendStatusMsgHook,sendStatusHook,sendTypingHook])
-            , insertWhereItGoes (A.listArray (63,64) [sendMessageHook, sendMessageHook])
-            ]
+        let doNothingHook crypto session msg = return (Left "unsupported")
+            assignHook 2  = (2,sendKillHook)
+            assignHook 16 = (16,sendLossless{-Ping-})
+            assignHook 24 = (24,sendOnlineHook)
+            assignHook 25 = (25,sendLossless{-Offline-})
+            assignHook 48 = (48,sendNickHook)
+            assignHook 49 = (49,sendStatusMsgHook)
+            assignHook 50 = (50,sendStatusHook)
+            assignHook 51 = (51,sendTypingHook)
+            assignHook 63 = (63,sendMessageHook)
+            assignHook 64 = (64,sendMessageHook{-ACTION-})
+            assignHook other = (other,doNothingHook)
+        insertArrayAt outHooks 0 (A.array (0,64) (map assignHook [0..64]))
         return (idmap,lossyEsc,losslessEsc,outHooks)
     ncView0 <- newTVar (sessionView sessions)
     pktq <- PQ.new (inboundQueueCapacity sessions) 0