Hello,
the branch 5.6 has been created, to be used for releasing v5.6.x series.
To check out this branch, the following commands can be used:
git clone https://github.com/kamailio/kamailio kamailio-5.6
cd kamailio-5.6
git checkout -b 5.6 origin/5.6
Pushing commits in this branch:
git push origin 5.6:5.6
Note that 5.6 is an official stable branch, so only bug fixes, missing
kemi exports (discuss on sr-dev if not sure) or improvements to
documentation or helper tools can be pushed to this branch.
As usual, if there is a bug fixed, commit and push first to master
branch and then cherry pick to 5.5 branch:
git cherry-pick -x COMMITID
In few weeks, the first release from branch 5.6 will be out,
respectively Kamailio v5.6.0.
Cheers,
Daniel
--
Daniel-Constantin Mierla -- www.asipto.comwww.twitter.com/miconda -- www.linkedin.com/in/miconda
Kamailio Advanced Training - Online
* https://www.asipto.com/sw/kamailio-advanced-training-online/
Hello,
the formal notification that the development for the next major version
5.6.0 is now frozen. The focus has to be on testing the master branch.
Also, the master branch should not get commits with new features till
the branch 5.6 is created, expected to happen in 2-4 weeks, a matter of
how testing goes on. Meanwhile, the commits with new features in the C
code can be pushed to personal branches, new pull requests can still be
done, but they will be merged after branching 5.6.
Can still be done commits with documentation improvements, enhancements
to related tools (e.g., kamctl, kamcmd), merging exiting pull requests
at this moment, exporting missing KEMI functions and completing the
functionality
of the new modules added for 5.6.
Once the branch 5.6 is created, new features can be pushed again to
master branch as usual. From that moment, the v5.6.0 should be out very
soon, time used for further testing but also preparing the release of
packages.
If someone is not sure if a commit brings a new feature, just make a
pull request and it can be discussed there on github portal or via
sr-dev mailing list.
A summary of what is new in upcoming 5.6 is going to be built at:
* https://www.kamailio.org/wiki/features/new-in-5.6.x
Upgrade guidelines will be collected at:
* https://www.kamailio.org/wiki/install/upgrade/5.5.x-to-5.6.0
Everyone is more than welcome to contribute to the above wiki pages,
especially to the upgrade guidelines, to help everyone else during the
migration process from v5.5.x to 5.6.x.
Cheers,
Daniel
--
Daniel-Constantin Mierla -- www.asipto.comwww.twitter.com/miconda -- www.linkedin.com/in/miconda
Module: kamailio
Branch: master
Commit: d9e0e3716cd85a4fae4587e7bf8dc6967cf19ebe
URL: https://github.com/kamailio/kamailio/commit/d9e0e3716cd85a4fae4587e7bf8dc69…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2022-05-04T16:33:08+02:00
Revert "sanity: fix sanity_reply function name for config exports"
This reverts commit eeefe7dcc2af90e7def8f1698e8f79d0dd020043.
---
Modified: src/lib/srdb1/db.c
Modified: src/lib/srdb1/db_con.h
Modified: src/modules/sanity/sanity_mod.c
---
Diff: https://github.com/kamailio/kamailio/commit/d9e0e3716cd85a4fae4587e7bf8dc69…
Patch: https://github.com/kamailio/kamailio/commit/d9e0e3716cd85a4fae4587e7bf8dc69…
---
diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c
index 5dc0cabfb7..54b66d330b 100644
--- a/src/lib/srdb1/db.c
+++ b/src/lib/srdb1/db.c
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2001-2003 FhG Fokus
* Copyright (C) 2007-2008 1&1 Internet AG
- *
+ *
* This file is part of Kamailio, a free SIP server.
*
* Kamailio is free software; you can redistribute it and/or modify
@@ -14,8 +14,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
*/
@@ -294,7 +294,7 @@ db1_con_t* db_do_init2(const str* url, void* (*new_connection)(), db_pooling_t p
LM_ERR("The configured db_url is too long\n");
return 0;
}
-
+
/* this is the root memory for this database connection. */
res = (db1_con_t*)pkg_malloc(con_size);
if (!res) {
diff --git a/src/lib/srdb1/db_con.h b/src/lib/srdb1/db_con.h
index fab02c0e62..3a026f1f93 100644
--- a/src/lib/srdb1/db_con.h
+++ b/src/lib/srdb1/db_con.h
@@ -14,8 +14,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
*/
@@ -36,7 +36,6 @@
* are used as a connection handle from modules uses the db API.
*/
typedef struct {
- long cpid; /*!< connection process id */
const str* table; /*!< Default table that should be used */
const char *tquote; /*!< Char to quote special tokens (table/column names) */
unsigned long tail; /*!< Variable length tail, database module specific */
diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c
index 832a0c2308..3f813bb021 100644
--- a/src/modules/sanity/sanity_mod.c
+++ b/src/modules/sanity/sanity_mod.c
@@ -60,7 +60,7 @@ static cmd_export_t cmds[] = {
REQUEST_ROUTE|ONREPLY_ROUTE},
{"sanity_check", (cmd_function)w_sanity_check, 2, fixup_igp_igp, 0,
REQUEST_ROUTE|ONREPLY_ROUTE},
- {"sanity_reply", (cmd_function)w_sanity_reply, 0, 0, 0,
+ {"sanity_check", (cmd_function)w_sanity_reply, 0, 0, 0,
REQUEST_ROUTE|ONREPLY_ROUTE},
{"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0, 0 },
{0, 0, 0, 0, 0, 0}
Module: kamailio
Branch: master
Commit: eeefe7dcc2af90e7def8f1698e8f79d0dd020043
URL: https://github.com/kamailio/kamailio/commit/eeefe7dcc2af90e7def8f1698e8f79d…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2022-05-04T16:25:03+02:00
sanity: fix sanity_reply function name for config exports
---
Modified: src/lib/srdb1/db.c
Modified: src/lib/srdb1/db_con.h
Modified: src/modules/sanity/sanity_mod.c
---
Diff: https://github.com/kamailio/kamailio/commit/eeefe7dcc2af90e7def8f1698e8f79d…
Patch: https://github.com/kamailio/kamailio/commit/eeefe7dcc2af90e7def8f1698e8f79d…
---
diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c
index 54b66d330b..5dc0cabfb7 100644
--- a/src/lib/srdb1/db.c
+++ b/src/lib/srdb1/db.c
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2001-2003 FhG Fokus
* Copyright (C) 2007-2008 1&1 Internet AG
- *
+ *
* This file is part of Kamailio, a free SIP server.
*
* Kamailio is free software; you can redistribute it and/or modify
@@ -14,8 +14,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
*/
@@ -294,7 +294,7 @@ db1_con_t* db_do_init2(const str* url, void* (*new_connection)(), db_pooling_t p
LM_ERR("The configured db_url is too long\n");
return 0;
}
-
+
/* this is the root memory for this database connection. */
res = (db1_con_t*)pkg_malloc(con_size);
if (!res) {
diff --git a/src/lib/srdb1/db_con.h b/src/lib/srdb1/db_con.h
index 3a026f1f93..fab02c0e62 100644
--- a/src/lib/srdb1/db_con.h
+++ b/src/lib/srdb1/db_con.h
@@ -14,8 +14,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
*/
@@ -36,6 +36,7 @@
* are used as a connection handle from modules uses the db API.
*/
typedef struct {
+ long cpid; /*!< connection process id */
const str* table; /*!< Default table that should be used */
const char *tquote; /*!< Char to quote special tokens (table/column names) */
unsigned long tail; /*!< Variable length tail, database module specific */
diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c
index 3f813bb021..832a0c2308 100644
--- a/src/modules/sanity/sanity_mod.c
+++ b/src/modules/sanity/sanity_mod.c
@@ -60,7 +60,7 @@ static cmd_export_t cmds[] = {
REQUEST_ROUTE|ONREPLY_ROUTE},
{"sanity_check", (cmd_function)w_sanity_check, 2, fixup_igp_igp, 0,
REQUEST_ROUTE|ONREPLY_ROUTE},
- {"sanity_check", (cmd_function)w_sanity_reply, 0, 0, 0,
+ {"sanity_reply", (cmd_function)w_sanity_reply, 0, 0, 0,
REQUEST_ROUTE|ONREPLY_ROUTE},
{"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0, 0 },
{0, 0, 0, 0, 0, 0}