@@ -60,10 +60,9 @@ demo1 mktrans = do
6060 closeTransport trans
6161
6262-- | Check that messages can be sent before receive is set up.
63−demo2 :: IO ()
64−demo2 = do
65− -- trans <- mkTransport
66− trans <- mkTransport $ TCPConfig undefined "127.0.0.1" "8080"
63+demo2 :: IO Transport -> IO ()
64+demo2 mktrans = do
65+ trans <- mktrans
6766
6867 (sourceAddr, targetEnd) <- newConnection trans
6968
@@ -77,10 +76,10 @@ demo2 = do
7776 closeTransport trans
7877
7978-- | Check that two different transports can be created.
80−demo3 :: IO ()
81−demo3 = do
82− trans1 <- mkTransport $ TCPConfig undefined "127.0.0.1" "8080"
83− trans2 <- mkTransport $ TCPConfig undefined "127.0.0.1" "8081"
79+demo3 :: (Int -> IO Transport) -> Int -> IO ()
80+demo3 mktrans offset = do
81+ trans1 <- mktrans (offset + 0)
82+ trans2 <- mktrans (offset + 1)
8483
8584 (sourceAddr1, targetEnd1) <- newConnection trans1
8685 (sourceAddr2, targetEnd2) <- newConnection trans2
@@ -101,6 +100,7 @@ demo3 = do
101100 closeTransport trans1
102101 closeTransport trans2
103102
103+
104104-- | Check that two different connections on the same transport can be created.
105105demo4 :: IO ()
106106demo4 = do
@@ -133,21 +133,31 @@ logServer name targetEnd = forever $ do
133133
134134--------------------------------------------------------------------------------
135135
136−runWAllTranports demo = do
136+runWAllTranports demo offset = do
137137 putStrLn "------------------------------------------------------------"
138138 putStrLn " MVAR transport:"
139139 demo Network.Transport.MVar.mkTransport
140140 putStrLn "\n TCP transport:"
141− demo$ mkTransport $ TCPConfig undefined "127.0.0.1" "8080"
141+ demo$ mkTransport $ TCPConfig undefined "127.0.0.1" (show (8080 + offset))
142142 putStrLn "\n PIPES transport:"
143143 demo Network.Transport.Pipes.mkTransport
144144 putStrLn "\n"
145145
146146main = do
147147 putStrLn "Demo0:"
148− runWAllTranports demo0
148+ runWAllTranports demo0 0
149+
150+ putStrLn "Demo1:"
151+ runWAllTranports demo1 10
152+
153+ putStrLn "Demo2:"
154+ runWAllTranports demo2 20
155+
156+ putStrLn "Done with all demos!"
157+
158+-- trans <- mkTransport $ TCPConfig undefined "127.0.0.1" "8080"
149159
150−-- putStrLn "Demo1:"
151−-- runWAllTranports demo1
160+-- trans1 <- mkTransport $ TCPConfig undefined "127.0.0.1" "8080"
161+-- trans2 <- mkTransport $ TCPConfig undefined "127.0.0.1" "8081"
152162
153163