diff options
author | Matthew Jordan <mjordan@digium.com> | 2013-01-02 18:11:59 +0000 |
---|---|---|
committer | Matthew Jordan <mjordan@digium.com> | 2013-01-02 18:11:59 +0000 |
commit | 8fb5bdce9ab9f7f3758545753cbc787653920753 (patch) | |
tree | 65809194af8a4fa757fef26a30a2cc9c3ed02182 /apps/app_queue.c | |
parent | 1fb06fde957fb466388c764384c2e14698e2dc15 (diff) |
Prevent exhaustion of system resources through exploitation of event cache
Asterisk maintains an internal cache for devices in the event subsystem. The
device state cache holds the state of each device known to Asterisk, such that
consumers of device state information can query for the last known state for
a particular device, even if it is not part of an active call. The concept of
a device in Asterisk can include entities that do not have a physical
representation. One way that this occurred was when anonymous calls are allowed
in Asterisk. A device was automatically created and stored in the cache for
each anonymous call that occurred; this was possible in the SIP and IAX2
channel drivers and through channel drivers that utilized the
res_jabber/res_xmpp resource modules (Gtalk, Jingle, and Motif). These devices
are never removed from the system, allowing anonymous calls to potentially
exhaust a system's resources.
This patch changes the event cache subsystem and device state management to
no longer cache devices that are not associated with a physical entity.
(issue ASTERISK-20175)
Reported by: Russell Bryant, Leif Madsen, Joshua Colp
Tested by: kmoore
patches:
event-cachability-3.diff uploaded by jcolp (license 5000)
........
Merged revisions 378303 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378320 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 378321 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378322 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_queue.c')
-rw-r--r-- | apps/app_queue.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index eac4d2ff6..c0daff4b6 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -1791,9 +1791,9 @@ static int handle_statechange(void *datap) if (found_member) { found = 1; if (avail) { - ast_devstate_changed(AST_DEVICE_NOT_INUSE, "Queue:%s_avail", q->name); + ast_devstate_changed(AST_DEVICE_NOT_INUSE, AST_DEVSTATE_CACHABLE, "Queue:%s_avail", q->name); } else { - ast_devstate_changed(AST_DEVICE_INUSE, "Queue:%s_avail", q->name); + ast_devstate_changed(AST_DEVICE_INUSE, AST_DEVSTATE_CACHABLE, "Queue:%s_avail", q->name); } } @@ -2083,7 +2083,7 @@ static void init_queue(struct call_queue *q) * AST_DEVICE_INUSE indicates no members are available. * AST_DEVICE_NOT_INUSE indicates a member is available. */ - ast_devstate_changed(AST_DEVICE_INUSE, "Queue:%s_avail", q->name); + ast_devstate_changed(AST_DEVICE_INUSE, AST_DEVSTATE_CACHABLE, "Queue:%s_avail", q->name); } static void clear_queue(struct call_queue *q) @@ -2963,7 +2963,7 @@ static int join_queue(char *queuename, struct queue_ent *qe, enum queue_result * ast_copy_string(qe->context, q->context, sizeof(qe->context)); q->count++; if (q->count == 1) { - ast_devstate_changed(AST_DEVICE_RINGING, "Queue:%s", q->name); + ast_devstate_changed(AST_DEVICE_RINGING, AST_DEVSTATE_CACHABLE, "Queue:%s", q->name); } res = 0; @@ -3271,7 +3271,7 @@ static void leave_queue(struct queue_ent *qe) char posstr[20]; q->count--; if (!q->count) { - ast_devstate_changed(AST_DEVICE_NOT_INUSE, "Queue:%s", q->name); + ast_devstate_changed(AST_DEVICE_NOT_INUSE, AST_DEVSTATE_CACHABLE, "Queue:%s", q->name); } /* Take us out of the queue */ @@ -3538,7 +3538,7 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies if (newstate != tmp->member->status) { ast_log(LOG_WARNING, "Found a channel matching iterface %s while status was %s changed to %s\n", tmp->member->interface, ast_devstate2str(tmp->member->status), ast_devstate2str(newstate)); - ast_devstate_changed_literal(newstate, tmp->member->interface); + ast_devstate_changed_literal(newstate, AST_DEVSTATE_CACHABLE, tmp->member->interface); } } if ((tmp->member->status != AST_DEVICE_NOT_INUSE) && (tmp->member->status != AST_DEVICE_UNKNOWN)) { @@ -6027,7 +6027,7 @@ static int remove_from_queue(const char *queuename, const char *interface) } if (!num_available_members(q)) { - ast_devstate_changed(AST_DEVICE_INUSE, "Queue:%s_avail", q->name); + ast_devstate_changed(AST_DEVICE_INUSE, AST_DEVSTATE_CACHABLE, "Queue:%s_avail", q->name); } res = RES_OKAY; @@ -6104,7 +6104,7 @@ static int add_to_queue(const char *queuename, const char *interface, const char new_member->status, new_member->paused); if (is_member_available(new_member)) { - ast_devstate_changed(AST_DEVICE_NOT_INUSE, "Queue:%s_avail", q->name); + ast_devstate_changed(AST_DEVICE_NOT_INUSE, AST_DEVSTATE_CACHABLE, "Queue:%s_avail", q->name); } ao2_ref(new_member, -1); @@ -6175,9 +6175,9 @@ static int set_member_paused(const char *queuename, const char *interface, const } if (is_member_available(mem)) { - ast_devstate_changed(AST_DEVICE_NOT_INUSE, "Queue:%s_avail", q->name); + ast_devstate_changed(AST_DEVICE_NOT_INUSE, AST_DEVSTATE_CACHABLE, "Queue:%s_avail", q->name); } else if (!num_available_members(q)) { - ast_devstate_changed(AST_DEVICE_INUSE, "Queue:%s_avail", q->name); + ast_devstate_changed(AST_DEVICE_INUSE, AST_DEVSTATE_CACHABLE, "Queue:%s_avail", q->name); } ast_queue_log(q->name, "NONE", mem->membername, (paused ? "PAUSE" : "UNPAUSE"), "%s", S_OR(reason, "")); |