diff options
| author | Matt O'Gorman <mogorman@digium.com> | 2006-10-03 22:36:51 +0000 |
|---|---|---|
| committer | Matt O'Gorman <mogorman@digium.com> | 2006-10-03 22:36:51 +0000 |
| commit | 7294ba38521f6af7746f76264919cb4739966792 (patch) | |
| tree | 8ee7236bff2e066bfbb1a85a08afb7b471a284e6 /channels/chan_gtalk.c | |
| parent | e486316dc6367aa3289a4d1955a233a02e65c258 (diff) | |
Merged revisions 44312 via svnmerge from
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
Diffstat (limited to 'channels/chan_gtalk.c')
| -rw-r--r-- | channels/chan_gtalk.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index c5a8483e4..fa8b57e4e 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -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(>alklock); 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; |