Browse code

Fix relative paths to tm header files.

This patch fixes relative paths to header files included from the tm
module. The module is located in sip-router/modules which kamailio
modules are in sip-router/modules_k, thus we have to replace ../tm/
with ../../modules/tm/.

Jan Janak authored on 15/04/2009 15:09:42
Showing 59 changed files
... ...
@@ -56,7 +56,7 @@
56 56
 #include "../../parser/msg_parser.h"
57 57
 #include "../../parser/parse_from.h"
58 58
 #include "../../parser/digest/digest.h"
59
-#include "../tm/t_funcs.h"
59
+#include "../../modules/tm/t_funcs.h"
60 60
 #include "acc_mod.h"
61 61
 #include "acc.h"
62 62
 #include "acc_extra.h"
... ...
@@ -41,7 +41,7 @@
41 41
 #include "../../dprint.h"
42 42
 #include "../../parser/parse_from.h"
43 43
 #include "../../parser/parse_content.h"
44
-#include "../tm/tm_load.h"
44
+#include "../../modules/tm/tm_load.h"
45 45
 #include "../rr/api.h"
46 46
 #include "../../lib/kcore/km_ut.h"
47 47
 #include "../../flags.h"
... ...
@@ -38,7 +38,7 @@
38 38
 #define _ACC_ACC_LOGIC_H
39 39
 
40 40
 #include "../../str.h"
41
-#include "../tm/t_hooks.h"
41
+#include "../../modules/tm/t_hooks.h"
42 42
 
43 43
 
44 44
 /* various acc variables */
... ...
@@ -66,7 +66,7 @@
66 66
 #include "../../lib/kcore/local_route.h"
67 67
 #include "../../dprint.h"
68 68
 #include "../../mem/mem.h"
69
-#include "../tm/tm_load.h"
69
+#include "../../modules/tm/tm_load.h"
70 70
 #include "../rr/api.h"
71 71
 #include "acc.h"
72 72
 #include "acc_mod.h"
... ...
@@ -30,7 +30,7 @@
30 30
 #include "../../str.h"
31 31
 #include "../../usr_avp.h"
32 32
 #include "../usrloc/usrloc.h"
33
-#include "../tm/tm_load.h"
33
+#include "../../modules/tm/tm_load.h"
34 34
 #include "../sl/sl_api.h"
35 35
 
