Browse Source

minor documentation/formatting changes

master
Jon Kristensen 14 years ago
parent
commit
4798838f20
  1. 2
      examples/EchoClient.hs
  2. 2
      source/Network/Xmpp.hs
  3. 2
      source/Network/Xmpp/Concurrent/Threads.hs
  4. 2
      source/Network/Xmpp/Concurrent/Types.hs
  5. 28
      source/Network/Xmpp/Sasl/StringPrep.hs

2
examples/EchoClient.hs

@ -48,7 +48,7 @@ main = do
return () return ()
return () return ()
-- Pull message stanzas, verify that they originate from a `full' Xmpp -- Pull message stanzas, verify that they originate from a `full' XMPP
-- address, and, if so, `echo' the message back. -- address, and, if so, `echo' the message back.
echo :: Xmpp () echo :: Xmpp ()
echo = forever $ do echo = forever $ do

2
source/Network/Xmpp.hs

@ -189,7 +189,7 @@ connect address hostname = do
XmppStreamError StreamInvalidNamespace Nothing Nothing XmppStreamError StreamInvalidNamespace Nothing Nothing
toError (StreamInvalidStreamPrefix _prefix) = toError (StreamInvalidStreamPrefix _prefix) =
XmppStreamError StreamBadNamespacePrefix Nothing Nothing XmppStreamError StreamBadNamespacePrefix Nothing Nothing
-- TO: Catch remaining xmppStartStream errors. -- TODO: Catch remaining xmppStartStream errors.
toError (StreamWrongVersion _ver) = toError (StreamWrongVersion _ver) =
XmppStreamError StreamUnsupportedVersion Nothing Nothing XmppStreamError StreamUnsupportedVersion Nothing Nothing
toError (StreamWrongLangTag _) = toError (StreamWrongLangTag _) =

2
source/Network/Xmpp/Concurrent/Threads.hs

@ -199,7 +199,7 @@ startThreads = do
{ connectionClosedHandler = \_ -> return () { connectionClosedHandler = \_ -> return ()
} }
-- | Creates and initializes a new Xmpp session. -- | Creates and initializes a new concurrent session.
newSession :: IO Session newSession :: IO Session
newSession = do newSession = do
(mC, pC, sC, hand, outC, stopThreads', writeR, conS, rdr, eh) <- startThreads (mC, pC, sC, hand, outC, stopThreads', writeR, conS, rdr, eh) <- startThreads

2
source/Network/Xmpp/Concurrent/Types.hs

@ -65,6 +65,8 @@ instance Show Interrupt where show _ = "<Interrupt>"
instance Ex.Exception Interrupt instance Ex.Exception Interrupt
-- | Contains whether or not a reply has been sent, and the IQ request body to
-- reply to.
data IQRequestTicket = IQRequestTicket data IQRequestTicket = IQRequestTicket
{ sentRef :: (TVar Bool) { sentRef :: (TVar Bool)
, iqRequestBody :: IQRequest , iqRequestBody :: IQRequest

28
source/Network/Xmpp/Sasl/StringPrep.hs

@ -8,41 +8,21 @@ import Data.Text(singleton)
nonAsciiSpaces = Set.fromList [ '\x00A0', '\x1680', '\x2000', '\x2001', '\x2002' nonAsciiSpaces = Set.fromList [ '\x00A0', '\x1680', '\x2000', '\x2001', '\x2002'
, '\x2003', '\x2004', '\x2005', '\x2006', '\x2007' , '\x2003', '\x2004', '\x2005', '\x2006', '\x2007'
, '\x2008', '\x2009', '\x200A', '\x200B', '\x202F' , '\x2008', '\x2009', '\x200A', '\x200B', '\x202F'
, '\x205F','\x3000'] , '\x205F', '\x3000'
]
toSpace x = if x `Set.member` nonAsciiSpaces then " " else singleton x toSpace x = if x `Set.member` nonAsciiSpaces then " " else singleton x
saslPrepQuery = Profile saslPrepQuery = Profile
[b1, toSpace] [b1, toSpace]
True True
[ c12 [c12, c21, c22, c3, c4, c5, c6, c7, c8, c9]
, c21
, c22
, c3
, c4
, c5
, c6
, c7
, c8
, c9
]
True True
saslPrepStore = Profile saslPrepStore = Profile
[b1, toSpace] [b1, toSpace]
True True
[ a1 [a1, c12, c21, c22, c3, c4, c5, c6, c7, c8, c9]
, c12
, c21
, c22
, c3
, c4
, c5
, c6
, c7
, c8
, c9
]
True True
normalizePassword = runStringPrep saslPrepStore normalizePassword = runStringPrep saslPrepStore

Loading…
Cancel
Save