kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 324048 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r324048 | twilson | 2011-06-16 17:35:41 -0500 (Thu, 16 Jun 2011) | 8 lines
  
  Lock the channel before calling the setoption callback
  
  The channel needs to be locked before calling these callback functions. Also,
  sip_setoption needs to lock the pvt and a check p->rtp is non-null before using
  it.
  
  Review: https://reviewboard.asterisk.org/r/1220/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Terry Wilson
2011-06-16 22:49:49 +00:00
parent ab0c2cf441
commit 34e2305ae7
4 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
channels/chan_sip.c
View File

@@ -4262,15 +4262,23 @@ static int sip_setoption(struct ast_channel *chan, int option, void *data, int d
int res = -1;
struct sip_pvt *p = chan->tech_pvt;
sip_pvt_lock(p);
switch (option) {
case AST_OPTION_FORMAT_READ:
res = ast_rtp_instance_set_read_format(p->rtp, (struct ast_format *) data);
if (p->rtp) {
res = ast_rtp_instance_set_read_format(p->rtp, (struct ast_format *) data);
}
break;
case AST_OPTION_FORMAT_WRITE:
res = ast_rtp_instance_set_write_format(p->rtp, (struct ast_format *) data);
if (p->rtp) {
res = ast_rtp_instance_set_write_format(p->rtp, (struct ast_format *) data);
}
break;
case AST_OPTION_MAKE_COMPATIBLE:
res = ast_rtp_instance_make_compatible(chan, p->rtp, (struct ast_channel *) data);
if (p->rtp) {
res = ast_rtp_instance_make_compatible(chan, p->rtp, (struct ast_channel *) data);
}
break;
case AST_OPTION_DIGIT_DETECT:
if ((ast_test_flag(&p->flags[0], SIP_DTMF) == SIP_DTMF_INBAND) ||
@@ -4298,6 +4306,8 @@ static int sip_setoption(struct ast_channel *chan, int option, void *data, int d
break;
}
sip_pvt_unlock(p);
return res;
}
@@ -4309,16 +4319,16 @@ static int sip_queryoption(struct ast_channel *chan, int option, void *data, int
struct sip_pvt *p = (struct sip_pvt *) chan->tech_pvt;
char *cp;
sip_pvt_lock(p);
switch (option) {
case AST_OPTION_T38_STATE:
/* Make sure we got an ast_t38_state enum passed in */
if (*datalen != sizeof(enum ast_t38_state)) {
ast_log(LOG_ERROR, "Invalid datalen for AST_OPTION_T38_STATE option. Expected %d, got %d\n", (int)sizeof(enum ast_t38_state), *datalen);
return -1;
break;
}
sip_pvt_lock(p);
/* Now if T38 support is enabled we need to look and see what the current state is to get what we want to report back */
if (ast_test_flag(&p->flags[1], SIP_PAGE2_T38SUPPORT)) {
switch (p->t38.state) {
@@ -4337,8 +4347,6 @@ static int sip_queryoption(struct ast_channel *chan, int option, void *data, int
}
}
sip_pvt_unlock(p);
*((enum ast_t38_state *) data) = state;
res = 0;
@@ -4370,6 +4378,8 @@ static int sip_queryoption(struct ast_channel *chan, int option, void *data, int
break;
}
sip_pvt_unlock(p);
return res;
}