sr-dev April 2018

sr-dev@lists.kamailio.org

19 participants
256 discussions

git:master:cf58e132: corex: fixed prototype for few exported xflags functions to config
by Daniel-Constantin Mierla 12 Apr '18

12 Apr '18

Module: kamailio Branch: master Commit: cf58e132fad925cb90fbe1193b8a568ba654e7cc URL: https://github.com/kamailio/kamailio/commit/cf58e132fad925cb90fbe1193b8a568… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-12T12:28:33+02:00 corex: fixed prototype for few exported xflags functions to config --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cf58e132fad925cb90fbe1193b8a568… Patch: https://github.com/kamailio/kamailio/commit/cf58e132fad925cb90fbe1193b8a568… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index e8ce8787fc..2eb4ff2863 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -48,8 +48,8 @@ static int w_msg_iflag_reset(sip_msg_t *msg, char *pflag, char *p2); static int w_msg_iflag_is_set(sip_msg_t *msg, char *pflag, char *p2); static int w_file_read(sip_msg_t *msg, char *fn, char *vn); static int w_file_write(sip_msg_t *msg, char *fn, char *vn); -static int w_isxflagset(struct sip_msg *msg, char *flag, str *s2); -static int w_resetxflag(struct sip_msg *msg, char *flag, str *s2); +static int w_isxflagset(struct sip_msg *msg, char *flag, char *s2); +static int w_resetxflag(struct sip_msg *msg, char *flag, char *s2); static int w_setxflag(struct sip_msg *msg, char *flag, char *s2); static int w_set_send_socket(sip_msg_t *msg, char *psock, char *p2); static int w_set_recv_socket(sip_msg_t *msg, char *psock, char *p2); @@ -498,7 +498,7 @@ static int ki_isxflagset(sip_msg_t *msg, int fval) /** * */ -static int w_isxflagset(sip_msg_t *msg, char *flag, str *s2) +static int w_isxflagset(sip_msg_t *msg, char *flag, char *s2) { int fval=0; if(fixup_get_ivalue(msg, (gparam_t*)flag, &fval)!=0) { @@ -521,7 +521,7 @@ static int ki_resetxflag(sip_msg_t *msg, int fval) /** * */ -static int w_resetxflag(sip_msg_t *msg, char *flag, str *s2) +static int w_resetxflag(sip_msg_t *msg, char *flag, char *s2) { int fval=0; if(fixup_get_ivalue(msg, (gparam_t*)flag, &fval)!=0) {

1 0

git:master:3d7ba76e: corex: documentation for via_add_srvid()
by Daniel-Constantin Mierla 12 Apr '18

12 Apr '18

Module: kamailio Branch: master Commit: 3d7ba76ec80e4135af1593c433d5e84fab44fedf URL: https://github.com/kamailio/kamailio/commit/3d7ba76ec80e4135af1593c433d5e84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-12T12:25:52+02:00 corex: documentation for via_add_srvid() --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3d7ba76ec80e4135af1593c433d5e84… Patch: https://github.com/kamailio/kamailio/commit/3d7ba76ec80e4135af1593c433d5e84… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 96b3df667c..a8076b36c5 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -573,6 +573,33 @@ set_recv_socket("udp:127.0.0.1:5060"); ... set_source_address("udp:127.0.0.1:5080"); ... +</programlisting> + </example> + </section> + <section id="corex.f.via_add_srvid"> + <title><function moreinfo="none">via_add_srvid(flags)</function></title> + <para> + Control if srvid parameter is added or not to local Via. If yes, + the value is server_id, added only if it is different than 0. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>flags</emphasis>: 1 - add srvid parameter; 0 - do not + add srvid parameter. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>via_add_srvid</function> usage</title> + <programlisting format="linespecific"> +... +via_add_srv("1"); +... </programlisting> </example> </section>

1 0

git:master:6f89332e: core: guarded bitwise test
by Daniel-Constantin Mierla 12 Apr '18

