sr-dev June 2020

sr-dev@lists.kamailio.org

24 participants
395 discussions

git:master:1a7ab6a5: siputils: docs for functions encoding/decoding contact uri using params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1a7ab6a5fc9b02f9e431e6d21f652de6283489c0 URL: https://github.com/kamailio/kamailio/commit/1a7ab6a5fc9b02f9e431e6d21f652de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-12T11:07:46+02:00 siputils: docs for functions encoding/decoding contact uri using params --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1a7ab6a5fc9b02f9e431e6d21f652de… Patch: https://github.com/kamailio/kamailio/commit/1a7ab6a5fc9b02f9e431e6d21f652de… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index a430f85cc9..25336cc207 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1157,6 +1157,102 @@ if(is_first_hop()) { ... } ... sip_p_charging_vector("g"); ... +</programlisting> + </example> + </section> + <section id="siputils.f.contact_param_encode"> + <title> + <function moreinfo="none">contact_param_encode(pname, saddr)</function> + </title> + <para> + This function encodes URI inside Contact headers by building a new + URI from 'saddr' parameter and adding a parameter with the name 'pname' + containing incoming URI encoded in Base64URL format. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>pname</emphasis> - name of the new URI parameter to + hold the encoded incoming URI. + </para> + </listitem> + <listitem> + <para><emphasis>saddr</emphasis> - local server address, can be + host part, host-port part or host-port-params part. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE. + </para> + <example> + <title><function>contact_param_encode</function> usage</title> + <programlisting format="linespecific"> +... +if (is_method("REGISTER") and src_ip == 10.0.0.0/8) { + contact_param_encode("ksu", "1.2.3.4:5060;transport=tcp"); +} +... +</programlisting> + </example> + </section> + <section id="siputils.f.contact_param_decode"> + <title> + <function moreinfo="none">contact_param_decode(pname)</function> + </title> + <para> + This function decodes URI inside Contact headers by building a new + URI from 'pname' parameter, decoding its value from Base64URL. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>pname</emphasis> - name of the incoming URI parameter + holding the encoded URI value. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE. + </para> + <example> + <title><function>contact_param_decode</function> usage</title> + <programlisting format="linespecific"> +... +if (is_method("REGISTER") and src_ip == 1.2.3.4) { + contact_param_decode("ksu"); +} +... +</programlisting> + </example> + </section> + <section id="siputils.f.contact_param_decode_ruri"> + <title> + <function moreinfo="none">contact_param_decode_uri(pname)</function> + </title> + <para> + This function decodes R-URI (request URI) by building a new + R-URI from 'pname' parameter, decoding its value from Base64URL. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>pname</emphasis> - name of the incoming URI parameter + holding the encoded URI value. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from REQUEST_ROUTE. + </para> + <example> + <title><function>contact_param_decode_ruri</function> usage</title> + <programlisting format="linespecific"> +... +if (is_method("INVITE") and src_ip == 1.2.3.4) { + contact_param_decode_ruri("ksu"); +} +... </programlisting> </example> </section>

3 years, 11 months

git:master:e2fd3c3e: siputils: functions to encode/decode contact address in a uri param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e2fd3c3e85762b4d3e2f7706bfc32deafef46497 URL: https://github.com/kamailio/kamailio/commit/e2fd3c3e85762b4d3e2f7706bfc32de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-12T11:07:46+02:00 siputils: functions to encode/decode contact address in a uri param --- Modified: src/modules/siputils/contact_ops.c Modified: src/modules/siputils/contact_ops.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/e2fd3c3e85762b4d3e2f7706bfc32de… Patch: https://github.com/kamailio/kamailio/commit/e2fd3c3e85762b4d3e2f7706bfc32de…

3 years, 11 months

git:master:11f98d59: modules: readme files regenerated - dialog ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 11f98d59347195304870bf521dc47a2c257b49db URL: https://github.com/kamailio/kamailio/commit/11f98d59347195304870bf521dc47a2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-12T10:31:20+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/11f98d59347195304870bf521dc47a2… Patch: https://github.com/kamailio/kamailio/commit/11f98d59347195304870bf521dc47a2…

3 years, 11 months

git:master:37d83a58: dialog: add parameter to configure synchronisation of all dialog states to DB

by Henning Westerholt

