From: Kevin Harwell <kharwell@digium.com>
Date: Thu, 16 Jan 2014 20:06:59 +0000 (+0000)
Subject: res_pjsip: AOR option qualify_frequency not respected on startup
X-Git-Tag: 13.0.0-beta1~641
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f6c34a6c9c1ca5c4e57de1a982560632edc2fa9;p=thirdparty%2Fasterisk.git

res_pjsip: AOR option qualify_frequency not respected on startup

If an endpoint had previously dynamically registered a contact and the contact
information was successfully stored in astdb then upon restart the qualify
notifications would not be sent out if the qualify_frequency was set.  This was
due to the fact that only permanent contacts were being checked and scheduled
for qualifies on startup.  Modified the code to check and schedule all
registered contacts at startup.

(closes issue ASTERISK-23062)
Reported by: Rusty Newton
Review: https://reviewboard.asterisk.org/r/3124/
........

Merged revisions 405748 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@405749 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_pjsip/pjsip_options.c b/res/res_pjsip/pjsip_options.c
index 2f7998d3b7..3e745d55fc 100644
--- a/res/res_pjsip/pjsip_options.c
+++ b/res/res_pjsip/pjsip_options.c
@@ -798,12 +798,12 @@ static int qualify_and_schedule_cb(void *obj, void *arg, int flags)
 
 /*!
  * \internal
- * \brief Qualify and schedule an endpoint's permanent contacts
+ * \brief Qualify and schedule an endpoint's contacts
  *
  * \detail For the given endpoint retrieve its list of aors, qualify all
- *         permanent contacts, and schedule for checks if configured.
+ *         contacts, and schedule for checks if configured.
  */
-static int qualify_and_schedule_permanent_cb(void *obj, void *arg, int flags)
+static int qualify_and_schedule_all_cb(void *obj, void *arg, int flags)
 {
 	struct ast_sip_endpoint *endpoint = obj;
 	char *aor_name, *aors;
@@ -817,31 +817,39 @@ static int qualify_and_schedule_permanent_cb(void *obj, void *arg, int flags)
 	while ((aor_name = strsep(&aors, ","))) {
 		RAII_VAR(struct ast_sip_aor *, aor,
 			 ast_sip_location_retrieve_aor(aor_name), ao2_cleanup);
+		struct ao2_container *contacts;
 
-		if (!aor || !aor->permanent_contacts) {
+		if (!aor || !(contacts = ast_sip_location_retrieve_aor_contacts(aor))) {
 			continue;
 		}
-		ao2_callback(aor->permanent_contacts, OBJ_NODATA, qualify_and_schedule_cb, aor);
+
+		ao2_callback(contacts, OBJ_NODATA, qualify_and_schedule_cb, aor);
+		ao2_ref(contacts, -1);
 	}
 
 	return 0;
 }
 
-static void qualify_and_schedule_permanent(void)
+static void qualify_and_schedule_all(void)
 {
-	RAII_VAR(struct ao2_container *, endpoints,
-		 ast_sip_get_endpoints(), ao2_cleanup);
+	struct ao2_container *endpoints = ast_sip_get_endpoints();
+
+	if (!endpoints) {
+		return;
+	}
 
 	ao2_callback(endpoints, OBJ_NODATA,
-		     qualify_and_schedule_permanent_cb, NULL);
+		     qualify_and_schedule_all_cb, NULL);
+	ao2_ref(endpoints, -1);
 }
 
 int ast_res_pjsip_init_options_handling(int reload)
 {
 	const pj_str_t STR_OPTIONS = { "OPTIONS", 7 };
 
-	if (sched_qualifies) {
-		ao2_t_ref(sched_qualifies, -1, "Remove old scheduled qualifies");
+	if (reload) {
+		qualify_and_schedule_all();
+		return 0;
 	}
 
 	if (!(sched_qualifies = ao2_t_container_alloc(
@@ -851,11 +859,6 @@ int ast_res_pjsip_init_options_handling(int reload)
 		return -1;
 	}
 
-	if (reload) {
-		qualify_and_schedule_permanent();
-		return 0;
-	}
-
 	if (pjsip_endpt_register_module(ast_sip_get_pjsip_endpoint(), &options_module) != PJ_SUCCESS) {
 		options_stop();
 		return -1;
@@ -871,7 +874,7 @@ int ast_res_pjsip_init_options_handling(int reload)
 		return -1;
 	}
 
-	qualify_and_schedule_permanent();
+	qualify_and_schedule_all();
 	ast_cli_register_multiple(cli_options, ARRAY_LEN(cli_options));
 	ast_manager_register2("PJSIPQualify", EVENT_FLAG_SYSTEM | EVENT_FLAG_REPORTING, ami_sip_qualify, NULL, NULL, NULL);