12 Apr '18

Module: kamailio Branch: master Commit: 6f89332ebbeb43862236c8a6a5686535a4e6caeb URL: https://github.com/kamailio/kamailio/commit/6f89332ebbeb43862236c8a6a568653… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-12T12:21:52+02:00 core: guarded bitwise test --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/6f89332ebbeb43862236c8a6a568653… Patch: https://github.com/kamailio/kamailio/commit/6f89332ebbeb43862236c8a6a568653… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index e7a6deeeb2..fe7eb6b491 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2909,7 +2909,7 @@ char* create_via_hf( unsigned int *len, } /* test and add srvid parameter to local via */ - if(msg && msg->msg_flags&FL_ADD_SRVID && server_id!=0) { + if(msg && (msg->msg_flags&FL_ADD_SRVID) && server_id!=0) { slen = snprintf(sbuf, 24, ";srvid=%u", (unsigned int)server_id); if(slen<=0 || slen>=24) { LM_WARN("failed to buld srvid parameter");

1 0

git:master:2e5b49d9: corex: added via_add_srvid() function
by Daniel-Constantin Mierla 12 Apr '18

12 Apr '18

Module: kamailio Branch: master Commit: 2e5b49d9f210a8a1cc8253e9a7ed31921fe0d853 URL: https://github.com/kamailio/kamailio/commit/2e5b49d9f210a8a1cc8253e9a7ed319… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-12T12:12:23+02:00 corex: added via_add_srvid() function --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2e5b49d9f210a8a1cc8253e9a7ed319… Patch: https://github.com/kamailio/kamailio/commit/2e5b49d9f210a8a1cc8253e9a7ed319… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index c78ba1bb22..e8ce8787fc 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -54,6 +54,7 @@ static int w_setxflag(struct sip_msg *msg, char *flag, char *s2); static int w_set_send_socket(sip_msg_t *msg, char *psock, char *p2); static int w_set_recv_socket(sip_msg_t *msg, char *psock, char *p2); static int w_set_source_address(sip_msg_t *msg, char *paddr, char *p2); +static int w_via_add_srvid(sip_msg_t *msg, char *pflags, char *p2); static int fixup_file_op(void** param, int param_no); @@ -111,6 +112,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"set_source_address", (cmd_function)w_set_source_address, 1, fixup_spve_null, 0, ANY_ROUTE }, + {"via_add_srvid", (cmd_function)w_via_add_srvid, 1, fixup_igp_null, + 0, ANY_ROUTE }, {0, 0, 0, 0, 0, 0} }; @@ -120,7 +123,7 @@ static param_export_t params[]={ (void*)corex_alias_subdomains_param}, {"network_io_intercept", INT_PARAM, &nio_intercept}, {"min_msg_len", INT_PARAM, &nio_min_msg_len}, - {"msg_avp", PARAM_STR, &nio_msg_avp_param}, + {"msg_avp", PARAM_STR, &nio_msg_avp_param}, {0, 0, 0} }; @@ -687,6 +690,34 @@ static int w_set_source_address(sip_msg_t *msg, char *paddr, char *p2) return ki_set_source_address(msg, &saddr); } +/** + * + */ +static int ki_via_add_srvid(sip_msg_t *msg, int fval) +{ + if(msg==NULL) + return -1; + if(fval) { + msg->msg_flags |= FL_ADD_SRVID; + } else { + msg->msg_flags &= ~(FL_ADD_SRVID); + } + return 1; +} + +/** + * + */ +static int w_via_add_srvid(sip_msg_t *msg, char *pflags, char *s2) +{ + int fval=0; + if(fixup_get_ivalue(msg, (gparam_t*)pflags, &fval)!=0) { + LM_ERR("no flag value\n"); + return -1; + } + return ki_via_add_srvid(msg, fval); +} + /** * */ @@ -737,6 +768,11 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("via_add_srvid"), + SR_KEMIP_INT, ki_via_add_srvid, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:ded5a70e: core: new internal msg flag to add srvid param to local via
by Daniel-Constantin Mierla 12 Apr '18

