Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

Replace the use of xml_stream by exmpp_xmlstream. exmpp_xml is

Browse Source 
configured to produce old #xmlelement records. exmpp_xmlstream is
configured to send old xmlstreamstart tuple.

Users are able to connect to ejabberd. 

Next step: ejabberd_c2s.

SVN Revision: 1365
This commit is contained in:
Jean-Sébastien Pédron 2008-06-19 10:23:52 +00:00
parent ad4a1c2a59
commit 58bfea2ad1
2 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2008-06-19 Jean-Sébastien Pédron <js.pedron@meetic-corp.com>
* src/ejabberd_receiver.erl: Replace the use of xml_stream by
exmpp_xmlstream. exmpp_xml is configured to produce old #xmlelement
records. exmpp_xmlstream is configured to send old xmlstreamstart
tuple. Users are able to connect to ejabberd. Next step:
ejabberd_c2s.
2008-06-19 Jean-Sébastien Pédron <js.pedron@meetic-corp.com>
Start the transition to exmpp.
2008-06-18 Badlop <badlop@process-one.net> 2008-06-18 Badlop <badlop@process-one.net>
* src/ejabberd.app: The ejabberd version number is defined in the * src/ejabberd.app: The ejabberd version number is defined in the

37
src/ejabberd_receiver.erl
View File

@ -131,11 +131,8 @@ init([Socket, SockMod, Shaper, MaxStanzaSize]) ->
%% Description: Handling call messages %% Description: Handling call messages
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
handle_call({starttls, TLSSocket}, _From, handle_call({starttls, TLSSocket}, _From,
#state{xml_stream_state = XMLStreamState, #state{xml_stream_state = XMLStreamState} = State) ->
c2s_pid = C2SPid, NewXMLStreamState = exmpp_xmlstream:reset(XMLStreamState),
max_stanza_size = MaxStanzaSize} = State) ->
close_stream(XMLStreamState),
NewXMLStreamState = xml_stream:new(C2SPid, MaxStanzaSize),
NewState = State#state{socket = TLSSocket, NewState = State#state{socket = TLSSocket,
sock_mod = tls, sock_mod = tls,
xml_stream_state = NewXMLStreamState}, xml_stream_state = NewXMLStreamState},
@ -146,11 +143,8 @@ handle_call({starttls, TLSSocket}, _From,
{stop, normal, ok, NewState} {stop, normal, ok, NewState}
end; end;
handle_call({compress, ZlibSocket}, _From, handle_call({compress, ZlibSocket}, _From,
#state{xml_stream_state = XMLStreamState, #state{xml_stream_state = XMLStreamState} = State) ->
c2s_pid = C2SPid, NewXMLStreamState = exmpp_xmlstream:reset(XMLStreamState),
max_stanza_size = MaxStanzaSize} = State) ->
close_stream(XMLStreamState),
NewXMLStreamState = xml_stream:new(C2SPid, MaxStanzaSize),
NewState = State#state{socket = ZlibSocket, NewState = State#state{socket = ZlibSocket,
sock_mod = ejabberd_zlib, sock_mod = ejabberd_zlib,
xml_stream_state = NewXMLStreamState}, xml_stream_state = NewXMLStreamState},
@ -161,15 +155,21 @@ handle_call({compress, ZlibSocket}, _From,
{stop, normal, ok, NewState} {stop, normal, ok, NewState}
end; end;
handle_call(reset_stream, _From, handle_call(reset_stream, _From,
#state{xml_stream_state = XMLStreamState, #state{xml_stream_state = XMLStreamState} = State) ->
c2s_pid = C2SPid, NewXMLStreamState = exmpp_xmlstream:reset(XMLStreamState),
max_stanza_size = MaxStanzaSize} = State) ->
close_stream(XMLStreamState),
NewXMLStreamState = xml_stream:new(C2SPid, MaxStanzaSize),
Reply = ok, Reply = ok,
{reply, Reply, State#state{xml_stream_state = NewXMLStreamState}}; {reply, Reply, State#state{xml_stream_state = NewXMLStreamState}};
handle_call({become_controller, C2SPid}, _From, State) -> handle_call({become_controller, C2SPid}, _From, State) ->
XMLStreamState = xml_stream:new(C2SPid, State#state.max_stanza_size), % XXX OLD FORMAT
Parser = exmpp_xml:start_parser([
{namespace, false},
{name_as_atom, false},
{maxsize, State#state.max_stanza_size}
]),
XMLStreamState = exmpp_xmlstream:start(
{gen_fsm, C2SPid}, Parser,
[{xmlstreamstart, old}]
),
NewState = State#state{c2s_pid = C2SPid, NewState = State#state{c2s_pid = C2SPid,
xml_stream_state = XMLStreamState}, xml_stream_state = XMLStreamState},
activate_socket(NewState), activate_socket(NewState),
@ -291,7 +291,7 @@ process_data(Data,
shaper_state = ShaperState, shaper_state = ShaperState,
c2s_pid = C2SPid} = State) -> c2s_pid = C2SPid} = State) ->
?DEBUG("Received XML on stream = ~p", [binary_to_list(Data)]), ?DEBUG("Received XML on stream = ~p", [binary_to_list(Data)]),
XMLStreamState1 = xml_stream:parse(XMLStreamState, Data), {ok, XMLStreamState1} = exmpp_xmlstream:parse(XMLStreamState, Data),
{NewShaperState, Pause} = shaper:update(ShaperState, size(Data)), {NewShaperState, Pause} = shaper:update(ShaperState, size(Data)),
if if
C2SPid == undefined -> C2SPid == undefined ->
@ -307,4 +307,5 @@ process_data(Data,
close_stream(undefined) -> close_stream(undefined) ->
ok; ok;
close_stream(XMLStreamState) -> close_stream(XMLStreamState) ->
xml_stream:close(XMLStreamState). exmpp_xml:stop_parser(exmpp_xmlstream:get_parser(XMLStreamState)),
exmpp_xmlstream:stop(XMLStreamState).