36 36
 struct cpl_enviroment {
... ...
@@ -26,7 +26,7 @@
26 26
  *             transaction is created (bogdan)
27 27
  */
28 28
 
29
-#include "../tm/h_table.h"
29
+#include "../../modules/tm/h_table.h"
30 30
 #include "../../parser/contact/parse_contact.h"
31 31
 
32 32
 
... ...
@@ -41,7 +41,7 @@
41 41
 #include "../../dprint.h"
42 42
 #include "../../parser/msg_parser.h"
43 43
 #include "../../data_lump_rpl.h"
44
-#include "../tm/tm_load.h"
44
+#include "../../modules/tm/tm_load.h"
45 45
 #include "../usrloc/usrloc.h"
46 46
 #include "CPL_tree.h"
47 47
 #include "loc_set.h"
... ...
@@ -23,7 +23,7 @@
23 23
 
24 24
 #include "../../action.h"
25 25
 #include "../../dset.h"
26
-#include "../tm/tm_load.h"
26
+#include "../../modules/tm/tm_load.h"
27 27
 #include "loc_set.h"
28 28
 #include "cpl_sig.h"
29 29
 #include "cpl_env.h"
... ...
@@ -55,7 +55,7 @@
55 55
 #include "../../lib/kmi/mi.h"
56 56
 #include "../../lvalue.h"
57 57
 #include "../../parser/parse_to.h"
58
-#include "../tm/tm_load.h"
58
+#include "../../modules/tm/tm_load.h"
59 59
 #include "../rr/api.h"
60 60
 #include "dlg_hash.h"
61 61
 #include "dlg_timer.h"
... ...
@@ -60,7 +60,7 @@
60 60
 #include "../../parser/contact/parse_contact.h"
61 61
 #include "../../parser/parse_from.h"
62 62
 #include "../../parser/parse_rr.h"
63
-#include "../tm/tm_load.h"
63
+#include "../../modules/tm/tm_load.h"
64 64
 #include "../rr/api.h"
65 65
 #include "dlg_hash.h"
66 66
 #include "dlg_timer.h"
... ...
@@ -33,7 +33,7 @@
33 33
 #include "../../parser/msg_parser.h"
34 34
 #include "../../str.h"
35 35
 #include "../../pvar.h"
36
-#include "../tm/t_hooks.h"
36
+#include "../../modules/tm/t_hooks.h"
37 37
 #include "dlg_timer.h"
38 38
 
39 39
 #define MAX_DLG_RR_PARAM_NAME 32
... ...
@@ -40,7 +40,7 @@
40 40
 #include "../../dprint.h"
41 41
 #include "../../ut.h"
42 42
 #include "../../route.h"
43
-#include "../tm/tm_load.h"
43
+#include "../../modules/tm/tm_load.h"
44 44
 #include "dlg_hash.h"
45 45
 #include "dlg_profile.h"
46 46
 
... ...
@@ -34,8 +34,8 @@
34 34
 #include "../../dprint.h"
35 35
 #include "../../config.h"
36 36
 #include "../../socket_info.h"
37
-#include "../tm/dlg.h"
38
-#include "../tm/tm_load.h"
37
+#include "../../modules/tm/dlg.h"
38
+#include "../../modules/tm/tm_load.h"
39 39
 #include "../../lib/kmi/tree.h"
40 40
 #include "../../lib/kcore/km_ut.h"
41 41
 #include "dlg_timer.h"
... ...
@@ -31,7 +31,7 @@
31 31
 #include "../../parser/parse_from.h"
32 32
 #include "../../parser/msg_parser.h"
33 33
 
34
-#include "../tm/tm_load.h"
34
+#include "../../modules/tm/tm_load.h"
35 35
 
36 36
 #include "dlg_req_within.h"
37 37
 #include "dlg_transfer.h"
... ...
@@ -63,7 +63,7 @@
63 63
 #include "../../parser/digest/digest.h"
64 64
 #include "../../resolve.h"
65 65
 #include "../../lvalue.h"
66
-#include "../tm/tm_load.h"
66
+#include "../../modules/tm/tm_load.h"
67 67
 #include "../../lib/srdb1/db.h"
68 68
 #include "../../lib/srdb1/db_res.h"
69 69
 #include "../../str.h"
... ...
@@ -43,7 +43,7 @@
43 43
 #include <stdio.h>
44 44
 #include "../../pvar.h"
45 45
 #include "../../parser/msg_parser.h"
46
-#include "../tm/tm_load.h"
46
+#include "../../modules/tm/tm_load.h"
47 47
 
48 48
 
49 49
 #define DS_HASH_USER_ONLY	1  /*!< use only the uri user part for hashing */
... ...
@@ -50,7 +50,7 @@
50 50
 #include "../../lib/kcore/hash_func.h"
51 51
 #include "../../lib/kmi/mi.h"
52 52
 
53
-#include "../tm/tm_load.h"
53
+#include "../../modules/tm/tm_load.h"
54 54
 
55 55
 
56 56
 #include "imc_mng.h"
... ...
@@ -28,7 +28,7 @@
28 28
 #ifndef _IMC_H_
29 29
 #define _IMC_H_
30 30
 
31
-#include "../tm/tm_load.h"
31
+#include "../../modules/tm/tm_load.h"
32 32
 
33 33
 extern str imc_cmd_start_str;
34 34
 extern char imc_cmd_start_char;
... ...
@@ -59,7 +59,7 @@
59 59
 #include "../../parser/parse_from.h"
60 60
 #include "../../lib/srdb1/db.h"
61 61
 
62
-#include "../tm/tm_load.h"
62
+#include "../../modules/tm/tm_load.h"
63 63
 
64 64
 #ifdef HAVE_IHTTP
65 65
 #include "../ihttp/ih_load.h"
... ...
@@ -51,7 +51,7 @@
51 51
 #include "../../timer.h"
52 52
 #include "../../mem/mem.h"
53 53
 #include "../../mem/shm_mem.h"
54
-#include "../tm/tm_load.h"
54
+#include "../../modules/tm/tm_load.h"
55 55
 
56 56
 #include "xjab_worker.h"
57 57
 #include "xjab_util.h"
... ...
@@ -35,7 +35,7 @@
35 35
 #include "../../str.h"
36 36
 #include "../../lib/srdb1/db.h"
37 37
 #include "../../locking.h"
38
-#include "../tm/tm_load.h"
38
+#include "../../modules/tm/tm_load.h"
39 39
 
40 40
 #include "xjab_util.h"
41 41
 #include "tree234.h"
... ...
@@ -64,7 +64,7 @@
64 64
 #include "../../lib/kmi/mi.h"
65 65
 #include "../../mod_fix.h"
66 66
 #include "../../socket_info.h"
67
-#include "../tm/tm_load.h"
67
+#include "../../modules/tm/tm_load.h"
68 68
 #include "../../pvar.h"
69 69
 #include "../../mod_fix.h"
70 70
 #include "hash.h"
... ...
@@ -64,7 +64,7 @@
64 64
 #include "../../usr_avp.h"
65 65
 #include "../../mod_fix.h"
66 66
 
67
-#include "../tm/tm_load.h"
67
+#include "../../modules/tm/tm_load.h"
68 68
 
69 69
 #include "ms_msg_list.h"
70 70
 #include "msfuncs.h"
... ...
@@ -49,7 +49,7 @@
49 49
 #include "../../parser/parse_expires.h"
50 50
 #include "../../parser/contact/parse_contact.h"
51 51
 #include "../dialog/dlg_load.h"
52
-#include "../tm/tm_load.h"
52
+#include "../../modules/tm/tm_load.h"
53 53
 #include "../sl/sl_cb.h"
54 54
 
55 55
 
... ...
@@ -32,7 +32,7 @@
32 32
  *  2006-03-13  TM functions are loaded via API function (bogdan)
33 33
  */
34 34
 
35
-#include "../tm/tm_load.h"
35
+#include "../../modules/tm/tm_load.h"
36 36
 #include "tm.h"
37 37
 #include "destination.h"
38 38
 
... ...
@@ -45,7 +45,7 @@
45 45
 #include "../../lib/srdb1/db_val.h"
46 46
 #include "../../lib/kcore/hash_func.h"
47 47
 #include "../../socket_info.h"
48
-#include "../tm/tm_load.h"
48
+#include "../../modules/tm/tm_load.h"
49 49
 #include "../pua/hash.h"
50 50
 #include "presentity.h"
51 51
 #include "presence.h"
... ...
@@ -33,7 +33,7 @@
33 33
 
34 34
 
35 35
 #include "../../str.h"
36
-#include "../tm/dlg.h"
36
+#include "../../modules/tm/dlg.h"
37 37
 #include "subscribe.h"
38 38
 #include "presentity.h"
39 39
 
... ...
@@ -63,7 +63,7 @@
63 63
 #include "../../mem/mem.h"
64 64
 #include "../../mem/shm_mem.h"
65 65
 #include "../../usr_avp.h"
66
-#include "../tm/tm_load.h"
66
+#include "../../modules/tm/tm_load.h"
67 67
 #include "../sl/sl_api.h"
68 68
 #include "../../pt.h"
69 69
 #include "../../lib/kmi/mi.h"
... ...
@@ -37,7 +37,7 @@
37 37
 #define PA_MOD_H
38 38
 
39 39
 #include "../../parser/msg_parser.h"
40
-#include "../tm/tm_load.h"
40
+#include "../../modules/tm/tm_load.h"
41 41
 #include "../sl/sl_api.h"
42 42
 #include "../../lib/srdb1/db.h"
43 43
 #include "../../parser/parse_from.h"
... ...
@@ -42,7 +42,7 @@
42 42
 #include "../../mem/mem.h"
43 43
 #include "../../pt.h"
44 44
 #include "../../lib/srdb1/db.h"
45
-#include "../tm/tm_load.h"
45
+#include "../../modules/tm/tm_load.h"
46 46
 #include "pua.h"
47 47
 #include "send_publish.h"
48 48
 #include "send_subscribe.h"
... ...
@@ -41,7 +41,7 @@
41 41
 #include "../../parser/msg_parser.h"
42 42
 #include "../../lib/kcore/cmpapi.h"
43 43
 #include "../../lib/kcore/hash_func.h"
44
-#include "../tm/tm_load.h"
44
+#include "../../modules/tm/tm_load.h"
45 45
 #include "pua.h"
46 46
 #include "hash.h"
47 47
 #include "send_publish.h"
... ...
@@ -26,7 +26,7 @@
26 26
 #ifndef _PU_SEND_PUBLISH_
27 27
 #define _PU_SEND_PUBLISH_
28 28
 #include <time.h>
29
-#include "../tm/tm_load.h"
29
+#include "../../modules/tm/tm_load.h"
30 30
 #include "../../str.h"
31 31
 #include "hash.h"
32 32
 #include "event_list.h"
... ...
@@ -32,8 +32,8 @@
32 32
 #include "../../mem/mem.h"
33 33
 #include "../../dprint.h"
34 34
 #include "../../ut.h"
35
-#include "../tm/tm_load.h"
36
-#include "../tm/dlg.h"
35
+#include "../../modules/tm/tm_load.h"
36
+#include "../../modules/tm/dlg.h"
37 37
 #include "../../parser/msg_parser.h"
38 38
 #include "../../parser/contact/parse_contact.h"
39 39
 #include "../../parser/parse_from.h"
... ...
@@ -28,7 +28,7 @@
28 28
 
29 29
 #include <time.h>
30 30
 
31
-#include "../tm/tm_load.h"
31
+#include "../../modules/tm/tm_load.h"
32 32
 #include "../../str.h"
33 33
 #include "hash.h"
34 34
 
... ...
@@ -35,7 +35,7 @@
35 35
 #include "../../socket_info.h"
36 36
 #include "../usrloc/usrloc.h"
37 37
 #include "../usrloc/ul_callback.h"
38
-#include "../tm/tm_load.h"
38
+#include "../../modules/tm/tm_load.h"
39 39
 #include "../pua/pua.h"
40 40
 #include "pua_dialoginfo.h"
41 41
 
... ...
@@ -39,7 +39,7 @@
39 39
 #include "../../str.h"
40 40
 #include "../../mem/mem.h"
41 41
 #include "../../pt.h"
42
-#include "../tm/tm_load.h"
42
+#include "../../modules/tm/tm_load.h"
43 43
 #include "../pua/pua_bind.h"
44 44
 #include "mi_func.h"
45 45
 
... ...
@@ -33,7 +33,7 @@
33 33
 #include "../../str.h"
34 34
 #include "../usrloc/usrloc.h"
35 35
 #include "../usrloc/ul_callback.h"
36
-#include "../tm/tm_load.h"
36
+#include "../../modules/tm/tm_load.h"
37 37
 #include "../pua/pua.h"
38 38
 #include "pua_usrloc.h"
39 39
 
... ...
@@ -44,7 +44,7 @@
44 44
 #include "../../mem/shm_mem.h"
45 45
 #include "../../parser/parse_expires.h"
46 46
 #include "../../parser/msg_parser.h"
47
-#include "../tm/tm_load.h"
47
+#include "../../modules/tm/tm_load.h"
48 48
 #include "../xmpp/xmpp_api.h"
49 49
 #include "../pua/pua_bind.h"
50 50
 
... ...
@@ -29,7 +29,7 @@
29 29
 #include "../../parser/msg_parser.h"
30 30
 #include "../../parser/parse_content.h"
31 31
 #include "../../parser/parse_from.h"
32
-#include "../tm/tm_load.h"
32
+#include "../../modules/tm/tm_load.h"
33 33
 #include "../pua/pua_bind.h"
34 34
 #include "../pua/pidf.h"
35 35
 
... ...
@@ -23,7 +23,7 @@
23 23
 
24 24
 #include "../../dprint.h"
25 25
 #include "../../str.h"
26
-#include "../tm/tm_load.h"
26
+#include "../../modules/tm/tm_load.h"
27 27
 #include "../pua/pua_bind.h"
28 28
 #include "../pua/pidf.h"
29 29
 
... ...
@@ -41,7 +41,7 @@
41 41
 #include "../../parser/parse_cseq.h"
42 42
 #include "../../parser/contact/parse_contact.h"
43 43
 #include "../../parser/parse_rr.h"
44
-#include "../tm/dlg.h"
44
+#include "../../modules/tm/dlg.h"
45 45
 #include "../presence/utils_func.h"
46 46
 #include "../presence/hash.h"
47 47
 #include "../../lib/kcore/hash_func.h"
... ...
@@ -43,7 +43,7 @@
43 43
 #include "../../ut.h"
44 44
 #include "../../mem/mem.h"
45 45
 #include "../../mem/shm_mem.h"
46
-#include "../tm/tm_load.h"
46
+#include "../../modules/tm/tm_load.h"
47 47
 #include "../sl/sl_api.h"
48 48
 #include "../presence/bind_presence.h"
49 49
 #include "../presence/hash.h"
... ...
@@ -34,9 +34,9 @@
34 34
 #include "../../mem/shm_mem.h" /*shm_malloc*/
35 35
 #include "../../dprint.h" /*LM_**/
36 36
 #include "../../error.h" /*ser_error*/
37
-#include "../tm/tm_load.h" /*load_tm_api*/
38
-#include "../tm/h_table.h" /*cell*/
39
-#include "../tm/t_lookup.h" /*T_UNDEFINED*/
37
+#include "../../modules/tm/tm_load.h" /*load_tm_api*/
38
+#include "../../modules/tm/h_table.h" /*cell*/
39
+#include "../../modules/tm/t_lookup.h" /*T_UNDEFINED*/
40 40
 
41 41
 #include "encode_msg.h" /*encode_msg*/
42 42
 
... ...
@@ -26,7 +26,7 @@
26 26
 #include "../../str.h"/*str*/
27 27
 #include "../../ip_addr.h"/*ip_addr*/
28 28
 #include "../../sr_module.h" /*version,etc*/
29
-#include "../tm/tm_load.h"/*tm_binds*/
29
+#include "../../modules/tm/tm_load.h"/*tm_binds*/
30 30
 #include "ha.h"
31 31
 #include "cluster.h"
32 32
 #define MAX_AS_NR 5
... ...
@@ -54,9 +54,9 @@
54 54
 #include "../../parser/parse_uri.h" /*parse_uri*/
55 55
 #include "../../parser/msg_parser.h"
56 56
 #include "encode_msg.h"
57
-#include "../tm/t_lookup.h"
58
-#include "../tm/h_table.h"
59
-#include "../tm/dlg.h"
57
+#include "../../modules/tm/t_lookup.h"
58
+#include "../../modules/tm/h_table.h"
59
+#include "../../modules/tm/dlg.h"
60 60
 #include "seas.h"
61 61
 #include "statistics.h"
62 62
 #include "seas_action.h"
... ...
@@ -23,7 +23,7 @@
23 23
 #include <time.h>
24 24
 #include "../../lib/kcore/hash_func.h"/* for TABLE_ENTRIES define*/
25 25
 #include "../../locking.h"/* for TABLE_ENTRIES define*/
26
-#include "../tm/h_table.h"/* for struct cell*/
26
+#include "../../modules/tm/h_table.h"/* for struct cell*/
27 27
 #define STATS_CELLS 50
28 28
 #define UAS_T 0
29 29
 #define UAC_T 1
... ...
@@ -44,7 +44,7 @@
44 44
 #include "../../parser/parse_content.h"
45 45
 #include "../../parser/parse_from.h"
46 46
 #include "../../pvar.h"
47
-#include "../tm/tm_load.h"
47
+#include "../../modules/tm/tm_load.h"
48 48
 #include "../sl/sl_cb.h"
49 49
 #include "../../str.h"
50 50
 
... ...
@@ -58,7 +58,7 @@
58 58
 #include "../../mem/mem.h"
59 59
 #include "../../pvar.h"
60 60
 
61
-#include "../tm/tm_load.h"
61
+#include "../../modules/tm/tm_load.h"
62 62
 
63 63
 #include "sl_funcs.h"
64 64
 #include "sl_api.h"
... ...
@@ -44,7 +44,7 @@
44 44
 #include "../../mem/mem.h"
45 45
 #include "../../mem/shm_mem.h"
46 46
 #include "../../socket_info.h"
47
-#include "../tm/tm_load.h"
47
+#include "../../modules/tm/tm_load.h"
48 48
 #include "sms_funcs.h"
49 49
 #include "sms_report.h"
50 50
 #include "libsms_modem.h"
... ...
@@ -43,8 +43,8 @@
43 43
 #include "../../parser/parse_from.h"
44 44
 #include "../../data_lump_rpl.h"
45 45
 #include "../../lib/kcore/km_ut.h"
46
-#include "../tm/t_hooks.h"
47
-#include "../tm/uac.h"
46
+#include "../../modules/tm/t_hooks.h"
47
+#include "../../modules/tm/uac.h"
48 48
 #include "sms_funcs.h"
49 49
 #include "sms_report.h"
50 50
 #include "libsms_modem.h"
... ...
@@ -27,7 +27,7 @@
27 27
 #include "../../parser/msg_parser.h"
28 28
 #include "../../str.h"
29 29
 #include <termios.h>
30
-#include "../tm/tm_load.h"
30
+#include "../../modules/tm/tm_load.h"
31 31
 
32 32
 
33 33
 #define MAX_MODEMS    5       /* max number of modems */
... ...
@@ -36,7 +36,7 @@
36 36
 #include "../../data_lump.h"
37 37
 #include "../../mem/mem.h"
38 38
 #include "../../hashes.h"
39
-#include "../tm/tm_load.h"
39
+#include "../../modules/tm/tm_load.h"
40 40
 
41 41
 #include "auth.h"
42 42
 #include "auth_alg.h"
... ...
@@ -39,8 +39,8 @@
39 39
 #include "../../parser/parse_from.h"
40 40
 #include "../../mem/mem.h"
41 41
 #include "../../data_lump.h"
42
-#include "../tm/h_table.h"
43
-#include "../tm/tm_load.h"
42
+#include "../../modules/tm/h_table.h"
43
+#include "../../modules/tm/tm_load.h"
44 44
 #include "../rr/api.h"
45 45
 
46 46
 #include "from.h"
... ...
@@ -31,7 +31,7 @@
31 31
 
32 32
 #include "../../parser/msg_parser.h"
33 33
 #include "../../str.h"
34
-#include "../tm/t_hooks.h"
34
+#include "../../modules/tm/t_hooks.h"
35 35
 
36 36
 #define FROM_NO_RESTORE      (0)
37 37
 #define FROM_AUTO_RESTORE    (1)
... ...
@@ -41,8 +41,8 @@
41 41
 #include "../../error.h"
42 42
 #include "../../pvar.h"
43 43
 #include "../../mem/mem.h"
44
-#include "../tm/tm_load.h"
45
-#include "../tm/t_hooks.h"
44
+#include "../../modules/tm/tm_load.h"
45
+#include "../../modules/tm/t_hooks.h"
46 46
 #include "../rr/api.h"
47 47
 
48 48
 #include "from.h"
... ...
@@ -22,7 +22,7 @@
22 22
 
23 23
 #include "../../dprint.h"
24 24
 
25
-#include "../tm/tm_load.h"
25
+#include "../../modules/tm/tm_load.h"
26 26
 
27 27
 #include "uac_send.h"
28 28
 
... ...
@@ -32,7 +32,7 @@
32 32
 #include "../../parser/msg_parser.h"
33 33
 #include "../../sr_module.h"
34 34
 #include "../../str.h"
35
-#include "../tm/tm_load.h"
35
+#include "../../modules/tm/tm_load.h"
36 36
 #include "../acc/acc_logic.h"
37 37
 
38 38
 typedef int (*tm_get_trans_f)( struct sip_msg*, struct cell**);
... ...
@@ -32,7 +32,7 @@
32 32
 #include "../../str.h"
33 33
 #include "../../dprint.h"
34 34
 #include "../../mem/mem.h"
35
-#include "../tm/tm_load.h"
35
+#include "../../modules/tm/tm_load.h"
36 36
 #include "rd_funcs.h"
37 37
 #include "rd_filter.h"
38 38
 
... ...
@@ -105,7 +105,7 @@
105 105
 #include "../../parser/msg_parser.h"
106 106
 #include "../../parser/parse_content.h"
107 107
 #include "../../parser/parse_from.h"
108
-#include "../tm/tm_load.h"
108
+#include "../../modules/tm/tm_load.h"
109 109
 
110 110
 #include "xode.h"
111 111
 #include "xmpp.h"