Browse Source

fix stream feature pickler

a name space was missing
master
Philipp Balzarek 13 years ago
parent
commit
da2745d00f
  1. 11
      source/Network/Xmpp/Marshal.hs

11
source/Network/Xmpp/Marshal.hs

@ -247,7 +247,7 @@ xpStream = xpElemAttrs
-- Pickler/Unpickler for the stream features - TLS, SASL, and the rest. -- Pickler/Unpickler for the stream features - TLS, SASL, and the rest.
xpStreamFeatures :: PU [Node] StreamFeatures xpStreamFeatures :: PU [Node] StreamFeatures
xpStreamFeatures = xpWrap xpStreamFeatures = ("xpStreamFeatures","") <?> xpWrap
(\(tls, sasl, rest) -> StreamFeatures tls (mbl sasl) rest) (\(tls, sasl, rest) -> StreamFeatures tls (mbl sasl) rest)
(\(StreamFeatures tls sasl rest) -> (tls, lmb sasl, rest)) (\(StreamFeatures tls sasl rest) -> (tls, lmb sasl, rest))
(xpElemNodes (xpElemNodes
@ -264,10 +264,11 @@ xpStreamFeatures = xpWrap
) )
where where
pickleTlsFeature :: PU [Node] Bool pickleTlsFeature :: PU [Node] Bool
pickleTlsFeature = xpElemNodes "{urn:ietf:params:xml:ns:xmpp-tls}starttls" pickleTlsFeature = ("pickleTlsFeature", "") <?>
(xpElemExists "required") xpElemNodes "{urn:ietf:params:xml:ns:xmpp-tls}starttls"
(xpElemExists "{urn:ietf:params:xml:ns:xmpp-tls}required")
pickleSaslFeature :: PU [Node] [Text] pickleSaslFeature :: PU [Node] [Text]
pickleSaslFeature = xpElemNodes pickleSaslFeature = ("pickleSaslFeature", "") <?>
"{urn:ietf:params:xml:ns:xmpp-sasl}mechanisms" xpElemNodes "{urn:ietf:params:xml:ns:xmpp-sasl}mechanisms"
(xpAll $ xpElemNodes (xpAll $ xpElemNodes
"{urn:ietf:params:xml:ns:xmpp-sasl}mechanism" (xpContent xpId)) "{urn:ietf:params:xml:ns:xmpp-sasl}mechanism" (xpContent xpId))

Loading…
Cancel
Save