kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 16:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

prevent duplicate 200 ... and some formatting

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@4824 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2005-01-17 19:29:10 +00:00
parent 4f5f53706d
commit 58b1b7f825
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
channels/chan_sip.c
View File

@@ -7594,13 +7594,16 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc
found++; found++;
} }
if (found) if (found) {
transmit_response(p, "200 OK", req); transmit_response(p, "200 OK", req);
else { p->needdestroy = 1;
} else {
transmit_response(p, "403 Forbidden", req); transmit_response(p, "403 Forbidden", req);
p->needdestroy = 1; p->needdestroy = 1;
} }
return 0;
} else } else
p->subscribed = 1; p->subscribed = 1;
if (p->subscribed) if (p->subscribed)
@@ -7613,19 +7616,20 @@ 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 && !p->needdestroy) { 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);
p->needdestroy = 1;
return 0;
}
/* The next line can be removed if the SNOM200 Expires bug is fixed */
if (p->subscribed == 1) {
if (p->expiry>max_expiry) {
p->expiry = max_expiry;
}
}
transmit_response(p, "200 OK", req); transmit_response(p, "200 OK", req);
p->needdestroy = 1; sip_scheddestroy(p, (p->expiry+10)*1000);
return 0; transmit_state_notify(p, ast_extension_state(NULL, p->context, p->exten),1);
}
/* The next line can be removed if the SNOM200 Expires bug is fixed */
if (p->subscribed == 1) {
if (p->expiry>max_expiry)
p->expiry = max_expiry;
}
transmit_response(p, "200 OK", req);
sip_scheddestroy(p, (p->expiry+10)*1000);
transmit_state_notify(p, ast_extension_state(NULL, p->context, p->exten),1);
} }
} else if (!strcasecmp(cmd, "INFO")) { } else if (!strcasecmp(cmd, "INFO")) {
if (!ignore) { if (!ignore) {