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

Merge "res_pjsip_mwi: remove unneeded check on endpoint's contacts."

Browse Source
This commit is contained in:
zuul
2016-07-20 09:57:58 -05:00
committed by Gerrit Code Review
parent 333a0fed33 e9daa34261
commit b93c602198
1 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
res/res_pjsip_mwi.c
View File

@@ -976,38 +976,12 @@ static int create_mwi_subscriptions_for_endpoint(void *obj, void *arg, int flags
{ {
RAII_VAR(struct mwi_subscription *, aggregate_sub, NULL, ao2_cleanup); RAII_VAR(struct mwi_subscription *, aggregate_sub, NULL, ao2_cleanup);
struct ast_sip_endpoint *endpoint = obj; struct ast_sip_endpoint *endpoint = obj;
char *endpoint_aors, *aor_name, *mailboxes, *mailbox; char *mailboxes, *mailbox;
struct ao2_container *contacts = NULL;
if (ast_strlen_zero(endpoint->subscription.mwi.mailboxes)) { if (ast_strlen_zero(endpoint->subscription.mwi.mailboxes)) {
return 0; return 0;
} }
endpoint_aors = ast_strdupa(endpoint->aors);
while ((aor_name = ast_strip(strsep(&endpoint_aors, ",")))) {
RAII_VAR(struct ast_sip_aor *, aor, ast_sip_location_retrieve_aor(aor_name), ao2_cleanup);
if (!aor) {
continue;
}
contacts = ast_sip_location_retrieve_aor_contacts(aor);
if (!contacts || (ao2_container_count(contacts) == 0)) {
ao2_cleanup(contacts);
contacts = NULL;
continue;
}
break;
}
if (!contacts) {
return 0;
}
ao2_ref(contacts, -1);
if (endpoint->subscription.mwi.aggregate) { if (endpoint->subscription.mwi.aggregate) {
aggregate_sub = mwi_subscription_alloc(endpoint, 0, NULL); aggregate_sub = mwi_subscription_alloc(endpoint, 0, NULL);
if (!aggregate_sub) { if (!aggregate_sub) {