diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2006-01-25 00:35:12 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2006-01-25 00:35:12 +0000 |
| commit | efacb0ad66312eefeef6e46ba76fd2b8311655e2 (patch) | |
| tree | 8d848c789d1294ca858589fd532f1f36ab331710 /src/ejabberd_s2s_in.erl | |
| parent | * src/ejabberd_c2s.erl: Better error handling for stream (diff) | |
* src/ejabberd_c2s.erl: Remove top-level xmlns from incoming
stanzas
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_service.erl: Likewise
SVN Revision: 492
Diffstat (limited to 'src/ejabberd_s2s_in.erl')
| -rw-r--r-- | src/ejabberd_s2s_in.erl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index ed4a7af0..1de51fdf 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -346,7 +346,8 @@ stream_established({xmlstreamelement, El}, StateData) -> []}), {next_state, stream_established, StateData#state{timer = Timer}}; _ -> - {xmlelement, Name, Attrs, _Els} = El, + NewEl = jlib:remove_attr("xmlns", El), + {xmlelement, Name, Attrs, _Els} = NewEl, From_s = xml:get_attr_s("from", Attrs), From = jlib:string_to_jid(From_s), To_s = xml:get_attr_s("to", Attrs), @@ -366,7 +367,8 @@ stream_established({xmlstreamelement, El}, StateData) -> if ((Name == "iq") or (Name == "message") or (Name == "presence")) -> - ejabberd_router:route(From, To, El); + ejabberd_router:route( + From, To, NewEl); true -> error end; @@ -380,7 +382,8 @@ stream_established({xmlstreamelement, El}, StateData) -> if ((Name == "iq") or (Name == "message") or (Name == "presence")) -> - ejabberd_router:route(From, To, El); + ejabberd_router:route( + From, To, NewEl); true -> error end; |