sr-dev March 2014

sr-dev@lists.kamailio.org

29 participants
298 discussions

git:master: lib/ims/ims_getters: Changed cscf_get_called_party_id to cscf_get_public_identity_from_called_party_id
by Richard Good 07 Mar '14

07 Mar '14

Module: sip-router Branch: master Commit: bbcb7da488b7844ab7c64e800895c60cab0dc601 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bbcb7da… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Fri Mar 7 11:07:11 2014 +0200 lib/ims/ims_getters: Changed cscf_get_called_party_id to cscf_get_public_identity_from_called_party_id Changed function to get identity from called part id header instead of full header Fixes clients that attach extra info (e.g. phone-context) Changed references to this method in ims_charging and ims_registrar_pcscf --- lib/ims/ims_getters.c | 20 ++++++++++++++++++-- lib/ims/ims_getters.h | 4 ++-- modules/ims_charging/ims_ro.c | 2 +- modules/ims_charging/mod.c | 2 +- modules/ims_registrar_pcscf/service_routes.c | 2 +- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/lib/ims/ims_getters.c b/lib/ims/ims_getters.c index aa37c7d..eb266e8 100644 --- a/lib/ims/ims_getters.c +++ b/lib/ims/ims_getters.c @@ -1494,15 +1494,19 @@ int cscf_get_cseq(struct sip_msg *msg,struct hdr_field **hr) static str s_called_party_id={"P-Called-Party-ID",17}; /** - * Looks for the P-Called-Party-ID header and extracts its content. + * Looks for the P-Called-Party-ID header and extracts the public identity from it * @param msg - the sip message * @param hr - ptr to return the found hdr_field * @returns the P-Called_Party-ID */ -str cscf_get_called_party_id(struct sip_msg *msg,struct hdr_field **hr) +str cscf_get_public_identity_from_called_party_id(struct sip_msg *msg,struct hdr_field **hr) { str id={0,0}; struct hdr_field *h; + int after_semi_colon=0; + int len=0; + int i=0; + if (hr) *hr=0; if (!msg) return id; if (parse_headers(msg, HDR_EOH_F, 0)<0) { @@ -1522,6 +1526,18 @@ str cscf_get_called_party_id(struct sip_msg *msg,struct hdr_field **hr) while(id.len && (id.s[id.len-1]==' ' || id.s[id.len-1]=='\t' || id.s[id.len-1]=='>')){ id.len--; } + //get only text in front of ';' there might not even be a semi-colon + //this caters for extra information after the public identity - e.g. phone-context + len= id.len; + for(i=0; i<len;i++) { + if(id.s[i]==';'){ + //found semi-colon + after_semi_colon = 1; + } + if(after_semi_colon){ + id.len--; + } + } if (hr) *hr = h; return id; } diff --git a/lib/ims/ims_getters.h b/lib/ims/ims_getters.h index 2217ddc..aeeb591 100644 --- a/lib/ims/ims_getters.h +++ b/lib/ims/ims_getters.h @@ -420,12 +420,12 @@ int cscf_add_header_rpl(struct sip_msg *msg, str *hdr); int cscf_get_cseq(struct sip_msg *msg,struct hdr_field **hr); /** - * Looks for the P-Called-Party-ID header and extracts its content. + * Looks for the P-Called-Party-ID header and extracts the public identity from it * @param msg - the sip message * @param hr - ptr to return the found hdr_field * @returns the P-Called_Party-ID */ -str cscf_get_called_party_id(struct sip_msg *msg,struct hdr_field **hr); +str cscf_get_public_identity_from_called_party_id(struct sip_msg *msg,struct hdr_field **hr); #endif diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index ae13389..f71dc98 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -954,7 +954,7 @@ int Ro_Send_CCR(struct sip_msg *msg, struct dlg_cell *dlg, int dir, str* charge_ //getting called asserted identity - if ((called_asserted_identity = cscf_get_called_party_id(msg, &h)).len == 0) { + if ((called_asserted_identity = cscf_get_public_identity_from_called_party_id(msg, &h)).len == 0) { LM_DBG("No P-Called-Identity hdr found. Using request URI for called_asserted_identity"); called_asserted_identity = cscf_get_public_identity_from_requri(msg); free_called_asserted_identity = 1; diff --git a/modules/ims_charging/mod.c b/modules/ims_charging/mod.c index 4fb423f..bbc2708 100644 --- a/modules/ims_charging/mod.c +++ b/modules/ims_charging/mod.c @@ -362,7 +362,7 @@ static int w_ro_ccr(struct sip_msg *msg, str* route_name, str* direction, str* c } else if (dir == RO_TERM_DIRECTION){ //get callee IMPU from called part id - if not present then skip this - if ((identity = cscf_get_called_party_id(msg, &h)).len == 0) { + if ((identity = cscf_get_public_identity_from_called_party_id(msg, &h)).len == 0) { LM_WARN("No P-Called-Identity hdr found - will not get callbacks if this IMPU is removed to terminate call"); goto send_ccr; } diff --git a/modules/ims_registrar_pcscf/service_routes.c b/modules/ims_registrar_pcscf/service_routes.c index 6360aab..cafed54 100644 --- a/modules/ims_registrar_pcscf/service_routes.c +++ b/modules/ims_registrar_pcscf/service_routes.c @@ -481,7 +481,7 @@ int assert_called_identity(struct sip_msg* _m, udomain_t* _d) { goto error; } - called_party_id = cscf_get_called_party_id(req, &h); + called_party_id = cscf_get_public_identity_from_called_party_id(req, &h); if (!called_party_id.len){

1 0

git:master: modules/ims_registrar_scscf: updated documentation
by Richard Good 07 Mar '14

07 Mar '14

Module: sip-router Branch: master Commit: 02edf111af9d13e5bed1de768ca9f206a3537483 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=02edf11… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Fri Mar 7 11:08:51 2014 +0200 modules/ims_registrar_scscf: updated documentation --- .../doc/ims_registrar_scscf_admin.xml | 78 +++++++++++++++++++- 1 files changed, 77 insertions(+), 1 deletions(-) diff --git a/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml b/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml index 00b9b5c..26de7fc 100644 --- a/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml +++ b/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml @@ -686,7 +686,83 @@ if (can_subscribe_to_reg("location")){ </programlisting> </example> </section> - </section> + + <section> + <title><function + moreinfo="none">can_publish_reg(domain)</function></title> + + <para>This function checks to see that a PUBLISH request is authorised + to publish for a particular identity. Only 3 entities can + publish:</para> + + <itemizedlist> + <listitem> + <para><emphasis>The user agent to it's own state</emphasis></para> + </listitem> + + <listitem> + <para>The P-CSCF specified in the path header for that user</para> + </listitem> + + <listitem> + <para>Application Server (AS) not yet implemented</para> + </listitem> + </itemizedlist> + + <para>Meaning of the parameters is as follows:</para> + + <itemizedlist> + <listitem> + <para><emphasis>domain - Logical domain within + registrar.</emphasis></para> + </listitem> + </itemizedlist> + + <para>This function can be used in REQUEST_ROUTE</para> + + <example> + <title><function>can_publish_reg</function> usage</title> + + <programlisting format="linespecific">... +if (can_publish_reg("location")){ + $var(ret)= publish_reg("location"); +} +... +</programlisting> + </example> + </section> + + <section> + <title><function + moreinfo="none">publish_reg(domain)</function></title> + + <para>Save the publish to the REG event for the UAC or the + appropriate P-CSCF (in the path to the UAC).</para> + + <para>Meaning of the parameters is as follows:</para> + + <itemizedlist> + <listitem> + <para><emphasis>domain - Logical domain within + registrar.</emphasis></para> + </listitem> + </itemizedlist> + + <para>This function can be used in REQUEST_ROUTE</para> + + <example> + <title><function>publish_reg</function> usage</title> + + <programlisting format="linespecific">... +if (can_publish_reg("location")){ + $var(ret)= publish_reg("location"); +} +... +</programlisting> + </example> + </section> + + </section> <section> <title>RPC Commands</title>

1 0

git:refs/tags/4.0.6: Tag 4.0.6: v4.0.6
by Victor Seva 06 Mar '14

06 Mar '14

Module: sip-router Branch: refs/tags/4.0.6 Tag: 9d5eb1c06a334bf2d720cdb27114dc5038bbf259 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=tag;h=9d5eb1c06a… Tagger: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Thu Mar 6 21:27:56 2014 +0100 v4.0.6

1 0

git:refs/tags/3.3.7: Tag 3.3.7: v3.3.7
by Victor Seva 06 Mar '14

06 Mar '14

Module: sip-router Branch: refs/tags/3.3.7 Tag: 7e3df390ddb374fb3ea69db79b2ea18219a492d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=tag;h=7e3df390dd… Tagger: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Thu Mar 6 21:27:23 2014 +0100 v3.3.7

1 0

git:refs/tags/4.1.2: Tag 4.1.2: v4.1.2
by Victor Seva 06 Mar '14

06 Mar '14

Module: sip-router Branch: refs/tags/4.1.2 Tag: d46fa88d5df53946b6b71222832d17d8741ef155 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=tag;h=d46fa88d5d… Tagger: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Thu Mar 6 21:28:24 2014 +0100 v4.1.2

1 0

Kamailio v4.1.2 Released
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Hello, Kamailio SIP Server v4.1.2 stable release is out. This is a maintenance release of the latest stable branch, 4.1, that includes fixes since release of v4.1.1. There is no change to database schema or configuration language structure that you have to do on installations of v4.1.x. Deployments running previous v4.x.x versions are strongly recommended to be upgraded to v4.1.2. For more details about version 4.1.2 (including links and guidelines to download the tarball or from GIT repository), visit: * http://www.kamailio.org/w/2014/03/kamailio-v4-1-2-released/ RPM, Debian/Ubuntu packages will be available soon as well. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

1 0

Kamailio v4.0.6 Released
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Hello, Kamailio SIP Server v4.0.6 stable release is out. This is a maintenance release of the stable branch 4.0, that includes fixes since release of v4.0.5. There is no change to database schema or configuration language structure that you have to do on installations of v4.0.x. Deployments running previous v4.0.x versions are strongly recommended to be upgraded to v4.0.6. For more details about version 4.0.6 (including links and guidelines to download the tarball or from GIT repository), visit: * http://www.kamailio.org/w/2014/03/kamailio-v4-0-6-released/ Note that 4.0.x is previous stable release series, the latest one is now 4.1.x, with v4.1.2 released today as well. In addition, 3.3.7 was packaged in order to have it included in the new APT repository and make transition to newer versions easier for those still on branch 3.3. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

1 0

git:4.1: ChangeLog: content updated for v4.1.2
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Module: sip-router Branch: 4.1 Commit: 6fa599871111ac8c741455304f5117e441b3c946 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6fa5998… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 6 16:05:08 2014 +0100 ChangeLog: content updated for v4.1.2 --- ChangeLog | 795 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 795 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=6fa…

1 0

git:4.1: Makefile.defs: version set to 4.1.2
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Module: sip-router Branch: 4.1 Commit: e9daf4ff4120e7cbfc6d99880c9679ea8051f18a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e9daf4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 6 15:49:19 2014 +0100 Makefile.defs: version set to 4.1.2 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 9b2259a..37d921d 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -164,7 +164,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 4 PATCHLEVEL = 1 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = # memory manager switcher

1 0

git:4.1: pkg/kamailio: version set to 4.1.2 in rpm specs
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Module: sip-router Branch: 4.1 Commit: 25f6290d2ffba6178a0d3a3ce3ab833808830e6b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=25f6290… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 6 15:48:35 2014 +0100 pkg/kamailio: version set to 4.1.2 in rpm specs --- pkg/kamailio/rpm/kamailio.spec-4.1 | 2 +- pkg/kamailio/rpm/kamailio.spec.CenOS | 2 +- pkg/kamailio/rpm/kamailio.spec.SuSE | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 6578398..5c8d272 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.1.1 +%define ver 4.1.2 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index 29417db..90ac472 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.1.1 +%define ver 4.1.2 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index eead83e..bd9f13e 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.1.1 +%define ver 4.1.2 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2014