diff options
author | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-03 22:35:43 +0000 |
---|---|---|
committer | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-03 22:35:43 +0000 |
commit | e225c770d1d5319b1442606829a92d8d73db8ea8 (patch) | |
tree | 8ae34088e4a2d9b4ffacf7e027fbe8e2c087a9a4 | |
parent | d0ecdbc0e6148607c6e0fb99efca30460ebce5a4 (diff) |
fix issue with dialing client without resource.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@44312 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_gtalk.c | 8 | ||||
-rw-r--r-- | res/res_jabber.c | 26 |
2 files changed, 25 insertions, 9 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 9346d5ce8..7ce00c55e 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -878,8 +878,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; @@ -1512,6 +1513,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); @@ -1537,6 +1539,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) { @@ -1627,6 +1630,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; diff --git a/res/res_jabber.c b/res/res_jabber.c index 9a4b52db6..d9b76c630 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -871,7 +871,6 @@ static int aji_client_info_handler(void *data, ikspak *pak) struct aji_buddy *buddy = ASTOBJ_CONTAINER_FIND(&client->buddies, pak->from->partial); resource = aji_find_resource(buddy, pak->from->resource); - if (pak->subtype == IKS_TYPE_RESULT) { if (!resource) { ast_log(LOG_NOTICE,"JABBER: Received client info from %s when not requested.\n", pak->from->full); @@ -927,13 +926,26 @@ static int aji_client_info_handler(void *data, ikspak *pak) static int aji_dinfo_handler(void *data, ikspak *pak) { struct aji_client *client = ASTOBJ_REF((struct aji_client *) data); - char *node = NULL, *type = NULL; - type = iks_find_attrib(pak->x,"type"); - if (!strcasecmp(type,"error")) { + char *node = NULL; + struct aji_resource *resource = NULL; + struct aji_buddy *buddy = ASTOBJ_CONTAINER_FIND(&client->buddies, pak->from->partial); + + resource = aji_find_resource(buddy, pak->from->resource); + if (pak->subtype == IKS_TYPE_ERROR) { ast_log(LOG_WARNING, "Recieved error from a client, turn on jabber debug!\n"); return IKS_FILTER_EAT; } - if (!strcasecmp(type,"get") && !(node = iks_find_attrib(pak->query, "node"))) { + if (pak->subtype == IKS_TYPE_RESULT) { + if (!resource) { + ast_log(LOG_NOTICE,"JABBER: Received client info from %s when not requested.\n", pak->from->full); + ASTOBJ_UNREF(client, aji_client_destroy); + return IKS_FILTER_EAT; + } + if (iks_find_with_attrib(pak->query, "feature", "var", "http://www.google.com/xmpp/protocol/voice/v1")) { + resource->cap->jingle = 1; + } else + resource->cap->jingle = 0; + } else if (pak->subtype == IKS_TYPE_GET && !(node = iks_find_attrib(pak->query, "node"))) { iks *iq, *query, *identity, *disco, *reg, *commands, *gateway, *version, *vcard, *search; iq = iks_new("iq"); @@ -999,7 +1011,7 @@ static int aji_dinfo_handler(void *data, ikspak *pak) if (search) iks_delete(search); - } else if (!strcasecmp(type,"get") && !strcasecmp(node, "http://jabber.org/protocol/commands")) { + } else if (pak->subtype == IKS_TYPE_GET && !strcasecmp(node, "http://jabber.org/protocol/commands")) { iks *iq, *query, *confirm; iq = iks_new("iq"); query = iks_new("query"); @@ -1028,7 +1040,7 @@ static int aji_dinfo_handler(void *data, ikspak *pak) if (confirm) iks_delete(confirm); - } else if (!strcasecmp(type,"get") && !strcasecmp(node, "confirmaccount")) { + } else if (pak->subtype == IKS_TYPE_GET && !strcasecmp(node, "confirmaccount")) { iks *iq, *query, *feature; iq = iks_new("iq"); |