[sr-dev] git:master:27b6c641: tm: relocated defines not useful in the header file

Daniel-Constantin Mierla miconda at gmail.com
Wed May 4 09:24:28 CEST 2022


Module: kamailio
Branch: master
Commit: 27b6c641b5d941503f974fea05af506972ac2ab5
URL: https://github.com/kamailio/kamailio/commit/27b6c641b5d941503f974fea05af506972ac2ab5

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2022-05-04T09:00:55+02:00

tm: relocated defines not useful in the header file

---

Modified: src/modules/tm/t_msgbuilder.c
Modified: src/modules/tm/t_msgbuilder.h

---

Diff:  https://github.com/kamailio/kamailio/commit/27b6c641b5d941503f974fea05af506972ac2ab5.diff
Patch: https://github.com/kamailio/kamailio/commit/27b6c641b5d941503f974fea05af506972ac2ab5.patch

---

diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c
index ad9c8ae903..08e50a8ea9 100644
--- a/src/modules/tm/t_msgbuilder.c
+++ b/src/modules/tm/t_msgbuilder.c
@@ -46,6 +46,22 @@
 #endif
 
 
+#define CSEQ "CSeq: "
+#define CSEQ_LEN (sizeof(CSEQ)-1)
+#define TO "To: "
+#define TO_LEN (sizeof(TO)-1)
+#define CALLID "Call-ID: "
+#define CALLID_LEN (sizeof(CALLID)-1)
+#define FROM "From: "
+#define FROM_LEN (sizeof(FROM)-1)
+#define FROMTAG ";tag="
+#define FROMTAG_LEN (sizeof(FROMTAG)-1)
+#define TOTAG ";tag="
+#define TOTAG_LEN (sizeof(TOTAG)-1)
+#define MAXFWD_VALUE "70"
+#define MAXFWD_HEADER "Max-Forwards: " MAXFWD_VALUE CRLF
+#define MAXFWD_HEADER_LEN (sizeof(MAXFWD_HEADER) - 1)
+
 /* convenience macros */
 #define memapp(_d,_s,_len) \
 	do{\
diff --git a/src/modules/tm/t_msgbuilder.h b/src/modules/tm/t_msgbuilder.h
index e22bb0e1de..a97c1f9451 100644
--- a/src/modules/tm/t_msgbuilder.h
+++ b/src/modules/tm/t_msgbuilder.h
@@ -13,8 +13,8 @@
  * 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 
+ * 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
  *
  */
@@ -28,22 +28,6 @@
 #include "h_table.h"
 #include "t_reply.h"
 
-#define CSEQ "CSeq: "
-#define CSEQ_LEN (sizeof(CSEQ)-1)
-#define TO "To: "
-#define TO_LEN (sizeof(TO)-1)
-#define CALLID "Call-ID: "
-#define CALLID_LEN (sizeof(CALLID)-1)
-#define FROM "From: "
-#define FROM_LEN (sizeof(FROM)-1)
-#define FROMTAG ";tag="
-#define FROMTAG_LEN (sizeof(FROMTAG)-1)
-#define TOTAG ";tag="
-#define TOTAG_LEN (sizeof(TOTAG)-1)
-#define MAXFWD_VALUE "70"
-#define MAXFWD_HEADER "Max-Forwards: " MAXFWD_VALUE CRLF
-#define MAXFWD_HEADER_LEN (sizeof(MAXFWD_HEADER) - 1)
-
 char *build_local(struct cell *Trans, unsigned int branch,
 	unsigned int *len, char *method, int method_len, str *to
 	, struct cancel_reason* reason
@@ -55,7 +39,7 @@ char *build_local_reparse(struct cell *Trans, unsigned int branch,
 	);
 
 char *build_uac_request(  str msg_type, str dst, str from,
-	str fromtag, int cseq, str callid, str headers, 
+	str fromtag, int cseq, str callid, str headers,
 	str body, int branch,
 	struct cell *t, unsigned int *len);
 
@@ -71,7 +55,7 @@ char *build_uac_cancel(str *headers,str *body,struct cell *cancelledT,
  * request should be send. The function is used by tm when it generates
  * local ACK to 200 OK (on behalf of applications using uac
  */
-char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans, 
+char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans,
 					unsigned int branch, str *hdrs, str *body,
 					unsigned int *len, struct dest_info* dst);
 
@@ -79,8 +63,8 @@ char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans,
 /*
  * Create a request
  */
-char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int branch, 
-		    struct cell *t, int* len, struct dest_info* dst);
+char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int branch,
+		struct cell *t, int* len, struct dest_info* dst);
 
 
 int t_calc_branch(struct cell *t,




More information about the sr-dev mailing list