1 files changed, 22 insertions, 12 deletions

diff --git a/Presence/main.hs b/Presence/main.hs
index 92ef7034..83f11df3 100644
--- a/Presence/main.hs
+++ b/Presence/main.hs
@@ -125,6 +125,8 @@ data ClientSession = ClientSession {
     --            (*not* the login name of the user)
     unix_uid :: (IORef (Maybe (UserID,L.ByteString))),
 
+    unix_pid :: Maybe CPid,
+    
     -- unix_resource:  This is the detected TTY of the connecting client.
     unix_resource :: (IORef (Maybe L.ByteString)),
 
@@ -134,6 +136,8 @@ data ClientSession = ClientSession {
     --        localSubscriber & rosterChannel of the global state record.
     chans :: TVar [RefCountedChan],
 
+    clientChannel :: TChan ClientCommands,
+
     -- presence_state: a reference to the global state.
     presence_state :: PresenceState
 }
@@ -147,20 +151,25 @@ instance JabberClientSession ClientSession where
         muid <- getLocalPeerCred' addr
         L.putStrLn $ "CLIENT SESSION: open " <++> bshow muid
         uid_ref <- newIORef muid
-        res_ref <- newIORef Nothing
+        (mtty,pid) <- getTTYandPID muid
+        res_ref <- newIORef mtty
         chans <- atomically $ newTVar []
-        return $ ClientSession (hostname state) uid_ref res_ref chans state
-
-    setResource  s  resource    = do
+        clientChan <- atomically $ newTChan 
+        return $ ClientSession (hostname state) uid_ref pid res_ref chans clientChan state
+      where
+        getTTYandPID muid = do
+            us <- fmap Set.toList . readTVarIO $ activeUsers state
+            let tailOf3 (_,a,b) = (a,b)
+            (t,pid) <- case muid of
+                          Just (uid,inode) -> identifyTTY (map tailOf3 us) uid inode
+                          Nothing          -> return (Nothing,Nothing)
+            let rsc = t `mplus` fmap ( ("pid."<++>) . bshow ) pid
+            return (rsc,pid)
+
+    setResource  s  wanted_resource    = do
         -- TODO: handle resource = empty string 
-        us <- fmap Set.toList . readTVarIO $ activeUsers (presence_state s)
-        muid <- readIORef (unix_uid s)
-        let tailOf3 (_,a,b) = (a,b)
-        (t,pid) <- case muid of
-                      Just (uid,inode) -> identifyTTY (map tailOf3 us) uid inode
-                      Nothing          -> return (Nothing,Nothing)
-        let rsc = t `mplus` fmap ( ("pid."<++>) . bshow ) pid
-            rsc' = maybe resource id rsc
+        rsc <- readIORef (unix_resource s)
+        let rsc' = maybe wanted_resource id rsc
         writeIORef (unix_resource s) (Just rsc')
         L.putStrLn $ "CLIENT SESSION: resource " <++> rsc'
 
@@ -197,6 +206,7 @@ instance JabberClientSession ClientSession where
             writeTVar (chans session) (RefCountedChan rchan:cs)
             subscribeToChan rchan
             
+    clientChannel session = Main.clientChannel session
 
     forCachedPresence s action = do
         jid <- getJID s