Merged revisions 81650 via svnmerge from
authorPhilippe Sultan <philippe.sultan@gmail.com>
Thu, 6 Sep 2007 14:24:29 +0000 (14:24 +0000)
committerPhilippe Sultan <philippe.sultan@gmail.com>
Thu, 6 Sep 2007 14:24:29 +0000 (14:24 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81650 | phsultan | 2007-09-06 16:20:54 +0200 (Thu, 06 Sep 2007) | 3 lines

According to both RFC 3920 - section 9.1.2 - and Google's XMPP server
complaint, if set, the 'from' attribute must be set to the user's full
JID.
........

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

res/res_jabber.c

index 7330d35..eba4f62 100644 (file)
@@ -1402,7 +1402,7 @@ static void aji_handle_presence(struct aji_client *client, ikspak *pak)
                        if(query && iq)  {
                                iks_insert_attrib(iq, "type", "get");
                                iks_insert_attrib(iq, "to", pak->from->full);
-                               iks_insert_attrib(iq,"from",iks_find_attrib(pak->x,"to"));
+                               iks_insert_attrib(iq,"from", client->jid->full);
                                iks_insert_attrib(iq, "id", client->mid);
                                ast_aji_increment_mid(client->mid);
                                iks_insert_attrib(query, "xmlns", "http://jabber.org/protocol/disco#info");