12 Apr '18

Module: kamailio Branch: master Commit: ded5a70ed6bec3513c18044bd8852989a1d3f680 URL: https://github.com/kamailio/kamailio/commit/ded5a70ed6bec3513c18044bd885298… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-12T09:51:10+02:00 core: new internal msg flag to add srvid param to local via --- Modified: src/core/msg_translator.c Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/ded5a70ed6bec3513c18044bd885298… Patch: https://github.com/kamailio/kamailio/commit/ded5a70ed6bec3513c18044bd885298… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index ca0f9fa521..e7a6deeeb2 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2847,6 +2847,8 @@ char* create_via_hf( unsigned int *len, char* via; str extra_params; struct hostport hp; + char sbuf[24]; + int slen; #if defined USE_TCP || defined USE_SCTP char* id_buf; unsigned int id_len; @@ -2906,6 +2908,29 @@ char* create_via_hf( unsigned int *len, extra_params.s[extra_params.len]='\0'; } + /* test and add srvid parameter to local via */ + if(msg && msg->msg_flags&FL_ADD_SRVID && server_id!=0) { + slen = snprintf(sbuf, 24, ";srvid=%u", (unsigned int)server_id); + if(slen<=0 || slen>=24) { + LM_WARN("failed to buld srvid parameter"); + } else { + via = (char*)pkg_malloc(extra_params.len+slen+1); + if(via==0) { + LM_ERR("building srvid param failed\n"); + if (extra_params.s) pkg_free(extra_params.s); + return 0; + } + if(extra_params.len != 0) { + memcpy(via, extra_params.s, extra_params.len); + pkg_free(extra_params.s); + } + memcpy(via + extra_params.len, sbuf, slen); + extra_params.s = via; + extra_params.len += slen; + extra_params.s[extra_params.len] = '\0'; + } + } + set_hostport(&hp, msg); via = via_builder( len, send_info, branch, extra_params.len?&extra_params:0, &hp); diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 3d69e8d462..b06ff0d8d2 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -100,6 +100,7 @@ typedef enum request_method { #define FL_BODY_MULTIPART (1<<17) /* body modified is multipart */ #define FL_RR_ADDED (1<<18) /* Record-Route header was added */ #define FL_UAC_AUTH (1<<19) /* Proxy UAC-like authentication */ +#define FL_ADD_SRVID (1<<20) /*!< add 'srvid' to local via hdr */ /* WARNING: Value (1 << 28) is temporarily reserved for use in kamailio call_control * module (flag FL_USE_CALL_CONTROL )! */

1 0

git:master:9ddf2b6b: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 11 Apr '18

11 Apr '18

Module: kamailio Branch: master Commit: 9ddf2b6b5679e508da25dbdc4807115349541ea9 URL: https://github.com/kamailio/kamailio/commit/9ddf2b6b5679e508da25dbdc4807115… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-11T23:48:06+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README Modified: src/modules/app_perl/README Modified: src/modules/cdp/README Modified: src/modules/cdp_avp/README Modified: src/modules/dialog/README Modified: src/modules/dispatcher/README Modified: src/modules/ims_dialog/README Modified: src/modules/ims_registrar_scscf/README Modified: src/modules/ims_usrloc_pcscf/README Modified: src/modules/nathelper/README Modified: src/modules/registrar/README Modified: src/modules/rtpengine/README Modified: src/modules/rtpproxy/README Modified: src/modules/snmpstats/README --- Diff: https://github.com/kamailio/kamailio/commit/9ddf2b6b5679e508da25dbdc4807115… Patch: https://github.com/kamailio/kamailio/commit/9ddf2b6b5679e508da25dbdc4807115…

1 0

module FAQ, private contact replacement
by Henning Westerholt 11 Apr '18

11 Apr '18

