diff options
| author | Harald Welte <laforge@gnumonks.org> | 2010-05-17 00:53:10 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2010-05-17 00:53:10 +0200 |
| commit | 8fc1a46f2868d71ba271aa34d1758a6c6bb8bd92 (patch) | |
| tree | f342144b8f515700c1a4f1bdd78f436cdf194245 /openbsc/src/gprs | |
| parent | 2720e7310d3cce36bc3cbcf87d3e8eb2eecf5c75 (diff) | |
[SGSN] remove the mmctx->sgsn pointer
We never want to support multiple sgsn's within one process, so
there is no point in passing them around all the time.
Diffstat (limited to 'openbsc/src/gprs')
| -rw-r--r-- | openbsc/src/gprs/sgsn_libgtp.c | 3 | ||||
| -rw-r--r-- | openbsc/src/gprs/sgsn_main.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/openbsc/src/gprs/sgsn_libgtp.c b/openbsc/src/gprs/sgsn_libgtp.c index fcaee8bbb..e99cb6cc8 100644 --- a/openbsc/src/gprs/sgsn_libgtp.c +++ b/openbsc/src/gprs/sgsn_libgtp.c @@ -99,7 +99,6 @@ const struct value_string gtp_cause_strs[] = { int sgsn_create_pdp_ctx(struct ggsn_ctx *ggsn, struct sgsn_mm_ctx *mmctx, uint16_t nsapi, struct tlv_parsed *tp) { - struct sgsn_instance *sgsn = mmctx->sgsn; struct pdp_t *pdp; uint64_t imsi_ui64; int rc; @@ -184,7 +183,7 @@ static int create_pdp_conf(struct pdp_t *pdp, void *cbp, int cause) LOGP(DGPRS, LOGL_NOTICE, "Create PDP ctx req timed out\n"); if (pdp->version == 1) { pdp->version = 0; - gtp_create_context_req(mmctx->sgsn->gsn, pdp, cbp); + gtp_create_context_req(sgsn->gsn, pdp, cbp); return 0; } else { pdp_freepdp(pdp); diff --git a/openbsc/src/gprs/sgsn_main.c b/openbsc/src/gprs/sgsn_main.c index ac895a2ce..74efe8418 100644 --- a/openbsc/src/gprs/sgsn_main.c +++ b/openbsc/src/gprs/sgsn_main.c @@ -59,19 +59,19 @@ void subscr_put() { abort(); } void *tall_bsc_ctx; struct gprs_ns_inst *sgsn_nsi; - const char *openbsc_copyright = "Copyright (C) 2010 Harald Welte and On-Waves\n" "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n"; -struct sgsn_instance sgsn_inst = { +static struct sgsn_instance sgsn_inst = { .config_file = "osmo_sgsn.cfg", .cfg = { .gtp_statedir = "./", }, }; +struct sgsn_instance *sgsn = &sgsn_inst; /* call-back function for the NS protocol */ static int sgsn_ns_cb(enum gprs_ns_evt event, struct gprs_nsvc *nsvc, |