lynxis lazus has uploaded this change for review.

View Change

libvlr: Remove MSC specific parts

The libvlr should not contain any MSC specific parts.
Remove include and usage of MSC objects.

Change-Id: I35e3edc56c7c64ac2a4462dec8ea684b00ab3881
---
M include/osmocom/vlr/vlr.h
M src/libvlr/vlr.c
2 files changed, 0 insertions(+), 11 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/61/43461/1

diff --git a/include/osmocom/vlr/vlr.h b/include/osmocom/vlr/vlr.h
index 9b49ff2..497fa4f 100644
--- a/include/osmocom/vlr/vlr.h
+++ b/include/osmocom/vlr/vlr.h
@@ -13,7 +13,6 @@
 #include <osmocom/gsm/gsm0808.h>
 #include <osmocom/gsm/gsup.h>
 #include <osmocom/gsm/ipa.h>
-#include <osmocom/msc/msc_common.h>
 #include <osmocom/gsupclient/gsup_client.h>
 #include <osmocom/vlr/vlr_sgs.h>
 
diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c
index 919def3..ebc978f 100644
--- a/src/libvlr/vlr.c
+++ b/src/libvlr/vlr.c
@@ -35,8 +35,6 @@
 #include <osmocom/vlr/vlr_sgs.h>
 #include <osmocom/vlr/vlr.h>
 #include <osmocom/gsupclient/gsup_client_mux.h>
-#include <osmocom/msc/paging.h>
-#include <osmocom/msc/silent_call.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -605,8 +603,6 @@
 	     exists->imsi, osmo_use_count_to_str_c(OTC_SELECT, &exists->use_count),
 	     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])
@@ -643,12 +639,6 @@
 	if (!strcmp(vsub->imsi, imsi))
 		return;
 
-	/* If the same subscriber has silent call (probably pending) stop the silent call to prevent
-	 * use count mismatch when freeing the transaction. */
-	exists = vlr_subscr_find_by_imsi(vsub->vlr, imsi, NULL);
-	if (gsm_silent_call_is_ongoing(exists))
-		gsm_silent_call_stop(exists);
-
 	/* We've just learned about this new IMSI, our primary key in the VLR. make sure to invalidate any prior VLR
 	 * entries for this IMSI. */
 	exists = vlr_subscr_find_by_imsi(vsub->vlr, imsi, NULL);

To view, visit change 43461. To unsubscribe, or for help writing mail filters, visit settings.