Module: kamailio
Branch: master
Commit: fdc4b11cc414100f5ff01cb82e3d21d51cf5629d
URL: https://github.com/kamailio/kamailio/commit/fdc4b11cc414100f5ff01cb82e3d21d…
Author: Olle E. Johansson <oej(a)edvina.net>
Committer: Olle E. Johansson <oej(a)edvina.net>
Date: 2015-02-11T21:43:33+01:00
auth_db Rename main include file
---
Added: modules/auth_db/auth_db_mod.h
Removed: modules/auth_db/authdb_mod.h
---
Diff: https://github.com/kamailio/kamailio/commit/fdc4b11cc414100f5ff01cb82e3d21d…
Patch: https://github.com/kamailio/kamailio/commit/fdc4b11cc414100f5ff01cb82e3d21d…
---
diff --git a/modules/auth_db/auth_db_mod.h b/modules/auth_db/auth_db_mod.h
new file mode 100644
index 0000000..75ee611
--- /dev/null
+++ b/modules/auth_db/auth_db_mod.h
@@ -0,0 +1,57 @@
+/*
+ * $Id$
+ *
+ * Digest Authentication - Database support
+ *
+ * Copyright (C) 2001-2003 FhG Fokus
+ *
+ * This file is part of Kamailio, a free SIP server.
+ *
+ * Kamailio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version
+ *
+ * Kamailio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+#ifndef AUTHDB_MOD_H
+#define AUTHDB_MOD_H
+
+#include "../../str.h"
+#include "../../lib/srdb1/db.h"
+#include "../../modules/auth/api.h"
+#include "../../parser/msg_parser.h"
+
+
+/*
+ * Module parameters variables
+ */
+
+extern str user_column; /* 'username' column name */
+extern str domain_column; /* 'domain' column name */
+extern str pass_column; /* 'password' column name */
+extern str pass_column_2; /* Column containing HA1 string constructed
+ * of user@domain username
+ */
+
+extern int calc_ha1; /* if set to 1, ha1 is calculated by the server */
+extern int use_domain; /* If set to 1 then the domain will be used when selecting a row */
+
+extern db1_con_t* auth_db_handle; /* database connection handle */
+extern db_func_t auth_dbf;
+
+extern auth_api_s_t auth_api;
+
+extern pv_elem_t *credentials;
+extern int credentials_n;
+
+#endif /* AUTHDB_MOD_H */
diff --git a/modules/auth_db/authdb_mod.h b/modules/auth_db/authdb_mod.h
deleted file mode 100644
index 75ee611..0000000
--- a/modules/auth_db/authdb_mod.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * $Id$
- *
- * Digest Authentication - Database support
- *
- * Copyright (C) 2001-2003 FhG Fokus
- *
- * This file is part of Kamailio, a free SIP server.
- *
- * Kamailio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version
- *
- * Kamailio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * 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
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef AUTHDB_MOD_H
-#define AUTHDB_MOD_H
-
-#include "../../str.h"
-#include "../../lib/srdb1/db.h"
-#include "../../modules/auth/api.h"
-#include "../../parser/msg_parser.h"
-
-
-/*
- * Module parameters variables
- */
-
-extern str user_column; /* 'username' column name */
-extern str domain_column; /* 'domain' column name */
-extern str pass_column; /* 'password' column name */
-extern str pass_column_2; /* Column containing HA1 string constructed
- * of user@domain username
- */
-
-extern int calc_ha1; /* if set to 1, ha1 is calculated by the server */
-extern int use_domain; /* If set to 1 then the domain will be used when selecting a row */
-
-extern db1_con_t* auth_db_handle; /* database connection handle */
-extern db_func_t auth_dbf;
-
-extern auth_api_s_t auth_api;
-
-extern pv_elem_t *credentials;
-extern int credentials_n;
-
-#endif /* AUTHDB_MOD_H */
At startup, assume d_table->entries[5].next_id is initialized at 25 (see function init_dlg_table in dlg_hash.c) and assume you have only one dialog in the database with hash_entry=5 and hash_id=25. Since the condition next_id < dlg->h_id is false (because next_id == dlg->h_id == 25), the next available hash_id for a future dialog that matches this entry will be 25. Therefore, there will be duplicated (hash_entry,hash_id) which will cause errors when the dialog is inserted in the database.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/79
-- Commit Summary --
* Possible hash_entry,hash_id duplicate due to bad loading of dialogs at startup
-- File Changes --
M modules/dialog/dlg_db_handler.c (2)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/79.patchhttps://github.com/kamailio/kamailio/pull/79.diff
---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/79