Hello, in many modules we have a template text about our support contacts in the "FAQ" part: "E-mails regarding any stable Kamailio release should be sent to <sr-users(a)lists.kamailio.org> and e-mails regarding development versions should be sent to <sr-dev(a)lists.kamailio.org>. If you want to keep the mail private, send it to <sr-users(a)lists.kamailio.org>." The lower part (about the private contact) makes no sense anymore. It used contain a private SER contact address, and lost somehow its meaning during the conversion to Kamailio. I would like to change to this text to: "If you need to keep the e-mail private (e.g. for security issues) send it to management at kamailio dot org." Any objections against this change, or remarks about the replacement text? Regards, Henning

3 7

git:master:e0403459: module docs: remove info for confidential security reports again from module FAQs
by Henning Westerholt 11 Apr '18

11 Apr '18

Module: kamailio Branch: master Commit: e0403459f582e9264379a36061f1ef09e788bedc URL: https://github.com/kamailio/kamailio/commit/e0403459f582e9264379a36061f1ef0… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-04-11T23:41:24+02:00 module docs: remove info for confidential security reports again from module FAQs --- Modified: doc/docbook/entities.xml Modified: src/modules/acc/doc/acc_faq.xml Modified: src/modules/app_perl/doc/app_perl_faq.xml Modified: src/modules/cdp/doc/cdp_faq.xml Modified: src/modules/cdp_avp/doc/cdp_avp_faq.xml Modified: src/modules/dialog/doc/dialog_faq.xml Modified: src/modules/dispatcher/doc/dispatcher_faq.xml Modified: src/modules/ims_dialog/doc/ims_dialog_faq.xml Modified: src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_faq.xml Modified: src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_faq.xml Modified: src/modules/nathelper/doc/nathelper_faq.xml Modified: src/modules/registrar/doc/registrar_faq.xml Modified: src/modules/rtpengine/doc/rtpengine_faq.xml Modified: src/modules/rtpproxy/doc/rtpproxy_faq.xml Modified: src/modules/snmpstats/doc/snmpstats_faq.xml --- Diff: https://github.com/kamailio/kamailio/commit/e0403459f582e9264379a36061f1ef0… Patch: https://github.com/kamailio/kamailio/commit/e0403459f582e9264379a36061f1ef0…

1 0

git:master:cc6865cd: db_redis: Fix scanning large tables
by Andreas Granig 11 Apr '18

11 Apr '18

Module: kamailio Branch: master Commit: cc6865cd7d0fc48709acd7685d315eb5575e45bd URL: https://github.com/kamailio/kamailio/commit/cc6865cd7d0fc48709acd7685d315eb… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: 2018-04-11T17:28:32+02:00 db_redis: Fix scanning large tables * When querying large tables (e.g. pre-loading location by usrloc), make sure to use O(1) when adding keys by prepending them to list. * Increase batch size of redis scan command to reduce number of redis queries. * Batch creation of DB_ROW entries to free up memory allocated by redis in heap regularly. * Fix more issues reported by coverity. --- Modified: src/modules/db_redis/redis_connection.c Modified: src/modules/db_redis/redis_dbase.c Modified: src/modules/db_redis/redis_table.c --- Diff: https://github.com/kamailio/kamailio/commit/cc6865cd7d0fc48709acd7685d315eb… Patch: https://github.com/kamailio/kamailio/commit/cc6865cd7d0fc48709acd7685d315eb…

1 0

[kamailio/kamailio] Is t_flush_flags() really needed? (#1490)
by juha-h 11 Apr '18

11 Apr '18

I have not found any situation, where t_flush_flags() is needed. If I set a flag after t_newtran() and then call t_relay(), the flag stays set both in failure route and reply route. If there exists a case, where t_flush_flags() needs to be called after t_newtran(), it should be mentioned in README in order to avoid needless calls of t_flush_flags(). -- 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/issues/1490

2 4

← Newer
1
...
14
15
16
17
18
19
20
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2018