diff options
| author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2014-11-13 10:48:39 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-11-14 10:26:06 +0100 |
| commit | a0b6efb3685ea90190cfbd9423a74c181ea4f12f (patch) | |
| tree | 17d62d87e6fbf5229093a791b58f0e4042ff6ca9 /openbsc/src/gprs/sgsn_auth.c | |
| parent | f951a01bb227e524eb369051c95fbebace7570d0 (diff) | |
sgsn: Remove explicit sgsn_instance parameters
Currently the function in sgsn_auth.c either have an sgsn_config or
an sgsn_instance parameter. Since then global sgsn variable is
already being used in that file and since other parts of the SGSN
related code also rely on a global sgsn singleton, these parameters
pretend to provide a flexibility that is not really supported.
Therefore this patch removes these parameters except for the ACL
related functions, which do not call code that uses the sgsn
variable.
Sponsored-by: On-Waves ehf
Diffstat (limited to 'openbsc/src/gprs/sgsn_auth.c')
| -rw-r--r-- | openbsc/src/gprs/sgsn_auth.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/openbsc/src/gprs/sgsn_auth.c b/openbsc/src/gprs/sgsn_auth.c index 0407e9e69..eb85d45fb 100644 --- a/openbsc/src/gprs/sgsn_auth.c +++ b/openbsc/src/gprs/sgsn_auth.c @@ -34,9 +34,9 @@ const struct value_string auth_state_names[] = { const struct value_string *sgsn_auth_state_names = auth_state_names; -void sgsn_auth_init(struct sgsn_instance *sgi) +void sgsn_auth_init(void) { - INIT_LLIST_HEAD(&sgi->cfg.imsi_acl); + INIT_LLIST_HEAD(&sgsn->cfg.imsi_acl); } /* temporary IMSI ACL hack */ @@ -81,8 +81,7 @@ int sgsn_acl_del(const char *imsi, struct sgsn_config *cfg) return 0; } -enum sgsn_auth_state sgsn_auth_state(struct sgsn_mm_ctx *mmctx, - struct sgsn_config *cfg) +enum sgsn_auth_state sgsn_auth_state(struct sgsn_mm_ctx *mmctx) { char mccmnc[16]; int check_net = 0; @@ -125,22 +124,22 @@ enum sgsn_auth_state sgsn_auth_state(struct sgsn_mm_ctx *mmctx, return SGSN_AUTH_REJECTED; } -int sgsn_auth_request(struct sgsn_mm_ctx *mmctx, struct sgsn_config *cfg) +int sgsn_auth_request(struct sgsn_mm_ctx *mmctx) { /* TODO: Add remote subscriber update requests here */ - sgsn_auth_update(mmctx, sgsn); + sgsn_auth_update(mmctx); return 0; } -void sgsn_auth_update(struct sgsn_mm_ctx *mmctx, struct sgsn_instance *sgi) +void sgsn_auth_update(struct sgsn_mm_ctx *mmctx) { enum sgsn_auth_state auth_state; LOGMMCTXP(LOGL_DEBUG, mmctx, "Updating authorization\n"); - auth_state = sgsn_auth_state(mmctx, &sgi->cfg); + auth_state = sgsn_auth_state(mmctx); if (auth_state == SGSN_AUTH_UNKNOWN) { /* Reject requests since remote updates are NYI */ LOGMMCTXP(LOGL_ERROR, mmctx, |