Actually check the "sendtodialplan" option setting for xmpp.
authorRussell Bryant <russell@russellbryant.com>
Tue, 7 Jun 2011 19:17:31 +0000 (19:17 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 7 Jun 2011 19:17:31 +0000 (19:17 +0000)
(closes issue ASTERISK-17978)
Reported by: elguero
Patches:
    stop_messages_going_to_dialplan.patch (license #5026)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@322244 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_jabber.c

index ccd5fb2..2d0ffcb 100644 (file)
@@ -2295,21 +2295,23 @@ static void aji_handle_message(struct aji_client *client, ikspak *pak)
                ast_debug(3, "message comes from %s\n", insert->from);
        }
 
-       if ((msg = ast_msg_alloc())) {
-               int res;
+       if (client->send_to_dialplan) {
+               if ((msg = ast_msg_alloc())) {
+                       int res;
 
-               res = ast_msg_set_to(msg, "xmpp:%s", client->user);
-               res |= ast_msg_set_from(msg, "xmpp:%s", insert->from);
-               res |= ast_msg_set_body(msg, "%s", insert->message);
-               res |= ast_msg_set_context(msg, "%s", client->context);
+                       res = ast_msg_set_to(msg, "xmpp:%s", client->user);
+                       res |= ast_msg_set_from(msg, "xmpp:%s", insert->from);
+                       res |= ast_msg_set_body(msg, "%s", insert->message);
+                       res |= ast_msg_set_context(msg, "%s", client->context);
 
-               if (res) {
-                       ast_msg_destroy(msg);
-               } else {
-                       ast_msg_queue(msg);
-               }
+                       if (res) {
+                               ast_msg_destroy(msg);
+                       } else {
+                               ast_msg_queue(msg);
+                       }
 
-               msg = NULL;
+                       msg = NULL;
+               }
        }
 
        /* remove old messages received from this JID