Merged revisions 65841 via svnmerge from
[asterisk/asterisk.git] / channels / chan_gtalk.c
index 8c4a27b..58567a4 100644 (file)
@@ -899,6 +899,7 @@ static struct ast_channel *gtalk_new(struct gtalk *client, struct gtalk_pvt *i,
        int fmt;
        int what;
        const char *n2;
+       char *data = NULL, *cid = NULL;
 
        if (title)
                n2 = title;
@@ -964,9 +965,21 @@ static struct ast_channel *gtalk_new(struct gtalk *client, struct gtalk_pvt *i,
        ast_copy_string(tmp->exten, i->exten, sizeof(tmp->exten));
        /* Don't use ast_set_callerid() here because it will
         * generate a needless NewCallerID event */
-       tmp->cid.cid_num = ast_strdup(i->cid_num);
-       tmp->cid.cid_ani = ast_strdup(i->cid_num);
-       tmp->cid.cid_name = ast_strdup(i->cid_name);
+       if (!strcasecmp(client->name, "guest")) {
+               if (strchr(i->them, '/')) {
+                       char *aux;
+                       data = ast_strdupa((char *)i->them);
+                       aux = data;
+                       cid = strsep(&aux, "/");
+               } else
+                       cid = i->them;
+       } else {
+               cid = client->user;
+       }
+       cid = strsep(&cid, "@");
+       tmp->cid.cid_num = ast_strdup(cid);
+       tmp->cid.cid_ani = ast_strdup(cid);
+       tmp->cid.cid_name = ast_strdup(i->them);
        if (!ast_strlen_zero(i->exten) && strcmp(i->exten, "s"))
                tmp->cid.cid_dnid = ast_strdup(i->exten);
        tmp->priority = 1;