diff options
Diffstat (limited to 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 54 |
1 files changed, 42 insertions, 12 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 36d8aae43..2c2e11c52 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -3769,6 +3769,28 @@ static int iax2_hangup(struct ast_channel *c) return 0; } +/*! + * \note expects the pvt to be locked + */ +static int wait_for_peercallno(struct chan_iax2_pvt *pvt) +{ + unsigned short callno = pvt->callno; + + if (!pvt->peercallno) { + /* We don't know the remote side's call number, yet. :( */ + int count = 10; + while (count-- && pvt && !pvt->peercallno) { + DEADLOCK_AVOIDANCE(&iaxsl[callno]); + pvt = iaxs[callno]; + } + if (!pvt->peercallno) { + return -1; + } + } + + return 0; +} + static int iax2_setoption(struct ast_channel *c, int option, void *data, int datalen) { struct ast_option_header *h; @@ -3781,8 +3803,23 @@ static int iax2_setoption(struct ast_channel *c, int option, void *data, int dat errno = ENOSYS; return -1; default: - if (!(h = ast_malloc(datalen + sizeof(*h)))) + { + unsigned short callno = PTR_TO_CALLNO(c->tech_pvt); + struct chan_iax2_pvt *pvt; + + ast_mutex_lock(&iaxsl[callno]); + pvt = iaxs[callno]; + + if (wait_for_peercallno(pvt)) { + ast_mutex_unlock(&iaxsl[callno]); + return -1; + } + + ast_mutex_unlock(&iaxsl[callno]); + + if (!(h = ast_malloc(datalen + sizeof(*h)))) { return -1; + } h->flag = AST_OPTION_FLAG_REQUEST; h->option = htons(option); @@ -3793,6 +3830,7 @@ static int iax2_setoption(struct ast_channel *c, int option, void *data, int dat ast_free(h); return res; } + } } static struct ast_frame *iax2_read(struct ast_channel *c) @@ -4019,17 +4057,9 @@ static int iax2_indicate(struct ast_channel *c, int condition, const void *data, ast_mutex_lock(&iaxsl[callno]); pvt = iaxs[callno]; - if (!pvt->peercallno) { - /* We don't know the remote side's call number, yet. :( */ - int count = 10; - while (count-- && pvt && !pvt->peercallno) { - DEADLOCK_AVOIDANCE(&iaxsl[callno]); - pvt = iaxs[callno]; - } - if (!pvt->peercallno) { - res = -1; - goto done; - } + if (wait_for_peercallno(pvt)) { + res = -1; + goto done; } switch (condition) { |