From e8c985abf3265c02d6c20e6b8b51ee433d927063 Mon Sep 17 00:00:00 2001 From: nils-ohlmeier Date: Fri, 19 Jan 2007 17:00:33 +0000 Subject: [PATCH] moved UA header to one central define git-svn-id: http://svn.berlios.de/svnroot/repos/sipsak/trunk@429 75b5f7c7-cfd4-0310-b54c-e118b2c5249a (cherry picked from commit 1b991473ad78f8b1b661d331fdac7fd0fd4c5a01) (cherry picked from commit ade4019081cc41d458eef97dd8e4c24891838434) --- request.c | 36 ++++++++++++++++++------------------ sipsak.h | 5 +++-- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/request.c b/request.c index 9405719..1147e33 100644 --- a/request.c +++ b/request.c @@ -54,7 +54,7 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int "%s%i %s\r\n" "%s0\r\n" "%s70\r\n" - "%ssipsak %s\r\n", + "%s%s\r\n", REG_STR, domainname, SIP20_STR, FROM_STR, username, domainname, c, TO_STR, username, domainname, @@ -62,7 +62,7 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int CSEQ_STR, cseq, REG_STR, CON_LEN_STR, MAX_FRW_STR, - UA_STR, SIPSAK_VERSION); + UA_STR, UA_VAL_STR); req_buff += strlen(req_buff); if (contact_uri!=NULL) { sprintf(req_buff, "%s%i\r\n" @@ -97,7 +97,7 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int "%s%i\r\n" "%s0\r\n" "%s70\r\n" - "%ssipsak %s\r\n" + "%s%s\r\n" "%ssip:%s%s:%i;%s0", REG_STR, domainname, SIP20_STR, FROM_STR, username, domainname, c, @@ -107,7 +107,7 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int EXP_STR, expires_t, CON_LEN_STR, MAX_FRW_STR, - UA_STR, SIPSAK_VERSION, + UA_STR, UA_VAL_STR, CONT_STR, username, fqdn, lport, CON_EXP_STR); req_buff += strlen(req_buff); if (transport != SIP_UDP_TRANSPORT) { @@ -130,7 +130,7 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int "%ssip:sipsak@%s:%i\r\n" "%sDONT ANSWER this test call!\r\n" "%s70\r\n" - "%ssipsak %s\r\n" + "%s%s\r\n" "\r\n", INV_STR, username, domainname, SIP20_STR, FROM_STR, fqdn, lport, c, @@ -141,7 +141,7 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int CONT_STR, fqdn, lport, SUB_STR, MAX_FRW_STR, - UA_STR, SIPSAK_VERSION); + UA_STR, UA_VAL_STR); add_via(req_buf_begin); sprintf(repl_buff, "%s" @@ -151,7 +151,7 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int "%s%i %s\r\n" "%s0\r\n" "%ssip:sipsak_conf@%s:%i\r\n" - "%ssipsak %s\r\n" + "%s%s\r\n" "\r\n", SIP200_STR, FROM_STR, fqdn, lport, c, @@ -160,7 +160,7 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int CSEQ_STR, cseq, INV_STR, CON_LEN_STR, CONT_STR, fqdn, lport, - UA_STR, SIPSAK_VERSION); + UA_STR, UA_VAL_STR); break; case REQ_MES: sprintf(req_buff, @@ -170,14 +170,14 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int "%s%i %s\r\n" "%s%s\r\n" "%s70\r\n" - "%ssipsak %s\r\n", + "%s%s\r\n", MES_STR, username, domainname, SIP20_STR, TO_STR, username, domainname, CALL_STR, c, fqdn, CSEQ_STR, cseq, MES_STR, CON_TYP_STR, TXT_PLA_STR, MAX_FRW_STR, - UA_STR, SIPSAK_VERSION); + UA_STR, UA_VAL_STR); req_buff += strlen(req_buff); if (from_uri) { sprintf(req_buff, @@ -222,7 +222,7 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int "%s%u@%s\r\n" "%s%i %s\r\n" "%s0\r\n" - "%ssipsak %s\r\n" + "%s%s\r\n" "\r\n", SIP200_STR, FROM_STR, fqdn, lport, c, @@ -230,7 +230,7 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int CALL_STR, c, fqdn, CSEQ_STR, cseq, MES_STR, CON_LEN_STR, - UA_STR, SIPSAK_VERSION); + UA_STR, UA_VAL_STR); break; case REQ_OPT: sprintf(req_buff, @@ -242,7 +242,7 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int "%ssip:sipsak@%s:%i\r\n" "%s0\r\n" "%s70\r\n" - "%ssipsak %s\r\n" + "%s%s\r\n" "%s%s\r\n" "\r\n", OPT_STR, username, domainname, SIP20_STR, @@ -253,7 +253,7 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int CONT_STR, fqdn, lport, CON_LEN_STR, MAX_FRW_STR, - UA_STR, SIPSAK_VERSION, + UA_STR, UA_VAL_STR, ACP_STR, TXT_PLA_STR); add_via(req_buf_begin); break; @@ -268,7 +268,7 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int "%ssip:sipsak@%s:9\r\n" "%s0\r\n" "%s70\r\n" - "%ssipsak %s\r\n" + "%s%s\r\n" "\r\n", FLOOD_METH, username, domainname, SIP20_STR, VIA_SIP_STR, TRANSPORT_UDP_STR, fqdn, d, @@ -279,7 +279,7 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int CONT_STR, fqdn, CON_LEN_STR, MAX_FRW_STR, - UA_STR, SIPSAK_VERSION); + UA_STR, UA_VAL_STR); break; case REQ_RAND: sprintf(req_buff, @@ -291,7 +291,7 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int "%ssipsak@%s:%i\r\n" "%s0\r\n" "%s70\r\n" - "%ssipsak %s\r\n" + "%s%s\r\n" "\r\n", OPT_STR, domainname, SIP20_STR, FROM_STR, fqdn, lport, c, @@ -301,7 +301,7 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int CONT_STR, fqdn, lport, CON_LEN_STR, MAX_FRW_STR, - UA_STR, SIPSAK_VERSION); + UA_STR, UA_VAL_STR); add_via(req_buf_begin); break; default: diff --git a/sipsak.h b/sipsak.h index 9041105..40ea995 100644 --- a/sipsak.h +++ b/sipsak.h @@ -115,6 +115,7 @@ #define SIP_T2 8*SIP_T1 #define SIPSAK_VERSION PACKAGE_VERSION +#define UA_VAL_STR "sipsak " SIPSAK_VERSION #define BUFSIZE 4096 #define SIPSAK_MAX_PASSWD_LEN 20 @@ -299,8 +300,8 @@ #define SIPSAK_HASHHEXLEN 2 * SIPSAK_HASHLEN // FIXME: this has to replaced with a real evaluation -// #define WITH_TLS_TRANSP 1 -// #define DEBUG 1 +#define WITH_TLS_TRANSP 1 +#define DEBUG 1 #ifdef WITH_TLS_TRANSP char *cert_file, *ca_file;