Browse code

core, lib, modules: updated include paths for header files

Daniel-Constantin Mierla authored on 07/12/2016 11:07:22
Showing 1502 changed files
... ...
@@ -43,20 +43,20 @@
43 43
  * 
44 44
  */
45 45
 
46
-#include "../../parser/msg_parser.h"
47
-#include "../../parser/digest/digest.h"
48
-#include "../../parser/parse_to.h"
49
-#include "../../parser/parse_expires.h"
50
-#include "../../parser/contact/parse_contact.h"
51
-#include "../../parser/parse_uri.h"
52
-#include "../../parser/parse_rr.h"
53
-#include "../../parser/parse_nameaddr.h"
54
-#include "../../data_lump.h"
55
-#include "../../data_lump_rpl.h"
56
-#include "../../parser/parse_from.h"
57
-#include "../../parser/parse_content.h"
46
+#include "../../core/parser/msg_parser.h"
47
+#include "../../core/parser/digest/digest.h"
48
+#include "../../core/parser/parse_to.h"
49
+#include "../../core/parser/parse_expires.h"
50
+#include "../../core/parser/contact/parse_contact.h"
51
+#include "../../core/parser/parse_uri.h"
52
+#include "../../core/parser/parse_rr.h"
53
+#include "../../core/parser/parse_nameaddr.h"
54
+#include "../../core/data_lump.h"
55
+#include "../../core/data_lump_rpl.h"
56
+#include "../../core/parser/parse_from.h"
57
+#include "../../core/parser/parse_content.h"
58 58
 #include "ims_getters.h"
59
-#include "../../parser/parse_ppi_pai.h"
59
+#include "../../core/parser/parse_ppi_pai.h"
60 60
 
61 61
 
62 62
 /**
... ...
@@ -45,9 +45,9 @@
45 45
 #ifndef __IMS_GETTERS_H
46 46
 #define __IMS_GETTERS_H
47 47
 
48
-#include "../../str.h"
48
+#include "../../core/str.h"
49 49
 
50
-#include "../../parser/contact/parse_contact.h"
50
+#include "../../core/parser/contact/parse_contact.h"
51 51
 
52 52
 /** Return and break the execution of routng script */
53 53
 #define CSCF_RETURN_BREAK	0 
... ...
@@ -36,7 +36,7 @@
36 36
 #include <string.h>
37 37
 #include <errno.h>
38 38
 
39
-#include "../../dprint.h"
39
+#include "../../core/dprint.h"
40 40
 #include "mi_mem.h"
41 41
 #include "attr.h"
42 42
 #include "fmt.h"
... ...
@@ -35,7 +35,7 @@
35 35
 #define _MI_ATTR_H
36 36
 
37 37
 #include <stdarg.h>
38
-#include "../../str.h"
38
+#include "../../core/str.h"
39 39
 #include "tree.h"
40 40
 
