res_pjsip: delay contact pruning on Asterisk start

Move the call to ast_sip_location_prune_boot_contacts() *after* the call
to ast_res_pjsip_init_options_handling() so that
res/res_pjsip/pjsip_options.c is informed about the contact deletion and
updates its sip_options_contact_statuses list. This allows for an AMI
event to be sent by res/res_pjsip/pjsip_options.c if the endpoint
registers again from the same remote address and port (i.e., same URI)
as used before the Asterisk restart.

ASTERISK-30109
Reported-by: Michael Neuhauser
Change-Id: I1ba4478019e4931a7085f62708d9b66837e901a8

diff --git a/res/res_pjsip.c b/res/res_pjsip.c
index d722bbe0fd88e09726507aa2b0a6986fc582a4da..2febf3de875aee2270c89218035891ab2cd5a8b9 100644 (file)
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@ -2766,6 +2766,14 @@ static int load_module(void)
                goto error;
        }
 
+       /*
+        * It is OK to prune the contacts now that
+        * ast_res_pjsip_init_options_handling() has added the contact observer
+        * of res/res_pjsip/pjsip_options.c to sorcery (to ensure that any
+        * pruned contacts are removed from this module's data structure).
+        */
+       ast_sip_location_prune_boot_contacts();
+
        if (ast_res_pjsip_init_message_filter()) {
                ast_log(LOG_ERROR, "Failed to initialize message IP updating. Aborting load\n");
                goto error;

diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c
index 5f1f61e397cd980ac1caa4ec98259c0256e4b189..6bc978dae59d5c9b835f0c7590aee2e0c449e00b 100644 (file)
--- a/res/res_pjsip/pjsip_configuration.c
+++ b/res/res_pjsip/pjsip_configuration.c
@@ -2280,8 +2280,6 @@ int ast_res_pjsip_initialize_configuration(void)
 
        load_all_endpoints();
 
-       ast_sip_location_prune_boot_contacts();
-
        acl_change_sub = stasis_subscribe(ast_security_topic(), acl_change_stasis_cb, NULL);
        stasis_subscription_accept_message_type(acl_change_sub, ast_named_acl_change_type());
        stasis_subscription_set_filter(acl_change_sub, STASIS_SUBSCRIPTION_FILTER_SELECTIVE);