From df2791da8f15aca4608e9bc748b43776c7797340 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Thu, 2 Jun 2016 12:51:31 -0500
Subject: [PATCH] pjsip_distributor.c: Ignore messages until fully booted.
We should not be processing any incoming messages until we are fully
booted. We may not have dialplan or other needed configuration loaded
yet.
ASTERISK-26089 #close
Reported by: Scott Griepentrog
ASTERISK-26088
Reported by: Richard Mudgett
Change-Id: I584aefb4f34b885a8927e1f13a2c64babd606264
---
CHANGES | 3 +++
res/res_pjsip/pjsip_distributor.c | 11 ++++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/CHANGES b/CHANGES
index 43dc18f4ba..56daf17670 100644
--- a/CHANGES
+++ b/CHANGES
@@ -397,6 +397,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 3867eaea0c..288a3e00a8 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));
--
GitLab