summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2016-05-02 08:34:57 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-01-23 13:56:01 +0100
commit87271a4e48b0d859f2e12d95558371be20709f7c (patch)
tree781208e6d197dfde741d83f3abf77e99dc8aea4f
parent3c0ffa19f904423abd56499e48518735af98d163 (diff)
SGSN: Don't indicate GERAN in Iu mode PDP CTX ACT REQ to GGSN
-rw-r--r--openbsc/src/gprs/sgsn_libgtp.c30
1 files changed, 20 insertions, 10 deletions
diff --git a/openbsc/src/gprs/sgsn_libgtp.c b/openbsc/src/gprs/sgsn_libgtp.c
index 072b9baf0..6958a4d30 100644
--- a/openbsc/src/gprs/sgsn_libgtp.c
+++ b/openbsc/src/gprs/sgsn_libgtp.c
@@ -247,12 +247,8 @@ struct sgsn_pdp_ctx *sgsn_create_pdp_ctx(struct sgsn_ggsn_ctx *ggsn,
memcpy(pdp->gsnlu.v, &sgsn->cfg.gtp_listenaddr.sin_addr,
sizeof(sgsn->cfg.gtp_listenaddr.sin_addr));
- /* Assume we are a GERAN system */
- pdp->rattype.l = 1;
- pdp->rattype.v[0] = 2;
- pdp->rattype_given = 1;
-
- /* Include RAI and ULI all the time */
+ /* Routing Area Identifier with LAC and RAC fixed values, as
+ * requested in 29.006 7.3.1 */
pdp->rai_given = 1;
pdp->rai.l = 6;
raid = mmctx->ra;
@@ -260,10 +256,24 @@ struct sgsn_pdp_ctx *sgsn_create_pdp_ctx(struct sgsn_ggsn_ctx *ggsn,
raid.rac = 0xFF;
gsm48_construct_ra(pdp->rai.v, &raid);
- pdp->userloc_given = 1;
- pdp->userloc.l = 8;
- pdp->userloc.v[0] = 0; /* CGI for GERAN */
- bssgp_create_cell_id(&pdp->userloc.v[1], &mmctx->ra, mmctx->gb.cell_id);
+ pdp->rattype.l = 1;
+ pdp->rattype_given = 1;
+
+ switch (mmctx->ran_type) {
+ case MM_CTX_T_GERAN_Gb:
+ case MM_CTX_T_GERAN_Iu:
+ pdp->rattype.v[0] = 2;
+ /* User Location Information */
+ pdp->userloc_given = 1;
+ pdp->userloc.l = 8;
+ pdp->userloc.v[0] = 0; /* CGI for GERAN */
+ bssgp_create_cell_id(&pdp->userloc.v[1], &mmctx->ra, mmctx->gb.cell_id);
+ break;
+ case MM_CTX_T_UTRAN_Iu:
+ pdp->rattype.v[0] = 1;
+ /* FIXME: Optional User Location Information with SAI */
+ break;
+ }
/* include the IMEI(SV) */
pdp->imeisv_given = 1;