Merged revisions 80661 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80661 | phsultan | 2007-08-24 13:42:46 +0200 (Fri, 24 Aug 2007) | 9 lines

Closes issue #10509

Googletalk calls are answered too early, which results in CDRs wrongly
stating that a call was ANSWERED when the calling party cancelled a
call before before being established.

We must not answer the call upon reception of a 'transport-accept' iq
packet, but this packet still needs to be acknowledged, otherwise the
remote peer would close the call (like in #8970).
........

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

diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index 22d8a29..42e8401 100644 (file)
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -622,6 +622,30 @@ static int gtalk_is_answered(struct gtalk *client, ikspak *pak)
        return 1;
 }
 
+static int gtalk_is_accepted(struct gtalk *client, ikspak *pak)
+{
+       struct gtalk_pvt *tmp;
+       char *from;
+
+       ast_log(LOG_DEBUG, "The client is %s\n", client->name);
+       /* find corresponding call */
+       for (tmp = client->p; tmp; tmp = tmp->next) {
+               if (iks_find_with_attrib(pak->x, "session", "id", tmp->sid))
+                       break;
+       }
+
+       from = iks_find_attrib(pak->x, "to");
+       if(!from)
+               from = client->connection->jid->full;
+
+       if (!tmp)
+               ast_log(LOG_NOTICE, "Whoa, didn't find call!\n");
+
+       /* answer 'iq' packet to let the remote peer know that we're alive */
+       gtalk_response(client, from, pak, NULL, NULL);
+       return 1;
+}
+
 static int gtalk_handle_dtmf(struct gtalk *client, ikspak *pak)
 {
        struct gtalk_pvt *tmp;
@@ -1571,8 +1595,10 @@ static int gtalk_parser(void *data, ikspak *pak)
                ast_debug(3, "About to add candidate!\n");
                gtalk_add_candidate(client, pak);
                ast_debug(3, "Candidate Added!\n");
-       } else if (iks_find_with_attrib(pak->x, "session", "type", "accept") || iks_find_with_attrib(pak->x, "session", "type", "transport-accept")) {
+       } else if (iks_find_with_attrib(pak->x, "session", "type", "accept")) {
                gtalk_is_answered(client, pak);
+       } else if (iks_find_with_attrib(pak->x, "session", "type", "transport-accept")) {
+               gtalk_is_accepted(client, pak);
        } else if (iks_find_with_attrib(pak->x, "session", "type", "content-info")) {
                gtalk_handle_dtmf(client, pak);
        } else if (iks_find_with_attrib(pak->x, "session", "type", "terminate")) {