aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2016-05-05 00:20:15 +0200
committerHolger Weiss <holger@zedat.fu-berlin.de>2016-05-05 00:20:15 +0200
commitd6700bdc5b6fcb04b9d49275b19f63d39a5b3967 (patch)
tree073ac0db776c847d24652040e86f52fc805e32b9 /src
parentAdd missing odbc->sql in comment from commit 1aae8a9f (diff)
parentProcess messages of unknown type consistently (diff)
Merge remote-tracking branch 'processone/pr/1088'
* processone/pr/1088: Process messages of unknown type consistently
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_sm.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl
index 25f6ea027..5ee652cce 100644
--- a/src/ejabberd_sm.erl
+++ b/src/ejabberd_sm.erl
@@ -518,16 +518,16 @@ do_route(From, To, #xmlel{} = Packet) ->
<<"message">> ->
case fxml:get_attr_s(<<"type">>, Attrs) of
<<"chat">> -> route_message(From, To, Packet, chat);
- <<"normal">> -> route_message(From, To, Packet, normal);
- <<"">> -> route_message(From, To, Packet, normal);
<<"headline">> -> ok;
<<"error">> -> ok;
- _ ->
+ <<"groupchat">> ->
ErrTxt = <<"User session not found">>,
Err = jlib:make_error_reply(
Packet,
?ERRT_SERVICE_UNAVAILABLE(Lang, ErrTxt)),
- ejabberd_router:route(To, From, Err)
+ ejabberd_router:route(To, From, Err);
+ _ ->
+ route_message(From, To, Packet, normal)
end;
<<"iq">> ->
case fxml:get_attr_s(<<"type">>, Attrs) of