Merge "pjsip_distributor.c: Ignore messages until fully booted." into 13

2 files changed, 13 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index 518ee81d7..9922937ab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -52,6 +52,9 @@ res_pjsip
    into the "reg_server" field in the ps_contacts table to facilitate
    multi-server setups.
 
+ * When starting Asterisk, received traffic will now be ignored until Asterisk
+   has loaded all modules and is fully booted.
+
 res_hep
 ------------------
  * Added a new option, 'uuid_type', that sets the preferred source of the Homer
diff --git a/res/res_pjsip/pjsip_distributor.c b/res/res_pjsip/pjsip_distributor.c
index 3867eaea0..288a3e00a 100644
--- a/res/res_pjsip/pjsip_distributor.c
+++ b/res/res_pjsip/pjsip_distributor.c
@@ -290,11 +290,20 @@ static pjsip_module endpoint_mod = {
 
 static pj_bool_t distributor(pjsip_rx_data *rdata)
 {
-	pjsip_dialog *dlg = find_dialog(rdata);
+	pjsip_dialog *dlg;
 	struct distributor_dialog_data *dist = NULL;
 	struct ast_taskprocessor *serializer = NULL;
 	pjsip_rx_data *clone;
 
+	if (!ast_test_flag(&ast_options, AST_OPT_FLAG_FULLY_BOOTED)) {
+		/*
+		 * Ignore everything until we are fully booted.  Let the
+		 * peer retransmit messages until we are ready.
+		 */
+		return PJ_TRUE;
+	}
+
+	dlg = find_dialog(rdata);
 	if (dlg) {
 		ast_debug(3, "Searching for serializer on dialog %s for %s\n",
 			dlg->obj_name, pjsip_rx_data_get_info(rdata));