Module: kamailio Branch: master Commit: 37d83a5838a50350563f19387fad455d6a433a02 URL: https://github.com/kamailio/kamailio/commit/37d83a5838a50350563f19387fad455… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-12T08:26:30Z dialog: add parameter to configure synchronisation of all dialog states to DB - add parameter to configure synchronisation of all dialog states to DB - new parameter update_all_states added to module interface - activated by default to provide correct failover behaviour for users - really large installation should test it and consider the load trade-off --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_db_handler.c Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/37d83a5838a50350563f19387fad455… Patch: https://github.com/kamailio/kamailio/commit/37d83a5838a50350563f19387fad455… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 61e4b0cbcf..0078ee7468 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -114,6 +114,7 @@ int dlg_noack_timeout = 60; int dlg_end_timeout = 300; int dlg_enable_dmq = 0; +int dlg_update_all_states = 1; int dlg_event_rt[DLG_EVENTRT_MAX]; str dlg_event_callback = STR_NULL; @@ -327,6 +328,7 @@ static param_export_t mod_params[]={ { "h_id_start", PARAM_INT, &dlg_h_id_start }, { "h_id_step", PARAM_INT, &dlg_h_id_step }, { "keep_proxy_rr", INT_PARAM, &dlg_keep_proxy_rr }, + { "update_all_states", INT_PARAM, &dlg_update_all_states }, { 0,0,0 } }; diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 1325469675..df43c7e618 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -81,6 +81,7 @@ static db1_con_t* dialog_db_handle = 0; /* database connection handle */ static db_func_t dialog_dbf; extern int dlg_enable_stats; +extern int dlg_update_all_states; extern int dlg_h_id_start; extern int dlg_h_id_step; @@ -815,7 +816,7 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) &sflags_column, /*18*/ &toroute_name_column, /*19*/ &req_uri_column, /*20*/ &xdata_column, /*21*/ &iflags_column /*22*/ }; - if(cell->state<DLG_STATE_EARLY || cell->state==DLG_STATE_DELETED) { + if((dlg_update_all_states == 0) && (cell->state<DLG_STATE_EARLY || cell->state==DLG_STATE_DELETED)) { LM_DBG("not storing dlg in db during initial or deleted states\n"); return 0; } diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 987bd54545..1940a968e3 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -82,7 +82,8 @@ <para><emphasis>5</emphasis> : Deleted dialog</para> </listitem> </itemizedlist> - <para>The early and deleted dialog states are not updated in database storage. + <para>The early and deleted dialog states are updated in database storage, + unless deactivated with the <emphasis>update_all_states</emphasis> parameter. </para> </section> @@ -1640,6 +1641,39 @@ modparam("dialog", "keep_proxy_rr", 1) </programlisting> </example> </section> + + <section id="dialog.p.update_all_states"> + <title><varname>update_all_states</varname> (string)</title> + <para> + When enabled the dialog modules will also synchronize the + early and deleted dialog states to the database. This is + useful in failover situations, but of course will generate + more load to the database from this module. + </para> + <para> + Valid values are: + </para> + <itemizedlist> + <listitem><para> + <emphasis>0</emphasis> - Don't synchronize early and deleted dialogs + </para></listitem> + <listitem><para> + <emphasis>1</emphasis> - Synchronize early and deleted dialogs + </para></listitem> + </itemizedlist> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + <example> + <title>Set <varname>update_all_states</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dialog", "update_all_states", 1) +... +</programlisting> + </example> + </section> + </section> <section>

3 years, 11 months

