kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display invalid extension when there is one, fix minor OSP typo, Don't send 200 OK after 403 Forbidden on SUBSCRIBE

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3349 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-06-29 13:52:03 +00:00
parent 9a478cb855
commit eb6b35b75f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_sip.c
View File

@@ -7079,7 +7079,7 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc
if (!ignore && p) if (!ignore && p)
p->lastinvite = seqno; p->lastinvite = seqno;
if (p) { if (p && !p->needdestroy) {
if (!(p->expiry = atoi(get_header(req, "Expires")))) { if (!(p->expiry = atoi(get_header(req, "Expires")))) {
transmit_response(p, "200 OK", req); transmit_response(p, "200 OK", req);
p->needdestroy = 1; p->needdestroy = 1;

2
pbx.c
View File

@@ -1878,7 +1878,7 @@ int ast_pbx_run(struct ast_channel *c)
strncpy(c->exten, "i", sizeof(c->exten)-1); strncpy(c->exten, "i", sizeof(c->exten)-1);
c->priority = 1; c->priority = 1;
} else { } else {
ast_log(LOG_WARNING, "Invalid extension, but no rule 'i' in context '%s'\n", c->context); ast_log(LOG_WARNING, "Invalid extension '%s', but no rule 'i' in context '%s'\n", exten, c->context);
goto out; goto out;
} }
} else { } else {

2
res/res_osp.c
View File

@@ -452,7 +452,7 @@ int ast_osp_validate(char *provider, char *token, int *handle, unsigned int *tim
} }
callerid = l; callerid = l;
ast_mutex_lock(&osplock); ast_mutex_lock(&osplock);
ast_inet_ntoa(ip, sizeof(ip), addr)); ast_inet_ntoa(ip, sizeof(ip), addr);
osp = providers; osp = providers;
while(osp) { while(osp) {
if (!strcasecmp(osp->name, provider)) { if (!strcasecmp(osp->name, provider)) {