sysmocom/asterisk
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ensure that notify message sent out have the correct state (issue #5088 with minor mods)

Browse source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6509 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming 2005-09-02 19:24:32 +00:00
parent 6a260b78fe
commit 3bad83e0f2
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
channels/chan_sip.c
View file

@ -1042,7 +1042,7 @@ static int ast_sip_ouraddrfor(struct in_addr *them, struct in_addr *us)
/*--- append_history: Append to SIP dialog history */
/* Always returns 0 */
static int append_history(struct sip_pvt *p, char *event, char *data)
static int append_history(struct sip_pvt *p, const char *event, const char *data)
{
struct sip_history *hist, *prev;
char *c;
@ -9947,7 +9947,7 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
{
int gotdest;
int res = 0;
int firststate = 0;
int firststate = AST_EXTENSION_REMOVED;
if (p->initreq.headers) {
/* We already have a dialog */
@ -10066,13 +10066,6 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
}
if (p->subscribed != NONE)
p->stateid = ast_extension_state_add(p->context, p->exten, cb_extensionstate, p);
firststate = ast_extension_state(NULL, p->context, p->exten);
if (firststate < 0) {
ast_log(LOG_ERROR, "Got SUBSCRIBE for extensions without hint. Please add hint to %s in context %s\n", p->exten, p->context);
transmit_response(p, "404 Not found", req);
ast_set_flag(p, SIP_NEEDDESTROY);
return 0;
}
}
}
@ -10084,8 +10077,7 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
ast_set_flag(p, SIP_NEEDDESTROY);
return 0;
}
/* TODO: Do we need this any longer? And what exactly to remove? */
/* The next line can be removed if the SNOM200 Expires bug is fixed */
/* The next 4 lines can be removed if the SNOM Expires bug is fixed */
if (p->subscribed == DIALOG_INFO_XML) {
if (p->expiry > max_expiry)
p->expiry = max_expiry;
@ -10096,8 +10088,16 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
if (p->autokillid > -1)
sip_cancel_destroy(p); /* Remove subscription expiry for renewals */
sip_scheddestroy(p, (p->expiry + 10) * 1000); /* Set timer for destruction of call at expiration */
transmit_state_notify(p, firststate, 1, 1); /* Send first notification */
append_history(p, "Subscribestatus", "active");
if ((firststate = ast_extension_state(NULL, p->context, p->exten)) < 0) {
ast_log(LOG_ERROR, "Got SUBSCRIBE for extensions without hint. Please add hint to %s in context %s\n", p->exten, p->context);
transmit_response(p, "404 Not found", req);
ast_set_flag(p, SIP_NEEDDESTROY);
return 0;
} else {
transmit_state_notify(p, firststate, 1, 1); /* Send first notification */
append_history(p, "Subscribestatus", ast_extension_state2str(firststate));
}
}
return 1;
}