diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2007-03-17 23:02:06 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2007-03-17 23:02:06 +0000 |
| commit | 77282b0e1a728bdb6d8215ff21d7aaf82e121bf3 (patch) | |
| tree | 6c573448a81d61bedde1d61dc1fd3d0e3172432f | |
| parent | * src/ejabberd_s2s.erl: Fixed spelling (diff) | |
* src/ejabberd_s2s.erl: Don't bounce packets with "error" and
"result" type
SVN Revision: 747
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/ejabberd_s2s.erl | 11 |
2 files changed, 11 insertions, 3 deletions
@@ -1,5 +1,8 @@ 2007-03-18 Alexey Shchepin <alexey@sevcom.net> + * src/ejabberd_s2s.erl: Don't bounce packets with "error" and + "result" type + * src/ejabberd_s2s.erl: Fixed spelling * src/ejabberd_s2s.erl: Don't start s2s process for existing diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl index 7800724e5..97ef9556e 100644 --- a/src/ejabberd_s2s.erl +++ b/src/ejabberd_s2s.erl @@ -210,9 +210,14 @@ do_route(From, To, Packet) -> send_element(Pid, {xmlelement, Name, NewAttrs, Els}), ok; {aborted, Reason} -> - Err = jlib:make_error_reply( - Packet, ?ERR_SERVICE_UNAVAILABLE), - ejabberd_router:route(To, From, Err), + case xml:get_tag_attr_s("type", Packet) of + "error" -> ok; + "result" -> ok; + _ -> + Err = jlib:make_error_reply( + Packet, ?ERR_SERVICE_UNAVAILABLE), + ejabberd_router:route(To, From, Err) + end, false end. |