lynxis lazus has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/38494?usp=email )
Change subject: NOT_FOR_MASTER: hard remove paging_request_join_vsub()
......................................................................
NOT_FOR_MASTER: hard remove paging_request_join_vsub()
The paging_request_join_vsub() is a MSC function which uses two vsub and got
called
by the VLR code, which can't work in the future when moving libvlr into an own
(shared) library.
Also this is a layer violation.
Either we create callback for this or rewrite it.
FIXME: is this case even valid? Can we have multiple MS with different TMSIs
and waiting paging
requests? And if so, when can this happen?
Change-Id: I84d9690df1d90598689e2b0e9400573aa45b8620
---
M src/libvlr/vlr.c
M src/libvlr/vlr_auth_fsm.c
2 files changed, 1 insertion(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/94/38494/1
diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c
index 4b6c05b..f6c3ab8 100644
--- a/src/libvlr/vlr.c
+++ b/src/libvlr/vlr.c
@@ -35,7 +35,6 @@
#include <osmocom/vlr/vlr_sgs.h>
#include <osmocom/vlr/vlr.h>
#include <osmocom/msc/gsup_client_mux.h>
-#include <osmocom/msc/paging.h>
#include <netinet/in.h>
#include <arpa/inet.h>
@@ -176,7 +175,6 @@
#define vlr_stat_item_set(vlr, idx, val) \
osmo_stat_item_set(osmo_stat_item_group_get_item((vlr)->statg, idx),
val)
-
/***********************************************************************
* Convenience functions
***********************************************************************/
@@ -604,8 +602,6 @@
vlr_subscr_name(vsub),
osmo_use_count_to_str_c(OTC_SELECT, &vsub->use_count));
- /* Take over some state from the previous vsub */
- paging_request_join_vsub(vsub, exists);
if (!vsub->msisdn[0])
OSMO_STRLCPY_ARRAY(vsub->msisdn, exists->msisdn);
if (!vsub->name[0])
diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c
index d00219b..85f30f4 100644
--- a/src/libvlr/vlr_auth_fsm.c
+++ b/src/libvlr/vlr_auth_fsm.c
@@ -696,3 +696,4 @@
at->use_count++;
return true;
}
+
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38494?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I84d9690df1d90598689e2b0e9400573aa45b8620
Gerrit-Change-Number: 38494
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus <[email protected]>
