2 files changed, 20 insertions, 13 deletions

diff --git a/Presence/UTmp.hs b/Presence/UTmp.hs
index f22d1426..99d51205 100644
--- a/Presence/UTmp.hs
+++ b/Presence/UTmp.hs
@@ -19,18 +19,15 @@ import Data.Maybe
 import System.Posix.Signals
 import System.Posix.Types
 import Control.Monad
-import Data.Char
 import Data.Word
 import Data.Int
 import Control.Monad.Error.Class
 import System.IO.Error
-import Debug.Trace
 import qualified Paths
-import Data.Text     ( Text )
-import Unsafe.Coerce ( unsafeCoerce )
-import qualified Data.Text as Text
+import Data.Text      ( Text )
+import Unsafe.Coerce  ( unsafeCoerce )
+import Network.Socket ( SockAddr(..) )
 import qualified Data.Text.Encoding as Text
-import qualified Codec.Binary.Base16 as Hex
 
 
 utmp_file = Paths.utmp -- "/var/run/utmp"
@@ -49,7 +46,10 @@ decode_utmp_bytestring =
                , UnsignedLE 2 -- exit status (int)
                , UnsignedLE 4 -- session id  (int)
                , Fixed 8 -- time entry was made
-               , Fixed 16 -- remote addr v6
+               , Unsigned 4 -- remote addr v6 addr[0]
+               , Unsigned 4 -- remote addr v6 addr[1]
+               , Unsigned 4 -- remote addr v6 addr[2]
+               , Unsigned 4 -- remote addr v6 addr[3]
                , Skip 20 -- reserved
                ])
 
@@ -67,7 +67,8 @@ utmp = fmap (map decode_utmp_bytestring . utmp_records) utmp_bs
 
 toStr = takeWhile (/='\0') . C.unpack
 
-interp_utmp_record (typ,pid,tty,inittab,user,hostv4,term,exit,session,time,hostv6) =
+interp_utmp_record (typ,pid,tty,inittab,user,hostv4,term,exit,session,time
+                   ,addr0,addr1,addr2,addr3) =
     ( (toEnum . fromIntegral) typ :: UT_Type
     , toStr user, toStr tty, processId pid, toStr hostv4 )
  where
@@ -122,13 +123,14 @@ data UtmpRecord = UtmpRecord
   , utmpPid :: CPid
   , utmpHost :: Text
   , utmpSession :: Int32
-  , utmpRemoteAddr :: Text
+  , utmpRemoteAddr :: Maybe SockAddr
   }
- deriving ( Show, Read, Eq, Ord )
+ deriving ( Show, Eq, Ord )
 
 toText bs = Text.decodeUtf8 $ C.takeWhile (/='\0') bs
 
-interp_utmp_record2 (typ,pid,tty,inittab,user,hostv4,term,exit,session,time,addr) =
+interp_utmp_record2 (typ,pid,tty,inittab,user,hostv4
+                    ,term,exit,session,time,addr0,addr1,addr2,addr3) =
     UtmpRecord
         { utmpType = toEnum (fromIntegral typ) :: UT_Type
         , utmpUser = toText user
@@ -136,7 +138,12 @@ interp_utmp_record2 (typ,pid,tty,inittab,user,hostv4,term,exit,session,time,addr
         , utmpPid  = processId pid
         , utmpHost = toText hostv4
         , utmpSession = coerceToSigned session
-        , utmpRemoteAddr = Text.pack (Hex.encode $ map (fromIntegral . ord) $ C.unpack addr) }
+        , utmpRemoteAddr =
+            if all (==0) [addr1,addr2,addr3]
+             then do guard (addr0/=0)
+                     Just $ SockAddrInet6 0 0 (0,0,0xFFFF,addr0) 0
+             else Just $ SockAddrInet6 0 0 (addr0,addr1,addr2,addr3) 0
+        }
  where
     processId = CPid . coerceToSigned
 
diff --git a/consolation.hs b/consolation.hs
index 0c6e907a..3daa258b 100644
--- a/consolation.hs
+++ b/consolation.hs
@@ -99,7 +99,7 @@ newCon log activeTTY utmp = do
                  then " host=" <> tshow (utmpHost u)
                  else "")
             <> " session=" <> tshow (utmpSession u)
-            <> " addr=" <> utmpRemoteAddr u
+            <> " addr=" <> tshow (utmpRemoteAddr u)
     loop tty tu (Just u)
  where
     bstatus r ttynum mtu