dect
/
asterisk
Archived
13
0
Fork 0

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

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3349 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2004-06-29 13:52:03 +00:00
parent 30784d4f0c
commit a809376df8
3 changed files with 3 additions and 3 deletions

View File

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

View File

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