sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

git:richard.good/diameter_rx_media: ims_qos: bug fix for Rx flow-description AVP

by Richard Good

Module: sip-router Branch: richard.good/diameter_rx_media Commit: c258aa9b90277a3bba69d629a99fec09217b45f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c258aa9… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Mar 14 18:55:52 2013 +0200 ims_qos: bug fix for Rx flow-description AVP - rx_avp.c: rx_create_media_subcomponent_avp removed options from flow-description AVP as per Rx 29.214 --- modules/ims_qos/rx_avp.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/ims_qos/rx_avp.c b/modules/ims_qos/rx_avp.c index 86a630f..d628192 100644 --- a/modules/ims_qos/rx_avp.c +++ b/modules/ims_qos/rx_avp.c @@ -505,8 +505,11 @@ static str permit_out = {"permit out ", 11}; static str permit_in = {"permit in ", 10}; static str from_s = {" from ", 6}; static str to_s = {" to ", 4}; -static char * permit_out_with_ports = "permit out %i from %.*s %u to %.*s %u %s"; -static char * permit_in_with_ports = "permit in %i from %.*s %u to %.*s %u %s"; +//removed final %s - this is options which Rx 29.214 says will not be used for flow-description AVP +static char * permit_out_with_ports = "permit out %i from %.*s %u to %.*s %u"; +//static char * permit_out_with_ports = "permit out %i from %.*s %u to %.*s %u %s"; +static char * permit_in_with_ports = "permit in %i from %.*s %u to %.*s %u"; +//static char * permit_in_with_ports = "permit in %i from %.*s %u to %.*s %u %s"; AAA_AVP *rx_create_media_subcomponent_avp(int number, char* proto, str *ipA, str *portA, @@ -551,13 +554,13 @@ AAA_AVP *rx_create_media_subcomponent_avp(int number, char* proto, } set_4bytes(x, number); - + flow_number = cdpb.AAACreateAVP(AVP_IMS_Flow_Number, AAA_AVP_FLAG_MANDATORY | AAA_AVP_FLAG_VENDOR_SPECIFIC, IMS_vendor_id_3GPP, x, 4, AVP_DUPLICATE_DATA); cdpb.AAAAddAVPToList(&list, flow_number); - + /*IMS Flow descriptions*/ /*first flow is the receive flow*/ flow_data.len = snprintf(flow_data.s, len, permit_out_with_ports, proto_int,

11 years, 8 months

git:richard.good/diameter_rx_media: ims_qos: 1st run at enabling Rx for media calling

by Richard Good

Module: sip-router Branch: richard.good/diameter_rx_media Commit: ed43cf44b7755ae2fbfdeae0c00161f76f0b7b86 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed43cf4… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Feb 28 15:22:14 2013 +0200 ims_qos: 1st run at enabling Rx for media calling - Previous Rx iteration only worked for Rx subscription to signalling status. These additions allow Rx to be used for media authorization typically between an AF (e.g. P-CSCF) and PCRF. --- modules/ims_qos/mod.c | 441 ++++++++++++++++++++++++++-------------------- modules/ims_qos/mod.h | 11 -- modules/ims_qos/rx_aar.c | 165 +++++++++++++++--- modules/ims_qos/rx_aar.h | 17 ++- 4 files changed, 402 insertions(+), 232 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ed4…

11 years, 8 months

git:richard.good/diameter_rx_media: ims_qos: standardised on return code for modules

by Richard Good

