[sr-dev] git:master: tm: use server signature from config var

[Daniel-Constantin Mierla]

Module: sip-router
Branch: master
Commit: d3be842237ba670d671b8af0f59a39dda7503545
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d3be842237ba670d671b8af0f59a39dda7503545

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Thu Aug 20 11:48:35 2009 +0300

tm: use server signature from config var

---

 modules/tm/t_msgbuilder.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c
index fe0eed4..a76c3db 100644
--- a/modules/tm/t_msgbuilder.c
+++ b/modules/tm/t_msgbuilder.c
@@ -154,7 +154,7 @@ char *build_local(struct cell *Trans,unsigned int branch,
 
 	/* User Agent */
 	if (server_signature) {
-		*len += USER_AGENT_LEN + CRLF_LEN;
+		*len += user_agent_hdr.len + CRLF_LEN;
 	}
 	/* Content Length, EoM */
 	*len+=CONTENT_LENGTH_LEN+1 + CRLF_LEN + CRLF_LEN;
@@ -194,7 +194,8 @@ char *build_local(struct cell *Trans,unsigned int branch,
 
 	/* User Agent header */
 	if (server_signature) {
-		append_str(p,USER_AGENT CRLF, USER_AGENT_LEN+CRLF_LEN );
+		append_str(p, user_agent_hdr.s, user_agent_hdr.len );
+		append_str(p, CRLF, CRLF_LEN );
 	}
 	/* Content Length, EoM */
 	append_str(p, CONTENT_LENGTH "0" CRLF CRLF ,
@@ -1026,7 +1027,7 @@ char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans,
 	*len += calc_routeset_len(list, cont);
 	
 	     /* User Agent */
-	if (server_signature) *len += USER_AGENT_LEN + CRLF_LEN;
+	if (server_signature) *len += user_agent_hdr.len + CRLF_LEN;
 		/* extra headers */
 	if (hdrs)
 		*len += hdrs->len;
@@ -1077,7 +1078,8 @@ char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans,
 	
 	     /* User Agent header */
 	if (server_signature) {
-		append_str(p, USER_AGENT CRLF, USER_AGENT_LEN + CRLF_LEN);
+		append_str(p, user_agent_hdr.s, user_agent_hdr.len);
+		append_str(p, CRLF, CRLF_LEN);
 	}
 	
 	/* extra headers */
@@ -1342,7 +1344,7 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int bra
 	*len += calculate_routeset_length(dialog);                                                   /* Route set */
 	*len += CONTENT_LENGTH_LEN + content_length.len + CRLF_LEN; /* Content-
 																	 Length */
-	*len += (server_signature ? (USER_AGENT_LEN + CRLF_LEN) : 0);                                /* Signature */
+	*len += (server_signature ? (user_agent_hdr.len + CRLF_LEN) : 0);	                         /* Signature */
 	*len += (headers ? headers->len : 0);                                                        /* Additional headers */
 	*len += (body ? body->len : 0);                                                              /* Message body */
 	*len += CRLF_LEN;                                                                            /* End of Header */
@@ -1369,7 +1371,10 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int bra
 	memapp(w, CRLF, CRLF_LEN);
 	
 	     /* Server signature */
-	if (server_signature) memapp(w, USER_AGENT CRLF, USER_AGENT_LEN + CRLF_LEN);
+	if (server_signature) {
+		memapp(w, user_agent_hdr.s, user_agent_hdr.len);
+		memapp(w, CRLF, CRLF_LEN);
+	}
 	if (headers) memapp(w, headers->s, headers->len);
 	memapp(w, CRLF, CRLF_LEN);
      	if (body) memapp(w, body->s, body->len);