sr-dev July 2018

sr-dev@lists.kamailio.org

17 participants
229 discussions

git:master:fee61089: modules: readme files regenerated - sanity ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: fee610899711cc9e2accd777250e1983b9282737 URL: https://github.com/kamailio/kamailio/commit/fee610899711cc9e2accd777250e198… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-09T15:31:42+02:00 modules: readme files regenerated - sanity ... [skip ci] --- Modified: src/modules/sanity/README --- Diff: https://github.com/kamailio/kamailio/commit/fee610899711cc9e2accd777250e198… Patch: https://github.com/kamailio/kamailio/commit/fee610899711cc9e2accd777250e198… --- diff --git a/src/modules/sanity/README b/src/modules/sanity/README index 14aa8462cc..588f53deae 100644 --- a/src/modules/sanity/README +++ b/src/modules/sanity/README @@ -183,6 +183,9 @@ modparam("sanity", "autodrop", 1) module sends a precise error reply via SL send_reply(). Thus there is no need to reply with a generic error message. + The parameters can be static integers or variables holding integer + values. + Example 1.5. sanity_check usage ... if (!sanity_check()) {

5 years, 10 months

git:master:eb96593d: app_lua: restore top index to lua stack after executing a function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: eb96593d0f1bb60fe6e955daa1a1b91ef65c69bd URL: https://github.com/kamailio/kamailio/commit/eb96593d0f1bb60fe6e955daa1a1b91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-09T15:25:43+02:00 app_lua: restore top index to lua stack after executing a function - could be related to GH #1577 --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/eb96593d0f1bb60fe6e955daa1a1b91… Patch: https://github.com/kamailio/kamailio/commit/eb96593d0f1bb60fe6e955daa1a1b91… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 7f0fd1fbc0..97d141cd22 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -646,6 +646,7 @@ int app_lua_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, int ret; str txt; sip_msg_t *bmsg; + int ltop; if(_sr_L_env.LL==NULL) { @@ -663,7 +664,8 @@ int app_lua_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, } else LM_DBG("reload deactivated\n"); LM_DBG("executing Lua function: [[%s]]\n", func); - LM_DBG("lua top index is: %d\n", lua_gettop(_sr_L_env.LL)); + ltop = lua_gettop(_sr_L_env.LL); + LM_DBG("lua top index is: %d\n", ltop); lua_getglobal(_sr_L_env.LL, func); if(!lua_isfunction(_sr_L_env.LL, -1)) { @@ -674,8 +676,12 @@ int app_lua_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, lua_typename(_sr_L_env.LL,lua_type(_sr_L_env.LL, -1))); txt.s = (char*)lua_tostring(_sr_L_env.LL, -1); LM_ERR("error from Lua: %s\n", (txt.s)?txt.s:"unknown"); + /* restores the original stack size */ + lua_settop(_sr_L_env.LL, ltop); return -1; } else { + /* restores the original stack size */ + lua_settop(_sr_L_env.LL, ltop); return 1; } } @@ -721,13 +727,20 @@ int app_lua_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, } lua_pop(_sr_L_env.LL, 1); if(n==1) { + /* restores the original stack size */ + lua_settop(_sr_L_env.LL, ltop); return 1; } else { LM_ERR("error executing: %s (err: %d)\n", func, ret); + /* restores the original stack size */ + lua_settop(_sr_L_env.LL, ltop); return -1; } } + /* restores the original stack size */ + lua_settop(_sr_L_env.LL, ltop); + return 1; }

5 years, 10 months

git:master:3ddf9de8: sanity: note that params for sanity_check(...) can be vars

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3ddf9de8f0345db6a5fb0c632784b38482687891 URL: https://github.com/kamailio/kamailio/commit/3ddf9de8f0345db6a5fb0c632784b38… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-09T10:26:11+02:00 sanity: note that params for sanity_check(...) can be vars --- Modified: src/modules/sanity/doc/sanity_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3ddf9de8f0345db6a5fb0c632784b38… Patch: https://github.com/kamailio/kamailio/commit/3ddf9de8f0345db6a5fb0c632784b38… --- diff --git a/src/modules/sanity/doc/sanity_admin.xml b/src/modules/sanity/doc/sanity_admin.xml index f951ca0031..dec9d79a86 100644 --- a/src/modules/sanity/doc/sanity_admin.xml +++ b/src/modules/sanity/doc/sanity_admin.xml @@ -244,6 +244,9 @@ modparam("sanity", "autodrop", 1) reply via SL <function>send_reply()</function>. Thus there is no need to reply with a generic error message. </para> + <para> + The parameters can be static integers or variables holding integer values. + </para> <example> <title><function>sanity_check</function> usage</title> <programlisting>

5 years, 10 months

git:5.0:f310c738: usrloc: test if path value for rpc ul.add is .

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: f310c7384cd6233f9af835d7dff63738d07f0b15 URL: https://github.com/kamailio/kamailio/commit/f310c7384cd6233f9af835d7dff6373… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-09T10:46:31+02:00 usrloc: test if path value for rpc ul.add is . - char usually used for setting no value --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/f310c7384cd6233f9af835d7dff6373… Patch: https://github.com/kamailio/kamailio/commit/f310c7384cd6233f9af835d7dff6373… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 6133db8acd..c3e5a99405 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -580,7 +580,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) ret = rpc->scan(ctx, "SSSdfSddd", &table, &aor, &contact, &ci.expires, &dtemp, &path, &ci.flags, &ci.cflags, &ci.methods); - if(path.len==1 && (strncmp(path.s, "0", 1)==0)) { + if(path.len==1 && (strncmp(path.s, "0", 1)==0 || strncmp(path.s, ".", 1)==0)) { LM_DBG("path == 0 -> unset\n"); } else {

5 years, 10 months

git:master:7bc82ef8: core: cfg struct - pack structures that use a dynamic array at the end

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7bc82ef842316449cbebeddf594a0e2975855242 URL: https://github.com/kamailio/kamailio/commit/7bc82ef842316449cbebeddf594a0e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-09T10:20:42+02:00 core: cfg struct - pack structures that use a dynamic array at the end - compiler padding to alling fields results in wrong offset for last field which is computed as `sizeof(struct) - 1 - GH #1583 --- Modified: src/core/cfg/cfg_struct.h --- Diff: https://github.com/kamailio/kamailio/commit/7bc82ef842316449cbebeddf594a0e2… Patch: https://github.com/kamailio/kamailio/commit/7bc82ef842316449cbebeddf594a0e2… --- diff --git a/src/core/cfg/cfg_struct.h b/src/core/cfg/cfg_struct.h index 6436eed677..e03024e700 100644 --- a/src/core/cfg/cfg_struct.h +++ b/src/core/cfg/cfg_struct.h @@ -40,22 +40,24 @@ * When the config is shmzied, these variables are combined in * an array. */ +#pragma pack(push, 1) typedef struct _cfg_add_var { struct _cfg_add_var *next; unsigned int type; /*!< type == 0 is also valid, it indicates that the group must be created with the default values */ + unsigned int group_id; /*!< Id of the group instance */ union { char *ch; str s; int i; } val; - unsigned int group_id; /*!< Id of the group instance */ int name_len; /*!< Name of the variable. The variable may not be known, for example the additional group value is set in the script before the cfg group is declared. Hence, the pointer cannot be stored here. */ char name[1]; } cfg_add_var_t; +#pragma pack(pop) /*! \brief structure used for variable - pointer mapping */ typedef struct _cfg_mapping { @@ -72,6 +74,7 @@ typedef struct _cfg_mapping { enum { CFG_GROUP_UNKNOWN = 0, CFG_GROUP_DYNAMIC, CFG_GROUP_STATIC }; /*! \brief linked list of registered groups */ +#pragma pack(push, 1) typedef struct _cfg_group { int num; /*!< number of variables within the group */ cfg_mapping_t *mapping; /*!< describes the mapping betweeen @@ -103,9 +106,11 @@ typedef struct _cfg_group { int name_len; char name[1]; } cfg_group_t; +#pragma pack(pop) /*! \brief One instance of the cfg group variables which stores * the additional values. These values can overwrite the default values. */ +#pragma pack(push, 1) typedef struct _cfg_group_inst { unsigned int id; /*!< identifier of the group instance */ unsigned int set[CFG_MAX_VAR_NUM/(sizeof(int)*8)]; @@ -114,6 +119,7 @@ typedef struct _cfg_group_inst { then the default value is used, and copied into this instance. */ unsigned char vars[1]; /*!< block for the values */ } cfg_group_inst_t; +#pragma pack(pop) /*! \brief Meta-data which is stored before each variable group * within the blob. This structure is used to handle the multivalue @@ -125,6 +131,7 @@ typedef struct _cfg_group_meta { } cfg_group_meta_t; /*! \brief single memoy block that contains all the cfg values */ +#pragma pack(push, 1) typedef struct _cfg_block { atomic_t refcnt; /*!< reference counter, the block is automatically deleted @@ -132,6 +139,7 @@ typedef struct _cfg_block { int _pad; /*!< force 8 byte alignment */ unsigned char vars[1]; /*!< blob that contains the values */ } cfg_block_t; +#pragma pack(pop) /*! \brief Linked list of per-child process callbacks. * Each child process has a local pointer, and executes the callbacks

5 years, 10 months

git:master:f66bbb5b: sanity: allow vars in params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f66bbb5b6da13ad627bf0c8ee50bdbad9c93b43c URL: https://github.com/kamailio/kamailio/commit/f66bbb5b6da13ad627bf0c8ee50bdba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-09T08:54:47+02:00 sanity: allow vars in params --- Modified: src/modules/sanity/sanity_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f66bbb5b6da13ad627bf0c8ee50bdba… Patch: https://github.com/kamailio/kamailio/commit/f66bbb5b6da13ad627bf0c8ee50bdba… --- diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c index a425da7646..6d8de764bc 100644 --- a/src/modules/sanity/sanity_mod.c +++ b/src/modules/sanity/sanity_mod.c @@ -27,6 +27,7 @@ #include "../../core/sr_module.h" #include "../../core/ut.h" #include "../../core/error.h" +#include "../../core/mod_fix.h" #include "../../core/kemi.h" MODULE_VERSION @@ -44,8 +45,7 @@ strl* proxyrequire_list = NULL; sl_api_t slb; static int mod_init(void); -static int sanity_fixup(void** param, int param_no); -static int w_sanity_check(struct sip_msg* _msg, char* _foo, char* _bar); +static int w_sanity_check(sip_msg_t* _msg, char* _msg_check, char* _uri_check); static int bind_sanity(sanity_api_t* api); /* @@ -54,9 +54,9 @@ static int bind_sanity(sanity_api_t* api); static cmd_export_t cmds[] = { {"sanity_check", (cmd_function)w_sanity_check, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, - {"sanity_check", (cmd_function)w_sanity_check, 1, sanity_fixup, + {"sanity_check", (cmd_function)w_sanity_check, 1, fixup_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, - {"sanity_check", (cmd_function)w_sanity_check, 2, sanity_fixup, + {"sanity_check", (cmd_function)w_sanity_check, 2, fixup_igp_igp, REQUEST_ROUTE|ONREPLY_ROUTE}, {"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0}, {0, 0, 0, 0} @@ -116,40 +116,6 @@ static int mod_init(void) { return 0; } -static int sanity_fixup(void** param, int param_no) { - int checks; - str in; - - if (param_no == 1) { - in.s = (char*)*param; - in.len = strlen(in.s); - if (str2int(&in, (unsigned int*)&checks) < 0) { - LM_ERR("failed to convert input integer\n"); - return E_UNSPEC; - } - if ((checks < 1) || (checks >= (SANITY_MAX_CHECKS))) { - LM_ERR("input parameter (%i) outside of valid range <1-%i)\n", - checks, SANITY_MAX_CHECKS); - return E_UNSPEC; - } - *param = (void*)(long)checks; - } - if (param_no == 2) { - in.s = (char*)*param; - in.len = strlen(in.s); - if (str2int(&in, (unsigned int*)&checks) < 0) { - LM_ERR("failed to convert second integer argument\n"); - return E_UNSPEC; - } - if ((checks < 1) || (checks >= (SANITY_URI_MAX_CHECKS))) { - LM_ERR("second input parameter (%i) outside of valid range <1-%i\n", - checks, SANITY_URI_MAX_CHECKS); - return E_UNSPEC; - } - *param = (void*)(long)checks; - } - return 0; -} /** * perform SIP message sanity check @@ -236,23 +202,39 @@ int sanity_check_defaults(struct sip_msg* msg) /** * wrapper for sanity_check() to be used from config file */ -static int w_sanity_check(struct sip_msg* _msg, char* _number, char* _arg) { - int ret, check, arg; - - if (_number == NULL) { - check = default_msg_checks; +static int w_sanity_check(sip_msg_t* _msg, char* _msg_check, char* _uri_check) +{ + int ret, msg_check, uri_check; + + if (_msg_check == NULL) { + msg_check = default_msg_checks; + } else { + if(fixup_get_ivalue(_msg, (gparam_t*)_msg_check, &msg_check)<0) { + LM_ERR("failed to get msg check flags parameter\n"); + return -1; + } } - else { - check = (int)(long)_number; + if (_uri_check == NULL) { + uri_check = default_uri_checks; + } else { + if(fixup_get_ivalue(_msg, (gparam_t*)_uri_check, &uri_check)<0) { + LM_ERR("failed to get uri check flags parameter\n"); + return -1; + } } - if (_arg == NULL) { - arg = default_uri_checks; + + if ((msg_check < 1) || (msg_check >= (SANITY_MAX_CHECKS))) { + LM_ERR("input parameter (%i) outside of valid range <1-%i)\n", + msg_check, SANITY_MAX_CHECKS); + return -1; } - else { - arg = (int)(long)_arg; + if ((uri_check < 1) || (uri_check >= (SANITY_URI_MAX_CHECKS))) { + LM_ERR("second input parameter (%i) outside of valid range <1-%i\n", + uri_check, SANITY_URI_MAX_CHECKS); + return -1; } - ret = sanity_check(_msg, check, arg); + ret = sanity_check(_msg, msg_check, uri_check); LM_DBG("sanity checks result: %d\n", ret); if(_sanity_drop!=0) return ret;

5 years, 10 months

git:master:95fc59a0: core: define core tokens before parsing config file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 95fc59a0bcddae3e174c4baf3f47a6cd2a15791b URL: https://github.com/kamailio/kamailio/commit/95fc59a0bcddae3e174c4baf3f47a6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-07T10:01:09+02:00 core: define core tokens before parsing config file --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/95fc59a0bcddae3e174c4baf3f47a6c… Patch: https://github.com/kamailio/kamailio/commit/95fc59a0bcddae3e174c4baf3f47a6c… --- diff --git a/src/main.c b/src/main.c index 846e35970d..1830b9628f 100644 --- a/src/main.c +++ b/src/main.c @@ -1952,6 +1952,8 @@ int main(int argc, char** argv) init_tcp_options(); /* set the defaults before the config */ #endif + pp_define_core(); + /* process command line (cfg. file path etc) */ optind = 1; /* reset getopt */ /* switches required before script processing */ @@ -2155,7 +2157,6 @@ int main(int argc, char** argv) } if (debug_flag) default_core_cfg.debug = debug_save; pp_ifdef_level_check(); - pp_define_core(); print_rls(); if(init_dst_set()<0) {

5 years, 10 months

git:master:9a3bb8d2: core: added config defines for application version

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9a3bb8d2141c67ec1147085948ea38103ca6090d URL: https://github.com/kamailio/kamailio/commit/9a3bb8d2141c67ec1147085948ea381… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-07T09:08:18+02:00 core: added config defines for application version - three tokens are defined for version X.Y.Z: * KAMAILIO_X, KAMAILIO_X_Y, KAMAILIO_X_Y_Z --- Modified: src/core/ppcfg.c Modified: src/core/ppcfg.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/9a3bb8d2141c67ec1147085948ea381… Patch: https://github.com/kamailio/kamailio/commit/9a3bb8d2141c67ec1147085948ea381… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index f8688988aa..d15e0f899e 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -225,4 +225,56 @@ void pp_ifdef_level_check(void) } } +/** + * + */ +void pp_define_core(void) +{ + char defval[64]; + char *p; + int n; + + strcpy(defval, NAME); + p = defval; + while(*p) { + *p = (char)toupper(*p); + p++; + } + + n = snprintf(p, 64 - (int)(p-defval), "_%d", VERSIONVAL/1000000); + if(n<0 || n>=64 - (int)(p-defval)) { + LM_ERR("faild to build define token\n"); + return; + } + pp_define_set_type(0); + if(pp_define(strlen(defval), defval)<0) { + LM_ERR("unable to set cfg define: %s\n", defval); + return; + } + + n = snprintf(p, 64 - (int)(p-defval), "_%d_%d", VERSIONVAL/1000000, + (VERSIONVAL%1000000)/1000); + if(n<0 || n>=64 - (int)(p-defval)) { + LM_ERR("faild to build define token\n"); + return; + } + pp_define_set_type(0); + if(pp_define(strlen(defval), defval)<0) { + LM_ERR("unable to set cfg define: %s\n", defval); + return; + } + + n = snprintf(p, 64 - (int)(p-defval), "_%d_%d_%d", VERSIONVAL/1000000, + (VERSIONVAL%1000000)/1000, VERSIONVAL%1000); + if(n<0 || n>=64 - (int)(p-defval)) { + LM_ERR("faild to build define token\n"); + return; + } + pp_define_set_type(0); + if(pp_define(strlen(defval), defval)<0) { + LM_ERR("unable to set cfg define: %s\n", defval); + return; + } +} + /* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index 5524b9fd58..432d76bcfb 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -45,6 +45,8 @@ int pp_define_set_type(int type); void pp_ifdef_level_update(int val); void pp_ifdef_level_check(void); +void pp_define_core(void); + #endif /*_PPCFG_H_*/ /* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/src/main.c b/src/main.c index 30f659c8c1..846e35970d 100644 --- a/src/main.c +++ b/src/main.c @@ -2155,6 +2155,7 @@ int main(int argc, char** argv) } if (debug_flag) default_core_cfg.debug = debug_save; pp_ifdef_level_check(); + pp_define_core(); print_rls(); if(init_dst_set()<0) {

5 years, 10 months

RFC: database unsigned number types

by Daniel-Constantin Mierla

Hello, starting here a discussion about an issue with the database API and signed/unsigned number type to see how to address it. So far, the database API supported only signed types for numbers, respectively DB1_INT (int in c) and DB1_BIGINT (long long in c). However, many database table columns are defined as UNSIGNED INT or UNSIGNED BIGINT. The database connector modules are mapping UNSIGED values retrieved from database over signed fields in DB API structure. The other way around is done as well: signed values are the inserted in the unsigned columns. There is no issue if the value in C is a positive number, however, if the value goes over MAX_UINT/2 (over 2147483647), it becomes negative and inserting the value in database results in an exception and 0 being stored instead. So far, I guess the issue was rarely exposed, if at all, because no report on it, even these data types for DB1 are since the SER project was started in 2001. As I looked at database definition schema, most of unsigned columns are for internal flags or ids (e.g., lcr_id), where I guess no large values were used or needed so far. However, it can bite at any time and needs to be addressed. So far, two solutions come in mind: 1) drop using UNSIGNED INT for those db columns, use only INT and do unsigned cast in the C code when reading and cast to int when writing. 2) update the db connector modules to support unsigned types -- I added support for them in DB API, but each db_* module has to be updated. The also each module that uses UNSIGNED DB columns must be updated 1) should be simpler, 2) more work but better in long term Any other ideas? Which of the options you prefer to go for? Not to forget: somehow related, probably we have to switch from int to long for PV number values, otherwise timestamp variables can go negative once unix timestamp approaches MAX_UINT/2 (still plenty of time, but should not be delayed for long ...). Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com

5 years, 10 months

git:master:4c52bd84: pv: new class of variables - $ksr(attr)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4c52bd84068ca48a09bc971f32fdf028a889ee96 URL: https://github.com/kamailio/kamailio/commit/4c52bd84068ca48a09bc971f32fdf02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-06T16:01:18+02:00 pv: new class of variables - $ksr(attr) - get attributes of kamailio sip router instance - implemented attributes: * ver - return version string * verval - return version value --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/4c52bd84068ca48a09bc971f32fdf02… Patch: https://github.com/kamailio/kamailio/commit/4c52bd84068ca48a09bc971f32fdf02… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 096b253b30..ee455ca219 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -511,6 +511,8 @@ static pv_export_t mod_pvs[] = { pv_parse_expires_name, 0, 0, 0 }, { {"msg", (sizeof("msg")-1)}, PVT_OTHER, pv_get_msg_attrs, 0, pv_parse_msg_attrs_name, 0, 0, 0 }, + { {"ksr", (sizeof("ksr")-1)}, PVT_OTHER, pv_get_ksr_attrs, 0, + pv_parse_ksr_attrs_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 8d8f35f250..8957098895 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3522,6 +3522,58 @@ int pv_get_msg_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } } +/** + * + */ +int pv_parse_ksr_attrs_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, "ver", 3)==0) + sp->pvp.pvn.u.isname.name.n = 0; + else goto error; + break; + case 6: + if(strncmp(in->s, "verval", 6)==0) + sp->pvp.pvn.u.isname.name.n = 1; + 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 PV ksr key: %.*s\n", in->len, in->s); + return -1; +} + + +/** + * + */ +int pv_get_ksr_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + if(param==NULL) + return pv_get_null(msg, param, res); + + switch(param->pvn.u.isname.name.n) { + case 0: /* version */ + return pv_get_strzval(msg, param, res, VERSION); + case 1: /* version value */ + return pv_get_uintval(msg, param, res, VERSIONVAL); + + default: + return pv_get_null(msg, param, res); + } +} + int pv_parse_env_name(pv_spec_p sp, str *in) { char *csname; diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 453c1c3197..411f2f8aac 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -373,5 +373,11 @@ int pv_get_msg_attrs(sip_msg_t *msg, pv_param_t *param, int pv_parse_env_name(pv_spec_p sp, str *in); int pv_get_env(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); + +int pv_parse_ksr_attrs_name(pv_spec_p sp, str *in); + +int pv_get_ksr_attrs(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res); + #endif

5 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2018