Module: sip-router Branch: richard.good/diameter_rx_media Commit: 72d618cc7e669cab90fbed8c3580c464b13f6118 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=72d618c… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Feb 28 15:20:45 2013 +0200 ims_qos: standardised on return code for modules - Use CSCF_RETURN_ instead of RX_RETURN_ throughout the module - previously a mix of both these static variables was used. Both variables are identical but it made for confusing code reading. --- modules/ims_qos/rx_avp.c | 10 ++++++---- modules/ims_qos/rx_str.c | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/modules/ims_qos/rx_avp.c b/modules/ims_qos/rx_avp.c index f92d507..86a630f 100644 --- a/modules/ims_qos/rx_avp.c +++ b/modules/ims_qos/rx_avp.c @@ -56,6 +56,8 @@ #include "rx_avp.h" #include "mod.h" +#include "../../lib/ims/ims_getters.h" + /**< Structure with pointers to cdp funcs, global variable defined in mod.c */ extern struct cdp_binds cdpb; extern cdp_avp_bind_t *cdp_avp; @@ -86,7 +88,7 @@ inline int rx_add_avp(AAAMessage *m, char *d, int len, int avp_code, cdpb.AAAFreeAVP(&avp); return 0; } - return RX_RETURN_TRUE; + return CSCF_RETURN_TRUE; } /** @@ -122,7 +124,7 @@ static inline int rx_add_avp_list(AAA_AVP_LIST *list, char *d, int len, int avp_ avp->prev = 0; } - return RX_RETURN_TRUE; + return CSCF_RETURN_TRUE; } /** @@ -272,7 +274,7 @@ inline int rx_add_destination_realm_avp(AAAMessage *msg, str data) { * Creates and adds an Acct-Application-Id AVP. * @param msg - the Diameter message to add to. * @param data - the value for the AVP payload - * @return RX_RETURN_TRUE on success or 0 on error + * @return CSCF_RETURN_TRUE on success or 0 on error */ inline int rx_add_auth_application_id_avp(AAAMessage *msg, unsigned int data) { char x[4]; @@ -292,7 +294,7 @@ inline int rx_add_auth_application_id_avp(AAAMessage *msg, unsigned int data) { * @param msg - the Diameter message to add to. * @param r - the sip_message to extract the data from. * @param tag - originating (0) terminating (1) - * @return RX_RETURN_TRUE on success or 0 on error + * @return CSCF_RETURN_TRUE on success or 0 on error * */ diff --git a/modules/ims_qos/rx_str.c b/modules/ims_qos/rx_str.c index 7521034..2d630a3 100644 --- a/modules/ims_qos/rx_str.c +++ b/modules/ims_qos/rx_str.c @@ -58,6 +58,8 @@ #include "rx_avp.h" #include "rx_str.h" +#include "../../lib/ims/ims_getters.h" + extern str IMS_Serv_AVP_val; int rx_send_str(str *rx_session_id) { @@ -72,7 +74,7 @@ int rx_send_str(str *rx_session_id) { if (!rx_session_id || !rx_session_id->s || !rx_session_id->len) { LM_ERR("Dialog has no Rx session associated\n"); - return RX_RETURN_FALSE; + return CSCF_RETURN_FALSE; }else { LM_DBG("Rx session id exists\n"); @@ -83,7 +85,7 @@ int rx_send_str(str *rx_session_id) { auth = cdpb.AAAGetAuthSession(*rx_session_id); if (!auth) { LM_ERR("Could not get Auth Session for session id: [%.*s]\n", rx_session_id->len, rx_session_id->s); - return RX_RETURN_FALSE; + return CSCF_RETURN_FALSE; }else{ LM_DBG("Retrieved Auth Session for session id: [%.*s]\n", rx_session_id->len, rx_session_id->s); } @@ -155,7 +157,7 @@ int rx_send_str(str *rx_session_id) { LM_DBG("Successfully sent Rx STR for session: [%.*s]\n", rx_session_id->len, rx_session_id->s); - return RX_RETURN_TRUE; + return CSCF_RETURN_TRUE; error: LM_DBG("Error sending Rx STR for session: [%.*s]\n", rx_session_id->len, rx_session_id->s); @@ -166,5 +168,5 @@ error: auth = 0; } - return RX_RETURN_FALSE; + return CSCF_RETURN_FALSE; }

11 years, 8 months

git:richard.good/diameter_rx_media: ims_qos: updated documentation for Rx calling

by Richard Good

