diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-07-20 09:58:00 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-07-20 09:58:00 -0500 |
| commit | 7ce180a7548af5c89a193592ae3f0e429b948f2d (patch) | |
| tree | 9b32b5492f34ee753c5d3e0471fa6c5d094cb4d3 /res | |
| parent | 5f24874ebb8686eb73817084385bb23727c19e85 (diff) | |
| parent | cb58f853e1bccb1b9ba1df458234052fc14c822f (diff) | |
Merge "res_pjsip_mwi: remove unneeded check on endpoint's contacts." into 13
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_pjsip_mwi.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/res/res_pjsip_mwi.c b/res/res_pjsip_mwi.c index 9eba335b5..d86c96c74 100644 --- a/res/res_pjsip_mwi.c +++ b/res/res_pjsip_mwi.c @@ -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); struct ast_sip_endpoint *endpoint = obj; - char *endpoint_aors, *aor_name, *mailboxes, *mailbox; - struct ao2_container *contacts = NULL; + char *mailboxes, *mailbox; if (ast_strlen_zero(endpoint->subscription.mwi.mailboxes)) { 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) { aggregate_sub = mwi_subscription_alloc(endpoint, 0, NULL); if (!aggregate_sub) { |