- sr-dev - kamailio.org

git:master:82845eac: db_cluster: Add RPC success and error messages to dbcl_rpc_enable_connection
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 82845eac8a8bae73d1033736ff9cf15337661981 URL: https://github.com/kamailio/kamailio/commit/82845eac8a8bae73d1033736ff9cf15… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 db_cluster: Add RPC success and error messages to dbcl_rpc_enable_connection --- Modified: src/modules/db_cluster/db_cluster_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/82845eac8a8bae73d1033736ff9cf15… Patch: https://github.com/kamailio/kamailio/commit/82845eac8a8bae73d1033736ff9cf15… --- diff --git a/src/modules/db_cluster/db_cluster_mod.c b/src/modules/db_cluster/db_cluster_mod.c index d4aae0e123..2ddbffc2ad 100644 --- a/src/modules/db_cluster/db_cluster_mod.c +++ b/src/modules/db_cluster/db_cluster_mod.c @@ -309,6 +309,7 @@ static void dbcl_rpc_enable_connection(rpc_t *rpc, void *c) if(cls==NULL) { LM_INFO("cluster not found [%.*s]\n", cluster.len, cluster.s); + rpc->fault(c, 500, "Cluster not found"); return; } @@ -317,11 +318,14 @@ static void dbcl_rpc_enable_connection(rpc_t *rpc, void *c) if(con==NULL) { LM_INFO("connection not found [%.*s]\n", connection.len, connection.s); + rpc->fault(c, 500, "Cluster connection not found"); return; } - - dbcl_enable_con(con); - + if(dbcl_enable_con(con) < 0) { + rpc->fault(c, 500, "Failed to enable cluster connection."); + return; + } + rpc->rpl_printf(c, "Ok. Cluster connection enabled."); return; }

1 0

git:master:fc0ee0bc: db_cluster: Add RPC error message when clusters not found
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: fc0ee0bca6d5b42d11e0d7ed5933e23ae1636941 URL: https://github.com/kamailio/kamailio/commit/fc0ee0bca6d5b42d11e0d7ed5933e23… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 db_cluster: Add RPC error message when clusters not found --- Modified: src/modules/db_cluster/db_cluster_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fc0ee0bca6d5b42d11e0d7ed5933e23… Patch: https://github.com/kamailio/kamailio/commit/fc0ee0bca6d5b42d11e0d7ed5933e23… --- diff --git a/src/modules/db_cluster/db_cluster_mod.c b/src/modules/db_cluster/db_cluster_mod.c index 2ddbffc2ad..c42d5b2aa9 100644 --- a/src/modules/db_cluster/db_cluster_mod.c +++ b/src/modules/db_cluster/db_cluster_mod.c @@ -339,6 +339,7 @@ static void dbcl_rpc_list_clusters(rpc_t *rpc, void *c) if(cls==NULL) { LM_ERR("root not set\n"); + rpc->fault(c, 500, "Clusters not found"); return; }

1 0

git:master:9f8de525: dispatcher: Add RPC success response on reload
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 9f8de5255bb90551d6cad5828ccafb6f41083c47 URL: https://github.com/kamailio/kamailio/commit/9f8de5255bb90551d6cad5828ccafb6… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 dispatcher: Add RPC success response on reload --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/9f8de5255bb90551d6cad5828ccafb6… Patch: https://github.com/kamailio/kamailio/commit/9f8de5255bb90551d6cad5828ccafb6… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 4ed98919b7..4493fed425 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1557,6 +1557,7 @@ static void dispatcher_rpc_reload(rpc_t *rpc, void *ctx) return; } } + rpc->rpl_printf(ctx, "Ok. Dispatcher successfully reloaded."); return; }

1 0

git:master:4d41b85a: dbcluster: Add RPC error message wheb listing connections and no cluster is found
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 4d41b85a6b9d7f82306282a19c01d63b90f2a7d9 URL: https://github.com/kamailio/kamailio/commit/4d41b85a6b9d7f82306282a19c01d63… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 dbcluster: Add RPC error message wheb listing connections and no cluster is found --- Modified: src/modules/db_cluster/db_cluster_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4d41b85a6b9d7f82306282a19c01d63… Patch: https://github.com/kamailio/kamailio/commit/4d41b85a6b9d7f82306282a19c01d63… --- diff --git a/src/modules/db_cluster/db_cluster_mod.c b/src/modules/db_cluster/db_cluster_mod.c index bdbbb70ce6..a2c28f88e5 100644 --- a/src/modules/db_cluster/db_cluster_mod.c +++ b/src/modules/db_cluster/db_cluster_mod.c @@ -189,6 +189,7 @@ static void dbcl_rpc_list_connections(rpc_t *rpc, void *c) if(cls==NULL) { LM_ERR("cluster not found [%.*s]\n", cluster.len, cluster.s); + rpc->fault(c, 500, "Cluster not found"); return; }

1 0

git:master:86b4189c: db_cluster: Add RPC error messages and responses to dbcl_rpc_ddisable_connection
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 86b4189c1335a2d1aa4414ab9d1a5b8a27a29e00 URL: https://github.com/kamailio/kamailio/commit/86b4189c1335a2d1aa4414ab9d1a5b8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 db_cluster: Add RPC error messages and responses to dbcl_rpc_ddisable_connection --- Modified: src/modules/db_cluster/db_cluster_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/86b4189c1335a2d1aa4414ab9d1a5b8… Patch: https://github.com/kamailio/kamailio/commit/86b4189c1335a2d1aa4414ab9d1a5b8… --- diff --git a/src/modules/db_cluster/db_cluster_mod.c b/src/modules/db_cluster/db_cluster_mod.c index a2c28f88e5..d4aae0e123 100644 --- a/src/modules/db_cluster/db_cluster_mod.c +++ b/src/modules/db_cluster/db_cluster_mod.c @@ -250,6 +250,7 @@ static void dbcl_rpc_disable_connection(rpc_t *rpc, void *c) if(cls==NULL) { LM_INFO("cluster not found [%.*s]\n", cluster.len, cluster.s); + rpc->fault(c, 500, "Cluster not found"); return; } @@ -258,16 +259,22 @@ static void dbcl_rpc_disable_connection(rpc_t *rpc, void *c) if(con==NULL) { LM_INFO("connection not found [%.*s]\n", connection.len, connection.s); + rpc->fault(c, 500, "Cluster connection not found"); return; } if(con->sinfo==NULL) + rpc->fault(c, 500, "Cluster state info missing."); return; /* Overwrite the number of seconds if the connection is already disabled. */ if (con->sinfo->state & DBCL_CON_INACTIVE) { - dbcl_disable_con(con, seconds); + if(dbcl_disable_con(con, seconds) < 0) { + rpc->fault(c, 500, "Failed disabling cluster connection."); + return; + } + rpc->rpl_printf(c, "Ok. Cluster connection re-disabled."); return; } @@ -277,8 +284,11 @@ static void dbcl_rpc_disable_connection(rpc_t *rpc, void *c) return; } - dbcl_disable_con(con, seconds); - + if(dbcl_disable_con(con, seconds) < 0) { + rpc->fault(c, 500, "Failed disabling cluster connection."); + return; + }; + rpc->rpl_printf(c, "Ok. Cluster connection disabled."); return; }

1 0

git:master:fecda3d1: htable: Add RPC response for successful reload of htable
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: fecda3d12f0f72ba0f35f239108f5dcd3bec0959 URL: https://github.com/kamailio/kamailio/commit/fecda3d12f0f72ba0f35f239108f5dc… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:09+01:00 htable: Add RPC response for successful reload of htable --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/fecda3d12f0f72ba0f35f239108f5dc… Patch: https://github.com/kamailio/kamailio/commit/fecda3d12f0f72ba0f35f239108f5dc… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index bd6d474e9d..3e9f52bf13 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1912,6 +1912,7 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) } free(nht.entries); ht_db_close_con(); + rpc->rpl_printf(c, "Ok. Htable reloaded."); return; }

1 0

git:master:326abd17: htable: Add RPC response for storing htable to DB
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 326abd1737336ad733cb53f9b4ac506f178da0e2 URL: https://github.com/kamailio/kamailio/commit/326abd1737336ad733cb53f9b4ac506… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 htable: Add RPC response for storing htable to DB --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/326abd1737336ad733cb53f9b4ac506… Patch: https://github.com/kamailio/kamailio/commit/326abd1737336ad733cb53f9b4ac506… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 3e9f52bf13..7e72ad0840 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1963,6 +1963,7 @@ static void htable_rpc_store(rpc_t* rpc, void* c) return; } ht_db_close_con(); + rpc->rpl_printf(c, "Ok. Htable successfully stored to DB."); return; }

1 0

