Module: sip-router Branch: master Commit: a22807aeeda001fbf3471bdbd73966063e53ad2d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a22807a… Author: pd &lt;peter.dunkley(a)crocodile-rcs.com&gt; Committer: pd &lt;peter.dunkley(a)crocodile-rcs.com&gt; Date: Tue Aug 9 11:50:48 2011 +0100 modules_k/xcap_server: rolling back the addition of the xuiddomain pseudo-variable - As Juha has pointed out this change was unnecessary. The domain can be extracted from xuid using $(xcapuri(u=>xuid){uri.host}) --- modules_k/xcap_server/README | 2 +- modules_k/xcap_server/doc/xcap_server_admin.xml | 2 +- modules_k/xcap_server/xcap_misc.c | 13 ------------- modules_k/xcap_server/xcap_misc.h | 1 - 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/modules_k/xcap_server/README b/modules_k/xcap_server/README index 88623e1..aca4a04 100644 --- a/modules_k/xcap_server/README +++ b/modules_k/xcap_server/README @@ -264,7 +264,7 @@ event_route[xhttp:request] { * $xcapuri(name=>key) - name can be any to idenitfy the XCAP uri; key can be: data, uri, root, auid, type, tree, xuid, file, node, - target, domain, xuiddomain. + target, domain. Exported pseudo-variables are documented at http://www.kamailio.org/dokuwiki/. diff --git a/modules_k/xcap_server/doc/xcap_server_admin.xml b/modules_k/xcap_server/doc/xcap_server_admin.xml index d83c7c5..c690557 100644 --- a/modules_k/xcap_server/doc/xcap_server_admin.xml +++ b/modules_k/xcap_server/doc/xcap_server_admin.xml @@ -307,7 +307,7 @@ event_route[xhttp:request] { <listitem><para> <emphasis>$xcapuri(name=>key)</emphasis> - name can be any to idenitfy the XCAP uri; key can be: data, uri, root, auid, - type, tree, xuid, file, node, target, domain, xuiddomain. + type, tree, xuid, file, node, target, domain. </para></listitem> </itemizedlist> <para> diff --git a/modules_k/xcap_server/xcap_misc.c b/modules_k/xcap_server/xcap_misc.c index 06b5a57..57abf3f 100644 --- a/modules_k/xcap_server/xcap_misc.c +++ b/modules_k/xcap_server/xcap_misc.c @@ -238,13 +238,6 @@ int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri) s.len -= xuri->xuid.len + 1; } - /* xuiddomain */ - if (xuri->xuid.len > 0) { - p = strchr(xuri->xuid.s, '@'); - xuri->xuiddomain.s = p + 1; - xuri->xuiddomain.len = xuri->xuid.len - (p - xuri->xuid.s) - 1; - } - /* file */ xuri->file.s = s.s; if(xuri->nss==NULL) { @@ -754,8 +747,6 @@ int pv_parse_xcap_uri_name(pv_spec_p sp, str *in) pxs->ktype = 9; } else if(pxs->key.len==6 && strncmp(pxs->key.s, "domain", 6)==0) { pxs->ktype = 10; - } else if(pxs->key.len==10 && strncmp(pxs->key.s, "xuiddomain", 10)==0) { - pxs->ktype = 11; } else { LM_ERR("unknown key type [%.*s]\n", in->len, in->s); goto error; @@ -859,10 +850,6 @@ int pv_get_xcap_uri(struct sip_msg *msg, pv_param_t *param, /* get domain */ if(pxs->xus->xuri.domain.len>0) return pv_get_strval(msg, param, res, &pxs->xus->xuri.domain); - case 11: - /* get xuiddomain */ - if(pxs->xus->xuri.xuiddomain.len>0) - return pv_get_strval(msg, param, res, &pxs->xus->xuri.xuiddomain); break; default: return pv_get_null(msg, param, res); diff --git a/modules_k/xcap_server/xcap_misc.h b/modules_k/xcap_server/xcap_misc.h index 908d592..4fcd3d1 100644 --- a/modules_k/xcap_server/xcap_misc.h +++ b/modules_k/xcap_server/xcap_misc.h @@ -48,7 +48,6 @@ typedef struct xcap_uri { str node; str target; str domain; - str xuiddomain; } xcap_uri_t; int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri);