sr-dev May 2016

sr-dev@lists.kamailio.org

28 participants
350 discussions

git:master:fed93eed: Merge pull request #594 from boettner/master
by Daniel-Constantin Mierla 03 May '16

03 May '16

Module: kamailio Branch: master Commit: fed93eed03b84298544b91a5227ad752f38d56e3 URL: https://github.com/kamailio/kamailio/commit/fed93eed03b84298544b91a5227ad75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-03T23:02:38+02:00 Merge pull request #594 from boettner/master a single digit is a valid enum_query() request --- Modified: modules/enum/enum.c --- Diff: https://github.com/kamailio/kamailio/commit/fed93eed03b84298544b91a5227ad75… Patch: https://github.com/kamailio/kamailio/commit/fed93eed03b84298544b91a5227ad75… --- diff --git a/modules/enum/enum.c b/modules/enum/enum.c index 6439f54..1abd962 100644 --- a/modules/enum/enum.c +++ b/modules/enum/enum.c @@ -254,7 +254,7 @@ static inline int is_e164(str* _user) int i; char c; - if ((_user->len > 2) && (_user->len < MAX_NUM_LEN) && ((_user->s)[0] == '+')) { + if ((_user->len > 1) && (_user->len < MAX_NUM_LEN) && ((_user->s)[0] == '+')) { for (i = 1; i < _user->len; i++) { c = (_user->s)[i]; if ((c < '0') || (c > '9')) return -1; @@ -762,14 +762,15 @@ int enum_query(struct sip_msg* _msg, str* suffix, str* service) return -1; } + user_s = _msg->parsed_uri.user.s; + user_len = _msg->parsed_uri.user.len; + if (is_e164(&(_msg->parsed_uri.user)) == -1) { - LM_ERR("R-URI user is not an E164 number\n"); + LM_ERR("R-URI user '<%.*s>' is not an E164 number\n", + user_len, user_s); return -1; } - user_s = _msg->parsed_uri.user.s; - user_len = _msg->parsed_uri.user.len; - memcpy(&(string[0]), user_s, user_len); string[user_len] = (char)0;

1 0

git:master:fd3c30f9: enum: print out malformed uri in enum_query()
by Jonas BÃ¶ttner 03 May '16

03 May '16

Module: kamailio Branch: master Commit: fd3c30f981d97622fb99f2122ce0bc950774edfb URL: https://github.com/kamailio/kamailio/commit/fd3c30f981d97622fb99f2122ce0bc9… Author: Jonas BÃ¶ttner <boettner(a)sipgate.de> Committer: Jonas BÃ¶ttner <boettner(a)sipgate.de> Date: 2016-05-02T14:20:25+02:00 enum: print out malformed uri in enum_query() - previous error message did not show up the username part of r-uri. therefor debugging was difficult. --- Modified: modules/enum/enum.c --- Diff: https://github.com/kamailio/kamailio/commit/fd3c30f981d97622fb99f2122ce0bc9… Patch: https://github.com/kamailio/kamailio/commit/fd3c30f981d97622fb99f2122ce0bc9… --- diff --git a/modules/enum/enum.c b/modules/enum/enum.c index 2c3620f..1abd962 100644 --- a/modules/enum/enum.c +++ b/modules/enum/enum.c @@ -762,14 +762,15 @@ int enum_query(struct sip_msg* _msg, str* suffix, str* service) return -1; } + user_s = _msg->parsed_uri.user.s; + user_len = _msg->parsed_uri.user.len; + if (is_e164(&(_msg->parsed_uri.user)) == -1) { - LM_ERR("R-URI user is not an E164 number\n"); + LM_ERR("R-URI user '<%.*s>' is not an E164 number\n", + user_len, user_s); return -1; } - user_s = _msg->parsed_uri.user.s; - user_len = _msg->parsed_uri.user.len; - memcpy(&(string[0]), user_s, user_len); string[user_len] = (char)0;

1 0

git:master:86ecdb2e: enum: single digit is valid in function enum_query
by Jonas BÃ¶ttner 03 May '16

03 May '16

Module: kamailio Branch: master Commit: 86ecdb2ec109af536efa70c2b0e4b93c4072e8b5 URL: https://github.com/kamailio/kamailio/commit/86ecdb2ec109af536efa70c2b0e4b93… Author: Jonas BÃ¶ttner <boettner(a)sipgate.de> Committer: Jonas BÃ¶ttner <boettner(a)sipgate.de> Date: 2016-05-02T14:19:30+02:00 enum: single digit is valid in function enum_query - is_e164() returns true for a single digit (previously two digits) --- Modified: modules/enum/enum.c --- Diff: https://github.com/kamailio/kamailio/commit/86ecdb2ec109af536efa70c2b0e4b93… Patch: https://github.com/kamailio/kamailio/commit/86ecdb2ec109af536efa70c2b0e4b93… --- diff --git a/modules/enum/enum.c b/modules/enum/enum.c index 6439f54..2c3620f 100644 --- a/modules/enum/enum.c +++ b/modules/enum/enum.c @@ -254,7 +254,7 @@ static inline int is_e164(str* _user) int i; char c; - if ((_user->len > 2) && (_user->len < MAX_NUM_LEN) && ((_user->s)[0] == '+')) { + if ((_user->len > 1) && (_user->len < MAX_NUM_LEN) && ((_user->s)[0] == '+')) { for (i = 1; i < _user->len; i++) { c = (_user->s)[i]; if ((c < '0') || (c > '9')) return -1;

1 0

