Change in osmo-bsc[master]: BSSMAP RESET: move cancel-paging call to osmo_bsc_sigtran_reset()

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20626 )

Change subject: BSSMAP RESET: move cancel-paging call to osmo_bsc_sigtran_reset()
......................................................................

BSSMAP RESET: move cancel-paging call to osmo_bsc_sigtran_reset()

So far we would cancel ongoing Paging for a given MSC only after receiving a
RESET message from that BSC. However, the typical operation would be that
OsmoBSC *sends* a RESET and receives a RESET-ACK.

Instead, move the call to within osmo_bsc_sigtran_reset(). This is also called
when OsmoBSC considers the A-interface link to be lost, from the a_reset.c
code, after multiple SCCP connection failures.

Change-Id: Ia14b916be56563d18632c69a833084e71799a468
---
M include/osmocom/bsc/osmo_bsc_sigtran.h
M src/osmo-bsc/osmo_bsc_bssap.c
M src/osmo-bsc/osmo_bsc_sigtran.c
3 files changed, 6 insertions(+), 5 deletions(-)

Approvals:
  neels: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/include/osmocom/bsc/osmo_bsc_sigtran.h b/include/osmocom/bsc/osmo_bsc_sigtran.h
index 79afa6b..df37cf4 100644
--- a/include/osmocom/bsc/osmo_bsc_sigtran.h
+++ b/include/osmocom/bsc/osmo_bsc_sigtran.h
@@ -38,7 +38,7 @@
 int osmo_bsc_sigtran_init(struct llist_head *mscs);
 
 /* Close all open sigtran connections and channels */
-void osmo_bsc_sigtran_reset(const struct bsc_msc_data *msc);
+void osmo_bsc_sigtran_reset(struct bsc_msc_data *msc);
 
 void osmo_bsc_sigtran_tx_reset(const struct bsc_msc_data *msc);
 
diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c
index c2c05af..d37b3e0 100644
--- a/src/osmo-bsc/osmo_bsc_bssap.c
+++ b/src/osmo-bsc/osmo_bsc_bssap.c
@@ -100,9 +100,6 @@
 	 * close all active channels on the BTS side as well */
 	osmo_bsc_sigtran_reset(msc);
 
-	/* Drop all ongoing paging requests that this MSC has created on any BTS */
-	paging_flush_network(msc->network, msc);
-
 	update_msc_osmux_support(msc, msg, length);
 
 	/* Inform the MSC that we have received the reset request and
diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c
index 75b3b58..c2df17e 100644
--- a/src/osmo-bsc/osmo_bsc_sigtran.c
+++ b/src/osmo-bsc/osmo_bsc_sigtran.c
@@ -35,6 +35,7 @@
 #include <osmocom/bsc/bsc_subscr_conn_fsm.h>
 #include <osmocom/bsc/gsm_data.h>
 #include <osmocom/bsc/bts.h>
+#include <osmocom/bsc/paging.h>
 #include <osmocom/mgcp_client/mgcp_common.h>
 
 /* A pointer to a list with all involved MSCs
@@ -415,11 +416,14 @@
 }
 
 /* Close all open sigtran connections and channels */
-void osmo_bsc_sigtran_reset(const struct bsc_msc_data *msc)
+void osmo_bsc_sigtran_reset(struct bsc_msc_data *msc)
 {
 	struct gsm_subscriber_connection *conn, *conn_temp;
 	OSMO_ASSERT(msc);
 
+	/* Drop all ongoing paging requests that this MSC has created on any BTS */
+	paging_flush_network(msc->network, msc);
+
 	/* Close all open connections */
 	llist_for_each_entry_safe(conn, conn_temp, &bsc_gsmnet->subscr_conns, entry) {
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20626
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ia14b916be56563d18632c69a833084e71799a468
Gerrit-Change-Number: 20626
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201015/79c2c68c/attachment.htm>