- new folder src/ to hold the source code for main project applications
- main.c is in src/
- all core files are subfolder are in src/core/
- modules are in src/modules/
- libs are in src/lib/
- application Makefiles are in src/
- application binary is built in src/ (src/kamailio)
1 | 1 |
deleted file mode 100644 |
... | ... |
@@ -1,47 +0,0 @@ |
1 |
-/* |
|
2 |
- * Copyright (C) 2001-2003 FhG Fokus |
|
3 |
- * |
|
4 |
- * This file is part of Kamailio, a free SIP server. |
|
5 |
- * |
|
6 |
- * Kamailio is free software; you can redistribute it and/or modify |
|
7 |
- * it under the terms of the GNU General Public License as published by |
|
8 |
- * the Free Software Foundation; either version 2 of the License, or |
|
9 |
- * (at your option) any later version |
|
10 |
- * |
|
11 |
- * Kamailio is distributed in the hope that it will be useful, |
|
12 |
- * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
13 |
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
14 |
- * GNU General Public License for more details. |
|
15 |
- * |
|
16 |
- * You should have received a copy of the GNU General Public License |
|
17 |
- * along with this program; if not, write to the Free Software |
|
18 |
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
19 |
- */ |
|
20 |
-/*! |
|
21 |
-* \file |
|
22 |
-* \brief Kamailio core :: Hash support |
|
23 |
-* \ingroup core |
|
24 |
-* Module: \ref core |
|
25 |
-*/ |
|
26 |
- |
|
27 |
- |
|
28 |
- |
|
29 |
-#ifndef _HASH_H |
|
30 |
-#define _HASH_H |
|
31 |
- |
|
32 |
-#include "str.h" |
|
33 |
-#include "hashes.h" |
|
34 |
- |
|
35 |
-/* always use a power of 2 for hash table size */ |
|
36 |
-#define T_TABLE_POWER 16 |
|
37 |
-#define TABLE_ENTRIES (1 << (T_TABLE_POWER)) |
|
38 |
- |
|
39 |
-unsigned int new_hash( str call_id, str cseq_nr ); |
|
40 |
- |
|
41 |
-#define new_hash2(call_id, cseq_nr) \ |
|
42 |
- (get_hash2_raw(&(call_id), &(cseq_nr)) & (TABLE_ENTRIES-1)) |
|
43 |
- |
|
44 |
- |
|
45 |
-#define hash( cid, cseq) new_hash2( cid, cseq ) |
|
46 |
- |
|
47 |
-#endif |
... | ... |
@@ -1,21 +1,14 @@ |
1 | 1 |
/* |
2 |
- * $Id$ |
|
3 |
- * |
|
4 | 2 |
* Copyright (C) 2001-2003 FhG Fokus |
5 | 3 |
* |
6 |
- * This file is part of ser, a free SIP server. |
|
4 |
+ * This file is part of Kamailio, a free SIP server. |
|
7 | 5 |
* |
8 |
- * ser is free software; you can redistribute it and/or modify |
|
6 |
+ * Kamailio is free software; you can redistribute it and/or modify |
|
9 | 7 |
* it under the terms of the GNU General Public License as published by |
10 | 8 |
* the Free Software Foundation; either version 2 of the License, or |
11 | 9 |
* (at your option) any later version |
12 | 10 |
* |
13 |
- * For a license to use the ser software under conditions |
|
14 |
- * other than those described here, or to purchase support for this |
|
15 |
- * software, please contact iptel.org by e-mail at the following addresses: |
|
16 |
- * info@iptel.org |
|
17 |
- * |
|
18 |
- * ser is distributed in the hope that it will be useful, |
|
11 |
+ * Kamailio is distributed in the hope that it will be useful, |
|
19 | 12 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
20 | 13 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
21 | 14 |
* GNU General Public License for more details. |
... | ... |
@@ -24,6 +17,12 @@ |
24 | 17 |
* along with this program; if not, write to the Free Software |
25 | 18 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
26 | 19 |
*/ |
20 |
+/*! |
|
21 |
+* \file |
|
22 |
+* \brief Kamailio core :: Hash support |
|
23 |
+* \ingroup core |
|
24 |
+* Module: \ref core |
|
25 |
+*/ |
|
27 | 26 |
|
28 | 27 |
|
29 | 28 |
|
... | ... |
@@ -22,7 +22,7 @@ |
22 | 22 |
* |
23 | 23 |
* You should have received a copy of the GNU General Public License |
24 | 24 |
* along with this program; if not, write to the Free Software |
25 |
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
25 |
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
26 | 26 |
*/ |
27 | 27 |
|
28 | 28 |
|
... | ... |
@@ -31,13 +31,16 @@ |
31 | 31 |
#define _HASH_H |
32 | 32 |
|
33 | 33 |
#include "str.h" |
34 |
+#include "hashes.h" |
|
34 | 35 |
|
35 | 36 |
/* always use a power of 2 for hash table size */ |
36 | 37 |
#define T_TABLE_POWER 16 |
37 | 38 |
#define TABLE_ENTRIES (1 << (T_TABLE_POWER)) |
38 | 39 |
|
39 |
-int new_hash( str call_id, str cseq_nr ); |
|
40 |
-int new_hash2( str call_id, str cseq_nr ); |
|
40 |
+unsigned int new_hash( str call_id, str cseq_nr ); |
|
41 |
+ |
|
42 |
+#define new_hash2(call_id, cseq_nr) \ |
|
43 |
+ (get_hash2_raw(&(call_id), &(cseq_nr)) & (TABLE_ENTRIES-1)) |
|
41 | 44 |
|
42 | 45 |
|
43 | 46 |
#define hash( cid, cseq) new_hash2( cid, cseq ) |
... | ... |
@@ -33,14 +33,14 @@ |
33 | 33 |
#include "str.h" |
34 | 34 |
|
35 | 35 |
/* always use a power of 2 for hash table size */ |
36 |
-#define T_TABLE_POWER 10 |
|
36 |
+#define T_TABLE_POWER 12 |
|
37 | 37 |
#define TABLE_ENTRIES (1 << (T_TABLE_POWER)) |
38 | 38 |
|
39 | 39 |
int new_hash( str call_id, str cseq_nr ); |
40 |
-int old_hash( str call_id, str cseq_nr ); |
|
40 |
+int new_hash2( str call_id, str cseq_nr ); |
|
41 | 41 |
|
42 | 42 |
int init_hash(); |
43 | 43 |
|
44 |
-#define hash( cid, cseq) new_hash( cid, cseq ) |
|
44 |
+#define hash( cid, cseq) new_hash2( cid, cseq ) |
|
45 | 45 |
|
46 | 46 |
#endif |
... | ... |
@@ -1,8 +1,32 @@ |
1 | 1 |
/* |
2 | 2 |
* $Id$ |
3 |
+ * |
|
4 |
+ * Copyright (C) 2001-2003 Fhg Fokus |
|
5 |
+ * |
|
6 |
+ * This file is part of ser, a free SIP server. |
|
7 |
+ * |
|
8 |
+ * ser is free software; you can redistribute it and/or modify |
|
9 |
+ * it under the terms of the GNU General Public License as published by |
|
10 |
+ * the Free Software Foundation; either version 2 of the License, or |
|
11 |
+ * (at your option) any later version |
|
12 |
+ * |
|
13 |
+ * For a license to use the ser software under conditions |
|
14 |
+ * other than those described here, or to purchase support for this |
|
15 |
+ * software, please contact iptel.org by e-mail at the following addresses: |
|
16 |
+ * info@iptel.org |
|
17 |
+ * |
|
18 |
+ * ser is distributed in the hope that it will be useful, |
|
19 |
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
20 |
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
21 |
+ * GNU General Public License for more details. |
|
22 |
+ * |
|
23 |
+ * You should have received a copy of the GNU General Public License |
|
24 |
+ * along with this program; if not, write to the Free Software |
|
25 |
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
3 | 26 |
*/ |
4 | 27 |
|
5 | 28 |
|
29 |
+ |
|
6 | 30 |
#ifndef _HASH_H |
7 | 31 |
#define _HASH_H |
8 | 32 |
|
... | ... |
@@ -9,12 +9,14 @@ |
9 | 9 |
#include "str.h" |
10 | 10 |
|
11 | 11 |
/* always use a power of 2 for hash table size */ |
12 |
-#define T_TABLE_POWER 12 |
|
12 |
+#define T_TABLE_POWER 10 |
|
13 | 13 |
#define TABLE_ENTRIES (1 << (T_TABLE_POWER)) |
14 | 14 |
|
15 | 15 |
int new_hash( str call_id, str cseq_nr ); |
16 | 16 |
int old_hash( str call_id, str cseq_nr ); |
17 | 17 |
|
18 |
+int init_hash(); |
|
19 |
+ |
|
18 | 20 |
#define hash( cid, cseq) new_hash( cid, cseq ) |
19 | 21 |
|
20 | 22 |
#endif |
1 | 1 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,20 @@ |
1 |
+/* |
|
2 |
+ * $Id$ |
|
3 |
+ */ |
|
4 |
+ |
|
5 |
+ |
|
6 |
+#ifndef _HASH_H |
|
7 |
+#define _HASH_H |
|
8 |
+ |
|
9 |
+#include "str.h" |
|
10 |
+ |
|
11 |
+/* always use a power of 2 for hash table size */ |
|
12 |
+#define T_TABLE_POWER 12 |
|
13 |
+#define TABLE_ENTRIES (1 << (T_TABLE_POWER)) |
|
14 |
+ |
|
15 |
+int new_hash( str call_id, str cseq_nr ); |
|
16 |
+int old_hash( str call_id, str cseq_nr ); |
|
17 |
+ |
|
18 |
+#define hash( cid, cseq) new_hash( cid, cseq ) |
|
19 |
+ |
|
20 |
+#endif |