osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39544?usp=email ) Change subject: GTP: CreatePDPContext: only use IMEISV IE when IMEISV is known ...................................................................... GTP: CreatePDPContext: only use IMEISV IE when IMEISV is known The IE is optional, but if it is present, it must be 11 byte long containing a 8 byte IMEISV. If IMEI is unknown the SGSN would add an empty IMEISV IE which is invalid. Change-Id: I812af1e702e77214244f32ae65663c1a03b23962 (cherry picked from commit 7d94476bde47cd9803f410ec2ffd072213e9ab48) --- M src/sgsn/sgsn_libgtp.c 1 file changed, 8 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index faf0e7f..385b843 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -299,11 +299,14 @@ break; } - /* include the IMEI(SV) */ - pdp->imeisv_given = 1; - gsm48_encode_bcd_number(&pdp->imeisv.v[0], 8, 0, mmctx->imei); - pdp->imeisv.l = pdp->imeisv.v[0]; - memmove(&pdp->imeisv.v[0], &pdp->imeisv.v[1], 8); + /* optional include the IMEI(SV) */ + if (mmctx->imei[0] != '\0') { + memset(&pdp->imeisv.v[0], 0, 8); + pdp->imeisv_given = 1; + gsm48_encode_bcd_number(&pdp->imeisv.v[0], 8, 0, mmctx->imei); + pdp->imeisv.l = 8; + memmove(&pdp->imeisv.v[0], &pdp->imeisv.v[1], 8); + } /* change pdp state to 'requested' */ pctx->state = PDP_STATE_CR_REQ; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39544?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: pespin/base Gerrit-Change-Id: I812af1e702e77214244f32ae65663c1a03b23962 Gerrit-Change-Number: 39544 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu>