aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc/src
diff options
context:
space:
mode:
Diffstat (limited to 'openbsc/src')
-rw-r--r--openbsc/src/gprs/gprs_gmm.c2
-rw-r--r--openbsc/src/gprs/gprs_sgsn.c6
-rw-r--r--openbsc/src/gprs/sgsn_auth.c38
3 files changed, 27 insertions, 19 deletions
diff --git a/openbsc/src/gprs/gprs_gmm.c b/openbsc/src/gprs/gprs_gmm.c
index afd3bbb06..48fb29d1b 100644
--- a/openbsc/src/gprs/gprs_gmm.c
+++ b/openbsc/src/gprs/gprs_gmm.c
@@ -644,7 +644,7 @@ static int gsm48_gmm_authorize(struct sgsn_mm_ctx *ctx)
if (ctx->auth_state == SGSN_AUTH_UNKNOWN) {
/* Request authorization, this leads to a call to
- * sgsn_update_subscriber_data which in turn calls
+ * sgsn_auth_update which in turn calls
* gsm0408_gprs_access_granted or gsm0408_gprs_access_denied */
sgsn_auth_request(ctx, &sgsn->cfg);
diff --git a/openbsc/src/gprs/gprs_sgsn.c b/openbsc/src/gprs/gprs_sgsn.c
index daf9483bd..9fc4b86f3 100644
--- a/openbsc/src/gprs/gprs_sgsn.c
+++ b/openbsc/src/gprs/gprs_sgsn.c
@@ -451,11 +451,9 @@ int sgsn_force_reattach_oldmsg(struct msgb *oldmsg)
return gsm0408_gprs_force_reattach_oldmsg(oldmsg);
}
-void sgsn_update_subscriber_data(struct sgsn_mm_ctx *mmctx,
- struct sgsn_subscriber_data *sd)
+void sgsn_update_subscriber_data(struct sgsn_mm_ctx *mmctx)
{
OSMO_ASSERT(mmctx);
- if (sd->auth_state != mmctx->auth_state)
- sgsn_auth_update(mmctx, sd);
+ sgsn_auth_update(mmctx, sgsn);
}
diff --git a/openbsc/src/gprs/sgsn_auth.c b/openbsc/src/gprs/sgsn_auth.c
index d2d4913b6..0407e9e69 100644
--- a/openbsc/src/gprs/sgsn_auth.c
+++ b/openbsc/src/gprs/sgsn_auth.c
@@ -32,6 +32,8 @@ const struct value_string auth_state_names[] = {
{ 0, NULL }
};
+const struct value_string *sgsn_auth_state_names = auth_state_names;
+
void sgsn_auth_init(struct sgsn_instance *sgi)
{
INIT_LLIST_HEAD(&sgi->cfg.imsi_acl);
@@ -125,29 +127,37 @@ enum sgsn_auth_state sgsn_auth_state(struct sgsn_mm_ctx *mmctx,
int sgsn_auth_request(struct sgsn_mm_ctx *mmctx, struct sgsn_config *cfg)
{
- struct sgsn_subscriber_data sd = {0};
+ /* TODO: Add remote subscriber update requests here */
+
+ sgsn_auth_update(mmctx, sgsn);
+
+ return 0;
+}
+
+void sgsn_auth_update(struct sgsn_mm_ctx *mmctx, struct sgsn_instance *sgi)
+{
+ enum sgsn_auth_state auth_state;
- sd.auth_state = sgsn_auth_state(mmctx, cfg);
+ LOGMMCTXP(LOGL_DEBUG, mmctx, "Updating authorization\n");
- if (sd.auth_state == SGSN_AUTH_UNKNOWN) {
+ auth_state = sgsn_auth_state(mmctx, &sgi->cfg);
+ if (auth_state == SGSN_AUTH_UNKNOWN) {
+ /* Reject requests since remote updates are NYI */
LOGMMCTXP(LOGL_ERROR, mmctx,
"Missing information, authorization not possible\n");
- sd.auth_state = SGSN_AUTH_REJECTED;
+ auth_state = SGSN_AUTH_REJECTED;
}
- /* This will call sgsn_auth_update if auth_state has changed */
- sgsn_update_subscriber_data(mmctx, &sd);
- return 0;
-}
+ if (mmctx->auth_state == auth_state)
+ return;
-void sgsn_auth_update(struct sgsn_mm_ctx *mmctx, struct sgsn_subscriber_data *sd)
-{
- LOGMMCTXP(LOGL_INFO, mmctx, "Got authorization update: state %s\n",
- get_value_string(auth_state_names, sd->auth_state));
+ LOGMMCTXP(LOGL_INFO, mmctx, "Got authorization update: state %s -> %s\n",
+ get_value_string(sgsn_auth_state_names, mmctx->auth_state),
+ get_value_string(sgsn_auth_state_names, auth_state));
- mmctx->auth_state = sd->auth_state;
+ mmctx->auth_state = auth_state;
- switch (sd->auth_state) {
+ switch (auth_state) {
case SGSN_AUTH_ACCEPTED:
gsm0408_gprs_access_granted(mmctx);
break;