[sr-dev] git:master:d9e0e371: Revert "sanity: fix sanity_reply function name for config exports"

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: d9e0e3716cd85a4fae4587e7bf8dc6967cf19ebe
URL: https://github.com/kamailio/kamailio/commit/d9e0e3716cd85a4fae4587e7bf8dc6967cf19ebe

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at 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/d9e0e3716cd85a4fae4587e7bf8dc6967cf19ebe.diff
Patch: https://github.com/kamailio/kamailio/commit/d9e0e3716cd85a4fae4587e7bf8dc6967cf19ebe.patch

---

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}