[kamailio/kamailio] a single digit is a valid enum_query() request (#594)
by Jonas 03 May '16

03 May '16

We use enum_query() to dispatch calls over a set of gateways. In our case single digits (for instance "8") can be a valid direct dial number which we would like to through against our enum server. (This is an update of #593, now with guideline formatted commit messages.) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/594 -- Commit Summary -- * enum: single digit is valid in function enum_query * enum: print out malformed uri in enum_query() -- File Changes -- M modules/enum/enum.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/594.patch https://github.com/kamailio/kamailio/pull/594.diff --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/594

3 6

Registrar updates
by Olle E. Johansson 03 May '16

03 May '16

Kamailians, I’ve added two patches to the registrar module: - a new value to the XAVP created if you’ve set the xavp_rcd modparam to reveal the actual expiry value stored in the location database. In some cases, Kamailio will not accept the one provided by the client and respond with another value - this is that value https://www.kamailio.org/docs/modules/stable/modules/registrar.html#registr… - a new flag to save() to NOT apply variation set by default_expiry_range and expiry_range. This is handy if you replicate registrations - the second server needs to save the value sent by the first one and not change it once again. Both of these patches work for me, but I would be happy if someone else could test as well. If you find a problem, please open an issue in the bug tracker and I’ll look at it. Thanks /O

1 0

git:master:780a37d9: registrar Add expiry value to the xavp.
by Olle E. Johansson 03 May '16

03 May '16

Module: kamailio Branch: master Commit: 780a37d9c2d462289a2fad5c6dd25339cceaf6d9 URL: https://github.com/kamailio/kamailio/commit/780a37d9c2d462289a2fad5c6dd2533… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-05-03T21:59:13+02:00 registrar Add expiry value to the xavp. Quite handy if Kamailio for some reason changes the expiry value (min, max or variations caused by expiry_range) --- Modified: modules/registrar/README Modified: modules/registrar/doc/registrar.xml Modified: modules/registrar/doc/registrar_admin.xml Modified: modules/registrar/reply.c --- Diff: https://github.com/kamailio/kamailio/commit/780a37d9c2d462289a2fad5c6dd2533… Patch: https://github.com/kamailio/kamailio/commit/780a37d9c2d462289a2fad5c6dd2533… --- diff --git a/modules/registrar/README b/modules/registrar/README index fd6505f..104298f 100644 --- a/modules/registrar/README +++ b/modules/registrar/README @@ -3,6 +3,7 @@ registrar Module Jan Janak FhG FOKUS + <jan(a)iptel.org> Daniel-Constantin Mierla @@ -12,10 +13,17 @@ Juha Heinanen <jh(a)tutpro.com> +Olle E. Johansson + + Edvina AB + <oej(a)edvina.net> + Edited by Jan Janak + <jan(a)iptel.org> + Edited by Bogdan-Andre Iancu @@ -679,6 +687,7 @@ modparam("registrar", "xavp_cfg", "reg") $xavp(class[0]=>attribute). Valid inner XAVP names: * ruid - the record's internal unique id. * contact - the record's contact value. + * expires - the record's expires value. * received - the record's received value. For example. if this parameter is set to 'ulrcd', then values are set diff --git a/modules/registrar/doc/registrar.xml b/modules/registrar/doc/registrar.xml index 8e8143c..ec46234 100644 --- a/modules/registrar/doc/registrar.xml +++ b/modules/registrar/doc/registrar.xml @@ -17,9 +17,7 @@ <firstname>Jan</firstname> <surname>Janak</surname> <affiliation><orgname>&fhg;</orgname></affiliation> - <address> - <email>jan(a)iptel.org</email> - </address> + <email>jan(a)iptel.org</email> </author> <author> <firstname>Daniel-Constantin</firstname> @@ -31,12 +29,16 @@ <surname>Heinanen</surname> <email>jh(a)tutpro.com</email> </author> + <author> + <firstname>Olle E.</firstname> + <surname>Johansson</surname> + <affiliation><orgname>Edvina AB</orgname></affiliation> + <email>oej(a)edvina.net</email> + </author> <editor> <firstname>Jan</firstname> <surname>Janak</surname> - <address> - <email>jan(a)iptel.org</email> - </address> + <email>jan(a)iptel.org</email> </editor> <editor> <firstname>Bogdan-Andre</firstname> diff --git a/modules/registrar/doc/registrar_admin.xml b/modules/registrar/doc/registrar_admin.xml index 5443abc..7cce1cf 100644 --- a/modules/registrar/doc/registrar_admin.xml +++ b/modules/registrar/doc/registrar_admin.xml @@ -755,6 +755,11 @@ modparam("registrar", "xavp_cfg", "reg") </listitem> <listitem> <para> + <emphasis>expires</emphasis> - the record's expires value. + </para> + </listitem> + <listitem> + <para> <emphasis>received</emphasis> - the record's received value. </para> </listitem> diff --git a/modules/registrar/reply.c b/modules/registrar/reply.c index 6889d23..7c7971e 100644 --- a/modules/registrar/reply.c +++ b/modules/registrar/reply.c @@ -176,6 +176,7 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) sr_xavp_t *xavp=NULL; sr_xavp_t *list=NULL; str xname = {"ruid", 4}; + str ename = {"expires", 7}; sr_xval_t xval; @@ -334,9 +335,18 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; xval.v.s = c->ruid; + if(xavp_add_value(&xname, &xval, &xavp)==NULL) { LM_ERR("cannot add ruid value to xavp\n"); } + /* Add contact expiry */ + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_INT; + xval.v.i = (int)(c->expires - act_time); + + if(xavp_add_value(&ename, &xval, &xavp)==NULL) { + LM_ERR("cannot add expires value to xavp\n"); + } } }

1 0

git:master:55975adc: registrar Add option to the save() function to turn off expires variation when saving a registration
by Olle E. Johansson 03 May '16

03 May '16

Module: kamailio Branch: master Commit: 55975adcea77565f795ee79aa47cf44868bda5f2 URL: https://github.com/kamailio/kamailio/commit/55975adcea77565f795ee79aa47cf44… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-05-03T20:52:17+02:00 registrar Add option to the save() function to turn off expires variation when saving a registration --- Modified: modules/registrar/README Modified: modules/registrar/doc/registrar_admin.xml Modified: modules/registrar/registrar.h Modified: modules/registrar/save.c Modified: modules/registrar/sip_msg.c Modified: modules/registrar/sip_msg.h --- Diff: https://github.com/kamailio/kamailio/commit/55975adcea77565f795ee79aa47cf44… Patch: https://github.com/kamailio/kamailio/commit/55975adcea77565f795ee79aa47cf44…

1 0

git:master:0a296e5d: Registrar Fix various typos
by Olle E. Johansson 03 May '16

03 May '16

Module: kamailio Branch: master Commit: 0a296e5d831a5ecba6dadaa69109da8d93252275 URL: https://github.com/kamailio/kamailio/commit/0a296e5d831a5ecba6dadaa69109da8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-05-03T19:51:30+02:00 Registrar Fix various typos --- Modified: modules/registrar/registrar.c --- Diff: https://github.com/kamailio/kamailio/commit/0a296e5d831a5ecba6dadaa69109da8… Patch: https://github.com/kamailio/kamailio/commit/0a296e5d831a5ecba6dadaa69109da8… --- diff --git a/modules/registrar/registrar.c b/modules/registrar/registrar.c index 0752d2e..b04dbb3 100644 --- a/modules/registrar/registrar.c +++ b/modules/registrar/registrar.c @@ -272,26 +272,26 @@ static int mod_init(void) bind_usrloc_t bind_usrloc; qvalue_t dq; - - if(sruid_init(&_reg_sruid, '-', "uloc", SRUID_INC)<0) + if(sruid_init(&_reg_sruid, '-', "uloc", SRUID_INC) < 0) { return -1; + } #ifdef STATISTICS /* register statistics */ if (register_module_stats( exports.name, mod_stats)!=0 ) { - LM_ERR("failed to register core statistics\n"); + LM_ERR("Failed to register core statistics\n"); return -1; } #endif /* bind the SL API */ if (sl_load_api(&slb)!=0) { - LM_ERR("cannot bind to SL API\n"); + LM_ERR("Cannot bind to SL API. Please load the SL module before loading this module.\n"); return -1; } if(cfg_declare("registrar", registrar_cfg_def, &default_registrar_cfg, cfg_sizeof(registrar), &registrar_cfg)){ - LM_ERR("Fail to declare the configuration\n"); + LM_ERR("Failed to declare the configuration parameters.\n"); return -1; } @@ -315,7 +315,7 @@ static int mod_init(void) bind_usrloc = (bind_usrloc_t)find_export("ul_bind_usrloc", 1, 0); if (!bind_usrloc) { - LM_ERR("can't bind usrloc\n"); + LM_ERR("Can't bind to the usrloc module. Please load it before this module.\n"); return -1; } @@ -345,7 +345,7 @@ static int mod_init(void) set_child_rpc_sip_mode(); if(ul.register_ulcb(UL_CONTACT_EXPIRE, reg_ul_expired_contact, 0)< 0) { - LM_ERR("can not register callback for expired contacts\n"); + LM_ERR("Can not register callback for expired contacts (usrloc module)\n"); return -1; } } @@ -357,13 +357,13 @@ static int mod_init(void) if (sock_hdr_name.s) { if (sock_hdr_name.len==0 || sock_flag==-1) { - LM_WARN("empty sock_hdr_name or sock_flag no set -> reseting\n"); + LM_WARN("empty sock_hdr_name or sock_flag not set -> resetting\n"); sock_hdr_name.len = 0; sock_flag = -1; } } else if (reg_xavp_cfg.s) { if (reg_xavp_cfg.len == 0 || sock_flag == -1) { - LM_WARN("empty reg_xavp_cfg or sock_flag no set -> resetting\n"); + LM_WARN("empty reg_xavp_cfg or sock_flag not set -> resetting\n"); sock_flag = -1; } } else if (sock_flag!=-1) { @@ -464,6 +464,7 @@ static int w_lookup_to_dset(struct sip_msg* _m, char* _d, char* _uri) return lookup_to_dset(_m, (udomain_t*)_d, (uri.len>0)?&uri:NULL); } + /*! \brief * Wrapper to lookup_branches(location) */

1 0

git:4.3:45060ef7: xmlrpc: user libxml function to get content of node if type not provided for param
by Juha Heinanen 03 May '16

03 May '16

Module: kamailio Branch: 4.3 Commit: 45060ef72edf5fdac9376150e60d56ff9458e4ff URL: https://github.com/kamailio/kamailio/commit/45060ef72edf5fdac9376150e60d56f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2016-05-03T18:34:27+03:00 xmlrpc: user libxml function to get content of node if type not provided for param - it is considered to be string according to specs - old implementation was using the pointer inside the xmlNode struct, which may not be available later to free again by xmlrpc module garbage collector - reported by Juha Heinanen (cherry picked from commit 6b23c27d8406780083a6b7bb774efa2a53aea540) --- Modified: modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/45060ef72edf5fdac9376150e60d56f… Patch: https://github.com/kamailio/kamailio/commit/45060ef72edf5fdac9376150e60d56f… --- diff --git a/modules/xmlrpc/xmlrpc.c b/modules/xmlrpc/xmlrpc.c index 8761c02..dabb526 100644 --- a/modules/xmlrpc/xmlrpc.c +++ b/modules/xmlrpc/xmlrpc.c @@ -1407,6 +1407,7 @@ static int get_string(char** val, struct xmlrpc_reply* reply, return -1; } type=xml_get_type(dbl); + LM_DBG("xmrpc parameter type: %d\n", type); switch(type){ case XML_T_STR: case XML_T_TXT: @@ -1423,7 +1424,7 @@ static int get_string(char** val, struct xmlrpc_reply* reply, return -1; } if (type == XML_T_TXT) - val_str = (char*)dbl->content; + val_str = (char*)xmlNodeGetContent(dbl); else val_str = (char*)xmlNodeListGetString(doc, dbl->xmlChildrenNode, 1);

1 0

git:4.4:ea20338f: xmlrpc: user libxml function to get content of node if type not provided for param
by Juha Heinanen 03 May '16

03 May '16

Module: kamailio Branch: 4.4 Commit: ea20338f8786fac2bb290a610f938fec8e7ece54 URL: https://github.com/kamailio/kamailio/commit/ea20338f8786fac2bb290a610f938fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2016-05-03T18:33:10+03:00 xmlrpc: user libxml function to get content of node if type not provided for param - it is considered to be string according to specs - old implementation was using the pointer inside the xmlNode struct, which may not be available later to free again by xmlrpc module garbage collector - reported by Juha Heinanen (cherry picked from commit 6b23c27d8406780083a6b7bb774efa2a53aea540) --- Modified: modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/ea20338f8786fac2bb290a610f938fe… Patch: https://github.com/kamailio/kamailio/commit/ea20338f8786fac2bb290a610f938fe… --- diff --git a/modules/xmlrpc/xmlrpc.c b/modules/xmlrpc/xmlrpc.c index 8761c02..dabb526 100644 --- a/modules/xmlrpc/xmlrpc.c +++ b/modules/xmlrpc/xmlrpc.c @@ -1407,6 +1407,7 @@ static int get_string(char** val, struct xmlrpc_reply* reply, return -1; } type=xml_get_type(dbl); + LM_DBG("xmrpc parameter type: %d\n", type); switch(type){ case XML_T_STR: case XML_T_TXT: @@ -1423,7 +1424,7 @@ static int get_string(char** val, struct xmlrpc_reply* reply, return -1; } if (type == XML_T_TXT) - val_str = (char*)dbl->content; + val_str = (char*)xmlNodeGetContent(dbl); else val_str = (char*)xmlNodeListGetString(doc, dbl->xmlChildrenNode, 1);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2016