Module: sip-router Branch: richard.good/diameter_rx_media Commit: 9fc9a82a67f7eb0f76be8af3ae06bfc8b0beb596 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9fc9a82… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Feb 28 15:17:57 2013 +0200 ims_qos: updated documentation for Rx calling - Updated the documentation to correctly reflect how to use Diameter Rx to authorize calling and other media sessions --- modules/ims_qos/doc/ims_qos_admin.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/ims_qos/doc/ims_qos_admin.xml b/modules/ims_qos/doc/ims_qos_admin.xml index 1770bb8..5f3f1a2 100644 --- a/modules/ims_qos/doc/ims_qos_admin.xml +++ b/modules/ims_qos/doc/ims_qos_admin.xml @@ -239,7 +239,7 @@ modparam("ims_qos", "cdp_event_latency_log", 1) <section> <title><function - moreinfo="none">Rx_AAR(domain)</function></title> + moreinfo="none">Rx_AAR(direction)</function></title> <para>Perform a AAR on Diameter RX interface to request resource authorisation from a Diameter server (typically a PCRF). For more details @@ -249,8 +249,8 @@ modparam("ims_qos", "cdp_event_latency_log", 1) <itemizedlist> <listitem> - <para><emphasis>domain</emphasis> that usrloc_pcscf uses to store - user information.</para> + <para><emphasis>direction</emphasis>the direction of this message - + orig, term, etc.</para> </listitem> </itemizedlist>

11 years, 8 months

git:richard.good/diameter_rx_calling: ims_qos: bug fix for Rx flow-description AVP

by Richard Good

Module: sip-router Branch: richard.good/diameter_rx_calling Commit: 715c3a29fe990fbbf2193f44ea9dcde24421d833 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=715c3a2… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Mar 14 18:55:52 2013 +0200 ims_qos: bug fix for Rx flow-description AVP - rx_avp.c: rx_create_media_subcomponent_avp removed options from flow-description AVP as per Rx 29.214 --- modules/ims_qos/rx_avp.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/ims_qos/rx_avp.c b/modules/ims_qos/rx_avp.c index 86a630f..d628192 100644 --- a/modules/ims_qos/rx_avp.c +++ b/modules/ims_qos/rx_avp.c @@ -505,8 +505,11 @@ static str permit_out = {"permit out ", 11}; static str permit_in = {"permit in ", 10}; static str from_s = {" from ", 6}; static str to_s = {" to ", 4}; -static char * permit_out_with_ports = "permit out %i from %.*s %u to %.*s %u %s"; -static char * permit_in_with_ports = "permit in %i from %.*s %u to %.*s %u %s"; +//removed final %s - this is options which Rx 29.214 says will not be used for flow-description AVP +static char * permit_out_with_ports = "permit out %i from %.*s %u to %.*s %u"; +//static char * permit_out_with_ports = "permit out %i from %.*s %u to %.*s %u %s"; +static char * permit_in_with_ports = "permit in %i from %.*s %u to %.*s %u"; +//static char * permit_in_with_ports = "permit in %i from %.*s %u to %.*s %u %s"; AAA_AVP *rx_create_media_subcomponent_avp(int number, char* proto, str *ipA, str *portA, @@ -551,13 +554,13 @@ AAA_AVP *rx_create_media_subcomponent_avp(int number, char* proto, } set_4bytes(x, number); - + flow_number = cdpb.AAACreateAVP(AVP_IMS_Flow_Number, AAA_AVP_FLAG_MANDATORY | AAA_AVP_FLAG_VENDOR_SPECIFIC, IMS_vendor_id_3GPP, x, 4, AVP_DUPLICATE_DATA); cdpb.AAAAddAVPToList(&list, flow_number); - + /*IMS Flow descriptions*/ /*first flow is the receive flow*/ flow_data.len = snprintf(flow_data.s, len, permit_out_with_ports, proto_int,

11 years, 8 months

git:pd/outbound: Merge branch 'master' into outbound

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: 44e43d541baf52a327485d8627de3b95961bdaf9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=44e43d5… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 15 00:02:38 2013 +0000 Merge branch 'master' into outbound * master: sca: fix private hold handling xhttp_pi: escape special characters ---

11 years, 8 months

git:pd/outbound: modules/pv: added new $ruid and $branch(ruid) PVs

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: b53624e388c283ae1294bf595af123c3b77f6b93 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b53624e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 23:55:14 2013 +0000 modules/pv: added new $ruid and $branch(ruid) PVs --- modules/pv/pv.c | 3 +++ modules/pv/pv_branch.c | 12 +++++++++++- modules/pv/pv_core.c | 15 +++++++++++++++ modules/pv/pv_core.h | 3 +++ 4 files changed, 32 insertions(+), 1 deletions(-) diff --git a/modules/pv/pv.c b/modules/pv/pv.c index 3d2f01c..4ea5cc6 100644 --- a/modules/pv/pv.c +++ b/modules/pv/pv.c @@ -410,6 +410,9 @@ static pv_export_t mod_pvs[] = { {{"ua", (sizeof("ua")-1)}, /* */ PVT_OTHER, pv_get_useragent, 0, 0, 0, 0, 0}, + {{"ruid", (sizeof("ruid")-1)}, /* */ + PVT_OTHER, pv_get_ruid, 0, + 0, 0, 0, 0}, { {"shv", (sizeof("shv")-1)}, PVT_OTHER, pv_get_shvar, pv_set_shvar, pv_parse_shvar_name, 0, 0, 0}, diff --git a/modules/pv/pv_branch.c b/modules/pv/pv_branch.c index 9ae5be3..b292e31 100644 --- a/modules/pv/pv_branch.c +++ b/modules/pv/pv_branch.c @@ -40,6 +40,7 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, str path; unsigned int fl = 0; struct socket_info* fsocket = NULL; + str ruid; /* get the index */ if(pv_get_spec_index(msg, param, &idx, &idxf)!=0) @@ -48,7 +49,7 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); } - uri.s = get_branch(idx, &uri.len, &lq, &duri, &path, &fl, &fsocket, 0); + uri.s = get_branch(idx, &uri.len, &lq, &duri, &path, &fl, &fsocket, &ruid); /* branch(count) doesn't need a valid branch, everything else does */ if(uri.s == 0 && ( param->pvn.u.isname.name.n != 5/* count*/ )) @@ -79,6 +80,10 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, return pv_get_uintval(msg, param, res, nr_branches); case 6: /* flags */ return pv_get_uintval(msg, param, res, fl); + case 7: /* ruid */ + if(ruid.len==0) + return pv_get_null(msg, param, res); + return pv_get_strval(msg, param, res, &ruid); default: /* 0 - uri */ return pv_get_strval(msg, param, res, &uri); @@ -245,6 +250,9 @@ int pv_set_branchx(struct sip_msg* msg, pv_param_t *param, } br->flags = val->ri; break; + case 7: /* ruid */ + /* do nothing - cannot set the ruid */ + break; default: /* 0 - uri */ if(val==NULL || (val->flags&PV_VAL_NULL)) @@ -296,6 +304,8 @@ int pv_parse_branchx_name(pv_spec_p sp, str *in) case 4: if(strncmp(in->s, "path", 4)==0) sp->pvp.pvn.u.isname.name.n = 2; + else if (strncmp(in->s, "ruid", 4)==0) + sp->pvp.pvn.u.isname.name.n = 7; else goto error; break; case 1: diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index 99ae3d2..9c90902 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -1804,6 +1804,21 @@ int pv_get_cnt(struct sip_msg *msg, pv_param_t *param, return pv_get_uintval(msg, param, res, n); } +int pv_get_ruid(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->ruid.len==0) + { + LM_DBG("no ruid\n"); + return pv_get_null(msg, param, res); + } + + return pv_get_strval(msg, param, res, &msg->ruid); +} + /********* end PV get functions *********/ diff --git a/modules/pv/pv_core.h b/modules/pv/pv_core.h index a8d36bb..a51349f 100644 --- a/modules/pv/pv_core.h +++ b/modules/pv/pv_core.h @@ -214,6 +214,9 @@ int pv_get_server_id(struct sip_msg *msg, pv_param_t *param, int pv_get_cnt(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_ruid(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + /********* end PV get functions *********/ /********* start PV set functions *********/

11 years, 8 months

git:pd/outbound: modules/pv: updated use of get_branch() and next_branch() to cope with additional argument

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: a16fb22d12696f707839f7b97da471d02121e228 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a16fb22… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 23:34:34 2013 +0000 modules/pv: updated use of get_branch() and next_branch() to cope with additional argument --- modules/pv/pv_branch.c | 2 +- modules/pv/pv_core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/pv/pv_branch.c b/modules/pv/pv_branch.c index 2abd639..9ae5be3 100644 --- a/modules/pv/pv_branch.c +++ b/modules/pv/pv_branch.c @@ -48,7 +48,7 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); } - uri.s = get_branch(idx, &uri.len, &lq, &duri, &path, &fl, &fsocket); + uri.s = get_branch(idx, &uri.len, &lq, &duri, &path, &fl, &fsocket, 0); /* branch(count) doesn't need a valid branch, everything else does */ if(uri.s == 0 && ( param->pvn.u.isname.name.n != 5/* count*/ )) diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index a7e8c33..99ae3d2 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -1358,7 +1358,7 @@ int pv_get_branch(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); - branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0); + branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0, 0); if (!branch.s) { return pv_get_null(msg, param, res); } @@ -1387,7 +1387,7 @@ int pv_get_branches(struct sip_msg *msg, pv_param_t *param, cnt = s.len = 0; - while ((uri.s = get_branch(cnt, &uri.len, &q, 0, 0, 0, 0))) + while ((uri.s = get_branch(cnt, &uri.len, &q, 0, 0, 0, 0, 0))) { cnt++; s.len += uri.len; @@ -1411,7 +1411,7 @@ int pv_get_branches(struct sip_msg *msg, pv_param_t *param, i = 0; p = pv_local_buf; - while ((uri.s = get_branch(i, &uri.len, &q, 0, 0, 0, 0))) + while ((uri.s = get_branch(i, &uri.len, &q, 0, 0, 0, 0, 0))) { if (i) {

11 years, 8 months

git:pd/outbound: modules/domain: updated use of get_branch() and next_branch() to cope with additional argument

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: f63b55b96e9a2900cf73183fdaa41992c3c31dc5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f63b55b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 23:34:01 2013 +0000 modules/domain: updated use of get_branch() and next_branch() to cope with additional argument --- modules/domain/domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/domain/domain.c b/modules/domain/domain.c index b13ff7f..cacca0c 100644 --- a/modules/domain/domain.c +++ b/modules/domain/domain.c @@ -142,7 +142,7 @@ int is_uri_host_local(struct sip_msg* _msg, char* _s1, char* _s2) } return hash_table_lookup(&(_msg->parsed_uri.host), &did, &attrs); } else if (is_route_type(FAILURE_ROUTE)) { - branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0); + branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0, 0); if (branch.s) { if (parse_uri(branch.s, branch.len, &puri) < 0) { LM_ERR("error while parsing branch URI\n");

11 years, 8 months

git:pd/outbound: modules/tm: updated use of get_branch() and next_branch() to cope with additional argument

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: 0860555382575943b5f704b53a48e63db90754d8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0860555… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 23:34:48 2013 +0000 modules/tm: updated use of get_branch() and next_branch() to cope with additional argument --- modules/tm/t_fwd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 9659f6f..c5c0de8 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -1493,7 +1493,7 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , init_branch_iterator(); while((current_uri.s=next_branch( &current_uri.len, &q, &dst_uri, &path, - &bflags, &si))) { + &bflags, &si, 0))) { try_new++; setbflagsval(0, bflags);

11 years, 8 months

← Newer
1
...
22
23
24
25
26
27
28
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013