kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 44312 via svnmerge from

Browse Source 
https://svn.digium.com/svn/asterisk/branches/1.4

........
r44312 | mogorman | 2006-10-03 17:35:43 -0500 (Tue, 03 Oct 2006) | 2 lines

fix issue with dialing client without resource.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44313 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matt O'Gorman
2006-10-03 22:36:51 +00:00
parent e486316dc6
commit 7294ba3852
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_gtalk.c
View File

@@ -880,8 +880,9 @@ static struct gtalk_pvt *gtalk_alloc(struct gtalk *client, const char *us, const
data = ast_strdupa((char *) tmp->us);
exten = strsep(&data, "/");
free(data);
}
ast_copy_string(tmp->exten, exten, sizeof(tmp->exten));
} else
exten = tmp->us;
ast_copy_string(tmp->exten, exten, sizeof(tmp->exten));
ast_mutex_init(&tmp->lock);
ast_mutex_lock(&gtalklock);
tmp->next = client->p;
@@ -1515,6 +1516,7 @@ static int gtalk_do_reload(int fd, int argc, char **argv)
ast_verbose("IT DOES WORK!\n");
return RESULT_SUCCESS;
}
static int gtalk_parser(void *data, ikspak *pak)
{
struct gtalk *client = ASTOBJ_REF((struct gtalk *) data);
@@ -1540,6 +1542,7 @@ static int gtalk_parser(void *data, ikspak *pak)
ASTOBJ_UNREF(client, gtalk_member_destroy);
return IKS_FILTER_EAT;
}
/* Not using this anymore probably take out soon
static struct gtalk_candidate *gtalk_create_candidate(char *args)
{
@@ -1630,6 +1633,7 @@ static int gtalk_create_member(char *label, struct ast_variable *var, int allowg
IKS_PAK_IQ, IKS_RULE_FROM_PARTIAL, member->user,
IKS_RULE_NS, "http://www.google.com/session",
IKS_RULE_DONE);
} else {
ast_log(LOG_ERROR, "connection referenced not found!\n");
return 0;