24
1
mirror of https://github.com/processone/ejabberd.git synced 2024-06-16 22:05:29 +02:00

Exmpp now takes care of stanza serialization and compatible namespaces.

SVN Revision: 1433
This commit is contained in:
Jean-Sébastien Pédron 2008-07-11 12:40:49 +00:00
parent 7ca5bebab3
commit 8bfccb42a9
4 changed files with 9 additions and 13 deletions

View File

@ -1,3 +1,9 @@
2008-07-11 Jean-Sébastien Pédron <js.pedron@meetic-corp.com>
* src/ejabberd_s2s_in.erl, src/ejabberd_s2s_out.erl,
src/ejabberd_c2s.erl: Exmpp now takes care of stanza serialization and
compatible namespaces.
2008-07-09 Jean-Sébastien Pédron <js.pedron@meetic-corp.com>
* src/ejabberd_c2s.erl: Convert #xmlelement returned by the

View File

@ -1305,10 +1305,8 @@ send_text(StateData, Text) ->
send_element(StateData, #xmlel{ns = ?NS_XMPP, name = 'stream'} = El) ->
send_text(StateData, exmpp_stream:to_list(El));
send_element(StateData, #xmlel{ns = ?NS_JABBER_SERVER} = El) ->
send_text(StateData, exmpp_stanza:to_list(El, ?NS_JABBER_SERVER));
send_element(StateData, El) ->
send_text(StateData, exmpp_stanza:to_list(El, ?DEFAULT_NS)).
send_text(StateData, exmpp_stanza:to_list(El)).
new_id() ->

View File

@ -564,12 +564,8 @@ send_text(StateData, Text) ->
send_element(StateData, #xmlel{ns = ?NS_XMPP, name = 'stream'} = El) ->
send_text(StateData, exmpp_stream:to_list(El));
send_element(StateData, #xmlel{ns = ?NS_JABBER_CLIENT} = El) ->
send_text(StateData, exmpp_stanza:to_list(El,
?NS_JABBER_CLIENT, ?PREFIXED_NS));
send_element(StateData, El) ->
send_text(StateData, exmpp_stanza:to_list(El,
?DEFAULT_NS, ?PREFIXED_NS)).
send_text(StateData, exmpp_stanza:to_list(El)).
change_shaper(StateData, Host, JID) ->

View File

@ -790,12 +790,8 @@ send_text(StateData, Text) ->
send_element(StateData, #xmlel{ns = ?NS_XMPP, name = 'stream'} = El) ->
send_text(StateData, exmpp_stream:to_list(El));
send_element(StateData, #xmlel{ns = ?NS_JABBER_CLIENT} = El) ->
send_text(StateData, exmpp_stanza:to_list(El,
?NS_JABBER_CLIENT, ?PREFIXED_NS));
send_element(StateData, El) ->
send_text(StateData, exmpp_stanza:to_list(El,
?DEFAULT_NS, ?PREFIXED_NS)).
send_text(StateData, exmpp_stanza:to_list(El)).
send_queue(StateData, Q) ->
case queue:out(Q) of