kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-10 14:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

cdr.c: Use current ao2 flag names

Browse Source 
Change-Id: Ib59d7d2f2a4a822754628f2c48a308d6791a6e6e
This commit is contained in:
Richard Mudgett
2017-09-29 12:07:14 -05:00
parent 39b68a41f7
commit 7366657a9a
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
main/cdr.c
View File

@@ -785,11 +785,11 @@ static int cdr_object_channel_hash_fn(const void *obj, const int flags)
const struct cdr_object *cdr; const struct cdr_object *cdr;
const char *key; const char *key;
switch (flags & (OBJ_POINTER | OBJ_KEY | OBJ_PARTIAL_KEY)) { switch (flags & OBJ_SEARCH_MASK) {
case OBJ_KEY: case OBJ_SEARCH_KEY:
key = obj; key = obj;
break; break;
case OBJ_POINTER: case OBJ_SEARCH_OBJECT:
cdr = obj; cdr = obj;
key = cdr->uniqueid; key = cdr->uniqueid;
break; break;
@@ -810,14 +810,14 @@ static int cdr_object_channel_cmp_fn(void *obj, void *arg, int flags)
const char *right_key = arg; const char *right_key = arg;
int cmp; int cmp;
switch (flags & (OBJ_POINTER | OBJ_KEY | OBJ_PARTIAL_KEY)) { switch (flags & OBJ_SEARCH_MASK) {
case OBJ_POINTER: case OBJ_SEARCH_OBJECT:
right_key = right->uniqueid; right_key = right->uniqueid;
/* Fall through */ /* Fall through */
case OBJ_KEY: case OBJ_SEARCH_KEY:
cmp = strcmp(left->uniqueid, right_key); cmp = strcmp(left->uniqueid, right_key);
break; break;
case OBJ_PARTIAL_KEY: case OBJ_SEARCH_PARTIAL_KEY:
/* /*
* We could also use a partial key struct containing a length * We could also use a partial key struct containing a length
* so strlen() does not get called for every comparison instead. * so strlen() does not get called for every comparison instead.
@@ -1576,7 +1576,7 @@ static enum process_bridge_enter_results single_state_process_bridge_enter(struc
!success && (channel_id = ao2_iterator_next(&it_cdrs)); !success && (channel_id = ao2_iterator_next(&it_cdrs));
ao2_ref(channel_id, -1)) { ao2_ref(channel_id, -1)) {
RAII_VAR(struct cdr_object *, cand_cdr_master, RAII_VAR(struct cdr_object *, cand_cdr_master,
ao2_find(active_cdrs_by_channel, channel_id, OBJ_KEY), ao2_find(active_cdrs_by_channel, channel_id, OBJ_SEARCH_KEY),
ao2_cleanup); ao2_cleanup);
struct cdr_object *cand_cdr; struct cdr_object *cand_cdr;
@@ -1726,7 +1726,7 @@ static enum process_bridge_enter_results dial_state_process_bridge_enter(struct
!success && (channel_id = ao2_iterator_next(&it_cdrs)); !success && (channel_id = ao2_iterator_next(&it_cdrs));
ao2_ref(channel_id, -1)) { ao2_ref(channel_id, -1)) {
RAII_VAR(struct cdr_object *, cand_cdr_master, RAII_VAR(struct cdr_object *, cand_cdr_master,
ao2_find(active_cdrs_by_channel, channel_id, OBJ_KEY), ao2_find(active_cdrs_by_channel, channel_id, OBJ_SEARCH_KEY),
ao2_cleanup); ao2_cleanup);
struct cdr_object *cand_cdr; struct cdr_object *cand_cdr;
@@ -1960,9 +1960,9 @@ static void handle_dial_message(void *data, struct stasis_subscription *sub, str
/* Figure out who is running this show */ /* Figure out who is running this show */
if (caller) { if (caller) {
cdr = ao2_find(active_cdrs_by_channel, caller->uniqueid, OBJ_KEY); cdr = ao2_find(active_cdrs_by_channel, caller->uniqueid, OBJ_SEARCH_KEY);
} else { } else {
cdr = ao2_find(active_cdrs_by_channel, peer->uniqueid, OBJ_KEY); cdr = ao2_find(active_cdrs_by_channel, peer->uniqueid, OBJ_SEARCH_KEY);
} }
if (!cdr) { if (!cdr) {
@@ -2116,7 +2116,7 @@ static void handle_channel_cache_message(void *data, struct stasis_subscription
/* Handle Party A */ /* Handle Party A */
if (!cdr) { if (!cdr) {
cdr = ao2_find(active_cdrs_by_channel, uniqueid, OBJ_KEY); cdr = ao2_find(active_cdrs_by_channel, uniqueid, OBJ_SEARCH_KEY);
} }
if (!cdr) { if (!cdr) {
ast_log(AST_LOG_WARNING, "No CDR for channel %s\n", name); ast_log(AST_LOG_WARNING, "No CDR for channel %s\n", name);
@@ -2222,7 +2222,7 @@ static void handle_bridge_leave_message(void *data, struct stasis_subscription *
RAII_VAR(struct module_config *, mod_cfg, RAII_VAR(struct module_config *, mod_cfg,
ao2_global_obj_ref(module_configs), ao2_cleanup); ao2_global_obj_ref(module_configs), ao2_cleanup);
RAII_VAR(struct cdr_object *, cdr, RAII_VAR(struct cdr_object *, cdr,
ao2_find(active_cdrs_by_channel, channel->uniqueid, OBJ_KEY), ao2_find(active_cdrs_by_channel, channel->uniqueid, OBJ_SEARCH_KEY),
ao2_cleanup); ao2_cleanup);
struct cdr_object *it_cdr; struct cdr_object *it_cdr;
struct bridge_leave_data leave_data = { struct bridge_leave_data leave_data = {
@@ -2379,7 +2379,7 @@ static void handle_bridge_pairings(struct cdr_object *cdr, struct ast_bridge_sna
it_channels = ao2_iterator_init(bridge->channels, 0); it_channels = ao2_iterator_init(bridge->channels, 0);
while ((channel_id = ao2_iterator_next(&it_channels))) { while ((channel_id = ao2_iterator_next(&it_channels))) {
RAII_VAR(struct cdr_object *, cand_cdr, RAII_VAR(struct cdr_object *, cand_cdr,
ao2_find(active_cdrs_by_channel, channel_id, OBJ_KEY), ao2_find(active_cdrs_by_channel, channel_id, OBJ_SEARCH_KEY),
ao2_cleanup); ao2_cleanup);
if (!cand_cdr) { if (!cand_cdr) {
@@ -2525,7 +2525,7 @@ static void handle_bridge_enter_message(void *data, struct stasis_subscription *
struct ast_bridge_snapshot *bridge = update->bridge; struct ast_bridge_snapshot *bridge = update->bridge;
struct ast_channel_snapshot *channel = update->channel; struct ast_channel_snapshot *channel = update->channel;
RAII_VAR(struct cdr_object *, cdr, RAII_VAR(struct cdr_object *, cdr,
ao2_find(active_cdrs_by_channel, channel->uniqueid, OBJ_KEY), ao2_find(active_cdrs_by_channel, channel->uniqueid, OBJ_SEARCH_KEY),
ao2_cleanup); ao2_cleanup);
RAII_VAR(struct module_config *, mod_cfg, RAII_VAR(struct module_config *, mod_cfg,
ao2_global_obj_ref(module_configs), ao2_cleanup); ao2_global_obj_ref(module_configs), ao2_cleanup);
@@ -2593,7 +2593,7 @@ static void handle_parked_call_message(void *data, struct stasis_subscription *s
(unsigned int)stasis_message_timestamp(message)->tv_sec, (unsigned int)stasis_message_timestamp(message)->tv_sec,
(unsigned int)stasis_message_timestamp(message)->tv_usec); (unsigned int)stasis_message_timestamp(message)->tv_usec);
cdr = ao2_find(active_cdrs_by_channel, channel->uniqueid, OBJ_KEY); cdr = ao2_find(active_cdrs_by_channel, channel->uniqueid, OBJ_SEARCH_KEY);
if (!cdr) { if (!cdr) {
ast_log(AST_LOG_WARNING, "No CDR for channel %s\n", channel->name); ast_log(AST_LOG_WARNING, "No CDR for channel %s\n", channel->name);
ast_assert(0); ast_assert(0);
@@ -4216,8 +4216,8 @@ int ast_cdr_engine_init(void)
stasis_message_router_add(stasis_router, ast_parked_call_type(), handle_parked_call_message, NULL); stasis_message_router_add(stasis_router, ast_parked_call_type(), handle_parked_call_message, NULL);
stasis_message_router_add(stasis_router, cdr_sync_message_type(), handle_cdr_sync_message, NULL); stasis_message_router_add(stasis_router, cdr_sync_message_type(), handle_cdr_sync_message, NULL);
active_cdrs_by_channel = ao2_container_alloc(NUM_CDR_BUCKETS, active_cdrs_by_channel = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0,
cdr_object_channel_hash_fn, cdr_object_channel_cmp_fn); NUM_CDR_BUCKETS, cdr_object_channel_hash_fn, NULL, cdr_object_channel_cmp_fn);
if (!active_cdrs_by_channel) { if (!active_cdrs_by_channel) {
return -1; return -1;
} }