[kamailio/kamailio] sqlops: export sql_pvquery to KEMI (#2354)

by Victor Seva

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally #### Description add missing function You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2354 -- Commit Summary -- * sqlops: export sql_pvquery to KEMI -- File Changes -- M src/modules/sqlops/sqlops.c (59) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2354.patch https://github.com/kamailio/kamailio/pull/2354.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/2354

3 years, 11 months

git:master:3b2a0a84: sqlops: export sql_pvquery to KEMI

by Victor Seva

Module: kamailio Branch: master Commit: 3b2a0a849e60a6bf0bc9d8054568c954010d7aa6 URL: https://github.com/kamailio/kamailio/commit/3b2a0a849e60a6bf0bc9d8054568c95… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-12T09:32:09+02:00 sqlops: export sql_pvquery to KEMI --- Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/3b2a0a849e60a6bf0bc9d8054568c95… Patch: https://github.com/kamailio/kamailio/commit/3b2a0a849e60a6bf0bc9d8054568c95… --- diff --git a/src/modules/sqlops/sqlops.c b/src/modules/sqlops/sqlops.c index b3f21f6ff3..5eec552b65 100644 --- a/src/modules/sqlops/sqlops.c +++ b/src/modules/sqlops/sqlops.c @@ -492,6 +492,60 @@ static int ki_sqlops_query(sip_msg_t *msg, str *scon, str *squery, str *sres) return sqlops_do_query(scon, squery, sres); } +static int ki_sqlops_pvquery(sip_msg_t *msg, str *scon, str *squery, str *sres) +{ + pv_elem_t *query = NULL; + pvname_list_t *pv_res = NULL; + pvname_list_t *pvl = NULL; + sql_con_t *con = NULL; + int i, res; + + if (scon == NULL || scon->s == NULL || scon->len<=0) { + LM_ERR("invalid connection name\n"); + return -1; + } + + con = sql_get_connection(scon); + if(con==NULL) { + LM_ERR("invalid connection [%.*s]\n", scon->len, scon->s); + return -1; + } + + if(pv_parse_format(squery, &query)<0) + { + LM_ERR("invalid query string [%s]\n", squery->s); + return -1; + } + + /* parse result variables into list of pv_spec_t's */ + pv_res = parse_pvname_list(sres, 0); + if(pv_res==NULL) + { + LM_ERR("invalid result parameter [%s]\n", sres->s); + pv_elem_free_all(query); + return -1; + } + /* check if all result variables are writable */ + pvl = pv_res; + i = 1; + while (pvl) { + if (pvl->sname.setf == NULL) + { + LM_ERR("result variable [%d] is read-only\n", i); + pv_elem_free_all(query); + free_pvname_list(pv_res); + return -1; + } + i++; + pvl = pvl->next; + } + res = sql_do_pvquery(msg, con, query, pv_res); + + pv_elem_free_all(query); + free_pvname_list(pv_res); + return res; +} + static int ki_sqlops_query_async(sip_msg_t *msg, str *scon, str *squery) { sql_con_t *con = NULL; @@ -642,6 +696,11 @@ static sr_kemi_t sr_kemi_sqlops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sqlops"), str_init("sql_pvquery"), + SR_KEMIP_INT, ki_sqlops_pvquery, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("sqlops"), str_init("sql_xquery"), SR_KEMIP_INT, sqlops_do_xquery, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,

3 years, 11 months

[kamailio/kamailio] dispatcher: keep current destinations' load when adding/removing (#2353)

by Federico Cabiddu

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  When adding/removing a destination from a set, the load is currently non preserved, which leads to unbalanced load. This PR addresses the issue without affecting the behavior when loading/reloading the whole list. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2353 -- Commit Summary -- * dispatcher: keep current destinations' load when adding/removing -- File Changes -- M src/modules/dispatcher/dispatch.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2353.patch https://github.com/kamailio/kamailio/pull/2353.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/2353

3 years, 11 months

git:master:0dac4a75: Merge pull request #2353 from kamailio/grumvalski/ds_keep_load

by GitHub

Module: kamailio Branch: master Commit: 0dac4a759b841450a757f0ecdbf6d431d62bff87 URL: https://github.com/kamailio/kamailio/commit/0dac4a759b841450a757f0ecdbf6d43… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-06-12T07:50:46+02:00 Merge pull request #2353 from kamailio/grumvalski/ds_keep_load dispatcher: keep current destinations' load when adding/removing --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/0dac4a759b841450a757f0ecdbf6d43… Patch: https://github.com/kamailio/kamailio/commit/0dac4a759b841450a757f0ecdbf6d43… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index f481cb4d61..66b35742e5 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -353,7 +353,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) /** * */ -ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs) +ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) { ds_dest_t *dp = NULL; /* For DNS-Lookups */ @@ -419,6 +419,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs) dp->flags = flags; dp->priority = priority; + dp->dload = dload; if(ds_set_attrs(dp, attrs) < 0) { LM_ERR("cannot set attributes!\n"); @@ -498,14 +499,14 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs) * */ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, - int list_idx, int *setn) + int list_idx, int *setn, int dload) { ds_dest_t *dp = NULL; ds_set_t *sp = NULL; ds_dest_t *dp0 = NULL; ds_dest_t *dp1 = NULL; - dp = pack_dest(uri, flags, priority, attrs); + dp = pack_dest(uri, flags, priority, attrs, dload); if(!dp) goto err; @@ -854,7 +855,7 @@ int ds_load_list(char *lfile) attrs.len = p - attrs.s; add_destination: - if(add_dest2list(id, uri, flags, priority, &attrs, *next_idx, &setn) + if(add_dest2list(id, uri, flags, priority, &attrs, *next_idx, &setn, 0) != 0) { LM_WARN("unable to add destination %.*s to set %d -- skipping\n", uri.len, uri.s, id); @@ -1104,7 +1105,7 @@ int ds_load_db(void) } } LM_DBG("attributes string: [%.*s]\n", attrs.len, (attrs.s)?attrs.s:""); - if(add_dest2list(id, uri, flags, priority, &attrs, *next_idx, &setn) + if(add_dest2list(id, uri, flags, priority, &attrs, *next_idx, &setn, 0) != 0) { dest_errs++; LM_WARN("unable to add destination %.*s to set %d -- skipping\n", @@ -2420,7 +2421,7 @@ void ds_add_dest_cb(ds_set_t *node, int i, void *arg) if(add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, node->dlist[i].priority, &node->dlist[i].attrs.body, *next_idx, - &setn) != 0) { + &setn, node->dlist[i].dload) != 0) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); } @@ -2443,7 +2444,7 @@ int ds_add_dst(int group, str *address, int flags, str *attrs) // add new destination if(add_dest2list(group, *address, flags, priority, attrs, - *next_idx, &setn) != 0) { + *next_idx, &setn, 0) != 0) { LM_WARN("unable to add destination %.*s to set %d", address->len, address->s, group); if(ds_load_mode==1) { goto error; @@ -2478,7 +2479,7 @@ void ds_filter_dest_cb(ds_set_t *node, int i, void *arg) if(add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, node->dlist[i].priority, &node->dlist[i].attrs.body, *next_idx, - filter_arg->setn) != 0) { + filter_arg->setn, node->dlist[i].dload) != 0) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); } @@ -2494,7 +2495,7 @@ int ds_remove_dst(int group, str *address) setn = 0; - dp = pack_dest(*address, 0, 0, NULL); + dp = pack_dest(*address, 0, 0, NULL, 0); filter_arg.setid = group; filter_arg.dest = dp; filter_arg.setn = &setn;

3 years, 11 months

git:master:8d9e6578: dispatcher: keep current destinations' load when adding/removing

by Federico Cabiddu

Module: kamailio Branch: master Commit: 8d9e65789fe2f6da2648449639620899b1d1b2c3 URL: https://github.com/kamailio/kamailio/commit/8d9e65789fe2f6da264844963962089… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-06-10T07:17:13+02:00 dispatcher: keep current destinations' load when adding/removing --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/8d9e65789fe2f6da264844963962089… Patch: https://github.com/kamailio/kamailio/commit/8d9e65789fe2f6da264844963962089… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index f481cb4d61..66b35742e5 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -353,7 +353,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) /** * */ -ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs) +ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) { ds_dest_t *dp = NULL; /* For DNS-Lookups */ @@ -419,6 +419,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs) dp->flags = flags; dp->priority = priority; + dp->dload = dload; if(ds_set_attrs(dp, attrs) < 0) { LM_ERR("cannot set attributes!\n"); @@ -498,14 +499,14 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs) * */ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, - int list_idx, int *setn) + int list_idx, int *setn, int dload) { ds_dest_t *dp = NULL; ds_set_t *sp = NULL; ds_dest_t *dp0 = NULL; ds_dest_t *dp1 = NULL; - dp = pack_dest(uri, flags, priority, attrs); + dp = pack_dest(uri, flags, priority, attrs, dload); if(!dp) goto err; @@ -854,7 +855,7 @@ int ds_load_list(char *lfile) attrs.len = p - attrs.s; add_destination: - if(add_dest2list(id, uri, flags, priority, &attrs, *next_idx, &setn) + if(add_dest2list(id, uri, flags, priority, &attrs, *next_idx, &setn, 0) != 0) { LM_WARN("unable to add destination %.*s to set %d -- skipping\n", uri.len, uri.s, id); @@ -1104,7 +1105,7 @@ int ds_load_db(void) } } LM_DBG("attributes string: [%.*s]\n", attrs.len, (attrs.s)?attrs.s:""); - if(add_dest2list(id, uri, flags, priority, &attrs, *next_idx, &setn) + if(add_dest2list(id, uri, flags, priority, &attrs, *next_idx, &setn, 0) != 0) { dest_errs++; LM_WARN("unable to add destination %.*s to set %d -- skipping\n", @@ -2420,7 +2421,7 @@ void ds_add_dest_cb(ds_set_t *node, int i, void *arg) if(add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, node->dlist[i].priority, &node->dlist[i].attrs.body, *next_idx, - &setn) != 0) { + &setn, node->dlist[i].dload) != 0) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); } @@ -2443,7 +2444,7 @@ int ds_add_dst(int group, str *address, int flags, str *attrs) // add new destination if(add_dest2list(group, *address, flags, priority, attrs, - *next_idx, &setn) != 0) { + *next_idx, &setn, 0) != 0) { LM_WARN("unable to add destination %.*s to set %d", address->len, address->s, group); if(ds_load_mode==1) { goto error; @@ -2478,7 +2479,7 @@ void ds_filter_dest_cb(ds_set_t *node, int i, void *arg) if(add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, node->dlist[i].priority, &node->dlist[i].attrs.body, *next_idx, - filter_arg->setn) != 0) { + filter_arg->setn, node->dlist[i].dload) != 0) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); } @@ -2494,7 +2495,7 @@ int ds_remove_dst(int group, str *address) setn = 0; - dp = pack_dest(*address, 0, 0, NULL); + dp = pack_dest(*address, 0, 0, NULL, 0); filter_arg.setid = group; filter_arg.dest = dp; filter_arg.setn = &setn;

3 years, 11 months

git:5.3:7bf0fc43: core: remove compiler warnings [-Wstring-plus-int]

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 7bf0fc433008f4a0e0bd1e7eb7583fb989df973c URL: https://github.com/kamailio/kamailio/commit/7bf0fc433008f4a0e0bd1e7eb7583fb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-11T21:36:57+02:00 core: remove compiler warnings [-Wstring-plus-int] > core/parser/parse_fline.c:241:17: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] > SIP_VERSION+1, SIP_VERSION_LEN-1)) { > ~~~~~~~~~~~^~ > > core/parser/parse_fline.c:241:17: note: use array indexing to silence this warning > SIP_VERSION+1, SIP_VERSION_LEN-1)) { > ^ > & [ ] > core/parser/parse_fline.c:247:18: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] > HTTP_VERSION+1, HTTP_VERSION_LEN-1)) { > ~~~~~~~~~~~~^~ > > core/parser/parse_fline.c:247:18: note: use array indexing to silence this warning > HTTP_VERSION+1, HTTP_VERSION_LEN-1)) { > ^ > & [ ] > > 2 warnings generated. (cherry picked from commit f2959f422bb8171241728f5148d4b21c9cc2c681) --- Modified: src/core/parser/parse_fline.c --- Diff: https://github.com/kamailio/kamailio/commit/7bf0fc433008f4a0e0bd1e7eb7583fb… Patch: https://github.com/kamailio/kamailio/commit/7bf0fc433008f4a0e0bd1e7eb7583fb… --- diff --git a/src/core/parser/parse_fline.c b/src/core/parser/parse_fline.c index a5aefb7ee8..5016a31d59 100644 --- a/src/core/parser/parse_fline.c +++ b/src/core/parser/parse_fline.c @@ -238,13 +238,13 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start* fl) && (fl->u.request.version.s[0]=='S' || fl->u.request.version.s[0]=='s') && !strncasecmp(fl->u.request.version.s+1, - SIP_VERSION+1, SIP_VERSION_LEN-1)) { + &SIP_VERSION[1], SIP_VERSION_LEN-1)) { fl->flags|=FLINE_FLAG_PROTO_SIP; } else if(fl->u.request.version.len >= HTTP_VERSION_LEN && (fl->u.request.version.s[0]=='H' || fl->u.request.version.s[0]=='h') && !strncasecmp(fl->u.request.version.s+1, - HTTP_VERSION+1, HTTP_VERSION_LEN-1)) { + &HTTP_VERSION[1], HTTP_VERSION_LEN-1)) { fl->flags|=FLINE_FLAG_PROTO_HTTP; } }

3 years, 11 months

← Newer
1
...
25
26
27
28
29
30
31
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020