Module: sip-router Branch: 3.3 Commit: 1c0dbfdc4e2288896b7c533dfbc3275afb910869 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c0dbfdc...
Author: Peter Dunkley peter.dunkley@crocodile-rcs.com Committer: Peter Dunkley peter.dunkley@crocodile-rcs.com Date: Wed Apr 24 22:01:59 2013 +0100
modules/presence_xml: fixed issue with parsing some pres-rules documents
- pres-rules that contain external links in a <conditions /> node don't have to have <identity /> nodes in the <conditions /> node. - Kamailio returns an error when it finds a <conditions /> node with no <identity /> node inside it. - Kamailio doesn't support external links, but it should skip over the <conditions /> nodes that contain them rather than return an error as later <conditions /> nodes may contain entries it can work with. (cherry picked from commit ac99219b0a850e0305eaf661b028536cfc28e2cb)
---
modules_k/presence_xml/xcap_auth.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules_k/presence_xml/xcap_auth.c b/modules_k/presence_xml/xcap_auth.c index ad2603d..a9d9c81 100644 --- a/modules_k/presence_xml/xcap_auth.c +++ b/modules_k/presence_xml/xcap_auth.c @@ -308,8 +308,8 @@ xmlNodePtr get_rule_node(subs_t* subs, xmlDocPtr xcap_tree ) identity_node = xmlNodeGetChildByName(cond_node, "identity"); if(identity_node == NULL) { - LM_ERR("didn't find identity tag\n"); - goto error; + LM_WARN("didn't find identity tag\n"); + continue; } iden_child= xmlNodeGetChildByName(identity_node, "one");
-
Peter Dunkley