Browse code

tm: relocated defines not useful in the header file

(cherry picked from commit 27b6c641b5d941503f974fea05af506972ac2ab5)

Daniel-Constantin Mierla authored on 04/05/2022 07:00:55
Showing 2 changed files
... ...
@@ -46,6 +46,22 @@
46 46
 #endif
47 47
 
48 48
 
49
+#define CSEQ "CSeq: "
50
+#define CSEQ_LEN (sizeof(CSEQ)-1)
51
+#define TO "To: "
52
+#define TO_LEN (sizeof(TO)-1)
53
+#define CALLID "Call-ID: "
54
+#define CALLID_LEN (sizeof(CALLID)-1)
55
+#define FROM "From: "
56
+#define FROM_LEN (sizeof(FROM)-1)
57
+#define FROMTAG ";tag="
58
+#define FROMTAG_LEN (sizeof(FROMTAG)-1)
59
+#define TOTAG ";tag="
60
+#define TOTAG_LEN (sizeof(TOTAG)-1)
61
+#define MAXFWD_VALUE "70"
62
+#define MAXFWD_HEADER "Max-Forwards: " MAXFWD_VALUE CRLF
63
+#define MAXFWD_HEADER_LEN (sizeof(MAXFWD_HEADER) - 1)
64
+
49 65
 /* convenience macros */
50 66
 #define memapp(_d,_s,_len) \
51 67
 	do{\
... ...
@@ -13,8 +13,8 @@
13 13
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 14
  * GNU General Public License for more details.
15 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 
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 18
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
19 19
  *
20 20
  */
... ...
@@ -28,22 +28,6 @@
28 28
 #include "h_table.h"
29 29
 #include "t_reply.h"
30 30
 
31
-#define CSEQ "CSeq: "
32
-#define CSEQ_LEN (sizeof(CSEQ)-1)
33
-#define TO "To: "
34
-#define TO_LEN (sizeof(TO)-1)
35
-#define CALLID "Call-ID: "
36
-#define CALLID_LEN (sizeof(CALLID)-1)
37
-#define FROM "From: "
38
-#define FROM_LEN (sizeof(FROM)-1)
39
-#define FROMTAG ";tag="
40
-#define FROMTAG_LEN (sizeof(FROMTAG)-1)
41
-#define TOTAG ";tag="
42
-#define TOTAG_LEN (sizeof(TOTAG)-1)
43
-#define MAXFWD_VALUE "70"
44
-#define MAXFWD_HEADER "Max-Forwards: " MAXFWD_VALUE CRLF
45
-#define MAXFWD_HEADER_LEN (sizeof(MAXFWD_HEADER) - 1)
46
-
47 31
 char *build_local(struct cell *Trans, unsigned int branch,
48 32
 	unsigned int *len, char *method, int method_len, str *to
49 33
 	, struct cancel_reason* reason
... ...
@@ -55,7 +39,7 @@ char *build_local_reparse(struct cell *Trans, unsigned int branch,
55 39
 	);
56 40
 
57 41
 char *build_uac_request(  str msg_type, str dst, str from,
58
-	str fromtag, int cseq, str callid, str headers, 
42
+	str fromtag, int cseq, str callid, str headers,
59 43
 	str body, int branch,
60 44
 	struct cell *t, unsigned int *len);
61 45
 
... ...
@@ -71,7 +55,7 @@ char *build_uac_cancel(str *headers,str *body,struct cell *cancelledT,
71 55
  * request should be send. The function is used by tm when it generates
72 56
  * local ACK to 200 OK (on behalf of applications using uac
73 57
  */
74
-char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans, 
58
+char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans,
75 59
 					unsigned int branch, str *hdrs, str *body,
76 60
 					unsigned int *len, struct dest_info* dst);
77 61
 
... ...
@@ -79,8 +63,8 @@ char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans,
79 63
 /*
80 64
  * Create a request
81 65
  */
82
-char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int branch, 
83
-		    struct cell *t, int* len, struct dest_info* dst);
66
+char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int branch,
67
+		struct cell *t, int* len, struct dest_info* dst);
84 68
 
85 69
 
86 70
 int t_calc_branch(struct cell *t,