2
0
Эх сурвалжийг харах

"Route :" prefix (and separator) is used some more time across the
source. It was defined 3 times (with a small variation). Applied patch
moves the definition to global config.h.

Closes #SER-420.

Bogdan Pintea 16 жил өмнө
parent
commit
c711622635

+ 6 - 0
config.h

@@ -73,6 +73,12 @@
 #define MY_VIA "Via: SIP/2.0/UDP "
 #define MY_VIA "Via: SIP/2.0/UDP "
 #define MY_VIA_LEN (sizeof(MY_VIA) - 1)
 #define MY_VIA_LEN (sizeof(MY_VIA) - 1)
 
 
+#define ROUTE_PREFIX "Route: "
+#define ROUTE_PREFIX_LEN (sizeof(ROUTE_PREFIX) - 1)
+
+#define ROUTE_SEPARATOR ", "
+#define ROUTE_SEPARATOR_LEN (sizeof(ROUTE_SEPARATOR) - 1)
+
 #define CONTENT_LENGTH "Content-Length: "
 #define CONTENT_LENGTH "Content-Length: "
 #define CONTENT_LENGTH_LEN (sizeof(CONTENT_LENGTH)-1)
 #define CONTENT_LENGTH_LEN (sizeof(CONTENT_LENGTH)-1)
 
 

+ 0 - 6
modules/tm/dlg.c

@@ -54,12 +54,6 @@
 #define NORMAL_ORDER 0  /* Create route set in normal order - UAS */
 #define NORMAL_ORDER 0  /* Create route set in normal order - UAS */
 #define REVERSE_ORDER 1 /* Create route set in reverse order - UAC */
 #define REVERSE_ORDER 1 /* Create route set in reverse order - UAC */
 
 
-#define ROUTE_PREFIX "Route: "
-#define ROUTE_PREFIX_LEN (sizeof(ROUTE_PREFIX) - 1)
-
-#define ROUTE_SEPARATOR "," CRLF "       "
-#define ROUTE_SEPARATOR_LEN (sizeof(ROUTE_SEPARATOR) - 1)
-
 
 
 #ifdef DIALOG_CALLBACKS
 #ifdef DIALOG_CALLBACKS
 
 

+ 0 - 6
modules/tm/t_msgbuilder.c

@@ -70,12 +70,6 @@
 #endif
 #endif
 
 
 
 
-#define ROUTE_PREFIX "Route: "
-#define ROUTE_PREFIX_LEN (sizeof(ROUTE_PREFIX) - 1)
-
-#define ROUTE_SEPARATOR ", "
-#define ROUTE_SEPARATOR_LEN (sizeof(ROUTE_SEPARATOR) - 1)
-
 #define  append_mem_block(_d,_s,_len) \
 #define  append_mem_block(_d,_s,_len) \
 		do{\
 		do{\
 			memcpy((_d),(_s),(_len));\
 			memcpy((_d),(_s),(_len));\