git:master:559b52b1: mtree: Add RPC response on successful reload, re-organise function rpc_mtree_reload
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 559b52b194f813c0c8584b3becbac9b2ab8e0343 URL: https://github.com/kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 mtree: Add RPC response on successful reload, re-organise function rpc_mtree_reload --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b… Patch: https://github.com/kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 63180bbfb7..1a2cd9f737 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -929,61 +929,59 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) { str tname = {0, 0}; m_tree_t *pt = NULL; - int treloaded = 0; + int treeloaded = 0; if(db_table.len>0) { /* re-loading all information from database */ if(mt_load_db_trees()!=0) { - LM_ERR("cannot re-load mtrees from database\n"); - goto error; - } - } else { - if(!mt_defined_trees()) - { - LM_ERR("empty mtree list\n"); - goto error; + rpc->fault(c, 500, "Can not reload Mtrees from database."); + return; } + rpc->rpl_printf(c, "Ok. Mtrees reloaded."); + return; + } + if(!mt_defined_trees()) + { + rpc->fault(c, 500, "No Mtrees defined."); + return; + } - /* read tree name */ - if (rpc->scan(c, "S", &tname) != 1) { + /* read tree name */ + if (rpc->scan(c, "S", &tname) != 1) { + tname.s = 0; + tname.len = 0; + } else { + if(*tname.s=='.') { tname.s = 0; tname.len = 0; - } else { - if(*tname.s=='.') { - tname.s = 0; - tname.len = 0; - } } + } - pt = mt_get_first_tree(); + pt = mt_get_first_tree(); - while(pt!=NULL) + while(pt!=NULL) + { + if(tname.s==NULL + || (tname.s!=NULL && pt->tname.len>=tname.len + && strncmp(pt->tname.s, tname.s, tname.len)==0)) { - if(tname.s==NULL - || (tname.s!=NULL && pt->tname.len>=tname.len - && strncmp(pt->tname.s, tname.s, tname.len)==0)) + /* re-loading table from database */ + if(mt_load_db(pt)!=0) { - /* re-loading table from database */ - if(mt_load_db(pt)!=0) - { - LM_ERR("cannot re-load mtree from database\n"); - goto error; - } - treloaded = 1; + rpc->fault(c, 500, "Mtree Reload Failed"); + return; } - pt = pt->next; - } - if(treloaded == 0) { - rpc->fault(c, 500, "No Mtree Name Matching"); + treeloaded = 1; } + pt = pt->next; } - + if(treeloaded == 0) { + rpc->fault(c, 500, "Can not find specified Mtree"); + } + rpc->rpl_printf(c, "Ok. Mtree reloaded."); return; - -error: - rpc->fault(c, 500, "Mtree Reload Failed"); } static const char* rpc_mtree_reload_doc[2] = {

1 0

git:master:0b5407ec: htable: Add response for rpc flush failed and success states
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 0b5407ec0f13d7631a5273171338628b44814498 URL: https://github.com/kamailio/kamailio/commit/0b5407ec0f13d7631a5273171338628… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:09+01:00 htable: Add response for rpc flush failed and success states --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/0b5407ec0f13d7631a5273171338628… Patch: https://github.com/kamailio/kamailio/commit/0b5407ec0f13d7631a5273171338628… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 78f151daf3..bd6d474e9d 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1809,7 +1809,11 @@ static void htable_rpc_flush(rpc_t* rpc, void* c) rpc->fault(c, 500, "No such htable"); return; } - ht_reset_content(ht); + if(ht_reset_content(ht) < 0) { + rpc->fault(c, 500, "Htable flush failed."); + return; + } + rpc->rpl_printf(c, "Ok. Htable flushed."); } /*! \brief RPC htable.reload command to reload content of a hash table */

1 0

git:master:c4e462fa: core: parser sdp - print hdr name by length on error in get_sdp_hdr_field()
by Daniel-Constantin Mierla 28 Dec '21

28 Dec '21

Module: kamailio Branch: master Commit: c4e462fa6bda38ac6fd814ce8d98ea030d4049b9 URL: https://github.com/kamailio/kamailio/commit/c4e462fa6bda38ac6fd814ce8d98ea0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-28T20:27:43+01:00 core: parser sdp - print hdr name by length on error in get_sdp_hdr_field() --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/c4e462fa6bda38ac6fd814ce8d98ea0… Patch: https://github.com/kamailio/kamailio/commit/c4e462fa6bda38ac6fd814ce8d98ea0… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index c62a347ddc..9b7a442e79 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -757,7 +757,8 @@ char* get_sdp_hdr_field(char* buf, char* end, struct hdr_field* hdr) if (match){ match++; }else { - LM_ERR("bad body for <%s>(%d)\n", hdr->name.s, hdr->type); + LM_ERR("bad body for <%.*s>(%d)\n", hdr->name.len, hdr->name.s, + hdr->type); tmp=end; goto error; }

1 0

git:master:089a55b8: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 28 Dec '21

28 Dec '21

Module: kamailio Branch: master Commit: 089a55b8417b48ed783fafe0ed4bc10374e09425 URL: https://github.com/kamailio/kamailio/commit/089a55b8417b48ed783fafe0ed4bc10… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-28T20:16:21+01:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/089a55b8417b48ed783fafe0ed4bc10… Patch: https://github.com/kamailio/kamailio/commit/089a55b8417b48ed783fafe0ed4bc10… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index d5ea0ae845..bd32c3e674 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -461,6 +461,11 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") Please note that you need to set a positive ring_timeout value in order to use this function. + Note: the change of sip reply can be done only in cases when it is not + parsed too much before config execution, otherwise it fails. For + example, setting global parameter "log_prefix" can cause this function + to fail changing the replies. + The function returns TRUE on success, and FALSE during processing failures.

1 0

git:master:090f1f74: siputils: docs - note about restrictions of ring_insert_callid()
by Daniel-Constantin Mierla 28 Dec '21

28 Dec '21

Module: kamailio Branch: master Commit: 090f1f74603de6113f3dd41095ae41b4f03f8171 URL: https://github.com/kamailio/kamailio/commit/090f1f74603de6113f3dd41095ae41b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-28T20:00:17+01:00 siputils: docs - note about restrictions of ring_insert_callid() - GH #2989 --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/090f1f74603de6113f3dd41095ae41b… Patch: https://github.com/kamailio/kamailio/commit/090f1f74603de6113f3dd41095ae41b… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 2b7ac27951..db66d40ac6 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -286,6 +286,12 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") to use this function. </para> <para> + Note: the change of sip reply can be done only in cases when it is not + parsed too much before config execution, otherwise it fails. For + example, setting global parameter "log_prefix" can cause this function + to fail changing the replies. + </para> + <para> The function returns TRUE on success, and FALSE during processing failures. </para> <para>

1 0

