kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-15 22:38:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Be more explicit for CCSS generic device state event subscription.

Browse Source 
Make CCSS generic device state event subscription specify the
AST_EVENT_IE_STATE ie exists to be safe.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@321924 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2011-06-03 21:49:17 +00:00
parent 779a74b358
commit 549f79b9f3
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/ccss.c
View File

@@ -1135,9 +1135,11 @@ static struct generic_monitor_instance_list *create_new_generic_list(struct ast_
return NULL;
}
if (!(generic_list->sub = ast_event_subscribe(AST_EVENT_DEVICE_STATE, generic_monitor_devstate_cb,
"Requesting CC", NULL, AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR,
monitor->interface->device_name, AST_EVENT_IE_END))) {
if (!(generic_list->sub = ast_event_subscribe(AST_EVENT_DEVICE_STATE,
generic_monitor_devstate_cb, "Requesting CC", NULL,
AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR, monitor->interface->device_name,
AST_EVENT_IE_STATE, AST_EVENT_IE_PLTYPE_EXISTS,
AST_EVENT_IE_END))) {
cc_unref(generic_list, "Failed to subscribe to device state");
return NULL;
}
@@ -2523,9 +2525,10 @@ static int cc_generic_agent_start_monitoring(struct ast_cc_agent *agent)
ast_str_set(&str, 0, "Agent monitoring %s device state since it is busy\n",
agent->device_name);
if (!(generic_pvt->sub = ast_event_subscribe(
AST_EVENT_DEVICE_STATE, generic_agent_devstate_cb, ast_str_buffer(str), agent,
if (!(generic_pvt->sub = ast_event_subscribe(AST_EVENT_DEVICE_STATE,
generic_agent_devstate_cb, ast_str_buffer(str), agent,
AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR, agent->device_name,
AST_EVENT_IE_STATE, AST_EVENT_IE_PLTYPE_EXISTS,
AST_EVENT_IE_END))) {
return -1;
}