2 files changed, 20 insertions, 8 deletions

diff --git a/Presence/LocalPeerCred.hs b/Presence/LocalPeerCred.hs
index 2d5c0628..14f5234a 100644
--- a/Presence/LocalPeerCred.hs
+++ b/Presence/LocalPeerCred.hs
@@ -107,15 +107,17 @@ unmap6mapped4 addr = addr
 identifyTTY tty_pids uid inode = do
     pid <- scanProc (show uid) (L.unpack inode)
     -- putStrLn $ "scanProc --> "++show pid
-    flip (maybe (return Nothing)) pid $ \(pid,ttydev) -> do
+    flip (maybe (return (Nothing,Nothing))) pid $ \(pid,ttydev) -> do
     tty <- ttyOrDisplay pid ttydev
     -- putStrLn $ "users = " ++ show tty_pids
     dts <- ttyToXorgs tty_pids
     -- putStrLn $ "displays = " ++ show dts 
     -- putStrLn $ "tty = " ++ show tty
     -- -- displays = [(":5",Chunk "tty7" Empty)]
-    let tty' = if take 3 tty=="tty" then Just (L.pack tty) else lookup (parseTty tty) (map (first parseTty) dts)
-    return tty'
+    let tty' = if take 3 tty=="tty" 
+                then Just (L.pack tty) 
+                else lookup (parseTty tty) (map (first parseTty) dts)
+    return (tty',Just pid)
     where
         parseTty :: String -> Float
         parseTty = read .  tail . dropWhile (/=':') 
diff --git a/Presence/main.hs b/Presence/main.hs
index 7b3a7826..cd7d7898 100644
--- a/Presence/main.hs
+++ b/Presence/main.hs
@@ -97,7 +97,7 @@ getJabberUserForId muid =
 
 data ClientSession = ClientSession {
     localhost :: Peer, -- ByteString,
-    unix_uid :: (IORef (Maybe UserID)),
+    unix_uid :: (IORef (Maybe (UserID,L.ByteString))),
     unix_resource :: (IORef (Maybe L.ByteString)),
     presence_state :: PresenceState
 }
@@ -106,7 +106,9 @@ instance JabberClientSession ClientSession where
     data XMPPClass ClientSession = ClientSessions PresenceState
 
     newSession (ClientSessions state) sock = do
-        muid <- getLocalPeerCred sock
+        -- muid <- getLocalPeerCred sock
+        addr <- getPeerName sock
+        muid <- getLocalPeerCred' addr
         L.putStrLn $ "CLIENT SESSION: open " <++> bshow muid
         uid_ref <- newIORef muid
         res_ref <- newIORef Nothing
@@ -114,12 +116,20 @@ instance JabberClientSession ClientSession where
 
     setResource  s  resource    = do
         -- TODO: handle resource = empty string 
-        writeIORef (unix_resource s) (Just resource)
-        L.putStrLn $ "CLIENT SESSION: resource " <++> resource
+        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
+        writeIORef (unix_resource s) (Just rsc')
+        L.putStrLn $ "CLIENT SESSION: resource " <++> rsc'
 
     getJID       s             = do
         let host = localhost s
-        muid <- readIORef (unix_uid s)
+        muid <- fmap (fmap fst) $ readIORef (unix_uid s)
         user <- getJabberUserForId muid
 
         rsc <- readIORef (unix_resource s)