sipwise
/
sipsak
mirror of https://github.com/sipwise/sipsak.git
1
0
Fork 0
Code Issues Releases Wiki Activity

moved UA header to one central define

Browse Source 
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 ade4019081)
mr3.8.5
nils-ohlmeier 19 years ago committed by Victor Seva
parent 493a389766
commit e8c985abf3
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File

36
request.c
Unescape View File

@ -54,7 +54,7 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int
"%s%i %s\r\n" "%s%i %s\r\n"
"%s0\r\n" "%s0\r\n"
"%s70\r\n" "%s70\r\n"
"%ssipsak %s\r\n", "%s%s\r\n",
REG_STR, domainname, SIP20_STR, REG_STR, domainname, SIP20_STR,
FROM_STR, username, domainname, c, FROM_STR, username, domainname, c,
TO_STR, username, domainname, 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, CSEQ_STR, cseq, REG_STR,
CON_LEN_STR, CON_LEN_STR,
MAX_FRW_STR, MAX_FRW_STR,
UA_STR, SIPSAK_VERSION); UA_STR, UA_VAL_STR);
req_buff += strlen(req_buff); req_buff += strlen(req_buff);
if (contact_uri!=NULL) { if (contact_uri!=NULL) {
sprintf(req_buff, "%s%i\r\n" 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" "%s%i\r\n"
"%s0\r\n" "%s0\r\n"
"%s70\r\n" "%s70\r\n"
"%ssipsak %s\r\n" "%s%s\r\n"
"%ssip:%s%s:%i;%s0", "%ssip:%s%s:%i;%s0",
REG_STR, domainname, SIP20_STR, REG_STR, domainname, SIP20_STR,
FROM_STR, username, domainname, c, 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, EXP_STR, expires_t,
CON_LEN_STR, CON_LEN_STR,
MAX_FRW_STR, MAX_FRW_STR,
UA_STR, SIPSAK_VERSION, UA_STR, UA_VAL_STR,
CONT_STR, username, fqdn, lport, CON_EXP_STR); CONT_STR, username, fqdn, lport, CON_EXP_STR);
req_buff += strlen(req_buff); req_buff += strlen(req_buff);
if (transport != SIP_UDP_TRANSPORT) { 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" "%ssip:sipsak@%s:%i\r\n"
"%sDONT ANSWER this test call!\r\n" "%sDONT ANSWER this test call!\r\n"
"%s70\r\n" "%s70\r\n"
"%ssipsak %s\r\n" "%s%s\r\n"
"\r\n", "\r\n",
INV_STR, username, domainname, SIP20_STR, INV_STR, username, domainname, SIP20_STR,
FROM_STR, fqdn, lport, c, 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, CONT_STR, fqdn, lport,
SUB_STR, SUB_STR,
MAX_FRW_STR, MAX_FRW_STR,
UA_STR, SIPSAK_VERSION); UA_STR, UA_VAL_STR);
add_via(req_buf_begin); add_via(req_buf_begin);
sprintf(repl_buff, sprintf(repl_buff,
"%s" "%s"
@ -151,7 +151,7 @@ void create_msg(int action, char *req_buff, char *repl_buff, char *username, int
"%s%i %s\r\n" "%s%i %s\r\n"
"%s0\r\n" "%s0\r\n"
"%ssip:sipsak_conf@%s:%i\r\n" "%ssip:sipsak_conf@%s:%i\r\n"
"%ssipsak %s\r\n" "%s%s\r\n"
"\r\n", "\r\n",
SIP200_STR, SIP200_STR,
FROM_STR, fqdn, lport, c, 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, CSEQ_STR, cseq, INV_STR,
CON_LEN_STR, CON_LEN_STR,
CONT_STR, fqdn, lport, CONT_STR, fqdn, lport,
UA_STR, SIPSAK_VERSION); UA_STR, UA_VAL_STR);
break; break;
case REQ_MES: case REQ_MES:
sprintf(req_buff, 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%i %s\r\n"
"%s%s\r\n" "%s%s\r\n"
"%s70\r\n" "%s70\r\n"
"%ssipsak %s\r\n", "%s%s\r\n",
MES_STR, username, domainname, SIP20_STR, MES_STR, username, domainname, SIP20_STR,
TO_STR, username, domainname, TO_STR, username, domainname,
CALL_STR, c, fqdn, CALL_STR, c, fqdn,
CSEQ_STR, cseq, MES_STR, CSEQ_STR, cseq, MES_STR,
CON_TYP_STR, TXT_PLA_STR, CON_TYP_STR, TXT_PLA_STR,
MAX_FRW_STR, MAX_FRW_STR,
UA_STR, SIPSAK_VERSION); UA_STR, UA_VAL_STR);
req_buff += strlen(req_buff); req_buff += strlen(req_buff);
if (from_uri) { if (from_uri) {
sprintf(req_buff, 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%u@%s\r\n"
"%s%i %s\r\n" "%s%i %s\r\n"
"%s0\r\n" "%s0\r\n"
"%ssipsak %s\r\n" "%s%s\r\n"
"\r\n", "\r\n",
SIP200_STR, SIP200_STR,
FROM_STR, fqdn, lport, c, 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, CALL_STR, c, fqdn,
CSEQ_STR, cseq, MES_STR, CSEQ_STR, cseq, MES_STR,
CON_LEN_STR, CON_LEN_STR,
UA_STR, SIPSAK_VERSION); UA_STR, UA_VAL_STR);
break; break;
case REQ_OPT: case REQ_OPT:
sprintf(req_buff, 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" "%ssip:sipsak@%s:%i\r\n"
"%s0\r\n" "%s0\r\n"
"%s70\r\n" "%s70\r\n"
"%ssipsak %s\r\n" "%s%s\r\n"
"%s%s\r\n" "%s%s\r\n"
"\r\n", "\r\n",
OPT_STR, username, domainname, SIP20_STR, 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, CONT_STR, fqdn, lport,
CON_LEN_STR, CON_LEN_STR,
MAX_FRW_STR, MAX_FRW_STR,
UA_STR, SIPSAK_VERSION, UA_STR, UA_VAL_STR,
ACP_STR, TXT_PLA_STR); ACP_STR, TXT_PLA_STR);
add_via(req_buf_begin); add_via(req_buf_begin);
break; 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" "%ssip:sipsak@%s:9\r\n"
"%s0\r\n" "%s0\r\n"
"%s70\r\n" "%s70\r\n"
"%ssipsak %s\r\n" "%s%s\r\n"
"\r\n", "\r\n",
FLOOD_METH, username, domainname, SIP20_STR, FLOOD_METH, username, domainname, SIP20_STR,
VIA_SIP_STR, TRANSPORT_UDP_STR, fqdn, d, 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, CONT_STR, fqdn,
CON_LEN_STR, CON_LEN_STR,
MAX_FRW_STR, MAX_FRW_STR,
UA_STR, SIPSAK_VERSION); UA_STR, UA_VAL_STR);
break; break;
case REQ_RAND: case REQ_RAND:
sprintf(req_buff, 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" "%ssipsak@%s:%i\r\n"
"%s0\r\n" "%s0\r\n"
"%s70\r\n" "%s70\r\n"
"%ssipsak %s\r\n" "%s%s\r\n"
"\r\n", "\r\n",
OPT_STR, domainname, SIP20_STR, OPT_STR, domainname, SIP20_STR,
FROM_STR, fqdn, lport, c, 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, CONT_STR, fqdn, lport,
CON_LEN_STR, CON_LEN_STR,
MAX_FRW_STR, MAX_FRW_STR,
UA_STR, SIPSAK_VERSION); UA_STR, UA_VAL_STR);
add_via(req_buf_begin); add_via(req_buf_begin);
break; break;
default: default:

5
sipsak.h
Unescape View File

@ -115,6 +115,7 @@
#define SIP_T2 8*SIP_T1 #define SIP_T2 8*SIP_T1
#define SIPSAK_VERSION PACKAGE_VERSION #define SIPSAK_VERSION PACKAGE_VERSION
#define UA_VAL_STR "sipsak " SIPSAK_VERSION
#define BUFSIZE 4096 #define BUFSIZE 4096
#define SIPSAK_MAX_PASSWD_LEN 20 #define SIPSAK_MAX_PASSWD_LEN 20
@ -299,8 +300,8 @@
#define SIPSAK_HASHHEXLEN 2 * SIPSAK_HASHLEN #define SIPSAK_HASHHEXLEN 2 * SIPSAK_HASHLEN
// FIXME: this has to replaced with a real evaluation // FIXME: this has to replaced with a real evaluation
// #define WITH_TLS_TRANSP 1 #define WITH_TLS_TRANSP 1
// #define DEBUG 1 #define DEBUG 1
#ifdef WITH_TLS_TRANSP #ifdef WITH_TLS_TRANSP
char *cert_file, *ca_file; char *cert_file, *ca_file;

Write Preview
Loading…
Cancel
Save