41 41
 struct mi_attr{
... ...
@@ -33,7 +33,7 @@
33 33
 
34 34
 
35 35
 #include <string.h>
36
-#include "../../dprint.h"
36
+#include "../../core/dprint.h"
37 37
 #include "mi_mem.h"
38 38
 
39 39
 char *mi_fmt_buf = 0;
... ...
@@ -45,8 +45,8 @@
45 45
 
46 46
 #include <string.h>
47 47
 
48
-#include "../../dprint.h"
49
-#include "../../sr_module.h"
48
+#include "../../core/dprint.h"
49
+#include "../../core/sr_module.h"
50 50
 #include "mi_mem.h"
51 51
 #include "mi.h"
52 52
 
... ...
@@ -23,7 +23,7 @@
23 23
  * History:
24 24
  * ---------
25 25
  *  2006-09-08  first version (bogdan)
26
- *  2010-08-18  use mi types from ../../mi/mi_types.h (andrei)
26
+ *  2010-08-18  use mi types from ../../core/mi/mi_types.h (andrei)
27 27
  */
28 28
 
29 29
 /*!
... ...
@@ -36,8 +36,8 @@
36 36
 #ifndef _MI_MI_H_
37 37
 #define _MI_MI_H_
38 38
 
39
-#include "../../str.h"
40
-#include "../../mi/mi_types.h"
39
+#include "../../core/str.h"
40
+#include "../../core/mi/mi_types.h"
41 41
 #include "tree.h"
42 42
 
43 43
 #define MI_ASYNC_RPL_FLAG   (1<<0)
... ...
@@ -31,7 +31,7 @@
31 31
 #ifndef _MI_MEM_H_
32 32
 #define _MI_MEM_H_
33 33
 
34
-#include "../../mem/shm_mem.h"
34
+#include "../../core/mem/shm_mem.h"
35 35
 
36 36
 #ifdef MI_SYSTEM_MALLOC
37 37
 #include <stdlib.h>
... ...
@@ -39,7 +39,7 @@
39 39
 #define mi_realloc realloc
40 40
 #define mi_free free
41 41
 #else
42
-#include "../../mem/mem.h"
42
+#include "../../core/mem/mem.h"
43 43
 #define mi_malloc pkg_malloc
44 44
 #define mi_realloc pkg_realloc
45 45
 #define mi_free pkg_free
... ...
@@ -34,7 +34,7 @@
34 34
 #include <string.h>
35 35
 #include <stdio.h>
36 36
 #include <errno.h>
37
-#include "../../dprint.h"
37
+#include "../../core/dprint.h"
38 38
 #include "mi_mem.h"
39 39
 #include "tree.h"
40 40
 #include "fmt.h"
... ...
@@ -23,7 +23,7 @@
23 23
  * History:
24 24
  * ---------
25 25
  *  2006-09-08  first version (bogdan)
26
- *  2010-08-18  use mi types from ../../mi/mi_types.h (andrei)
26
+ *  2010-08-18  use mi types from ../../core/mi/mi_types.h (andrei)
27 27
  */
28 28
 
29 29
 /*!
... ...
@@ -39,8 +39,8 @@
39 39
 #define _MI_TREE_H
40 40
 
41 41
 #include <stdarg.h>
42
-#include "../../str.h"
43
-#include "../../mi/mi_types.h"
42
+#include "../../core/str.h"
43
+#include "../../core/mi/mi_types.h"
44 44
 
45 45
 struct mi_node;
46 46
 struct mi_handler;
... ...
@@ -21,7 +21,7 @@
21 21
 
22 22
 #include <malloc.h>	/* hook prototypes */
23 23
 
24
-#include "../../mem/shm_mem.h"
24
+#include "../../core/mem/shm_mem.h"
25 25
 #include "shm_regex.h"
26 26
 
27 27
 typedef void *(malloc_hook_t) (size_t, const void *);
... ...
@@ -49,11 +49,11 @@
49 49
  * - \ref ../modules/db_unixodbc
50 50
  */
51 51
 
52
-#include "../../dprint.h"
53
-#include "../../sr_module.h"
54
-#include "../../mem/mem.h"
55
-#include "../../ut.h"
56
-#include "../../globals.h"
52
+#include "../../core/dprint.h"
53
+#include "../../core/sr_module.h"
54
+#include "../../core/mem/mem.h"
55
+#include "../../core/ut.h"
56
+#include "../../core/globals.h"
57 57
 #include "db_cap.h"
58 58
 #include "db_id.h"
59 59
 #include "db_pool.h"
... ...
@@ -28,7 +28,7 @@
28 28
 #ifndef DB1_CON_H
29 29
 #define DB1_CON_H
30 30
 
31
-#include "../../str.h"
31
+#include "../../core/str.h"
32 32
 
33 33
 
34 34
 /*! \brief
... ...
@@ -27,10 +27,10 @@
27 27
 
28 28
 #include "db.h"
29 29
 #include "db_id.h"
30
-#include "../../dprint.h"
31
-#include "../../mem/mem.h"
32
-#include "../../pt.h"
33
-#include "../../ut.h"
30
+#include "../../core/dprint.h"
31
+#include "../../core/mem/mem.h"
32
+#include "../../core/pt.h"
33
+#include "../../core/ut.h"
34 34
 #include <stdlib.h>
35 35
 #include <string.h>
36 36
 
... ...
@@ -28,7 +28,7 @@
28 28
 #ifndef _DB1_ID_H
29 29
 #define _DB1_ID_H
30 30
 
31
-#include "../../str.h"
31
+#include "../../core/str.h"
32 32
 #include "db_pooling.h"
33 33
 
34 34
 /** Structure representing a database ID */
... ...
@@ -28,7 +28,7 @@
28 28
 #ifndef DB1_KEY_H
29 29
 #define DB1_KEY_H
30 30
 
31
-#include "../../ut.h"
31
+#include "../../core/ut.h"
32 32
 
33 33
 
34 34
 /**
... ...
@@ -25,7 +25,7 @@
25 25
  * \ingroup db1
26 26
  */
27 27
 
28
-#include "../../dprint.h"
28
+#include "../../core/dprint.h"
29 29
 #include "db_pool.h"
30 30
 
31 31
 
... ...
@@ -32,11 +32,11 @@
32 32
 
33 33
 #include <stdio.h>
34 34
 #include <stdlib.h>
35
-#include "../../dprint.h"
35
+#include "../../core/dprint.h"
36 36
 #include "db_ut.h"
37 37
 #include "db_query.h"
38
-#include "../../globals.h"
39
-#include "../../timer.h"
38
+#include "../../core/globals.h"
39
+#include "../../core/timer.h"
40 40
 
41 41
 static str  sql_str;
42 42
 static char *sql_buf = NULL;
... ...
@@ -31,8 +31,8 @@
31 31
 #include "db_res.h"
32 32
 
33 33
 #include "db_row.h"
34
-#include "../../dprint.h"
35
-#include "../../mem/mem.h"
34
+#include "../../core/dprint.h"
35
+#include "../../core/mem/mem.h"
36 36
 
37 37
 #include <string.h>
38 38
 
... ...
@@ -31,8 +31,8 @@
31 31
 #include "db_row.h"
32 32
 
33 33
 #include <string.h>
34
-#include "../../dprint.h"
35
-#include "../../mem/mem.h"
34
+#include "../../core/dprint.h"
35
+#include "../../core/mem/mem.h"
36 36
 
37 37
 /*
38 38
  * Release memory used by row
... ...
@@ -30,7 +30,7 @@
30 30
 
31 31
 
32 32
 #if defined (__OS_darwin) || defined (__OS_freebsd)
33
-#include "../../pvar.h"
33
+#include "../../core/pvar.h"
34 34
 #endif
35 35
 
36 36
 /**
... ...
@@ -63,8 +63,8 @@
63 63
 #include <stdlib.h>
64 64
 #include <string.h>
65 65
 
66
-#include "../../mem/mem.h"
67
-#include "../../dprint.h"
66
+#include "../../core/mem/mem.h"
67
+#include "../../core/dprint.h"
68 68
 
69 69
 #include "db_ut.h"
70 70
 
... ...
@@ -31,7 +31,7 @@
31 31
 #ifndef DB1_UT_H
32 32
 #define DB1_UT_H
33 33
 
34
-#include "../../pvar.h"
34
+#include "../../core/pvar.h"
35 35
 
36 36
 #include "db_key.h"
37 37
 #include "db.h"
... ...
@@ -37,7 +37,7 @@
37 37
 
38 38
 #include "db_con.h"
39 39
 #include <time.h>
40
-#include "../../str.h"
40
+#include "../../core/str.h"
41 41
 
42 42
 
43 43
 /**
... ...
@@ -27,12 +27,12 @@
27 27
 
28 28
 #include "db_drv.h"
29 29
 
30
-#include "../../dprint.h"
31
-#include "../../sr_module.h"
32
-#include "../../mem/mem.h"
33
-#include "../../str.h"
34
-#include "../../ut.h"
35
-#include "../../list.h"
30
+#include "../../core/dprint.h"
31
+#include "../../core/sr_module.h"
32
+#include "../../core/mem/mem.h"
33
+#include "../../core/str.h"
34
+#include "../../core/ut.h"
35
+#include "../../core/list.h"
36 36
 
37 37
 struct _db_root db_root = DBLIST_INITIALIZER(db_root);
38 38
 
... ...
@@ -25,9 +25,9 @@
25 25
 
26 26
 #include "db_cmd.h"
27 27
 
28
-#include "../../dprint.h"
29
-#include "../../mem/mem.h"
30
-#include "../../ut.h"
28
+#include "../../core/dprint.h"
29
+#include "../../core/mem/mem.h"
30
+#include "../../core/ut.h"
31 31
 
32 32
 #include <string.h>
33 33
 #include <stdarg.h>
... ...
@@ -25,8 +25,8 @@
25 25
 
26 26
 #include "db_con.h"
27 27
 
28
-#include "../../mem/mem.h"
29
-#include "../../dprint.h"
28
+#include "../../core/mem/mem.h"
29
+#include "../../core/dprint.h"
30 30
 
31 31
 #include <string.h>
32 32
 #include <stdlib.h>
... ...
@@ -31,8 +31,8 @@
31 31
 #include "db_ctx.h"
32 32
 #include "db.h"
33 33
 
34
-#include "../../dprint.h"
35
-#include "../../mem/mem.h"
34
+#include "../../core/dprint.h"
35
+#include "../../core/mem/mem.h"
36 36
 
37 37
 #include <string.h>
38 38
 
... ...
@@ -30,8 +30,8 @@
30 30
 #include "db_gen.h"
31 31
 #include "db_con.h"
32 32
 
33
-#include "../../str.h"
34
-#include "../../list.h"
33
+#include "../../core/str.h"
34
+#include "../../core/list.h"
35 35
 
36 36
 #ifdef __cplusplus
37 37
 extern "C" {
... ...
@@ -27,9 +27,9 @@
27 27
 
28 28
 #include "db_gen.h"
29 29
 
30
-#include "../../mem/mem.h"
31
-#include "../../sr_module.h"
32
-#include "../../ut.h"
30
+#include "../../core/mem/mem.h"
31
+#include "../../core/sr_module.h"
32
+#include "../../core/ut.h"
33 33
 
34 34
 #include <string.h>
35 35
 #include <stdlib.h>
... ...
@@ -28,8 +28,8 @@
28 28
 
29 29
 #include "db_gen.h"
30 30
 
31
-#include "../../str.h"
32
-#include "../../list.h"
31
+#include "../../core/str.h"
32
+#include "../../core/list.h"
33 33
 
34 34
 
35 35
 #ifdef __cplusplus
... ...
@@ -25,8 +25,8 @@
25 25
 
26 26
 #include "db_fld.h"
27 27
 
28
-#include "../../mem/mem.h"
29
-#include "../../dprint.h"
28
+#include "../../core/mem/mem.h"
29
+#include "../../core/dprint.h"
30 30
 
31 31
 #include <string.h>
32 32
 
... ...
@@ -27,7 +27,7 @@
27 27
  */
28 28
 
29 29
 #include "db_gen.h"
30
-#include "../../str.h"
30
+#include "../../core/str.h"
31 31
 #include <time.h>
32 32
 
33 33
 #ifdef __cplusplus
... ...
@@ -27,8 +27,8 @@
27 27
  */
28 28
 
29 29
 #include "db_drv.h"
30
-#include "../../str.h"
31
-#include "../../list.h"
30
+#include "../../core/str.h"
31
+#include "../../core/list.h"
32 32
 
33 33
 
34 34
 #ifdef __cplusplus
... ...
@@ -24,7 +24,7 @@
24 24
  */
25 25
 
26 26
 #include "db_pool.h"
27
-#include "../../dprint.h"
27
+#include "../../core/dprint.h"
28 28
 #include <unistd.h>
29 29
 #include <string.h>
30 30
 
... ...
@@ -28,7 +28,7 @@
28 28
 
29 29
 #include "db_drv.h"
30 30
 #include "db_uri.h"
31
-#include "../../list.h"
31
+#include "../../core/list.h"
32 32
 #include <sys/types.h>
33 33
 
34 34
 
... ...
@@ -25,8 +25,8 @@
25 25
 
26 26
 #include "db_rec.h"
27 27
 
28
-#include "../../dprint.h"
29
-#include "../../mem/mem.h"
28
+#include "../../core/dprint.h"
29
+#include "../../core/mem/mem.h"
30 30
 
31 31
 #include <stdlib.h>
32 32
 #include <string.h>
... ...
@@ -24,8 +24,8 @@
24 24
  */
25 25
 
26 26
 #include "db_res.h"
27
-#include "../../dprint.h"
28
-#include "../../mem/mem.h"
27
+#include "../../core/dprint.h"
28
+#include "../../core/mem/mem.h"
29 29
 #include <string.h>
30 30
 
31 31
 
... ...
@@ -24,9 +24,9 @@
24 24
  */
25 25
 
26 26
 #include "db_uri.h"
27
-#include "../../dprint.h"
28
-#include "../../mem/mem.h"
29
-#include "../../ut.h"
27
+#include "../../core/dprint.h"
28
+#include "../../core/mem/mem.h"
29
+#include "../../core/ut.h"
30 30
 #include <string.h>
31 31
 
32 32
 
... ...
@@ -27,7 +27,7 @@
27 27
  */
28 28
 
29 29
 #include "db_gen.h"
30
-#include "../../str.h"
30
+#include "../../core/str.h"
31 31
 
32 32
 
33 33
 #ifdef __cplusplus
... ...
@@ -30,8 +30,8 @@
30 30
 * Module: \ref srutils
31 31
 */
32 32
 
33
-#include "../../md5.h"
34
-#include "../../ut.h"
33
+#include "../../core/md5.h"
34
+#include "../../core/ut.h"
35 35
 #include "shautils.h"
36 36
 
37 37
 /*! \brief Compute MD5 checksum */
... ...
@@ -34,7 +34,7 @@ extern          "C"
34 34
 {
35 35
 #endif
36 36
 
37
-#include "../../str.h"
37
+#include "../../core/str.h"
38 38
 
39 39
 /* srjson Types: */
40 40
 #define srjson_False   0
... ...
@@ -33,9 +33,9 @@
33 33
 #include <string.h>
34 34
 #include <time.h>
35 35
 
36
-#include "../../dprint.h"
37
-#include "../../globals.h"
38
-#include "../../pt.h"
36
+#include "../../core/dprint.h"
37
+#include "../../core/globals.h"
38
+#include "../../core/pt.h"
39 39
 
40 40
 #include "sruid.h"
41 41
 
... ...
@@ -29,7 +29,7 @@
29 29
 #ifndef _SRUID_H_
30 30
 #define _SRUID_H_
31 31
 
32
-#include "../../str.h"
32
+#include "../../core/str.h"
33 33
 
34 34
 #define SRUID_SIZE	40
35 35
 
... ...
@@ -33,7 +33,7 @@
33 33
 #include <string.h>
34 34
 #include <time.h>
35 35
 
36
-#include "../../mem/mem.h"
36
+#include "../../core/mem/mem.h"
37 37
 #include "tmrec.h"
38 38
 
39 39
 
... ...
@@ -39,9 +39,9 @@
39 39
 
40 40
 #include "dtrie.h"
41 41
 
42
-#include "../../dprint.h"
43
-#include "../../mem/shm_mem.h"
44
-#include "../../mem/mem.h"
42
+#include "../../core/dprint.h"
43
+#include "../../core/mem/shm_mem.h"
44
+#include "../../core/mem/mem.h"
45 45
 
46 46
 
47 47
 struct dtrie_node_t *dtrie_init(const unsigned int branches)
... ...
@@ -61,85 +61,85 @@
61 61
 #include <sys/sockio.h>
62 62
 #endif
63 63
 
64
-#include "config.h"
65
-#include "dprint.h"
66
-#include "daemonize.h"
67
-#include "route.h"
68
-#include "udp_server.h"
69
-#include "globals.h"
70
-#include "mem/mem.h"
64
+#include "core/config.h"
65
+#include "core/dprint.h"
66
+#include "core/daemonize.h"
67
+#include "core/route.h"
68
+#include "core/udp_server.h"
69
+#include "core/globals.h"
70
+#include "core/mem/mem.h"
71 71
 #ifdef SHM_MEM
72
-#include "mem/shm_mem.h"
73
-#include "shm_init.h"
72
+#include "core/mem/shm_mem.h"
73
+#include "core/shm_init.h"
74 74
 #endif /* SHM_MEM */
75
-#include "sr_module.h"
76
-#include "timer.h"
77
-#include "parser/msg_parser.h"
78
-#include "ip_addr.h"
79
-#include "resolve.h"
80
-#include "parser/parse_hname2.h"
81
-#include "parser/digest/digest_parser.h"
82
-#include "name_alias.h"
83
-#include "hash_func.h"
84
-#include "pt.h"
85
-#include "script_cb.h"
86
-#include "nonsip_hooks.h"
87
-#include "ut.h"
88
-#include "events.h"
89
-#include "signals.h"
75
+#include "core/sr_module.h"
76
+#include "core/timer.h"
77
+#include "core/parser/msg_parser.h"
78
+#include "core/ip_addr.h"
79
+#include "core/resolve.h"
80
+#include "core/parser/parse_hname2.h"
81
+#include "core/parser/digest/digest_parser.h"
82
+#include "core/name_alias.h"
83
+#include "core/hash_func.h"
84
+#include "core/pt.h"
85
+#include "core/script_cb.h"
86
+#include "core/nonsip_hooks.h"
87
+#include "core/ut.h"
88
+#include "core/events.h"
89
+#include "core/signals.h"
90 90
 #ifdef USE_RAW_SOCKS
91
-#include "raw_sock.h"
91
+#include "core/raw_sock.h"
92 92
 #endif /* USE_RAW_SOCKS */
93 93
 #ifdef USE_TCP
94
-#include "poll_types.h"
95
-#include "tcp_init.h"
96
-#include "tcp_options.h"
94
+#include "core/poll_types.h"
95
+#include "core/tcp_init.h"
96
+#include "core/tcp_options.h"
97 97
 #ifdef CORE_TLS
98
-#include "tls/tls_init.h"
98
+#include "core/tls/tls_init.h"
99 99
 #define tls_has_init_si() 1
100 100
 #define tls_loaded() 1
101 101
 #else
102
-#include "tls_hooks_init.h"
102
+#include "core/tls_hooks_init.h"
103 103
 #endif /* CORE_TLS */
104 104
 #endif /* USE_TCP */
105 105
 #ifdef USE_SCTP
106
-#include "sctp_core.h"
107
-#endif
108
-#include "usr_avp.h"
109
-#include "rpc_lookup.h"
110
-#include "core_cmd.h"
111
-#include "flags.h"
112
-#include "lock_ops_init.h"
113
-#include "atomic_ops_init.h"
106
+#include "core/sctp_core.h"
107
+#endif
108
+#include "core/usr_avp.h"
109
+#include "core/rpc_lookup.h"
110
+#include "core/core_cmd.h"
111
+#include "core/flags.h"
112
+#include "core/lock_ops_init.h"
113
+#include "core/atomic_ops_init.h"
114 114
 #ifdef USE_DNS_CACHE
115
-#include "dns_cache.h"
115
+#include "core/dns_cache.h"
116 116
 #endif
117 117
 #ifdef USE_DST_BLACKLIST
118
-#include "dst_blacklist.h"
119
-#endif
120
-#include "rand/fastrand.h" /* seed */
121
-#include "rand/kam_rand.h"
122
-
123
-#include "stats.h"
124
-#include "counters.h"
125
-#include "cfg/cfg.h"
126
-#include "cfg/cfg_struct.h"
127
-#include "cfg_core.h"
128
-#include "endianness.h" /* init */
129
-#include "basex.h" /* init */
130
-#include "pvapi.h" /* init PV api */
131
-#include "pv_core.h" /* register core pvars */
132
-#include "ppcfg.h"
133
-#include "sock_ut.h"
134
-#include "async_task.h"
135
-#include "dset.h"
136
-#include "timer_proc.h"
137
-#include "srapi.h"
118
+#include "core/dst_blacklist.h"
119
+#endif
120
+#include "core/rand/fastrand.h" /* seed */
121
+#include "core/rand/kam_rand.h"
122
+
123
+#include "core/stats.h"
124
+#include "core/counters.h"
125
+#include "core/cfg/cfg.h"
126
+#include "core/cfg/cfg_struct.h"
127
+#include "core/cfg_core.h"
128
+#include "core/endianness.h" /* init */
129
+#include "core/basex.h" /* init */
130
+#include "core/pvapi.h" /* init PV api */
131
+#include "core/pv_core.h" /* register core pvars */
132
+#include "core/ppcfg.h"
133
+#include "core/sock_ut.h"
134
+#include "core/async_task.h"
135
+#include "core/dset.h"
136
+#include "core/timer_proc.h"
137
+#include "core/srapi.h"
138 138
 
139 139
 #ifdef DEBUG_DMALLOC
140 140
 #include <dmalloc.h>
141 141
 #endif
142
-#include "ver.h"
142
+#include "core/ver.h"
143 143
 
144 144
 /* define SIG_DEBUG by default */
145 145
 #ifdef NO_SIG_DEBUG
... ...
@@ -44,15 +44,15 @@
44 44
 #include <stdio.h>
45 45
 #include <time.h>
46 46
 
47
-#include "../../dprint.h"
48
-#include "../../error.h"
49
-#include "../../mem/mem.h"
50
-#include "../../usr_avp.h"
47
+#include "../../core/dprint.h"
48
+#include "../../core/error.h"
49
+#include "../../core/mem/mem.h"
50
+#include "../../core/usr_avp.h"
51 51
 #include "../../lib/srdb1/db.h"
52
-#include "../../parser/hf.h"
53
-#include "../../parser/msg_parser.h"
54
-#include "../../parser/parse_from.h"
55
-#include "../../parser/digest/digest.h"
52
+#include "../../core/parser/hf.h"
53
+#include "../../core/parser/msg_parser.h"
54
+#include "../../core/parser/parse_from.h"
55
+#include "../../core/parser/digest/digest.h"
56 56
 #include "../../modules/tm/t_funcs.h"
57 57
 #include "acc_mod.h"
58 58
 #include "acc.h"
... ...
@@ -38,10 +38,10 @@
38 38
 #include <string.h>
39 39
 #include <sys/time.h>
40 40
 
41
-#include "../../str.h"
42
-#include "../../dprint.h"
43
-#include "../../sr_module.h"
44
-#include "../../mem/mem.h"
41
+#include "../../core/str.h"
42
+#include "../../core/dprint.h"
43
+#include "../../core/sr_module.h"
44
+#include "../../core/mem/mem.h"
45 45
 
46 46
 /* param trasnporter */
47 47
 typedef struct acc_param {
... ...
@@ -36,7 +36,7 @@
36 36
  *
37 37
  */
38 38
 #include "../../modules/tm/tm_load.h"
39
-#include "../../str.h"
39
+#include "../../core/str.h"
40 40
 #include "../dialog/dlg_load.h"
41 41
 
42 42
 #include "acc_api.h"
... ...
@@ -44,10 +44,10 @@
44 44
 #include <stdlib.h>
45 45
 #include <string.h>
46 46
 #include <ctype.h>
47
-#include "../../dprint.h"
48
-#include "../../ut.h"
49
-#include "../../usr_avp.h"
50
-#include "../../mem/mem.h"
47
+#include "../../core/dprint.h"
48
+#include "../../core/ut.h"
49
+#include "../../core/usr_avp.h"
50
+#include "../../core/mem/mem.h"
51 51
 #include "acc_api.h"
52 52
 #include "acc_extra.h"
53 53
 
... ...
@@ -44,9 +44,9 @@
44 44
 #define _ACC_EXTRA_H_
45 45
 
46 46
 #include "acc_api.h"
47
-#include "../../str.h"
48
-#include "../../pvar.h"
49
-#include "../../parser/msg_parser.h"
47
+#include "../../core/str.h"
48
+#include "../../core/pvar.h"
49
+#include "../../core/parser/msg_parser.h"
50 50
 #include "../dialog/dlg_load.h"
51 51
 
52 52
 void init_acc_extra(void);
... ...
@@ -36,14 +36,14 @@
36 36
 #include <stdio.h>
37 37
 #include <string.h>
38 38
 
39
-#include "../../dprint.h"
40
-#include "../../sr_module.h"
41
-#include "../../parser/parse_from.h"
42
-#include "../../parser/parse_content.h"
43
-#include "../../strutils.h"
39
+#include "../../core/dprint.h"
40
+#include "../../core/sr_module.h"
41
+#include "../../core/parser/parse_from.h"
42
+#include "../../core/parser/parse_content.h"
43
+#include "../../core/strutils.h"
44 44
 #include "../../modules/tm/tm_load.h"
45 45
 #include "../rr/api.h"
46
-#include "../../flags.h"
46
+#include "../../core/flags.h"
47 47
 #include "acc.h"
48 48
 #include "acc_api.h"
49 49
 #include "acc_mod.h"
... ...
@@ -37,7 +37,7 @@
37 37
 #ifndef _ACC_ACC_LOGIC_H
38 38
 #define _ACC_ACC_LOGIC_H
39 39
 
40
-#include "../../str.h"
40
+#include "../../core/str.h"
41 41
 #include "../../modules/tm/t_hooks.h"
42 42
 #include "acc_api.h"
43 43
 
... ...
@@ -60,11 +60,11 @@
60 60
 #include <stdio.h>
61 61
 #include <string.h>
62 62
 
63
-#include "../../sr_module.h"
64
-#include "../../dprint.h"
65
-#include "../../mem/mem.h"
63
+#include "../../core/sr_module.h"
64
+#include "../../core/dprint.h"
65
+#include "../../core/mem/mem.h"
66 66
 #include "../../modules/tm/tm_load.h"
67
-#include "../../str.h"
67
+#include "../../core/str.h"
68 68
 #include "../rr/api.h"
69 69
 #include "acc.h"
70 70
 #include "acc_api.h"
... ...
@@ -40,8 +40,8 @@
40 40
 #include <string.h>
41 41
 #include <netinet/in.h>
42 42
 
43
-#include "../../mem/shm_mem.h"
44
-#include "../../dprint.h"
43
+#include "../../core/mem/shm_mem.h"
44
+#include "../../core/dprint.h"
45 45
 #include "diam_message.h"
46 46
 
47 47
 
... ...
@@ -38,8 +38,8 @@
38 38
 #include <string.h>
39 39
 #include <netinet/in.h>
40 40
 
41
-#include "../../mem/shm_mem.h"
42
-#include "../../dprint.h"
41
+#include "../../core/mem/shm_mem.h"
42
+#include "../../core/dprint.h"
43 43
 #include "diam_message.h"
44 44
 
45 45
 #define get_3bytes(_b) \
... ...
@@ -36,9 +36,9 @@
36 36
 #ifndef _AAA_DIAMETER_MSG_H
37 37
 #define _AAA_DIAMETER_MSG_H
38 38
 
39
-#include "../../str.h"
40
-#include "../../mem/mem.h"
41
-#include "../../endianness.h"
39
+#include "../../core/str.h"
40
+#include "../../core/mem/mem.h"
41
+#include "../../core/endianness.h"
42 42
 
43 43
 #define ad_malloc	pkg_malloc
44 44
 #define ad_free		pkg_free
... ...
@@ -37,11 +37,11 @@
37 37
 #include <string.h>
38 38
 #include <errno.h>
39 39
 
40
-#include "../../dprint.h"
41
-#include "../../parser/msg_parser.h"
42
-#include "../../parser/parse_to.h"
43
-#include "../../parser/parse_from.h"
44
-#include "../../mem/mem.h"
40
+#include "../../core/dprint.h"
41
+#include "../../core/parser/msg_parser.h"
42
+#include "../../core/parser/parse_to.h"
43
+#include "../../core/parser/parse_from.h"
44
+#include "../../core/mem/mem.h"
45 45
 
46 46
 #include "diam_message.h"
47 47
 #include "diam_tcp.h"
... ...
@@ -31,8 +31,8 @@
31 31
 #ifndef ACC_TCP
32 32
 #define ACC_TCP
33 33
 
34
-#include "../../str.h"
35
-#include "../../parser/msg_parser.h"
34
+#include "../../core/str.h"
35
+#include "../../core/parser/msg_parser.h"
36 36
 
37 37
 /* information needed for reading messages from tcp connection */
38 38
 typedef struct rd_buf
... ...
@@ -37,10 +37,10 @@
37 37
 #include <stdio.h>
38 38
 #include <string.h>
39 39
 
40
-#include "../../sr_module.h"
41
-#include "../../dprint.h"
42
-#include "../../mem/mem.h"
43
-#include "../../parser/parse_to.h"
40
+#include "../../core/sr_module.h"
41
+#include "../../core/dprint.h"
42
+#include "../../core/mem/mem.h"
43
+#include "../../core/parser/parse_to.h"
44 44
 #include "../misc_radius/radius.h"
45 45
 #include "../../modules/acc/acc_api.h"
46 46
 #include "acc_radius_mod.h"
... ...
@@ -27,13 +27,13 @@
27 27
 
28 28
 #include <stdio.h>
29 29
 #include <string.h>
30
-#include "../../sr_module.h"
30
+#include "../../core/sr_module.h"
31 31
 #include "../../lib/srdb1/db.h"
32
-#include "../../dprint.h"
33
-#include "../../error.h"
34
-#include "../../mem/mem.h"
35
-#include "../../ut.h"
36
-#include "../../mod_fix.h"
32
+#include "../../core/dprint.h"
33
+#include "../../core/error.h"
34
+#include "../../core/mem/mem.h"
35
+#include "../../core/ut.h"
36
+#include "../../core/mod_fix.h"
37 37
 
38 38
 #include "alookup.h"
39 39
 #include "api.h"
... ...
@@ -31,7 +31,7 @@
31 31
 #define _ALIAS_DB_H_
32 32
 
33 33
 #include "../../lib/srdb1/db.h"
34
-#include "../../parser/msg_parser.h"
34
+#include "../../core/parser/msg_parser.h"
35 35
 
36 36
 
37 37
 /* Module parameters variables */
... ...
@@ -28,15 +28,15 @@
28 28
 
29 29
 #include <string.h>
30 30
 
31
-#include "../../dprint.h"
32
-#include "../../action.h"
33
-#include "../../config.h"
34
-#include "../../ut.h"
35
-#include "../../parser/parse_uri.h"
31
+#include "../../core/dprint.h"
32
+#include "../../core/action.h"
33
+#include "../../core/config.h"
34
+#include "../../core/ut.h"
35
+#include "../../core/parser/parse_uri.h"
36 36
 #include "../../lib/srdb1/db.h"
37
-#include "../../mod_fix.h"
38
-#include "../../dset.h"
39
-#include "../../lvalue.h"
37
+#include "../../core/mod_fix.h"
38
+#include "../../core/dset.h"
39
+#include "../../core/lvalue.h"
40 40
 
41 41
 #include "alias_db.h"
42 42
 #include "alookup.h"
... ...
@@ -30,7 +30,7 @@
30 30
 #ifndef _ALOOKUP_H_
31 31
 #define _ALOOKUP_H_
32 32
 
33
-#include "../../parser/msg_parser.h"
33
+#include "../../core/parser/msg_parser.h"
34 34
 
35 35
 #define ALIAS_REVERSE_FLAG	(1<<0)
36 36
 #define ALIAS_DOMAIN_FLAG	(1<<1)
... ...
@@ -1,6 +1,6 @@
1 1
 #ifndef ALIASDB_API_H
2 2
 #define ALIASDB_API_H
3
-#include "../../str.h"
3
+#include "../../core/str.h"
4 4
 
5 5
 typedef int (*alias_db_lookup_t)(sip_msg_t*, str table);
6 6
 typedef int (*alias_db_lookup_ex_t)(sip_msg_t*, str table, unsigned long flags);
... ...
@@ -21,8 +21,8 @@
21 21
 
22 22
 #include <libgen.h>
23 23
 
24
-#include "../../str.h"
25
-#include "../../sr_module.h"
24
+#include "../../core/str.h"
25
+#include "../../core/sr_module.h"
26 26
 
27 27
 #include <jni.h>
28 28
 
... ...
@@ -22,13 +22,13 @@
22 22
 #ifndef __GLOBAL_H__
23 23
 #define	__GLOBAL_H__
24 24
 
25
-#include "../../str.h"
26
-#include "../../sr_module.h"
27
-#include "../../action.h"
28
-#include "../../mem/mem.h"
29
-#include "../../sr_module.h"
30
-#include "../../dset.h"
31
-#include "../../parser/msg_parser.h"
25
+#include "../../core/str.h"
26
+#include "../../core/sr_module.h"
27
+#include "../../core/action.h"
28
+#include "../../core/mem/mem.h"
29
+#include "../../core/sr_module.h"
30
+#include "../../core/dset.h"
31
+#include "../../core/parser/msg_parser.h"
32 32
 
33 33
 #include <jni.h>
34 34
 
... ...
@@ -20,8 +20,8 @@
20 20
  *
21 21
  */
22 22
 
23
-#include "../../str.h"
24
-#include "../../sr_module.h"
23
+#include "../../core/str.h"
24
+#include "../../core/sr_module.h"
25 25
 
26 26
 #include <string.h>
27 27
 #include <jni.h>
... ...
@@ -23,7 +23,7 @@
23 23
 #ifndef __JAVA_IFACE_H__
24 24
 #define	__JAVA_IFACE_H__
25 25
 
26
-#include "../../parser/msg_parser.h"
26
+#include "../../core/parser/msg_parser.h"
27 27
 
28 28
 int j_nst_exec_0(struct sip_msg *, char *, char *);
29 29
 int j_nst_exec_1(struct sip_msg *, char *, char *, char *);
... ...
@@ -21,11 +21,11 @@
21 21
  */
22 22
 
23 23
 
24
-#include "../../action.h"
25
-#include "../../mem/mem.h"
26
-#include "../../sr_module.h"
27
-#include "../../dset.h"
28
-#include "../../parser/msg_parser.h"
24
+#include "../../core/action.h"
25
+#include "../../core/mem/mem.h"
26
+#include "../../core/sr_module.h"
27
+#include "../../core/dset.h"
28
+#include "../../core/parser/msg_parser.h"
29 29
 
30 30