mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-11-03 20:38:59 +00:00 
			
		
		
		
	Move where the sorcery observer is added for qualify to guarantee the sched_qualifies container exists.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392864 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		@@ -688,11 +688,6 @@ int ast_sip_initialize_sorcery_qualify(struct ast_sorcery *sorcery)
 | 
			
		||||
	ast_sorcery_object_field_register(sorcery, CONTACT_STATUS, "rtt", "0", OPT_UINT_T,
 | 
			
		||||
					  1, FLDSET(struct ast_sip_contact_status, rtt));
 | 
			
		||||
 | 
			
		||||
	if (ast_sorcery_observer_add(sorcery, "contact", &contact_observer)) {
 | 
			
		||||
		ast_log(LOG_WARNING, "Unable to add contact observer\n");
 | 
			
		||||
		return -1;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -777,6 +772,11 @@ int ast_res_sip_init_options_handling(int reload)
 | 
			
		||||
		return -1;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (ast_sorcery_observer_add(ast_sip_get_sorcery(), "contact", &contact_observer)) {
 | 
			
		||||
		ast_log(LOG_WARNING, "Unable to add contact observer\n");
 | 
			
		||||
		return -1;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	qualify_and_schedule_permanent();
 | 
			
		||||
	ast_cli_register_multiple(cli_options, ARRAY_LEN(cli_options));
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user