2 files changed, 33 insertions, 13 deletions

diff --git a/ConduitServer.hs b/ConduitServer.hs
index 4b28194e..0838ce26 100644
--- a/ConduitServer.hs
+++ b/ConduitServer.hs
@@ -6,7 +6,10 @@ import Data.Conduit.Network
 import Data.Conduit
 import qualified Data.Conduit.List as CL
 import qualified Data.ByteString.Char8 as S
-import qualified Data.ByteString.Lazy.Char8 as L
+
+import Network.Socket (Family(..))
+import Data.HList
+import ServerC
 
 {-
 data AppData m = AppData
@@ -24,8 +27,22 @@ handleConnection appdata = do
     sourceLbs "<stream>\n" $$ appSink appdata -- send bytestring
     appSource appdata $$ CL.mapM_ S.putStrLn -- display inbound bytestring
 
-main = do
+mainOld = do
     -- Listen to port 5222 and invoke handleConnection on every
     -- inbound connection.
     runTCPServer (serverSettings 5222 HostAny) handleConnection
     return ()
+
+
+
+
+handleC st src snk = do
+    sourceLbs "<stream>\n" $$ snk
+    src $$ CL.mapM_ S.putStrLn
+
+mainC = do
+    doServer (AF_INET .*. 5222 .*. HNil) handleC
+    _ <- getLine
+    return ()
+
+main = mainC
diff --git a/Presence/ServerC.hs b/Presence/ServerC.hs
index 2e22825d..881ce5d2 100644
--- a/Presence/ServerC.hs
+++ b/Presence/ServerC.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
-module ServerC 
+module ServerC
     ( doServer
     , ConnId(..)
     ) where
@@ -56,8 +56,8 @@ doServer ::
   MonadIO m =>
     HCons Socket.Family (HCons PortNumber l)
     -> (HCons RestrictedSocket (HCons ConnId l)
-        -> Producer m S.ByteString 
-        -> Consumer S.ByteString m () 
+        -> Source m S.ByteString 
+        -> Sink S.ByteString m ()
         -> IO ())
     -> IO Socket
 doServer (HCons family port) g = runServer port (runConn g)
@@ -99,7 +99,7 @@ doServer (HCons family port) g = runServer port (runConn g)
               Retry           -> threadDelay 500000 >> mainLoop sock idnum go
               QuitOnException -> return ()
 
-packets :: MonadIO m => Handle -> Producer m S.ByteString
+packets :: MonadIO m => Handle -> Source m S.ByteString
 packets h = do
     packet <- lift $ liftIO $ getPacket h
     yield packet
@@ -108,7 +108,7 @@ packets h = do
  where
     getPacket h = do { hWaitForInput h (-1) ; hGetNonBlocking h 1024 }
 
-outgoing :: MonadIO m => Handle -> Consumer S.ByteString m ()
+outgoing :: MonadIO m => Handle -> Sink S.ByteString m ()
 outgoing h = do
     mpacket <- await
     maybe (return ()) 
@@ -116,14 +116,17 @@ outgoing h = do
           mpacket
     
 
+
+
 runConn ::
   MonadIO m =>
-  ( HCons RestrictedSocket st 
-    -> Producer m S.ByteString 
-    -> Consumer S.ByteString m () 
-    -> IO () )
-  -> st -> (Socket, t) -> IO ()
-
+  (HCons RestrictedSocket st 
+    -> Source m S.ByteString 
+    -> Sink S.ByteString m () 
+    -> IO ())
+  -> st 
+  -> (Socket, t) 
+  -> IO ()
 runConn g st (sock,_) = do
         h <- socketToHandle sock ReadWriteMode
         hSetBuffering h NoBuffering