cellular-infrastructure
/
osmo-gbproxy
mirror of https://gerrit.osmocom.org/osmo-gbproxy
9
0
Fork 0
Code Issues Releases Wiki Activity

gprs: Don't use subscr->keep_in_ram in normal operation 

Currently the keep_in_ram flag is explicitely reset in
gprs_subscr_cleanup to cover the case, that the VTY 'create'
sub-command has been used to create the subscriber entry.

This commit completely removes keep_in_ram handling from
gprs_subscriber.c and adds a VTY 'destroy' sub-command to reset the
flag and remove the entry. So 'create' and 'destroy' can be used to
manager sticky entries that are kept even when a location
cancellation is done.

Added VTY command:

- update-subscriber imsi IMSI destroy

Sponsored-by: On-Waves ehf
This commit is contained in:
Jacob Erlbeck 2015-01-27 12:41:19 +01:00 committed by Holger Hans Peter Freyther
parent 70c177ab94
commit eafb849beb
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openbsc/src/gprs/gprs_subscriber.c
View File

@ -139,8 +139,6 @@ void gprs_subscr_cleanup(struct gsm_subscriber *subscr)
gprs_subscr_purge(subscr);
subscr->flags &= ~GPRS_SUBSCRIBER_ENABLE_PURGE;
}
subscr->keep_in_ram = 0;
}
void gprs_subscr_cancel(struct gsm_subscriber *subscr)

27
openbsc/src/gprs/sgsn_vty.c
View File

@ -589,6 +589,32 @@ DEFUN(update_subscr_create, update_subscr_create_cmd,
return CMD_SUCCESS;
}
DEFUN(update_subscr_destroy, update_subscr_destroy_cmd,
UPDATE_SUBSCR_STR "destroy",
UPDATE_SUBSCR_HELP
"Destroy a subscriber entry\n")
{
const char *imsi = argv[0];
struct gsm_subscriber *subscr;
subscr = gprs_subscr_get_by_imsi(imsi);
if (!subscr) {
vty_out(vty, "%% subscriber record does not exist for %s%s",
imsi, VTY_NEWLINE);
return CMD_WARNING;
}
subscr->keep_in_ram = 0;
gprs_subscr_cancel(subscr);
if (subscr->use_count > 1)
vty_out(vty, "%% subscriber is still in use%s",
VTY_NEWLINE);
subscr_put(subscr);
return CMD_SUCCESS;
}
#define UL_ERR_STR "system-failure|data-missing|unexpected-data-value|" \
"unknown-subscriber|roaming-not-allowed"
@ -699,6 +725,7 @@ int sgsn_vty_init(void)
install_element(ENABLE_NODE, &update_subscr_insert_auth_triplet_cmd);
install_element(ENABLE_NODE, &update_subscr_create_cmd);
install_element(ENABLE_NODE, &update_subscr_destroy_cmd);
install_element(ENABLE_NODE, &update_subscr_cancel_cmd);
install_element(ENABLE_NODE, &update_subscr_update_location_result_cmd);
install_element(ENABLE_NODE, &update_subscr_update_auth_info_cmd);

3
openbsc/tests/vty_test_runner.py
View File

@ -770,6 +770,9 @@ class TestVTYSGSN(TestVTYGenericBSC):
self.assert_(res.find('Authorized: 1') >= 0)
self.assertTrue(self.vty.verify('update-subscriber imsi 1234567890 cancel', ['']))
res = self.vty.command('show subscriber cache')
self.assert_(res.find('1234567890') >= 0)
self.assertTrue(self.vty.verify('update-subscriber imsi 1234567890 destroy', ['']))
res = self.vty.command('show subscriber cache')
self.assert_(res.find('1234567890') < 0)
def add_nat_test(suite, workdir):