osmith has uploaded this change for review. ( 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(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/44/39544/1
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: newchange
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-CC: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39546?usp=email )
Change subject: jenkins.sh: No need to build libosmo-sigtran with doxygen
......................................................................
jenkins.sh: No need to build libosmo-sigtran with doxygen
Change-Id: Iab3d1b2e1591e66702a01def6c322f4a11970ead
(cherry picked from commit df44350b4b6fbc3922308fae18501ff11d546d9a)
---
M contrib/jenkins.sh
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/46/39546/1
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index ced8367..d3c7616 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -38,7 +38,7 @@
osmo-build-dep.sh osmo-hlr
if [ "x$IU" = "x--enable-iu" ]; then
- osmo-build-dep.sh libosmo-sigtran
+ osmo-build-dep.sh libosmo-sigtran "" --disable-doxygen
osmo-build-dep.sh libasn1c
#osmo-build-dep.sh asn1c aper-prefix # only needed for make regen in osmo-iuh
osmo-build-dep.sh osmo-iuh
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39546?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-sgsn
Gerrit-Branch: pespin/base
Gerrit-Change-Id: Iab3d1b2e1591e66702a01def6c322f4a11970ead
Gerrit-Change-Number: 39546
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39545?usp=email )
Change subject: sgsn_vty: Drop unneeded use of abis/ipa.h header
......................................................................
sgsn_vty: Drop unneeded use of abis/ipa.h header
The header is not needed and will eventually be deprecated.
Change-Id: I48a513b8ea63dadbc6d6d571380980f55ff04a06
(cherry picked from commit 7a45b5748582594d8113c24d7de03dd4740ccb4e)
---
M src/sgsn/sgsn_vty.c
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/45/39545/1
diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c
index 113fdd1..2d41009 100644
--- a/src/sgsn/sgsn_vty.c
+++ b/src/sgsn/sgsn_vty.c
@@ -53,7 +53,6 @@
#include <osmocom/vty/misc.h>
#include <osmocom/crypt/gprs_cipher.h>
#include <osmocom/crypt/utran_cipher.h>
-#include <osmocom/abis/ipa.h>
#include <osmocom/gprs/gprs_bssgp.h>
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39545?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-sgsn
Gerrit-Branch: pespin/base
Gerrit-Change-Id: I48a513b8ea63dadbc6d6d571380980f55ff04a06
Gerrit-Change-Number: 39545
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39548?usp=email )
Change subject: gprs_ms_net_cap_gea_mask(): protect against empty MS Network Capabilities
......................................................................
gprs_ms_net_cap_gea_mask(): protect against empty MS Network Capabilities
When the MS Network Capability is empty, expect to support at least
unencrypted communications.
This shouldn't be empty at all, as the minimum length of it is 2 when
the MS/UE is doing an Attach Request.
But when receiving a MS/UE SGSN Context via Gn, the field
is optional.
The MS/UE shall include it into the Routing Area Request,
but not must.
Change-Id: Ieef2e3eeaaadc90c35fff6f20d47bd36aaa4b9e6
(cherry picked from commit d3b037ccfae542807b7602c2163f11fa0eb3b885)
---
M src/sgsn/gprs_gmm.c
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/48/39548/1
diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c
index 9aae62b..7a4ea20 100644
--- a/src/sgsn/gprs_gmm.c
+++ b/src/sgsn/gprs_gmm.c
@@ -1229,6 +1229,10 @@
static uint8_t gprs_ms_net_cap_gea_mask(const uint8_t *ms_net_cap, uint8_t cap_len)
{
uint8_t mask = (1 << GPRS_ALGO_GEA0);
+
+ if (cap_len == 0)
+ return mask;
+
mask |= (0x80 & ms_net_cap[0]) ? (1 << GPRS_ALGO_GEA1) : 0;
if (cap_len < 2)
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39548?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-sgsn
Gerrit-Branch: pespin/base
Gerrit-Change-Id: Ieef2e3eeaaadc90c35fff6f20d47bd36aaa4b9e6
Gerrit-Change-Number: 39548
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-CC: pespin <pespin(a)sysmocom.de>