sr-dev February 2016

sr-dev@lists.kamailio.org

28 participants
302 discussions

[kamailio] P-Charging-Vector handling as RFC3455 (#215)

by Emmanuel BUU

Here are some proposed modifications to handle the P-Charging-Vector header as defined in rfc3455 section 4.6 to - parse charging vector from SIP message - generate new unique charging vector - remove a charging vector header a new pseudo variable pseudo variables are exported and enable Read onlly access to charging vector fields $pcv = whole field $pcv.value = icid-value field (see RFC3455 section 5.6) $pcv.genaddr = icid-generated-at field (see RFC3455 section 5.6) a new function acc_charging_vector() - g = generate a new charging vector or forward the orginal one - f = generate a new charging vector regardless of the orginal charging vector - r = remote the P-Charging vector header from the packet You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/215 -- Commit Summary -- * P-Charging-Vector implementation * Merge remote branch 'upstream/master' * P-Charging-Vector -- File Changes -- M modules/acc/acc_mod.c (18) A modules/acc/chargingvector.c (435) A modules/acc/chargingvector.h (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/215.patch https://github.com/kamailio/kamailio/pull/215.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/215

8 years, 9 months

git:master:745e79d0: siputils: docs for sip_p_charging_vector() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 745e79d03095d3d716c17406f66b89a185adad3c URL: https://github.com/kamailio/kamailio/commit/745e79d03095d3d716c17406f66b89a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-02-03T22:03:29+01:00 siputils: docs for sip_p_charging_vector() function --- Modified: modules/siputils/README Modified: modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/745e79d03095d3d716c17406f66b89a… Patch: https://github.com/kamailio/kamailio/commit/745e79d03095d3d716c17406f66b89a…

8 years, 9 months

git:master:2a9b4da1: siputils: exported $pcv(name) var and sip_p_charing_vector() func

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2a9b4da18eac72f09e8b69cf447afeb978842ae1 URL: https://github.com/kamailio/kamailio/commit/2a9b4da18eac72f09e8b69cf447afeb… Author: Emmanuel BUU <emmanuel.buu(a)ives.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-02-03T21:56:30+01:00 siputils: exported $pcv(name) var and sip_p_charing_vector() func - based on GH #215 - $pcv(all) = whole field - $pcv(value) = icid-value field (see RFC3455 section 5.6) - $pcv(genaddr) = icid-generated-at field (see RFC3455 section 5.6) --- Modified: modules/siputils/chargingvector.c Modified: modules/siputils/chargingvector.h Modified: modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/2a9b4da18eac72f09e8b69cf447afeb… Patch: https://github.com/kamailio/kamailio/commit/2a9b4da18eac72f09e8b69cf447afeb… --- diff --git a/modules/siputils/chargingvector.c b/modules/siputils/chargingvector.c index 4380b8c..5133054 100644 --- a/modules/siputils/chargingvector.c +++ b/modules/siputils/chargingvector.c @@ -454,3 +454,38 @@ int pv_get_charging_vector(struct sip_msg *msg, pv_param_t *param, pv_value_t *r return pv_get_null(msg, param, res); } + +int pv_parse_charging_vector_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) + { + case 3: + if(strncmp(in->s, "all", 3)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else goto error; + break; + case 5: + if(strncmp(in->s, "value", 5)==0) + sp->pvp.pvn.u.isname.name.n = 3; + else goto error; + break; + case 7: + if(strncmp(in->s, "genaddr", 7)==0) + sp->pvp.pvn.u.isname.name.n = 2; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown pcv name %.*s\n", in->len, in->s); + return -1; +} diff --git a/modules/siputils/chargingvector.h b/modules/siputils/chargingvector.h index 8bfaf57..d2c027f 100644 --- a/modules/siputils/chargingvector.h +++ b/modules/siputils/chargingvector.h @@ -42,4 +42,5 @@ int sip_handle_pcv(sip_msg_t *msg, char *flags, char *str2); int pv_get_charging_vector(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_parse_charging_vector_name(pv_spec_p sp, str *in); #endif diff --git a/modules/siputils/siputils.c b/modules/siputils/siputils.c index b6358ad..08692f3 100644 --- a/modules/siputils/siputils.c +++ b/modules/siputils/siputils.c @@ -77,6 +77,7 @@ #include "contact_ops.h" #include "sipops.h" #include "config.h" +#include "chargingvector.h" MODULE_VERSION @@ -177,6 +178,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"is_numeric", (cmd_function)is_numeric, 1, fixup_spve_null, 0, ANY_ROUTE}, + {"sip_p_charging_vector", (cmd_function)sip_handle_pcv, 1, fixup_spve_null, + fixup_free_spve_null, ANY_ROUTE}, {0,0,0,0,0,0} }; @@ -194,6 +197,13 @@ static param_export_t params[] = { }; + static pv_export_t mod_pvs[] = { + { {"pcv", (sizeof("pvc")-1)}, PVT_OTHER, pv_get_charging_vector, + 0, pv_parse_charging_vector_name, 0, 0, 0}, + + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; + struct module_exports exports= { "siputils", DEFAULT_DLFLAGS, /* dlopen flags */ @@ -201,7 +211,7 @@ struct module_exports exports= { params, /* param exports */ 0, /* exported statistics */ 0, /* exported MI functions */ - 0, /* exported pseudo-variables */ + mod_pvs, /* exported pseudo-variables */ 0, /* extra processes */ mod_init, /* initialization function */ 0, /* Response function */

8 years, 9 months

git:master:ede4a836: siputils: p-charging-vector header management

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ede4a836bd90b8da5a7b63f42ee238cb06933fe9 URL: https://github.com/kamailio/kamailio/commit/ede4a836bd90b8da5a7b63f42ee238c… Author: Emmanuel BUU <emmanuel.buu(a)ives.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-02-03T21:43:48+01:00 siputils: p-charging-vector header management - based on GH #215 --- Added: modules/siputils/chargingvector.c Added: modules/siputils/chargingvector.h --- Diff: https://github.com/kamailio/kamailio/commit/ede4a836bd90b8da5a7b63f42ee238c… Patch: https://github.com/kamailio/kamailio/commit/ede4a836bd90b8da5a7b63f42ee238c…

8 years, 9 months

git:master:be184b1b: kamctl: pi framework xml definition update

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: be184b1b3759931e5f189796b48156249a500e42 URL: https://github.com/kamailio/kamailio/commit/be184b1b3759931e5f189796b481562… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-02-03T21:23:50+01:00 kamctl: pi framework xml definition update --- Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/be184b1b3759931e5f189796b481562… Patch: https://github.com/kamailio/kamailio/commit/be184b1b3759931e5f189796b481562… --- diff --git a/utils/kamctl/xhttp_pi/pi_framework.xml b/utils/kamctl/xhttp_pi/pi_framework.xml index a1e95bc..4ed26a0 100644 --- a/utils/kamctl/xhttp_pi/pi_framework.xml +++ b/utils/kamctl/xhttp_pi/pi_framework.xml @@ -221,17 +221,6 @@ <column><field>attrs</field><type>DB1_STR</type></column> <column><field>description</field><type>DB1_STR</type></column> </db_table> -  - <db_table id="domainpolicy"> - <table_name>domainpolicy</table_name> - <db_url_id>mysql</db_url_id> - <column><field>id</field><type>DB1_INT</type></column> - <column><field>rule</field><type>DB1_STR</type></column> - <column><field>type</field><type>DB1_STR</type></column> - <column><field>att</field><type>DB1_STR</type></column> - <column><field>val</field><type>DB1_STR</type></column> - <column><field>description</field><type>DB1_STR</type></column> - </db_table>  <db_table id="domain"> <table_name>domain</table_name> @@ -252,6 +241,17 @@ <column><field>value</field><type>DB1_STR</type></column> <column><field>last_modified</field><type>DB1_DATETIME</type></column> </db_table> +  + <db_table id="domainpolicy"> + <table_name>domainpolicy</table_name> + <db_url_id>mysql</db_url_id> + <column><field>id</field><type>DB1_INT</type></column> + <column><field>rule</field><type>DB1_STR</type></column> + <column><field>type</field><type>DB1_STR</type></column> + <column><field>att</field><type>DB1_STR</type></column> + <column><field>val</field><type>DB1_STR</type></column> + <column><field>description</field><type>DB1_STR</type></column> + </db_table>  <db_table id="dr_gateways"> <table_name>dr_gateways</table_name>

8 years, 9 months

[kamailio] modules/ims_icscf: removes values.h dependency (#489)

by Mikko Lehto

Did not compile on FreeBSD 10. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/489 -- Commit Summary -- * modules/ims_icscf: removes values.h dependency -- File Changes -- M modules/ims_icscf/cxdx_lir.c (4) M modules/ims_icscf/scscf_list.c (5) M modules/ims_icscf/scscf_list.h (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/489.patch https://github.com/kamailio/kamailio/pull/489.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/489

8 years, 9 months

[kamailio] presence: improvements for 4.4 (#486)

by lazedo

adds presence:notify-reply event implements $notify_reply for handling in presence:notify-reply event adds flags, user_agent columns to active_watchers extends $subs to other subscription properties You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/486 -- Commit Summary -- * presence: add flags and user_agent to schema * presence: 4.4 improvements * presence: update documentation -- File Changes -- M lib/srdb1/schema/pr_active_watchers.xml (18) M modules/presence/README (259) M modules/presence/doc/presence_admin.xml (157) M modules/presence/hash.c (6) M modules/presence/notify.c (153) M modules/presence/notify.h (6) M modules/presence/presence.c (7) M modules/presence/subscribe.c (241) M modules/presence/subscribe.h (2) M utils/kamctl/db_berkeley/kamailio/active_watchers (4) M utils/kamctl/db_berkeley/kamailio/version (2) M utils/kamctl/db_sqlite/presence-create.sql (4) M utils/kamctl/dbtext/kamailio/active_watchers (2) M utils/kamctl/dbtext/kamailio/version (2) M utils/kamctl/mysql/presence-create.sql (4) M utils/kamctl/oracle/presence-create.sql (4) M utils/kamctl/postgres/presence-create.sql (4) M utils/kamctl/xhttp_pi/pi_framework.xml (30) M utils/kamctl/xhttp_pi/presence-mod (6) M utils/kamctl/xhttp_pi/presence-table (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/486.patch https://github.com/kamailio/kamailio/pull/486.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/486

8 years, 9 months

git:master:b8b39e7d: Merge pull request #489 from mslehto/valuesh

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b8b39e7d2f96cddd6ff2b7087c60f3f93fa90a1f URL: https://github.com/kamailio/kamailio/commit/b8b39e7d2f96cddd6ff2b7087c60f3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-02-03T21:18:36+01:00 Merge pull request #489 from mslehto/valuesh modules/ims_icscf: removes values.h dependency --- Modified: modules/ims_icscf/cxdx_lir.c Modified: modules/ims_icscf/scscf_list.c Modified: modules/ims_icscf/scscf_list.h --- Diff: https://github.com/kamailio/kamailio/commit/b8b39e7d2f96cddd6ff2b7087c60f3f… Patch: https://github.com/kamailio/kamailio/commit/b8b39e7d2f96cddd6ff2b7087c60f3f… --- diff --git a/modules/ims_icscf/cxdx_lir.c b/modules/ims_icscf/cxdx_lir.c index be18eb7..9e056f2 100644 --- a/modules/ims_icscf/cxdx_lir.c +++ b/modules/ims_icscf/cxdx_lir.c @@ -51,11 +51,6 @@ #include "mod.h" #include "location.h" -#if defined (__OS_freebsd) -#include "sys/limits.h" -#define MAXINT INT_MAX -#endif - //we use pseudo variables to communicate back to config file this takes the result and converys to a return code, publishes it a pseudo variable int create_lia_return_code(int result) { int rc; @@ -183,7 +178,7 @@ void async_cdp_lir_callback(int is_timeout, void *param, AAAMessage *lia, long e success: if (server_name.len) { - list = new_scscf_entry(server_name, MAXINT, data->orig); + list = new_scscf_entry(server_name, INT_MAX, data->orig); } else { list = I_get_capab_ordered(server_name, m_capab, m_capab_cnt, o_capab, o_capab_cnt, p_server_names, p_server_names_cnt, data->orig); } diff --git a/modules/ims_icscf/scscf_list.c b/modules/ims_icscf/scscf_list.c index 1d21ba3..3634285 100644 --- a/modules/ims_icscf/scscf_list.c +++ b/modules/ims_icscf/scscf_list.c @@ -47,11 +47,6 @@ #include "db.h" #include "../../lib/ims/useful_defs.h" -#if defined (__OS_freebsd) -#include "sys/limits.h" -#define MAXINT INT_MAX -#endif - extern int scscf_entry_expiry; //time for scscf entries to remain the scscf_list extern struct tm_binds tmb; //Structure with pointers to tm funcs @@ -188,10 +183,10 @@ scscf_entry* I_get_capab_ordered(str scscf_name, int *m, int mcnt, int *o, int o scscf_entry *list = 0; int i, r; - if (scscf_name.len) list = I_add_to_scscf_list(list, scscf_name, MAXINT, orig); + if (scscf_name.len) list = I_add_to_scscf_list(list, scscf_name, INT_MAX, orig); for (i = 0; i < pcnt; i++) - list = I_add_to_scscf_list(list, p[i], MAXINT - i, orig); + list = I_add_to_scscf_list(list, p[i], INT_MAX - i, orig); for (i = 0; i < SCSCF_Capabilities_cnt; i++) { r = I_get_capab_match(SCSCF_Capabilities + i, m, mcnt, o, ocnt); diff --git a/modules/ims_icscf/scscf_list.h b/modules/ims_icscf/scscf_list.h index b3d4cfd..3b72ba7 100644 --- a/modules/ims_icscf/scscf_list.h +++ b/modules/ims_icscf/scscf_list.h @@ -49,22 +49,13 @@ #include "../../sr_module.h" #include "../../modules/tm/tm_load.h" #include "mod.h" -#ifndef __OS_darwin -#include <values.h> -#endif +#include <limits.h> #include "../../mem/shm_mem.h" #include "../../dset.h" #include "../../timer.h" -#ifdef __OS_darwin -#ifndef MAXINT -#define MAXINT INT_MAX -#endif -#endif - - /** S-CSCF list element */ typedef struct _scscf_entry { str scscf_name; /**< SIP URI of the S-CSCF */

8 years, 9 months

git:master:5ac088f7: modules/ims_icscf: use INT_MAX instead of MAXINT

by Mikko Lehto

Module: kamailio Branch: master Commit: 5ac088f705468edffcef5cb669bbe28e4f3a905b URL: https://github.com/kamailio/kamailio/commit/5ac088f705468edffcef5cb669bbe28… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-02-03T21:31:03+02:00 modules/ims_icscf: use INT_MAX instead of MAXINT --- Modified: modules/ims_icscf/cxdx_lir.c Modified: modules/ims_icscf/scscf_list.c Modified: modules/ims_icscf/scscf_list.h --- Diff: https://github.com/kamailio/kamailio/commit/5ac088f705468edffcef5cb669bbe28… Patch: https://github.com/kamailio/kamailio/commit/5ac088f705468edffcef5cb669bbe28… --- diff --git a/modules/ims_icscf/cxdx_lir.c b/modules/ims_icscf/cxdx_lir.c index f1731bf..9e056f2 100644 --- a/modules/ims_icscf/cxdx_lir.c +++ b/modules/ims_icscf/cxdx_lir.c @@ -51,9 +51,6 @@ #include "mod.h" #include "location.h" -#include "limits.h" -#define MAXINT INT_MAX - //we use pseudo variables to communicate back to config file this takes the result and converys to a return code, publishes it a pseudo variable int create_lia_return_code(int result) { int rc; @@ -181,7 +178,7 @@ void async_cdp_lir_callback(int is_timeout, void *param, AAAMessage *lia, long e success: if (server_name.len) { - list = new_scscf_entry(server_name, MAXINT, data->orig); + list = new_scscf_entry(server_name, INT_MAX, data->orig); } else { list = I_get_capab_ordered(server_name, m_capab, m_capab_cnt, o_capab, o_capab_cnt, p_server_names, p_server_names_cnt, data->orig); } diff --git a/modules/ims_icscf/scscf_list.c b/modules/ims_icscf/scscf_list.c index ee8b743..3634285 100644 --- a/modules/ims_icscf/scscf_list.c +++ b/modules/ims_icscf/scscf_list.c @@ -183,10 +183,10 @@ scscf_entry* I_get_capab_ordered(str scscf_name, int *m, int mcnt, int *o, int o scscf_entry *list = 0; int i, r; - if (scscf_name.len) list = I_add_to_scscf_list(list, scscf_name, MAXINT, orig); + if (scscf_name.len) list = I_add_to_scscf_list(list, scscf_name, INT_MAX, orig); for (i = 0; i < pcnt; i++) - list = I_add_to_scscf_list(list, p[i], MAXINT - i, orig); + list = I_add_to_scscf_list(list, p[i], INT_MAX - i, orig); for (i = 0; i < SCSCF_Capabilities_cnt; i++) { r = I_get_capab_match(SCSCF_Capabilities + i, m, mcnt, o, ocnt); diff --git a/modules/ims_icscf/scscf_list.h b/modules/ims_icscf/scscf_list.h index ba29e1c..3b72ba7 100644 --- a/modules/ims_icscf/scscf_list.h +++ b/modules/ims_icscf/scscf_list.h @@ -56,11 +56,6 @@ #include "../../timer.h" -#ifndef MAXINT -#define MAXINT INT_MAX -#endif - - /** S-CSCF list element */ typedef struct _scscf_entry { str scscf_name; /**< SIP URI of the S-CSCF */

8 years, 9 months

git:master:888fd8e2: modules/ims_icscf: removes values.h dependency

by Mikko Lehto

Module: kamailio Branch: master Commit: 888fd8e287a6acc9313963d4d9b9af69127c0490 URL: https://github.com/kamailio/kamailio/commit/888fd8e287a6acc9313963d4d9b9af6… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-01-26T01:04:55+02:00 modules/ims_icscf: removes values.h dependency Did not compile on FreeBSD 10. --- Modified: modules/ims_icscf/cxdx_lir.c Modified: modules/ims_icscf/scscf_list.c Modified: modules/ims_icscf/scscf_list.h --- Diff: https://github.com/kamailio/kamailio/commit/888fd8e287a6acc9313963d4d9b9af6… Patch: https://github.com/kamailio/kamailio/commit/888fd8e287a6acc9313963d4d9b9af6… --- diff --git a/modules/ims_icscf/cxdx_lir.c b/modules/ims_icscf/cxdx_lir.c index be18eb7..f1731bf 100644 --- a/modules/ims_icscf/cxdx_lir.c +++ b/modules/ims_icscf/cxdx_lir.c @@ -51,10 +51,8 @@ #include "mod.h" #include "location.h" -#if defined (__OS_freebsd) -#include "sys/limits.h" +#include "limits.h" #define MAXINT INT_MAX -#endif //we use pseudo variables to communicate back to config file this takes the result and converys to a return code, publishes it a pseudo variable int create_lia_return_code(int result) { diff --git a/modules/ims_icscf/scscf_list.c b/modules/ims_icscf/scscf_list.c index 1d21ba3..ee8b743 100644 --- a/modules/ims_icscf/scscf_list.c +++ b/modules/ims_icscf/scscf_list.c @@ -47,11 +47,6 @@ #include "db.h" #include "../../lib/ims/useful_defs.h" -#if defined (__OS_freebsd) -#include "sys/limits.h" -#define MAXINT INT_MAX -#endif - extern int scscf_entry_expiry; //time for scscf entries to remain the scscf_list extern struct tm_binds tmb; //Structure with pointers to tm funcs diff --git a/modules/ims_icscf/scscf_list.h b/modules/ims_icscf/scscf_list.h index b3d4cfd..ba29e1c 100644 --- a/modules/ims_icscf/scscf_list.h +++ b/modules/ims_icscf/scscf_list.h @@ -49,20 +49,16 @@ #include "../../sr_module.h" #include "../../modules/tm/tm_load.h" #include "mod.h" -#ifndef __OS_darwin -#include <values.h> -#endif +#include <limits.h> #include "../../mem/shm_mem.h" #include "../../dset.h" #include "../../timer.h" -#ifdef __OS_darwin #ifndef MAXINT #define MAXINT INT_MAX #endif -#endif /** S-CSCF list element */

8 years, 9 months

← Newer
1
...
20
21
22
23
24
25
26
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2016