mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-17 15:29:05 +00:00
Modify rule filters to match with the Jingle namespace constant
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82320 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1537,9 +1537,10 @@ static int jingle_create_member(char *label, struct ast_variable *var, int allow
|
|||||||
else if (!strcasecmp(var->name, "connection")) {
|
else if (!strcasecmp(var->name, "connection")) {
|
||||||
if ((client = ast_aji_get_client(var->value))) {
|
if ((client = ast_aji_get_client(var->value))) {
|
||||||
member->connection = client;
|
member->connection = client;
|
||||||
iks_filter_add_rule(client->f, jingle_parser, member, IKS_RULE_TYPE,
|
iks_filter_add_rule(client->f, jingle_parser, member,
|
||||||
IKS_PAK_IQ, IKS_RULE_FROM_PARTIAL, member->user,
|
IKS_RULE_TYPE, IKS_PAK_IQ,
|
||||||
IKS_RULE_NS, "http://jabber.org/protocol/jingle",
|
IKS_RULE_FROM_PARTIAL, member->user,
|
||||||
|
IKS_RULE_NS, JINGLE_NS,
|
||||||
IKS_RULE_DONE);
|
IKS_RULE_DONE);
|
||||||
} else {
|
} else {
|
||||||
ast_log(LOG_ERROR, "connection referenced not found!\n");
|
ast_log(LOG_ERROR, "connection referenced not found!\n");
|
||||||
@@ -1645,8 +1646,7 @@ static int jingle_load_config(void)
|
|||||||
ASTOBJ_WRLOCK(iterator);
|
ASTOBJ_WRLOCK(iterator);
|
||||||
ASTOBJ_WRLOCK(member);
|
ASTOBJ_WRLOCK(member);
|
||||||
member->connection = iterator;
|
member->connection = iterator;
|
||||||
iks_filter_add_rule(iterator->f, jingle_parser, member, IKS_RULE_TYPE, IKS_PAK_IQ, IKS_RULE_NS,
|
iks_filter_add_rule(iterator->f, jingle_parser, member, IKS_RULE_TYPE, IKS_PAK_IQ, IKS_RULE_NS, JINGLE_NS, IKS_RULE_DONE);
|
||||||
"http://jabber.org/protocol/jingle", IKS_RULE_DONE);
|
|
||||||
ASTOBJ_UNLOCK(member);
|
ASTOBJ_UNLOCK(member);
|
||||||
ASTOBJ_CONTAINER_LINK(&jingles, member);
|
ASTOBJ_CONTAINER_LINK(&jingles, member);
|
||||||
ASTOBJ_UNLOCK(iterator);
|
ASTOBJ_UNLOCK(iterator);
|
||||||
|
|||||||
Reference in New Issue
Block a user