kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add content-length and blank header to registration request, add "fromdomain" option for setting domain for "from" field

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@751 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-04-06 02:51:10 +00:00
parent fbc8fd227c
commit 346d8d1b23
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
channels/chan_sip.c
View File

@@ -82,6 +82,8 @@ static char language[MAX_LANGUAGE] = "";
static char callerid[AST_MAX_EXTENSION] = "asterisk"; static char callerid[AST_MAX_EXTENSION] = "asterisk";
static char fromdomain[AST_MAX_EXTENSION] = "";
static int usecnt =0; static int usecnt =0;
static pthread_mutex_t usecnt_lock = AST_MUTEX_INITIALIZER; static pthread_mutex_t usecnt_lock = AST_MUTEX_INITIALIZER;
@@ -2172,7 +2174,10 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, char *cmd, c
} }
if (!n) if (!n)
n = l; n = l;
snprintf(from, sizeof(from), "\"%s\" <sip:%s@%s:%d>;tag=%08x", n, l, inet_ntoa(p->ourip), ourport, p->tag); if (ourport != 5060)
snprintf(from, sizeof(from), "\"%s\" <sip:%s@%s:%d>;tag=%08x", n, l, strlen(fromdomain) ? fromdomain : inet_ntoa(p->ourip), ourport, p->tag);
else
snprintf(from, sizeof(from), "\"%s\" <sip:%s@%s>;tag=%08x", n, l, strlen(fromdomain) ? fromdomain : inet_ntoa(p->ourip), p->tag);
if (strlen(p->username)) { if (strlen(p->username)) {
if (ntohs(p->sa.sin_port) != DEFAULT_SIP_PORT) { if (ntohs(p->sa.sin_port) != DEFAULT_SIP_PORT) {
@@ -2364,6 +2369,8 @@ static int transmit_register(struct sip_registry *r, char *cmd, char *auth)
snprintf(tmp, sizeof(tmp), "%d", default_expirey); snprintf(tmp, sizeof(tmp), "%d", default_expirey);
add_header(&req, "Expires", tmp); add_header(&req, "Expires", tmp);
add_header(&req, "Event", "registration"); add_header(&req, "Event", "registration");
add_header(&req, "Content-length", "0");
add_blank_header(&req);
copy_request(&p->initreq, &req); copy_request(&p->initreq, &req);
r->regstate=auth?REG_STATE_AUTHSENT:REG_STATE_REGSENT; r->regstate=auth?REG_STATE_AUTHSENT:REG_STATE_REGSENT;
return send_request(p, &req, 1, p->ocseq); return send_request(p, &req, 1, p->ocseq);
@@ -4578,6 +4585,7 @@ static int reload_config(void)
/* Initialize some reasonable defaults */ /* Initialize some reasonable defaults */
strncpy(context, "default", sizeof(context) - 1); strncpy(context, "default", sizeof(context) - 1);
strcpy(language, ""); strcpy(language, "");
strcpy(fromdomain, "");
v = ast_variable_browse(cfg, "general"); v = ast_variable_browse(cfg, "general");
while(v) { while(v) {
/* Create the interface list */ /* Create the interface list */
@@ -4598,6 +4606,8 @@ static int reload_config(void)
strncpy(language, v->value, sizeof(language)-1); strncpy(language, v->value, sizeof(language)-1);
} else if (!strcasecmp(v->name, "callerid")) { } else if (!strcasecmp(v->name, "callerid")) {
strncpy(callerid, v->value, sizeof(callerid)-1); strncpy(callerid, v->value, sizeof(callerid)-1);
} else if (!strcasecmp(v->name, "fromdomain")) {
strncpy(fromdomain, v->value, sizeof(fromdomain)-1);
} else if (!strcasecmp(v->name, "nat")) { } else if (!strcasecmp(v->name, "nat")) {
globalnat = ast_true(v->value); globalnat = ast_true(v->value);
} else if (!strcasecmp(v->name, "maxexpirey")) { } else if (!strcasecmp(v->name, "maxexpirey")) {