diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2017-03-29 12:45:47 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-03-29 12:45:47 -0500 |
| commit | 7c2f4601f2a211942e8ec5e3c4035ad8b6e8e294 (patch) | |
| tree | 12fb80837f84d840fda97876dbd446bdc2e67e9b /apps | |
| parent | 08210e851c4ef09c1344218e0853dcb09221e30a (diff) | |
| parent | 5d938045d465d66e28bb49816c482a8b68f99342 (diff) | |
Merge "channel: Remove old epoll support and fixed max number of file descriptors."
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_dial.c | 19 | ||||
| -rw-r--r-- | apps/app_queue.c | 18 |
2 files changed, 0 insertions, 37 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 1cb91811f..c8fcf4696 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1186,9 +1186,6 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, int prestart = num.busy + num.congestion + num.nochan; int orig = *to; struct ast_channel *peer = NULL; -#ifdef HAVE_EPOLL - struct chanlist *epollo; -#endif struct chanlist *outgoing = AST_LIST_FIRST(out_chans); /* single is set if only one destination is enabled */ int single = outgoing && !AST_LIST_NEXT(outgoing, node); @@ -1227,12 +1224,6 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, is_cc_recall = ast_cc_is_recall(in, &cc_recall_core_id, NULL); -#ifdef HAVE_EPOLL - AST_LIST_TRAVERSE(out_chans, epollo, node) { - ast_poll_channel_add(in, epollo->chan); - } -#endif - while ((*to = ast_remaining_ms(start, orig)) && !peer) { struct chanlist *o; int pos = 0; /* how many channels do we handle */ @@ -1359,9 +1350,6 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, f = ast_read(winner); if (!f) { ast_channel_hangupcause_set(in, ast_channel_hangupcause(c)); -#ifdef HAVE_EPOLL - ast_poll_channel_del(in, c); -#endif ast_channel_publish_dial(in, c, NULL, ast_hangup_cause_to_dial_status(ast_channel_hangupcause(c))); ast_hangup(c); c = o->chan = NULL; @@ -1786,13 +1774,6 @@ skip_frame:; publish_dial_end_event(in, out_chans, NULL, "NOANSWER"); } -#ifdef HAVE_EPOLL - AST_LIST_TRAVERSE(out_chans, epollo, node) { - if (epollo->chan) - ast_poll_channel_del(in, epollo->chan); - } -#endif - if (is_cc_recall) { ast_cc_completed(in, "Recall completed!"); } diff --git a/apps/app_queue.c b/apps/app_queue.c index 946869612..9bba6762d 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -4794,9 +4794,6 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte char membername[80] = ""; long starttime = 0; long endtime = 0; -#ifdef HAVE_EPOLL - struct callattempt *epollo; -#endif char *inchan_name; struct timeval start_time_tv = ast_tvnow(); int canceled_by_caller = 0; /* 1 when caller hangs up or press digit or press * */ @@ -4806,13 +4803,6 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte ast_channel_unlock(qe->chan); starttime = (long) time(NULL); -#ifdef HAVE_EPOLL - for (epollo = outgoing; epollo; epollo = epollo->q_next) { - if (epollo->chan) { - ast_poll_channel_add(in, epollo->chan); - } - } -#endif while ((*to = ast_remaining_ms(start_time_tv, orig)) && !peer) { int numlines, retry, pos = 1; @@ -5325,14 +5315,6 @@ skip_frame:; publish_dial_end_event(qe->chan, outgoing, NULL, "NOANSWER"); } -#ifdef HAVE_EPOLL - for (epollo = outgoing; epollo; epollo = epollo->q_next) { - if (epollo->chan) { - ast_poll_channel_del(in, epollo->chan); - } - } -#endif - return peer; } |