diff options
-rw-r--r-- | Presence/Server.hs | 6 | ||||
-rw-r--r-- | xmppServer.hs | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Presence/Server.hs b/Presence/Server.hs index 003fcdbb..312634cf 100644 --- a/Presence/Server.hs +++ b/Presence/Server.hs | |||
@@ -66,6 +66,12 @@ import System.Locale (defaultTimeLocale) | |||
66 | 66 | ||
67 | todo = error "unimplemented" | 67 | todo = error "unimplemented" |
68 | 68 | ||
69 | #if MIN_VERSION_network(2,4,0) | ||
70 | #else | ||
71 | deriving instance Ord SockAddr | ||
72 | #endif | ||
73 | |||
74 | |||
69 | type Microseconds = Int | 75 | type Microseconds = Int |
70 | type Miliseconds = Int | 76 | type Miliseconds = Int |
71 | type TimeOut = Miliseconds | 77 | type TimeOut = Miliseconds |
diff --git a/xmppServer.hs b/xmppServer.hs index 987e7dbc..7a61b00d 100644 --- a/xmppServer.hs +++ b/xmppServer.hs | |||
@@ -357,12 +357,13 @@ main = runResourceT $ do | |||
357 | , duplex = False } | 357 | , duplex = False } |
358 | client_params <- return $ connectionDefaults clientKey | 358 | client_params <- return $ connectionDefaults clientKey |
359 | let testaddr0 = "fd97:ca88:fa7c:b94b:c8b8:fad4:1021:a54d" | 359 | let testaddr0 = "fd97:ca88:fa7c:b94b:c8b8:fad4:1021:a54d" |
360 | -- testaddr0 = "fdef:9e0b:b502:52c3:c074:28d3:fcd7:bfb7" | ||
360 | testaddr<- fmap (addrAddress . head) $ | 361 | testaddr<- fmap (addrAddress . head) $ |
361 | getAddrInfo (Just $ defaultHints { addrFlags = [ AI_CANONNAME ]}) | 362 | getAddrInfo (Just $ defaultHints { addrFlags = [ AI_CANONNAME ]}) |
362 | (Just testaddr0) | 363 | (Just testaddr0) |
363 | (Just "5269") | 364 | (Just "5269") |
364 | putStrLn $ "Connecting to "++show testaddr | 365 | putStrLn $ "Connecting to "++show testaddr |
365 | control sv (ConnectWithEndlessRetry testaddr peer_params 2000) | 366 | control sv (ConnectWithEndlessRetry testaddr peer_params 10000) |
366 | forkIO $ monitor sv peer_params | 367 | forkIO $ monitor sv peer_params |
367 | control sv (Listen peerport peer_params) | 368 | control sv (Listen peerport peer_params) |
368 | -- control sv (Listen clientport client_params) | 369 | -- control sv (Listen clientport client_params) |