mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-06 04:30:28 +00:00
Display invalid extension when there is one, fix minor OSP typo, Don't send 200 OK after 403 Forbidden on SUBSCRIBE
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3349 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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
2
pbx.c
@@ -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 {
|
||||
|
@@ -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)) {
|
||||
|
Reference in New Issue
Block a user