[kamailio/kamailio] Run kamailio in kubernates (Issue #2988)
by maryamb99 27 Dec '21

27 Dec '21

Hello everyone, I have a problem over running local docker images of Kamailio in Kubernate cluster.. Consider I build a local docker image from Kamailio and create a pod in one of my nodes . My process created successfully and Kamailio listen over port 5060 now I need to rebuild another docker image with new Kamailio configuration and run it as another pod with new name and listening over port 5061 but I have error "ImagePullBackOff" . I test this scenario many times but problem exists.. It is devastating for me and I need emergency help. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2988 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2988(a)github.com>

3 3

[kamailio/kamailio] Remove RHEL/CentOS 6 packaging as EOL & other enhancements (PR #2986)
by istiak101 25 Dec '21

25 Dec '21

#### Pre-Submission Checklist    - [ ] 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 - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Removed RHEL/CentOS 6 packaging from spec file as those versions reached End of Life almost more than a year ago. Fixed a typo and did %autosetup instead of %setup -n which figures out name and version automatically from macros and also does a quiet decompression of source archive. Note: %autosetup has similar -n flag if archive name isn't standard like %{name}-%{version} You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2986 -- Commit Summary -- * Removed packaging for RHEL/CentOS 6 as End Of Life * Typo fix & %autosetup in prep section -- File Changes -- M pkg/kamailio/obs/kamailio.spec (104) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2986.patch https://github.com/kamailio/kamailio/pull/2986.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2986 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/2986(a)github.com>

3 4

Merry Christmas and Happy Holidays 2021-2022!
by Daniel-Constantin Mierla 25 Dec '21

25 Dec '21

Another challenging year is getting close to its end, pressuring even more everyone! Let's hope things will go back to a more usual life (as it used to be) in the near future! Kamailio project continued to develop, bringing out a new major release, preparing for the next one in a few months, relying on an amazing community of developers and users. We also trust it continued to help people and companies world wide to connect with the dear ones and build a better way of living. The season holidays are ahead, time to relax, spend time with family and friends! I take again this chance to express my thanks and greetings to all the friends, developers, supporting companies and community members that made 2021 another great year for Kamailio project. Enjoy the holidays! Merry Christmas! Daniel * Santa is flying Kamailio! * -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

[kamailio/kamailio] Add new parameter to $uac_req (Issue #2982)
by Neimar Avila 23 Dec '21

23 Dec '21

### Description If possible, add a new parameter, where you can choose between sending the password in ha1 or plain text. ### Expected behavior route[REGFWD] { if(!is_method("REGISTER")) { return; } $uac_req(method)="REGISTER"; $uac_req(auser)=$fU; $uac_req(apasswd)="4850730cadc0250e9fa951eae583ace9"; $uac_req(passtype)="ha1"; ... uac_req_send(); ... } #### Actual observed behavior It is currently not possible to send the password in ha1 format #### Debugging Data #### Log Messages #### SIP Traffic ### Possible Solutions Create an additional field. ### Additional Information version: kamailio 5.5.2 (x86_64/linux) 55e232 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 55e232 compiled on 14:20:31 Aug 25 2021 with gcc 4.8.5 * **Operating System**: CentOS Linux release 7.9.2009 (Core) Linux vsphone-proxy-srv1.virtualsistemas.local 3.10.0-1160.45.1.el7.x86_64 #1 SMP Wed Oct 13 17:20:51 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2982 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2982(a)github.com>

3 4

git:master:e809b241: uac: fix unknown type name
by Victor Seva 22 Dec '21

22 Dec '21

Module: kamailio Branch: master Commit: e809b2415b6074826bf641a0a85667a400f778ef URL: https://github.com/kamailio/kamailio/commit/e809b2415b6074826bf641a0a85667a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-12-22T18:08:30+01:00 uac: fix unknown type name introduced at b6e264c9780fc0432e6e746f473024e41bc1126b > uac_send.c: In function 'uac_send_tm_callback': > uac_send.c:741:16: error: unknown type name 'authenticate_body_t' > 741 | static authenticate_body_t auth; > | ^~~~~~~~~~~~~~~~~~~ > uac_send.c:781:49: warning: passing argument 2 of 'parse_authenticate_body' from incompatible pointer type [-Wincompatible-pointer-types] > 781 | if (parse_authenticate_body(&hdr->body, &auth)<0) > | ^~~~~ > | | > | int * > In file included from uac_send.c:42: > auth_hdr.h:30:67: note: expected 'struct authenticate_body *' but argument is of type 'int *' > 30 | int parse_authenticate_body( str *body, struct authenticate_body *auth); > | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ > uac_send.c:788:27: error: request for member 'realm' in something not a structure or union > 788 | cred.realm = auth.realm; > | ^ > uac_send.c:795:56: warning: passing argument 4 of 'do_uac_auth' from incompatible pointer type [-Wincompatible-pointer-types] > 795 | do_uac_auth(&tp->s_method, &tp->s_ruri, &cred, &auth, response); > | ^~~~~ > | | > | int * > In file included from uac_send.c:41: > auth.h:77:43: note: expected 'struct authenticate_body *' but argument is of type 'int *' > 77 | struct authenticate_body *auth, > | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ > uac_send.c:797:49: warning: passing argument 4 of 'build_authorization_hdr' from incompatible pointer type [-Wincompatible-pointer-types] > 797 | &auth, response); > | ^~~~~ > | | > | int * > In file included from uac_send.c:42: > auth_hdr.h:33:71: note: expected 'struct authenticate_body *' but argument is of type 'int *' > 33 | struct uac_credential *crd, struct authenticate_body *auth, > | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ > make[2]: *** [../../Makefile.rules:100: uac_send.o] Error 1 --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/e809b2415b6074826bf641a0a85667a… Patch: https://github.com/kamailio/kamailio/commit/e809b2415b6074826bf641a0a85667a… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index e5ea420d72..43767c7804 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -738,7 +738,7 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) struct hdr_field *hdr; HASHHEX response; str *new_auth_hdr = NULL; - static authenticate_body_t auth; + static uac_authenticate_body_t auth; uac_credential_t cred; char b_hdrs[MAX_UACH_SIZE]; str s_hdrs;

1 0

git:5.5:b42dfd30: pv_headers: restore pvh_real_hdr_del_by_name()
by Victor Seva 22 Dec '21

22 Dec '21

Module: kamailio Branch: 5.5 Commit: b42dfd30ba74562e3c7673b3de449760bb315d62 URL: https://github.com/kamailio/kamailio/commit/b42dfd30ba74562e3c7673b3de44976… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-12-22T11:21:15+01:00 pv_headers: restore pvh_real_hdr_del_by_name() it was wrongly removed at 09981c41cb6685fa18f61b9e7d66339917c4f097 (cherry picked from commit d8f0e71a0497e0bb98be60452914df51c84b56d8) --- Modified: src/modules/pv_headers/pvh_hdr.c --- Diff: https://github.com/kamailio/kamailio/commit/b42dfd30ba74562e3c7673b3de44976… Patch: https://github.com/kamailio/kamailio/commit/b42dfd30ba74562e3c7673b3de44976… --- diff --git a/src/modules/pv_headers/pvh_hdr.c b/src/modules/pv_headers/pvh_hdr.c index 31c09b4b5d..fbb471ccd5 100644 --- a/src/modules/pv_headers/pvh_hdr.c +++ b/src/modules/pv_headers/pvh_hdr.c @@ -131,6 +131,21 @@ int pvh_real_hdr_append(struct sip_msg *msg, str *hname, str *hvalue) return 1; } +int pvh_real_hdr_del_by_name(struct sip_msg *msg, str *hname) +{ + hdr_field_t *hf = NULL; + + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->name.len == hname->len + && strncasecmp(hf->name.s, hname->s, hname->len) == 0) { + LM_DBG("remove header[%.*s]: %.*s\n", hf->name.len, hf->name.s, + hf->body.len, hf->body.s); + del_lump(msg, hf->name.s - msg->buf, hf->len, 0); + } + } + return 1; +} + int pvh_real_hdr_remove_display(struct sip_msg *msg, str *hname) { hdr_field_t *hf = NULL;

1 0

git:master:d8f0e71a: pv_headers: restore pvh_real_hdr_del_by_name()
by Victor Seva 22 Dec '21

22 Dec '21

Module: kamailio Branch: master Commit: d8f0e71a0497e0bb98be60452914df51c84b56d8 URL: https://github.com/kamailio/kamailio/commit/d8f0e71a0497e0bb98be60452914df5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-12-22T11:19:19+01:00 pv_headers: restore pvh_real_hdr_del_by_name() it was wrongly removed at 09981c41cb6685fa18f61b9e7d66339917c4f097 --- Modified: src/modules/pv_headers/pvh_hdr.c --- Diff: https://github.com/kamailio/kamailio/commit/d8f0e71a0497e0bb98be60452914df5… Patch: https://github.com/kamailio/kamailio/commit/d8f0e71a0497e0bb98be60452914df5… --- diff --git a/src/modules/pv_headers/pvh_hdr.c b/src/modules/pv_headers/pvh_hdr.c index 31c09b4b5d..fbb471ccd5 100644 --- a/src/modules/pv_headers/pvh_hdr.c +++ b/src/modules/pv_headers/pvh_hdr.c @@ -131,6 +131,21 @@ int pvh_real_hdr_append(struct sip_msg *msg, str *hname, str *hvalue) return 1; } +int pvh_real_hdr_del_by_name(struct sip_msg *msg, str *hname) +{ + hdr_field_t *hf = NULL; + + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->name.len == hname->len + && strncasecmp(hf->name.s, hname->s, hname->len) == 0) { + LM_DBG("remove header[%.*s]: %.*s\n", hf->name.len, hf->name.s, + hf->body.len, hf->body.s); + del_lump(msg, hf->name.s - msg->buf, hf->len, 0); + } + } + return 1; +} + int pvh_real_hdr_remove_display(struct sip_msg *msg, str *hname) { hdr_field_t *hf = NULL;

1 0

[kamailio/kamailio] nats: Add publish function (PR #2915)
by Stefan Mititelu 22 Dec '21

22 Dec '21

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Added a publish function to nats module. When the function is called, the routing process tries to connect to the url (param) and tries to send the payload (param) to the subject queue (param). No libuv is used for this. Probably a better approach is to make publisher workers (like subscriber workers) and pass payload from routing processes to publisher worker processes via shared memory. Right now I see this as an improvement and find the new function good enough, for now. @eschmidbauer what do you think of this? Thank you, Stefan P.S. Will update doc after review. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2915 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2915/commits/121ae374e0c309027eeb…">nats: Add publish function</a> -- File Changes -- M src/modules/nats/nats_mod.c (71) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2915.patch https://github.com/kamailio/kamailio/pull/2915.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/2915

2 12

[kamailio/kamailio] ldap: rename private function ldap_connect (PR #2975)
by micmac1 22 Dec '21

22 Dec '21

``` When compiling against openldap 2.6.0 kamailio's private ldap_connect() clashes with openldap's own. curl dealt with a similar issue earlier (see [1]). Simply rename the function to avoid the issue. In file included from ldap_api_fn.c:37: ldap_connect.h:34:12: error: conflicting types for 'ldap_connect'; have 'int(char *)' 34 | extern int ldap_connect(char *_ld_name); | ^~~~~~~~~~~~ In file included from ldap_api_fn.c:33: /home/sk/tmp/sdk/openwrt-sdk-ath79-generic_gcc-11.2.0_musl.Linux-x86_64/staging_dir/target-mips_24kc_musl/usr/include/ldap.h:1555:1: note: previous declaration of 'ldap_connect' with type 'int(LDAP *)' {aka 'int(struct ldap *)'} 1555 | ldap_connect( LDAP *ld ); | ^~~~~~~~~~~~ make[5]: *** [../../Makefile.rules:100: ldap_api_fn.o] Error 1 make[4]: *** [Makefile:511: modules] Error 1 ``` [1] https://github.com/curl/curl/commit/8bdde6b14ce3b5fd71c772a578fcbd4b6fa6df19 Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net>   #### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Hi all, Small compile fix. I saw kamailio is failing to build on OpenWrt build bots since a recent openldap bump from 2.4.58 to 2.6.0. I linked a curl commit in the commit message, they also renamed some of their functions, although they did rename all their ldap_* functions to oldap_. I didn't dare do that in kamailio :) Renaming a single function was enough to make it compile again. Maybe you want to do something different to address this issue, I don't know. I didn't runtest this. Kind regards, Seb You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2975 -- Commit Summary -- * ldap: rename private function ldap_connect -- File Changes -- M src/modules/ldap/ldap_connect.c (2) M src/modules/ldap/ldap_connect.h (2) M src/modules/ldap/ldap_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2975.patch https://github.com/kamailio/kamailio/pull/2975.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/2975

2 2

git:master:362c6de0: ldap: rename private function ldap_connect
by Daniel-Constantin Mierla 22 Dec '21

22 Dec '21

Module: kamailio Branch: master Commit: 362c6de08058948d0a70a1eeb14ec718f922b4e5 URL: https://github.com/kamailio/kamailio/commit/362c6de08058948d0a70a1eeb14ec71… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-22T08:43:33+01:00 ldap: rename private function ldap_connect When compiling against openldap 2.6.0 kamailio's private ldap_connect() clashes with openldap's own. curl dealt with a similar issue earlier (see [1]). Simply rename the function to avoid the issue. In file included from ldap_api_fn.c:37: ldap_connect.h:34:12: error: conflicting types for 'ldap_connect'; have 'int(char *)' 34 | extern int ldap_connect(char *_ld_name); | ^~~~~~~~~~~~ In file included from ldap_api_fn.c:33: /home/sk/tmp/sdk/openwrt-sdk-ath79-generic_gcc-11.2.0_musl.Linux-x86_64/staging_dir/target-mips_24kc_musl/usr/include/ldap.h:1555:1: note: previous declaration of 'ldap_connect' with type 'int(LDAP *)' {aka 'int(struct ldap *)'} 1555 | ldap_connect( LDAP *ld ); | ^~~~~~~~~~~~ make[5]: *** [../../Makefile.rules:100: ldap_api_fn.o] Error 1 make[4]: *** [Makefile:511: modules] Error 1 [1] https://github.com/curl/curl/commit/8bdde6b14ce3b5fd71c772a578fcbd4b6fa6df19 Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/ldap/ldap_connect.c Modified: src/modules/ldap/ldap_connect.h Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/362c6de08058948d0a70a1eeb14ec71… Patch: https://github.com/kamailio/kamailio/commit/362c6de08058948d0a70a1eeb14ec71… --- diff --git a/src/modules/ldap/ldap_connect.c b/src/modules/ldap/ldap_connect.c index 06850705e3..352db480ff 100644 --- a/src/modules/ldap/ldap_connect.c +++ b/src/modules/ldap/ldap_connect.c @@ -185,7 +185,7 @@ int ldap_connect_ex(char *_ld_name, int llevel) return 0; } -int ldap_connect(char *_ld_name) +int oldap_connect(char *_ld_name) { return ldap_connect_ex(_ld_name, L_DBG); } diff --git a/src/modules/ldap/ldap_connect.h b/src/modules/ldap/ldap_connect.h index 32a39e8c57..725e55cd90 100644 --- a/src/modules/ldap/ldap_connect.h +++ b/src/modules/ldap/ldap_connect.h @@ -31,7 +31,7 @@ #include "../../core/str.h" #include "../../core/dprint.h" -extern int ldap_connect(char *_ld_name); +extern int oldap_connect(char *_ld_name); extern int ldap_disconnect(char *_ld_name); extern int ldap_reconnect(char *_ld_name); extern int ldap_get_vendor_version(char **_version); diff --git a/src/modules/ldap/ldap_mod.c b/src/modules/ldap/ldap_mod.c index 4eb4118c5b..1fea95e458 100644 --- a/src/modules/ldap/ldap_mod.c +++ b/src/modules/ldap/ldap_mod.c @@ -167,7 +167,7 @@ static int child_init(int rank) return -1; } - if(ldap_connect(ld_name) != 0) { + if(oldap_connect(ld_name) != 0) { LM_ERR("[%s]: failed to connect to LDAP host(s)\n", ld_name); ldap_disconnect(ld_name); return -1;

1 0

git:master:b6e264c9: uac: exposed internal flags for $uac_req(key) variable
by Daniel-Constantin Mierla 22 Dec '21

22 Dec '21

Module: kamailio Branch: master Commit: b6e264c9780fc0432e6e746f473024e41bc1126b URL: https://github.com/kamailio/kamailio/commit/b6e264c9780fc0432e6e746f473024e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-22T08:37:40+01:00 uac: exposed internal flags for $uac_req(key) variable - if set to 1, the password is considered to be HA1 value - GH #2982 --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/b6e264c9780fc0432e6e746f473024e… Patch: https://github.com/kamailio/kamailio/commit/b6e264c9780fc0432e6e746f473024e… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index d906a1c27f..e5ea420d72 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -43,6 +43,8 @@ #include "uac_send.h" #include "uac_reg.h" +#define UAC_SEND_FL_HA1 (1<<0) + #define MAX_UACH_SIZE 2048 #define MAX_UACB_SIZE 32768 #define MAX_UACD_SIZE 128 @@ -492,6 +494,19 @@ int pv_set_uac_req(struct sip_msg* msg, pv_param_t *param, } _uac_req.evtype = tval->ri; break; + case 17: + if(tval==NULL) + { + _uac_req.flags = 0; + return 0; + } + if(!(tval->flags&PV_VAL_INT)) + { + LM_ERR("Invalid value type\n"); + return -1; + } + _uac_req.flags = tval->ri; + break; } return 0; } @@ -528,6 +543,8 @@ int pv_parse_uac_req_name(pv_spec_p sp, str *in) case 5: if(strncmp(in->s, "auser", 5)==0) sp->pvp.pvn.u.isname.name.n = 9; + else if(strncmp(in->s, "flags", 5)==0) + sp->pvp.pvn.u.isname.name.n = 17; else goto error; break; case 6: @@ -721,8 +738,8 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) struct hdr_field *hdr; HASHHEX response; str *new_auth_hdr = NULL; - static struct authenticate_body auth; - struct uac_credential cred; + static authenticate_body_t auth; + uac_credential_t cred; char b_hdrs[MAX_UACH_SIZE]; str s_hdrs; uac_req_t uac_r; @@ -771,6 +788,9 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) cred.realm = auth.realm; cred.user = tp->s_auser; cred.passwd = tp->s_apasswd; + if(tp->flags & UAC_SEND_FL_HA1) { + cred.aflags = UAC_FLCRED_HA1; + } do_uac_auth(&tp->s_method, &tp->s_ruri, &cred, &auth, response); new_auth_hdr=build_authorization_hdr(ps->code, &tp->s_ruri, &cred,

1 0

[kamailio/kamailio] Potential resource leaks (Issue #2983)
by ryancaicse 22 Dec '21

22 Dec '21

`fclose(pf);` should be put before `Line 295`? https://github.com/kamailio/kamailio/blob/1ddc27f199061025a6a43da3e8a1388fc… -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2983 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2983(a)github.com>

3 6

git:master:84cdc334: auth_identity: close file in case of errors
by Daniel-Constantin Mierla 22 Dec '21

22 Dec '21

Module: kamailio Branch: master Commit: 84cdc33429c61fe7cac91cbedf96bef560267313 URL: https://github.com/kamailio/kamailio/commit/84cdc33429c61fe7cac91cbedf96bef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-22T08:12:20+01:00 auth_identity: close file in case of errors - GH #2983 --- Modified: src/modules/auth_identity/auth_identity.c --- Diff: https://github.com/kamailio/kamailio/commit/84cdc33429c61fe7cac91cbedf96bef… Patch: https://github.com/kamailio/kamailio/commit/84cdc33429c61fe7cac91cbedf96bef… --- diff --git a/src/modules/auth_identity/auth_identity.c b/src/modules/auth_identity/auth_identity.c index 4b4bb4bb08..d43df5a6c5 100644 --- a/src/modules/auth_identity/auth_identity.c +++ b/src/modules/auth_identity/auth_identity.c @@ -359,18 +359,22 @@ static int mod_init(void) } if (x509_get_notafter(&glb_imycertnotafter, pmycert)) { LOG(L_ERR, "AUTH_IDENTITY:mod_init: Error getting certificate expiration date\n"); + fclose(hpemfile); return -13; } if (x509_get_notbefore(&ttmp, pmycert)) { LOG(L_ERR, "AUTH_IDENTITY:mod_init: Error getting certificate validity date\n"); + fclose(hpemfile); return -13; } if ((tnow=time(0)) < 0) { LOG(L_ERR, "AUTH_IDENTITY:mod_init: time error %s\n", strerror(errno)); + fclose(hpemfile); return -13; } if (tnow < ttmp || tnow > glb_imycertnotafter) { LOG(L_ERR, "AUTH_IDENTITY:mod_init: Date of certificate is invalid (%s)\n", glb_sservercertpath); + fclose(hpemfile); return -14; }

1 0

git:master:81b8eb2c: ctl: implement long and long long types of values
by Daniel-Constantin Mierla 21 Dec '21

21 Dec '21

Module: kamailio Branch: master Commit: 81b8eb2c2f8e3fb370185bad05bd77656351dd06 URL: https://github.com/kamailio/kamailio/commit/81b8eb2c2f8e3fb370185bad05bd776… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-21T10:31:01+01:00 ctl: implement long and long long types of values - convert/store from/to double, based on supported types by binrpc, similar to xmlrpc --- Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/81b8eb2c2f8e3fb370185bad05bd776… Patch: https://github.com/kamailio/kamailio/commit/81b8eb2c2f8e3fb370185bad05bd776…

1 0

git:master:ff2d9e84: xmlrpc: implemented specifier for long and long long types of values
by Daniel-Constantin Mierla 21 Dec '21

21 Dec '21

Module: kamailio Branch: master Commit: ff2d9e84e43e87483cacc6bdbcf875f650b4d292 URL: https://github.com/kamailio/kamailio/commit/ff2d9e84e43e87483cacc6bdbcf875f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-21T09:07:17+01:00 xmlrpc: implemented specifier for long and long long types of values - they are mapped over double, xmlrpc defines only int and double types http://xmlrpc.com/spec.md --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/ff2d9e84e43e87483cacc6bdbcf875f… Patch: https://github.com/kamailio/kamailio/commit/ff2d9e84e43e87483cacc6bdbcf875f…

1 0

git:master:04763fe7: core: utils/srjon - macros to get long long values
by Daniel-Constantin Mierla 20 Dec '21

20 Dec '21

Module: kamailio Branch: master Commit: 04763fe7de760005535e145f7fd783bbb60b2586 URL: https://github.com/kamailio/kamailio/commit/04763fe7de760005535e145f7fd783b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-20T10:14:27+01:00 core: utils/srjon - macros to get long long values --- Modified: src/core/utils/srjson.h --- Diff: https://github.com/kamailio/kamailio/commit/04763fe7de760005535e145f7fd783b… Patch: https://github.com/kamailio/kamailio/commit/04763fe7de760005535e145f7fd783b… --- diff --git a/src/core/utils/srjson.h b/src/core/utils/srjson.h index dd56449340..dce2ae9252 100644 --- a/src/core/utils/srjson.h +++ b/src/core/utils/srjson.h @@ -53,6 +53,8 @@ extern "C" #define SRJSON_GET_UINT(sj) ((unsigned int)((sj)->valuedouble)) #define SRJSON_GET_LONG(sj) ((long)((sj)->valuedouble)) #define SRJSON_GET_ULONG(sj) ((unsigned long)((sj)->valuedouble)) +#define SRJSON_GET_LLONG(sj) ((long long)((sj)->valuedouble)) +#define SRJSON_GET_ULLONG(sj) ((unsigned long long)((sj)->valuedouble)) /* The srjson node structure: */ typedef struct srjson {

1 0

git:master:92683311: jsonrpcs: support for long/long values in rpc messages
by Daniel-Constantin Mierla 20 Dec '21

20 Dec '21

Module: kamailio Branch: master Commit: 92683311d16dafe56951d9603a3a1e9a1b219d9a URL: https://github.com/kamailio/kamailio/commit/92683311d16dafe56951d9603a3a1e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-20T10:15:36+01:00 jsonrpcs: support for long/long values in rpc messages - l and j for long and unsigned long - L and J for long long and unsigned long long --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/92683311d16dafe56951d9603a3a1e9… Patch: https://github.com/kamailio/kamailio/commit/92683311d16dafe56951d9603a3a1e9… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index a5a92e1537..a966f6438e 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -484,6 +484,18 @@ static srjson_t* jsonrpc_print_value(jsonrpc_ctx_t* ctx, char fmt, va_list* ap) case 'f': nj = srjson_CreateNumber(ctx->jrpl, va_arg(*ap, double)); break; + case 'l': + nj = srjson_CreateNumber(ctx->jrpl, va_arg(*ap, long)); + break; + case 'j': + nj = srjson_CreateNumber(ctx->jrpl, va_arg(*ap, unsigned long)); + break; + case 'L': + nj = srjson_CreateNumber(ctx->jrpl, va_arg(*ap, long long)); + break; + case 'J': + nj = srjson_CreateNumber(ctx->jrpl, va_arg(*ap, unsigned long long)); + break; case 'b': nj = srjson_CreateBool(ctx->jrpl, ((va_arg(*ap, int)==0)?0:1)); break; @@ -586,6 +598,10 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) { int *int_ptr; unsigned int *uint_ptr; + long *long_ptr; + unsigned long *ulong_ptr; + long long *llong_ptr; + unsigned long long *ullong_ptr; char **char_ptr; double *double_ptr; str *str_ptr; @@ -635,6 +651,22 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) double_ptr = va_arg(ap, double*); *double_ptr = ctx->req_node->valuedouble; break; + case 'l': /* Long */ + long_ptr = va_arg(ap, long*); + *long_ptr = SRJSON_GET_LONG(ctx->req_node); + break; + case 'j': /* Unsigned Long */ + ulong_ptr = va_arg(ap, unsigned long*); + *ulong_ptr = SRJSON_GET_ULONG(ctx->req_node); + break; + case 'L': /* Long Long */ + llong_ptr = va_arg(ap, long long*); + *llong_ptr = SRJSON_GET_LLONG(ctx->req_node); + break; + case 'J': /* Unsigned Long Long */ + ullong_ptr = va_arg(ap, unsigned long long*); + *ullong_ptr = SRJSON_GET_ULLONG(ctx->req_node); + break; case 's': /* zero terminated string */ char_ptr = va_arg(ap, char**); if(ctx->req_node->type==srjson_String) {

1 0

[kamailio/kamailio] kemi python3: exception occur when import logging module (#2885)
by Minh 20 Dec '21

20 Dec '21

### Description kemi python3: exception occur when import logging module  ### Troubleshooting #### Reproduction very simple to reproduce is add this line to python kemi file ``` import logging ``` #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages ``` 0(49) INFO: <core> [core/tcp_main.c:4983]: init_tcp(): using epoll_lt as the io watch method (auto detected) 0(49) WARNING: outbound [outbound_mod.c:121]: mod_init(): "stun" module is not loaded. STUN is required to use outbound with UDP. 0(49) INFO: <core> [core/kemi.c:105]: sr_kemi_core_info(): KAMAILIO PYTHON3 APPLICATION INSTANTIATE CLASS OBJECT 0(49) INFO: <core> [core/kemi.c:105]: sr_kemi_core_info(): KAMAILIO INITIATION 0(49) INFO: <core> [main.c:3030]: main(): processes (at least): 25 - shm size: 268435456 - pkg size: 16777216 0(49) INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 0(49) INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 Exception ignored in: <function _releaseLock at 0x7fb7ed1d3f28> Traceback (most recent call last): File "/usr/lib/python3.7/logging/__init__.py", line 226, in _releaseLock _lock.release() RuntimeError: cannot release un-acquired lock Ignoring exception from logging atfork <_StderrHandler <stderr> (WARNING)> release method: cannot release un-acquired lock 1(50) INFO: <core> [core/kemi.c:105]: sr_kemi_core_info(): KAMAILIO CHILD PROCESS INITIALIZED 1 Exception ignored in: <function _releaseLock at 0x7fb7ed1d3f28> Traceback (most recent call last): File "/usr/lib/python3.7/logging/__init__.py", line 226, in _releaseLock Exception ignored in: <function _releaseLock at 0x7fb7ed1d3f28> Traceback (most recent call last): File "/usr/lib/python3.7/logging/__init__.py", line 226, in _releaseLock Exception ignored in: <function _releaseLock at 0x7fb7ed1d3f28> Traceback (most recent call last): File "/usr/lib/python3.7/logging/__init__.py", line 226, in _releaseLock _lock.release() Exception ignored in: <function _releaseLock at 0x7fb7ed1d3f28> Traceback (most recent call last): File "/usr/lib/python3.7/logging/__init__.py", line 226, in _releaseLock _lock.release() _lock.release() ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` Test on `5.5.2` and `5.4.7` both occur the issue ``` root@c011e17b1e00:/opt/siproxy# kamailio -v version: kamailio 5.5.2 (x86_64/linux) 55e232 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 55e232 compiled on 11:54:55 Oct 14 2021 with gcc 8.3.0 ``` ``` root@sgcoordinator1:/opt# kamailio -v version: kamailio 5.4.5 (x86_64/linux) c46342 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: c46342 compiled on 07:26:04 Jul 23 2021 with gcc 8.3.0 ``` * **Operating System**: occur on debian or docker as well ``` Linux c011e17b1e00 5.10.47-linuxkit #1 SMP Sat Jul 3 21:51:47 UTC 2021 x86_64 GNU/Linux Linux machine 4.19.0-16-cloud-amd64 #1 SMP Debian 4.19.181-1 (2021-03-19) x86_64 GNU/Linux ``` -- 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/2885

4 10

git:master:bd42130e: misc/examples: kemi - sanity checks for response in python script
by Daniel-Constantin Mierla 20 Dec '21

20 Dec '21

Module: kamailio Branch: master Commit: bd42130e3cfb87856b4b0431de50eccdd4324f9f URL: https://github.com/kamailio/kamailio/commit/bd42130e3cfb87856b4b0431de50ecc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-20T08:55:51+01:00 misc/examples: kemi - sanity checks for response in python script --- Modified: misc/examples/kemi/kamailio-basic-kemi-python.py --- Diff: https://github.com/kamailio/kamailio/commit/bd42130e3cfb87856b4b0431de50ecc… Patch: https://github.com/kamailio/kamailio/commit/bd42130e3cfb87856b4b0431de50ecc… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-python.py b/misc/examples/kemi/kamailio-basic-kemi-python.py index 601daa3687..f62f392594 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python.py @@ -172,7 +172,7 @@ def ksr_route_reqinit(self, msg): KSR.sl.sl_send_reply(200,"Keepalive") return -255 - if KSR.sanity.sanity_check(1511, 7)<0 : + if KSR.sanity.sanity_check(17895, 7)<0 : KSR.err("Malformed SIP message from " + KSR.pv.get("$si") + ":" + str(KSR.pv.get("$sp")) +"\n") return -255 @@ -372,7 +372,14 @@ def ksr_failure_manage(self, msg): # SIP response handling # -- equivalent of reply_route{} def ksr_reply_route(self, msg): - KSR.info("===== response - from kamailio python script\n") + KSR.dbg("response handling - python script\n") + + if KSR.sanity.sanity_check(17604, 6)<0 : + KSR.err("Malformed SIP response from " + + KSR.pv.get("$si") + ":" + str(KSR.pv.get("$sp")) +"\n") + KSR.set_drop() + return -255 + return 1

1 0

[kamailio/kamailio] How to change language in siremis web interface? (Issue #2979)
by Mohammadb06 20 Dec '21

20 Dec '21

Hello everyone I’m new in siremis as web interface of kamailio and I immediately need your help,I installed kamailio and siremis and login in siremis web interface,I can work with it but now I have a problem. I want to change menu language there is an option in(setting->translate->manage languages) add my desired language and click save and i see this error: Error message: #2, count(): Parameter must be an array or an object that implements Countable Script name and line number of error: /var/www/siremis-5.3.x/siremis/modules/translation/lib/LangPackCreator.php ![Screenshot from 2021-12-19 12-46-52](https://user-images.githubusercontent.com/84019067/146672269-4734… what’s wrong and what should I do to resolve it? thank you for your help and I am pleased to receive your response -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2979 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2979(a)github.com>

2 2

git:master:99a9f27c: misc/examples: kemi - update lua sample config
by Daniel-Constantin Mierla 19 Dec '21

19 Dec '21

Module: kamailio Branch: master Commit: 99a9f27c8d24a06f201b4713f7a2bfeb37092482 URL: https://github.com/kamailio/kamailio/commit/99a9f27c8d24a06f201b4713f7a2bfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-19T17:55:55+01:00 misc/examples: kemi - update lua sample config --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/99a9f27c8d24a06f201b4713f7a2bfe… Patch: https://github.com/kamailio/kamailio/commit/99a9f27c8d24a06f201b4713f7a2bfe… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index a406b6429c..7b1476efb1 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -80,18 +80,20 @@ function ksr_request_route() return 1; end + -- handle retransmissions + if not KSR.is_ACK() then + if KSR.tmx.t_precheck_trans()>0 then + KSR.tm.t_check_trans(); + return 1; + end + if KSR.tm.t_check_trans()==0 then return 1 end + end + -- handle requests within SIP dialogs ksr_route_withindlg(); -- -- only initial requests (no To tag) - -- handle retransmissions - if KSR.tmx.t_precheck_trans()>0 then - KSR.tm.t_check_trans(); - return 1; - end - if KSR.tm.t_check_trans()==0 then return 1 end - -- authentication ksr_route_auth(); @@ -158,6 +160,11 @@ end -- Per SIP request initial checks function ksr_route_reqinit() + -- no connect for sending replies + KSR.set_reply_no_connect(); + -- enforce symmetric signaling + -- send back replies to the source address of request + KSR.force_rport(); if not KSR.is_myself_srcip() then local srcip = KSR.kx.get_srcip(); if KSR.htable.sht_match_name("ipban", "eq", srcip) > 0 then @@ -194,7 +201,7 @@ function ksr_route_reqinit() KSR.x.exit(); end - if KSR.sanity.sanity_check(1511, 7)<0 then + if KSR.sanity.sanity_check(17895, 7)<0 then KSR.err("malformed SIP message from " .. KSR.kx.get_srcip() .. ":" .. KSR.kx.get_srcport() .."\n"); KSR.x.exit(); @@ -319,7 +326,6 @@ function ksr_route_natdetect() if not KSR.nathelper then return 1; end - KSR.force_rport(); if KSR.nathelper.nat_uac_test(19)>0 then if KSR.is_REGISTER() then KSR.nathelper.fix_nated_register();

1 0

git:master:8e7f2e6a: dlgs: optimize dlgs_init, if/else path are identical
by Henning Westerholt 17 Dec '21

17 Dec '21

Module: kamailio Branch: master Commit: 8e7f2e6a158bb2c59600b03be3c7e6eefc416180 URL: https://github.com/kamailio/kamailio/commit/8e7f2e6a158bb2c59600b03be3c7e6e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-12-17T12:53:37Z dlgs: optimize dlgs_init, if/else path are identical --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8e7f2e6a158bb2c59600b03be3c7e6e… Patch: https://github.com/kamailio/kamailio/commit/8e7f2e6a158bb2c59600b03be3c7e6e… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index 46de9d5c44..a0c7af791e 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -174,11 +174,7 @@ static int ki_dlgs_init(sip_msg_t *msg, str *src, str *dst, str *data) if(msg->first_line.type == SIP_REQUEST) { rtype = SIP_REQUEST; - if(msg->first_line.u.request.method_value == METHOD_INVITE) { - rmethod = METHOD_INVITE; - } else { - rmethod = msg->first_line.u.request.method_value; - } + rmethod = msg->first_line.u.request.method_value; } else { rtype = SIP_REPLY; if(msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) ||

1 0

git:master:a993f153: kemix: added KSR.kx.get_rcvaddr_sock() - return local received address in socket format
by Daniel-Constantin Mierla 17 Dec '21

17 Dec '21

Module: kamailio Branch: master Commit: a993f1538918c6c31c5da031e1d903250c4a9048 URL: https://github.com/kamailio/kamailio/commit/a993f1538918c6c31c5da031e1d9032… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-17T08:45:11+01:00 kemix: added KSR.kx.get_rcvaddr_sock() - return local received address in socket format --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a993f1538918c6c31c5da031e1d9032… Patch: https://github.com/kamailio/kamailio/commit/a993f1538918c6c31c5da031e1d9032… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 3fb079349a..80d7807740 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -585,6 +585,38 @@ static sr_kemi_xval_t* ki_kx_get_rcv_sock_name(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rcvaddr_sock(sip_msg_t *msg) +{ + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + + } + + if(msg->rcv.bind_address==NULL || msg->rcv.bind_address->sock_str.s==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + } + + if (msg->rcv.bind_address->sock_str.len + 1 >= pv_get_buffer_size()) { + LM_ERR("local buffer size exceeded\n"); + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.v.s.s = pv_get_buffer(); + strncpy(_sr_kemi_kx_xval.v.s.s, msg->rcv.bind_address->sock_str.s, + msg->rcv.bind_address->sock_str.len); + _sr_kemi_kx_xval.v.s.len = msg->rcv.bind_address->sock_str.len; + _sr_kemi_kx_xval.v.s.s[_sr_kemi_kx_xval.v.s.len] = '\0'; + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + return &_sr_kemi_kx_xval; +} + /** * */ @@ -1473,6 +1505,11 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_rcvaddr_sock"), + SR_KEMIP_XVAL, ki_kx_get_rcvaddr_sock, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_proto"), SR_KEMIP_XVAL, ki_kx_get_proto, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:2aae3ee3: pv: added $Ras - return local received address in socket format
by Daniel-Constantin Mierla 17 Dec '21

17 Dec '21

Module: kamailio Branch: master Commit: 2aae3ee39ea56e349879e25234a75aa79ff4284d URL: https://github.com/kamailio/kamailio/commit/2aae3ee39ea56e349879e25234a75aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-17T08:34:46+01:00 pv: added $Ras - return local received address in socket format --- 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/2aae3ee39ea56e349879e25234a75aa… Patch: https://github.com/kamailio/kamailio/commit/2aae3ee39ea56e349879e25234a75aa… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 9de6bc49af..c34ce5dd31 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -406,6 +406,9 @@ static pv_export_t mod_pvs[] = { {{"rz", (sizeof("rz")-1)}, /* */ PVT_OTHER, pv_get_ruri_attr, 0, 0, 0, pv_init_iname, 5}, + {{"Ras", (sizeof("Ras")-1)}, /* */ + PVT_OTHER, pv_get_rcvaddr_socket, 0, + 0, 0, 0, 0}, {{"Ri", (sizeof("Ri")-1)}, /* */ PVT_OTHER, pv_get_rcvip, 0, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index de5d5b41c8..afccbd4c7f 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -932,6 +932,18 @@ int pv_get_rcvaddr_uri_full(struct sip_msg *msg, pv_param_t *param, return pv_get_rcvaddr_uri_helper(msg, param, 1, res); } +int pv_get_rcvaddr_socket(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address==NULL || msg->rcv.bind_address->sock_str.s==NULL) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &msg->rcv.bind_address->sock_str); +} + int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 5e0f6860b5..ffb7d734ba 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -166,6 +166,9 @@ int pv_get_rcvaddr_uri(struct sip_msg *msg, pv_param_t *param, int pv_get_rcvaddr_uri_full(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_rcvaddr_socket(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_rcvsname(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:d132d595: kemix: rename get_sas() to get_srcaddr_sock()
by Daniel-Constantin Mierla 17 Dec '21

17 Dec '21

Module: kamailio Branch: master Commit: d132d595c7a75e1206f4d42973966767e305f4fb URL: https://github.com/kamailio/kamailio/commit/d132d595c7a75e1206f4d4297396676… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-17T08:38:25+01:00 kemix: rename get_sas() to get_srcaddr_sock() --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d132d595c7a75e1206f4d4297396676… Patch: https://github.com/kamailio/kamailio/commit/d132d595c7a75e1206f4d4297396676… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 089ad5e326..3fb079349a 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -1103,7 +1103,7 @@ static sr_kemi_xval_t* ki_kx_get_srcuri(sip_msg_t *msg) /** * */ -static sr_kemi_xval_t* ki_kx_get_sas(sip_msg_t *msg) +static sr_kemi_xval_t* ki_kx_get_srcaddr_sock(sip_msg_t *msg) { str ssock; @@ -1403,8 +1403,8 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("get_sas"), - SR_KEMIP_XVAL, ki_kx_get_sas, + { str_init("kx"), str_init("get_srcaddr_sock"), + SR_KEMIP_XVAL, ki_kx_get_srcaddr_sock, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:bd528072: core: parser sdp - check if delimiter exceeds body limit
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: master Commit: bd5280726a9842b257afabae548853d000ecd249 URL: https://github.com/kamailio/kamailio/commit/bd5280726a9842b257afabae548853d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T10:01:34+01:00 core: parser sdp - check if delimiter exceeds body limit --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/bd5280726a9842b257afabae548853d… Patch: https://github.com/kamailio/kamailio/commit/bd5280726a9842b257afabae548853d… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index 14779e4d12..c3c94c37da 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -645,12 +645,16 @@ static int parse_mixed_content(str *mixed_body, str delimiter, sdp_info_t* _sdp) d1p = d2p; if (d1p == NULL || d1p >= bodylimit) break; /* No applications left */ + if(d1p + delimiter.len + 2 > bodylimit) { + LM_ERR("failed parsing [%.*s]\n", mixed_body->len, mixed_body->s); + return -1; + } d2p = find_next_sdp_line_delimiter(d1p, bodylimit, delimiter, bodylimit); /* d2p is text limit for application parsing */ - memset(&hf,0, sizeof(struct hdr_field)); + memset(&hf, 0, sizeof(struct hdr_field)); rest = eat_line(d1p + delimiter.len + 2, d2p - d1p - delimiter.len - 2); if ( rest > d2p ) { - LM_ERR("Unparsable <%.*s>\n", (int)(d2p-d1p), d1p); + LM_ERR("unparsable [%.*s]\n", (int)(d2p-d1p), d1p); return -1; } no_eoh_found = 1;

1 0

git:master:03acf834: core: parser - clang format parser_f.c
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: master Commit: 03acf834a19689d6c3efcea93e48985d3e7ffc37 URL: https://github.com/kamailio/kamailio/commit/03acf834a19689d6c3efcea93e48985… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T09:44:54+01:00 core: parser - clang format parser_f.c --- Modified: src/core/parser/parser_f.c --- Diff: https://github.com/kamailio/kamailio/commit/03acf834a19689d6c3efcea93e48985… Patch: https://github.com/kamailio/kamailio/commit/03acf834a19689d6c3efcea93e48985… --- diff --git a/src/core/parser/parser_f.c b/src/core/parser/parser_f.c index f1a532fd6f..c124f68cc5 100644 --- a/src/core/parser/parser_f.c +++ b/src/core/parser/parser_f.c @@ -15,8 +15,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -28,22 +28,27 @@ */ -#include "parser_f.h" +#include "parser_f.h" #include "../ut.h" /** @brief returns pointer to next line or after the end of buffer */ -char* eat_line(char* buffer, unsigned int len) +char *eat_line(char *buffer, unsigned int len) { - char* nl; + char *nl; /* jku .. replace for search with a library function; not conforming as I do not care about CR */ - nl=(char *)q_memchr( buffer, '\n', len ); - if ( nl ) { - if ( nl + 1 < buffer+len) nl++; - if (( nl+1<buffer+len) && * nl=='\r') nl++; - } else nl=buffer+len; + nl = (char *)q_memchr(buffer, '\n', len); + if(nl) { + if(nl + 1 < buffer + len) { + nl++; + } + if((nl + 1 < buffer + len) && *nl == '\r') { + nl++; + } + } else { + nl = buffer + len; + } return nl; } -

1 0

git:5.5:3cd4676c: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: 3cd4676ce5071f83fccc0e16946c9e0376b018f6 URL: https://github.com/kamailio/kamailio/commit/3cd4676ce5071f83fccc0e16946c9e0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-16T09:32:07+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/3cd4676ce5071f83fccc0e16946c9e0… Patch: https://github.com/kamailio/kamailio/commit/3cd4676ce5071f83fccc0e16946c9e0… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 86dde8f336..2bba8c8115 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -238,6 +238,14 @@ Chapter 1. Admin Guide module that uses libssl (OpenSSL library). A safe option is to have the tls module loaded first (be in the first "loadmodule" in Kamailio.cfg). + IMPORTANT: using this module compiled with newer versions of libssl + (e.g., v1.1+) may require Kamailio to be started with --atexit=no + command line parameters to avoid calling C atexit callbacks inside the + process ending during daemonize procedure as well as during shut down, + which can lead to crashes because it destroys and then accesses shared + memory. For example, such case has been reported for Ubuntu 20.04 or + RedHat 8. + 2. Quick Start The default kamailio.cfg file has basic tls support included, it has to

1 0

git:5.5:d06fbbea: misc/examples: kemi - sanity check for response in lua script
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: d06fbbea95b33934d841f37bff6ae2b32dde2f87 URL: https://github.com/kamailio/kamailio/commit/d06fbbea95b33934d841f37bff6ae2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:31:55+01:00 misc/examples: kemi - sanity check for response in lua script (cherry picked from commit 96ba8bdf87221c985d8198fe36f7f0bd9858a738) --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/d06fbbea95b33934d841f37bff6ae2b… Patch: https://github.com/kamailio/kamailio/commit/d06fbbea95b33934d841f37bff6ae2b… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index bddabbaa89..a406b6429c 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -195,7 +195,7 @@ function ksr_route_reqinit() end if KSR.sanity.sanity_check(1511, 7)<0 then - KSR.err("Malformed SIP message from " + KSR.err("malformed SIP message from " .. KSR.kx.get_srcip() .. ":" .. KSR.kx.get_srcport() .."\n"); KSR.x.exit(); end @@ -418,6 +418,11 @@ end -- SIP response handling -- equivalent of reply_route{} function ksr_reply_route() - KSR.info("===== response - from kamailio lua script\n"); + KSR.dbg("response - from kamailio lua script\n"); + if KSR.sanity.sanity_check(17604, 6)<0 then + KSR.err("malformed SIP response from " + .. KSR.kx.get_srcip() .. ":" .. KSR.kx.get_srcport() .."\n"); + KSR.x.drop(); + end return 1; end

1 0

git:5.5:17bbfe97: Makefile.defs: use sed instead of awk for detecting glibc version
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: 17bbfe97179a2965b145b946b76ba458c2af8bd5 URL: https://github.com/kamailio/kamailio/commit/17bbfe97179a2965b145b946b76ba45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:30:33+01:00 Makefile.defs: use sed instead of awk for detecting glibc version (cherry picked from commit 225a59475c91e154ce0a7f0ec252be841a5a8ce5) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/17bbfe97179a2965b145b946b76ba45… Patch: https://github.com/kamailio/kamailio/commit/17bbfe97179a2965b145b946b76ba45… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index ab3d6b7e27..3793705039 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1888,7 +1888,7 @@ ifeq ($(OS), linux) endif ifeq ($(CC_NAME), gcc) # link librt for glibc <= 2.17 - GLIBCVER:=$(shell ldd --version | head -1 | awk '{ sub(/\./, "", $NF); print $NF }' ) + GLIBCVER=$(shell ldd --version | head -1 | sed -e 's/^.* //' -e 's/\.//' ) ifeq ($(shell [ $(GLIBCVER) -le 217 ] && echo librt), librt) LIBS+=-lrt endif

1 0

git:5.5:e1fb93fa: tls: docs - added note about --atexit=no cli param for newer libssl versions
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: e1fb93fa9e3b79f043fd6b7379a61340ba93e071 URL: https://github.com/kamailio/kamailio/commit/e1fb93fa9e3b79f043fd6b7379a6134… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:31:02+01:00 tls: docs - added note about --atexit=no cli param for newer libssl versions (cherry picked from commit 8dc18cab5bc32c1d34a9113242d230b7458d4075) --- Modified: src/modules/tls/doc/tls.xml --- Diff: https://github.com/kamailio/kamailio/commit/e1fb93fa9e3b79f043fd6b7379a6134… Patch: https://github.com/kamailio/kamailio/commit/e1fb93fa9e3b79f043fd6b7379a6134… --- diff --git a/src/modules/tls/doc/tls.xml b/src/modules/tls/doc/tls.xml index b5ea415ae7..e356d5bff7 100644 --- a/src/modules/tls/doc/tls.xml +++ b/src/modules/tls/doc/tls.xml @@ -64,6 +64,15 @@ that uses libssl (OpenSSL library). A safe option is to have the tls module loaded first (be in the first "loadmodule" in &kamailio;.cfg). </para> + <para> + IMPORTANT: using this module compiled with newer versions of libssl + (e.g., v1.1+) may require &kamailio; to be started with + <emphasis>--atexit=no</emphasis> command line parameters to avoid + calling C atexit callbacks inside the process ending during + daemonize procedure as well as during shut down, which can lead + to crashes because it destroys and then accesses shared memory. For + example, such case has been reported for Ubuntu 20.04 or RedHat 8. + </para> </section> <section id="tls.quick_start"> <title>Quick Start</title>

1 0

git:5.5:a2446f51: core: parser - clang format for parse_identityinfo.c
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: a2446f5194446ab9432aecde99522e709ecdc1e3 URL: https://github.com/kamailio/kamailio/commit/a2446f5194446ab9432aecde99522e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:31:32+01:00 core: parser - clang format for parse_identityinfo.c (cherry picked from commit 1cd480dfe6f2e06bac99b74e466e0c6bb8801279) --- Modified: src/core/parser/parse_identityinfo.c --- Diff: https://github.com/kamailio/kamailio/commit/a2446f5194446ab9432aecde99522e7… Patch: https://github.com/kamailio/kamailio/commit/a2446f5194446ab9432aecde99522e7…

1 0

git:5.5:d7c030f5: core: parser/sdp - check for delimiter size done before comparison
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: d7c030f576fa87b5959b7156c6b2077d76bb1fee URL: https://github.com/kamailio/kamailio/commit/d7c030f576fa87b5959b7156c6b2077… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:29:59+01:00 core: parser/sdp - check for delimiter size done before comparison (cherry picked from commit b83810eb1eb70f326698db874a1f67cf6a8d06cf) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/d7c030f576fa87b5959b7156c6b2077… Patch: https://github.com/kamailio/kamailio/commit/d7c030f576fa87b5959b7156c6b2077… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 144d63b537..c62a347ddc 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -794,12 +794,12 @@ char *find_sdp_line_delimiter(char* p, char* plimit, str delimiter) return NULL; /* We matched '--', * now let's match the boundary delimiter */ + if(cp1+2+delimiter.len >= plimit) + return NULL; if (strncmp(cp1+2, delimiter.s, delimiter.len) == 0) break; else cp = cp1 + 2 + delimiter.len; - if (cp >= plimit) - return NULL; } if (cp1[-1] == '\n' || cp1[-1] == '\r') return cp1;

1 0

git:5.5:27875047: presence: info logs instead of error for not maching conditions
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: 27875047db766cc7cb3a4d5d7638bdafd98e09b1 URL: https://github.com/kamailio/kamailio/commit/27875047db766cc7cb3a4d5d7638bda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:30:08+01:00 presence: info logs instead of error for not maching conditions (cherry picked from commit f42b6c5cf2ee9861cb1eed016a5ddcc499d2b854) --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/27875047db766cc7cb3a4d5d7638bda… Patch: https://github.com/kamailio/kamailio/commit/27875047db766cc7cb3a4d5d7638bda… --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index a7629a4e92..0ba00f0197 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -1369,10 +1369,10 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, send_412: if(!ruid) { - LM_ERR("No E_Tag match %*s\n", presentity->etag.len, + LM_INFO("No E-Tag match %*s\n", presentity->etag.len, presentity->etag.s); } else { - LM_ERR("No ruid match %*s\n", ruid->len, ruid->s); + LM_INFO("No ruid match %*s\n", ruid->len, ruid->s); } if(msg != NULL) {

1 0

git:5.5:f387209c: core: parser/sdp - cast to unsigned for left shifting
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: f387209ca7efd65a1fd7ee510d899fec6e080289 URL: https://github.com/kamailio/kamailio/commit/f387209ca7efd65a1fd7ee510d899fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:29:28+01:00 core: parser/sdp - cast to unsigned for left shifting (cherry picked from commit c1ec3857f360c806b7cc856b8e6ae3d5362ef49f) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/f387209ca7efd65a1fd7ee510d899fe… Patch: https://github.com/kamailio/kamailio/commit/f387209ca7efd65a1fd7ee510d899fe… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 8f189cf207..e118b4ac33 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -52,7 +52,10 @@ static struct { #define READ(val) \ - (*(val + 0) + (*(val + 1) << 8) + (*(val + 2) << 16) + (*(val + 3) << 24)) + ((unsigned int)(*(val + 0)) \ + + ((unsigned int)(*(val + 1)) << 8) \ + + ((unsigned int)(*(val + 2)) << 16) \ + + ((unsigned int)(*(val + 3)) << 24)) #define advance(_ptr,_n,_str,_error) \ do{\ if ((_ptr)+(_n)>(_str).s+(_str).len)\

1 0

git:5.5:4b9987bd: core: parser/sdp - coherent indentation of two functions
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: 4b9987bd630d78aa27ea392491989ddfeeda0d98 URL: https://github.com/kamailio/kamailio/commit/4b9987bd630d78aa27ea392491989dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:29:49+01:00 core: parser/sdp - coherent indentation of two functions (cherry picked from commit 1b5756ae9f67c3907c134eb725f19c875cccd913) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/4b9987bd630d78aa27ea392491989dd… Patch: https://github.com/kamailio/kamailio/commit/4b9987bd630d78aa27ea392491989dd… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index e118b4ac33..144d63b537 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -742,7 +742,7 @@ char* get_sdp_hdr_field(char* buf, char* end, struct hdr_field* hdr) } /* eliminate leading whitespace */ - tmp=eat_lws_end(tmp, end); + tmp=eat_lws_end(tmp, end); if (tmp>=end) { LM_ERR("hf empty\n"); goto error; @@ -781,32 +781,32 @@ char* get_sdp_hdr_field(char* buf, char* end, struct hdr_field* hdr) char *find_sdp_line_delimiter(char* p, char* plimit, str delimiter) { - static char delimiterhead[3] = "--"; - char *cp, *cp1; - /* Iterate through body */ - cp = p; - for (;;) { - if (cp >= plimit) - return NULL; - for(;;) { - cp1 = ser_memmem(cp, delimiterhead, plimit-cp, 2); - if (cp1 == NULL) - return NULL; - /* We matched '--', - * now let's match the boundary delimiter */ - if (strncmp(cp1+2, delimiter.s, delimiter.len) == 0) - break; - else - cp = cp1 + 2 + delimiter.len; - if (cp >= plimit) - return NULL; - } - if (cp1[-1] == '\n' || cp1[-1] == '\r') - return cp1; - if (plimit - cp1 < 2 + delimiter.len) - return NULL; - cp = cp1 + 2 + delimiter.len; - } + static char delimiterhead[3] = "--"; + char *cp, *cp1; + /* Iterate through body */ + cp = p; + for (;;) { + if (cp >= plimit) + return NULL; + for(;;) { + cp1 = ser_memmem(cp, delimiterhead, plimit-cp, 2); + if (cp1 == NULL) + return NULL; + /* We matched '--', + * now let's match the boundary delimiter */ + if (strncmp(cp1+2, delimiter.s, delimiter.len) == 0) + break; + else + cp = cp1 + 2 + delimiter.len; + if (cp >= plimit) + return NULL; + } + if (cp1[-1] == '\n' || cp1[-1] == '\r') + return cp1; + if (plimit - cp1 < 2 + delimiter.len) + return NULL; + cp = cp1 + 2 + delimiter.len; + } } @@ -815,10 +815,10 @@ char *find_sdp_line_delimiter(char* p, char* plimit, str delimiter) */ char *find_next_sdp_line_delimiter(char* p, char* plimit, str delimiter, char* defptr) { - char *t; - if (p >= plimit || plimit - p < 3) - return defptr; - t = find_sdp_line_delimiter(p + 2, plimit, delimiter); - return t ? t : defptr; + char *t; + if (p >= plimit || plimit - p < 3) + return defptr; + t = find_sdp_line_delimiter(p + 2, plimit, delimiter); + return t ? t : defptr; }

1 0

git:5.5:0afcccdc: src/Makefile.defs: link -lrt if glibc <= 2.17
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: 0afcccdc46950c5b4a49024e2092ab712ba6be94 URL: https://github.com/kamailio/kamailio/commit/0afcccdc46950c5b4a49024e2092ab7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:27:31+01:00 src/Makefile.defs: link -lrt if glibc <= 2.17 - GH #2921 (cherry picked from commit 743a9d33dcc3a6220bba217c14810dafb53355b2) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/0afcccdc46950c5b4a49024e2092ab7… Patch: https://github.com/kamailio/kamailio/commit/0afcccdc46950c5b4a49024e2092ab7… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 82b8751e2e..ab3d6b7e27 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1886,6 +1886,13 @@ ifeq ($(OS), linux) ifeq ($(NO_SELECT),) C_DEFS+=-DHAVE_SELECT endif + ifeq ($(CC_NAME), gcc) + # link librt for glibc <= 2.17 + GLIBCVER:=$(shell ldd --version | head -1 | awk '{ sub(/\./, "", $NF); print $NF }' ) + ifeq ($(shell [ $(GLIBCVER) -le 217 ] && echo librt), librt) + LIBS+=-lrt + endif + endif endif ifeq ($(OS), gnu_kfreebsd)

1 0

git:5.5:88b50be1: websockets: enable KEEPALIVE_MECHANISM_CONCHECK
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: 88b50be127ca0dab57784e0ffb96d6eb44196772 URL: https://github.com/kamailio/kamailio/commit/88b50be127ca0dab57784e0ffb96d6e… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:28:55+01:00 websockets: enable KEEPALIVE_MECHANISM_CONCHECK KEEPALIVE_MECHANISM_CONCHECK was added but can't be enabled (cherry picked from commit 29c3b865d8efde8435c2217df44d1df684caaea2) --- Modified: src/modules/websocket/websocket.c --- Diff: https://github.com/kamailio/kamailio/commit/88b50be127ca0dab57784e0ffb96d6e… Patch: https://github.com/kamailio/kamailio/commit/88b50be127ca0dab57784e0ffb96d6e… --- diff --git a/src/modules/websocket/websocket.c b/src/modules/websocket/websocket.c index 5cef5d6b1a..f7273048e3 100644 --- a/src/modules/websocket/websocket.c +++ b/src/modules/websocket/websocket.c @@ -221,6 +221,7 @@ static int mod_init(void) switch(ws_keepalive_mechanism) { case KEEPALIVE_MECHANISM_PING: case KEEPALIVE_MECHANISM_PONG: + case KEEPALIVE_MECHANISM_CONCHECK: break; default: ws_keepalive_mechanism = DEFAULT_KEEPALIVE_MECHANISM;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev