Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly detect Measurement Reports
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11224 ) Change subject: BTS_Tests.ttcn: fix: properly detect Measurement Reports .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11224/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11224/2/bts/BTS_Tests.ttcn@3762 PS2, Line 3762: [exp_sacch] as_meas_res(verify_meas := false); Good point. I don't even know, how can we print something here without changing the as_meas_res(). > BTW: Does TTCN3 supports passing params by name > instead of order? Sure :) -- To view, visit https://gerrit.osmocom.org/11224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iea5ee868ede8bfe1e2b1cbf5abcbf2844d3fe9a4 Gerrit-Change-Number: 11224 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 04 Oct 2018 17:20:39 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: add 'lazy' mode for as_meas_res()
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11226 ) Change subject: BTS_Tests.ttcn: add 'lazy' mode for as_meas_res() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I39118d6e64c767fad2c9618ec0ef4532dc60e715 Gerrit-Change-Number: 11226 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 04 Oct 2018 16:35:19 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: expect RSL_MEAS_RES messages
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11227 ) Change subject: BTS_Tests.ttcn: fix: expect RSL_MEAS_RES messages .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34227b981f76377c338fad4ff9560ba2042abce4 Gerrit-Change-Number: 11227 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 04 Oct 2018 16:35:16 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly detect Measurement Reports
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11224 ) Change subject: BTS_Tests.ttcn: fix: properly detect Measurement Reports .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11224/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11224/2/bts/BTS_Tests.ttcn@3762 PS2, Line 3762: [exp_sacch] as_meas_res(verify_meas := false); I think you are changing logic here too, because if exp_sacch=false you want to fail if you receive something there, but you don't do that after your change. BTW: Does TTCN3 supports passing params by name instead of order? -- To view, visit https://gerrit.osmocom.org/11224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iea5ee868ede8bfe1e2b1cbf5abcbf2844d3fe9a4 Gerrit-Change-Number: 11224 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 04 Oct 2018 16:34:06 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-hlr[master]: fix is_ps logic in rx_upd_loc_req(), store CS as is_ps = false
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11230 ) Change subject: fix is_ps logic in rx_upd_loc_req(), store CS as is_ps = false .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2c5fa9f5cae25cfd66afbf088303edff7d045a00 Gerrit-Change-Number: 11230 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 04 Oct 2018 16:24:16 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ttcn3-hacks[master]: BSC_Tests: use consistant AMR S0-S15 bits
dexter has posted comments on this change. ( https://gerrit.osmocom.org/11131 ) Change subject: BSC_Tests: use consistant AMR S0-S15 bits .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia98f18ba2c17c85ed01488734dc6df67f5b60d41 Gerrit-Change-Number: 11131 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Comment-Date: Thu, 04 Oct 2018 16:18:44 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-bsc[master]: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11060 to look at the new patch set (#9). Change subject: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST .. codec_pref: handle S0-S15 in ASSIGNMENT REQUEST Opposed to all other codecs that are common in GSM, AMR requires a codec configuration that is expressed by a bitmask (S0 to S15) in the speech codec list in the ASSIGNMENT REQUEST. Also the BSC acknowledges those configuration in the ASSIGNMENT COMPLETE message. At the moment osmo-bsc ignores all incoming configuration bits. The bits in the ASSIGNMENT COMPLETE speech codec (choosen) field are hardcoded. - Store the configuration bits while parsing the ASSIGNMENT COMPLETE - Create an intersection with the configuration that is actually supported by the BSS - Return the resulting (chosen) configuration bits with the assignment complete message. - Use the (highest of the) agreed codec rates in RSL channel activation. Change-Id: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Related: OS#3529 --- M include/osmocom/bsc/codec_pref.h M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c M tests/codec_pref/codec_pref_test.c M tests/codec_pref/codec_pref_test.ok 10 files changed, 190 insertions(+), 101 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/11060/9 -- To view, visit https://gerrit.osmocom.org/11060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Gerrit-Change-Number: 11060 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Neels Hofmeyr
Change in osmo-ci[master]: osmocom-nightly-packages.sh: Build against newest limesuite release v...
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11235 ) Change subject: osmocom-nightly-packages.sh: Build against newest limesuite release v18.10.0 .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4e3a3d3ac4422cbf9c4e8c8bda3d3f7b27be1a14 Gerrit-Change-Number: 11235 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 04 Oct 2018 16:10:26 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ci[master]: osmocom-nightly-packages.sh: Build against newest limesuite release v...
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11235 ) Change subject: osmocom-nightly-packages.sh: Build against newest limesuite release v18.10.0 .. Patch Set 1: Tested locally it works fine (I can register phones and place a call with this limesuite version and master osmo-trx). Also tested it builds fine in my OBS. -- To view, visit https://gerrit.osmocom.org/11235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4e3a3d3ac4422cbf9c4e8c8bda3d3f7b27be1a14 Gerrit-Change-Number: 11235 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 04 Oct 2018 16:10:22 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-ci[master]: osmocom-nightly-packages.sh: Build against newest limesuite release v...
Pau Espin Pedrol has uploaded this change for review. (
https://gerrit.osmocom.org/11235
Change subject: osmocom-nightly-packages.sh: Build against newest limesuite
release v18.10.0
..
osmocom-nightly-packages.sh: Build against newest limesuite release v18.10.0
Change-Id: I4e3a3d3ac4422cbf9c4e8c8bda3d3f7b27be1a14
---
M scripts/osmocom-nightly-packages.sh
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/35/11235/1
diff --git a/scripts/osmocom-nightly-packages.sh
b/scripts/osmocom-nightly-packages.sh
index ba324cb..1c98029 100755
--- a/scripts/osmocom-nightly-packages.sh
+++ b/scripts/osmocom-nightly-packages.sh
@@ -126,7 +126,7 @@
}
checkout_limesuite() {
- TAG="01e2d00c5005b85d1f94cca02881756a72e35e2a"
+ TAG="v18.10.0"
cd "$REPO"
git clone https://github.com/myriadrf/LimeSuite limesuite
@@ -186,7 +186,7 @@
create_osmo_trx_debian8_jessie
- build limesuite no_commit
--git-upstream-tree=01e2d00c5005b85d1f94cca02881756a72e35e2a
+ build limesuite no_commit --git-upstream-tree=v18.10.0
build libosmocore
build libosmo-sccp
build libosmo-abis
--
To view, visit https://gerrit.osmocom.org/11235
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e3a3d3ac4422cbf9c4e8c8bda3d3f7b27be1a14
Gerrit-Change-Number: 11235
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol
Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly detect Measurement Reports
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11224 ) Change subject: BTS_Tests.ttcn: fix: properly detect Measurement Reports .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iea5ee868ede8bfe1e2b1cbf5abcbf2844d3fe9a4 Gerrit-Change-Number: 11224 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 04 Oct 2018 15:40:34 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in openbsc[master]: examples: nanobts: openbsc-multitrx.cfg: Set SDCCH in correct TS of TRX1
Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11234 Change subject: examples: nanobts: openbsc-multitrx.cfg: Set SDCCH in correct TS of TRX1 .. examples: nanobts: openbsc-multitrx.cfg: Set SDCCH in correct TS of TRX1 According to verify_chan_comb(), nanoBTS supports SDCCH8 only in TS1. Change-Id: I37b91745ddf7000add3c24f6bb782ae0c61d2978 --- M openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/34/11234/1 diff --git a/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg b/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg index 7c03ed5..99f2653 100644 --- a/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg +++ b/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg @@ -71,9 +71,9 @@ max_power_red 0 rsl e1 tei 0 timeslot 0 -phys_chan_config SDCCH8 - timeslot 1 phys_chan_config TCH/F + timeslot 1 +phys_chan_config SDCCH8 timeslot 2 phys_chan_config TCH/F timeslot 3 -- To view, visit https://gerrit.osmocom.org/11234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I37b91745ddf7000add3c24f6bb782ae0c61d2978 Gerrit-Change-Number: 11234 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol
Change in osmo-gsm-tester[master]: defaults.conf: Add SDCCH8 ts in TRX1 cfg
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11225 to look at the new patch set (#2). Change subject: defaults.conf: Add SDCCH8 ts in TRX1 cfg .. defaults.conf: Add SDCCH8 ts in TRX1 cfg This way we can test too if SDCH8 channels are allocated and used correctly in TRX1 in multiTRX setups. Change-Id: I9d08f3d019a28cf775d70d941c5a60a7e7ca20a9 --- M example/defaults.conf 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/25/11225/2 -- To view, visit https://gerrit.osmocom.org/11225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9d08f3d019a28cf775d70d941c5a60a7e7ca20a9 Gerrit-Change-Number: 11225 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-hlr[master]: store gsup peer upon accepting LU
Neels Hofmeyr has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11232 ) Change subject: store gsup peer upon accepting LU .. store gsup peer upon accepting LU Store the GSUP client's IPA_IDTAG_SERNR in vlr_number or sgsn_number (depending on is_ps), just before sending the Insert Subscriber Data message after a successful LU Req. Log about it. Original patch: Ib2611421f3638eadc361787af801fffe9a34bd8a by laforge Related: OS#2796 Change-Id: If438664faa5d68404f465f8b2002c6d03bbf3ceb --- M src/hlr.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/32/11232/2 -- To view, visit https://gerrit.osmocom.org/11232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If438664faa5d68404f465f8b2002c6d03bbf3ceb Gerrit-Change-Number: 11232 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr
Change in osmo-hlr[master]: fix is_ps logic in rx_upd_loc_req(), store CS as is_ps = false
Neels Hofmeyr has uploaded this change for review. (
https://gerrit.osmocom.org/11230
Change subject: fix is_ps logic in rx_upd_loc_req(), store CS as is_ps = false
..
fix is_ps logic in rx_upd_loc_req(), store CS as is_ps = false
A missing 'else' in rx_upd_loc_req() causes *all* clients to be indicated as
is_ps=true regardless of the GSUP CN Domain IE that was received.
Replace that odd if cascade with a switch() that fixes the flawed logic. Hence
osmo-hlr now correctly indicates each client's is_ps, iff the client sends CN
Domain IEs in GSUP LU Request messages.
Related: OS#2796, OS#3601
Change-Id: I2c5fa9f5cae25cfd66afbf088303edff7d045a00
---
M src/hlr.c
1 file changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/30/11230/1
diff --git a/src/hlr.c b/src/hlr.c
index df48a99..f631d52 100644
--- a/src/hlr.c
+++ b/src/hlr.c
@@ -250,18 +250,19 @@
lu_op_statechg(luop, LU_S_LU_RECEIVED);
- if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_CS)
+ switch (gsup->cn_domain) {
+ case OSMO_GSUP_CN_DOMAIN_CS:
conn->supports_cs = true;
- if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_PS) {
- conn->supports_ps = true;
- luop->is_ps = true;
- } else {
+ break;
+ default:
/* The client didn't send a CN_DOMAIN IE; assume
packet-switched in
* accordance with the GSUP spec in osmo-hlr's user manual
(section
* 11.6.15 "CN Domain" says "if no CN Domain IE is present
within
* a request, the PS Domain is assumed." */
+ case OSMO_GSUP_CN_DOMAIN_PS:
conn->supports_ps = true;
luop->is_ps = true;
+ break;
}
llist_add(&luop->list, &g_lu_ops);
--
To view, visit https://gerrit.osmocom.org/11230
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c5fa9f5cae25cfd66afbf088303edff7d045a00
Gerrit-Change-Number: 11230
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr
Change in osmo-hlr[master]: more space for vlr_number and sgsn_number
Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11231 Change subject: more space for vlr_number and sgsn_number .. more space for vlr_number and sgsn_number To be able to handle our 20 chars long IPA tags, enlarge the vlr_number and sgsn_number storage in struct hlr_subscriber. Technically, osmo-hlr should be able to store any type of Global Title, blob of arbitrary size. For our purposes, 32 is enough for now. Related: OS#2796 Change-Id: I0121f1c4dbda3a076d780a3834281b21dab85493 --- M src/db.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/31/11231/1 diff --git a/src/db.h b/src/db.h index 92fdac4..956b5ed 100644 --- a/src/db.h +++ b/src/db.h @@ -69,8 +69,8 @@ charimsi[GSM23003_IMSI_MAX_DIGITS+1]; charmsisdn[GT_MAX_DIGITS+1]; /* imeisv? */ - charvlr_number[GT_MAX_DIGITS+1]; - charsgsn_number[GT_MAX_DIGITS+1]; + charvlr_number[32]; + charsgsn_number[32]; charsgsn_address[GT_MAX_DIGITS+1]; /* ggsn number + address */ /* gmlc number */ -- To view, visit https://gerrit.osmocom.org/11231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0121f1c4dbda3a076d780a3834281b21dab85493 Gerrit-Change-Number: 11231 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr
Change in osmo-hlr[master]: store gsup peer upon accepting LU
Neels Hofmeyr has uploaded this change for review. (
https://gerrit.osmocom.org/11232
Change subject: store gsup peer upon accepting LU
..
store gsup peer upon accepting LU
Store the GSUP client's IPA_IDTAG_SERNR in vlr_number or sgsn_number (depending
on is_ps), just before sending the Insert Subscriber Data message after a
successful LU Req. Log about it.
Original patch: Ib2611421f3638eadc361787af801fffe9a34bd8a by laforge
Related: OS#2796
Change-Id: If438664faa5d68404f465f8b2002c6d03bbf3ceb
---
M src/hlr.c
1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/32/11232/1
diff --git a/src/hlr.c b/src/hlr.c
index f631d52..cf4871e 100644
--- a/src/hlr.c
+++ b/src/hlr.c
@@ -242,12 +242,16 @@
static int rx_upd_loc_req(struct osmo_gsup_conn *conn,
const struct osmo_gsup_message *gsup)
{
+ struct hlr_subscriber *subscr;
struct lu_operation *luop = lu_op_alloc_conn(conn);
+
if (!luop) {
LOGP(DMAIN, LOGL_ERROR, "LU REQ from conn without addr?\n");
return -EINVAL;
}
+ subscr = &luop->subscr;
+
lu_op_statechg(luop, LU_S_LU_RECEIVED);
switch (gsup->cn_domain) {
@@ -298,6 +302,14 @@
lu_op_tx_cancel_old(luop);
} else
#endif
+
+ /* Store the VLR / SGSN number with the subscriber, so we know where it
was last seen. */
+ LOGP(DAUC, LOGL_DEBUG, "IMSI='%s': storing %s = %s\n",
+subscr->imsi, luop->is_ps ? "SGSN number" : "VLR number", (const
char*)luop->peer);
+ if (db_subscr_lu(g_hlr->dbc, subscr->id, (const char *)luop->peer,
luop->is_ps))
+ LOGP(DAUC, LOGL_ERROR, "IMSI='%s': Cannot update %s in the
database\n",
+subscr->imsi, luop->is_ps ? "SGSN number" : "VLR number");
+
{
/* TODO: Subscriber allowed to roam in PLMN? */
/* TODO: Update RoutingInfo */
--
To view, visit https://gerrit.osmocom.org/11232
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: If438664faa5d68404f465f8b2002c6d03bbf3ceb
Gerrit-Change-Number: 11232
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr
Change in osmo-hlr[master]: fix and re-enable osmo_hlr_subscriber_update_notify()
Neels Hofmeyr has uploaded this change for review. (
https://gerrit.osmocom.org/11233
Change subject: fix and re-enable osmo_hlr_subscriber_update_notify()
..
fix and re-enable osmo_hlr_subscriber_update_notify()
Send updated subscriber data out to exactly those GSUP clients that match the
last LU operations (depending on each client sending distinct identification).
As this adds logging on DLGSUP, also change adjacent GSUP related logging from
DMAIN to DLGSUP.
Related: OS#2785
Change-Id: I7c317de8329d9a115d072fc61ddb9abc21b7e8d8
---
M src/hlr.c
1 file changed, 45 insertions(+), 23 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/33/11233/1
diff --git a/src/hlr.c b/src/hlr.c
index cf4871e..4ed8a7c 100644
--- a/src/hlr.c
+++ b/src/hlr.c
@@ -54,16 +54,20 @@
void
osmo_hlr_subscriber_update_notify(struct hlr_subscriber *subscr)
{
- /* FIXME: the below code can only be re-enabled after we make sure that
an ISD
-* is only sent tot the currently serving VLR and/or SGSN (if there are
any).
-* We cannot blindly flood the entire PLMN with this, as it would
create subscriber
-* state in every VLR/SGSN out there, even those that have never seen
the subscriber.
-* See https://osmocom.org/issues/3154 for details. */
-#if 0
struct osmo_gsup_conn *co;
- if (g_hlr->gs == NULL)
+ if (g_hlr->gs == NULL) {
+ LOGP(DLGSUP, LOGL_DEBUG,
+"IMSI %s: NOT Notifying peers of subscriber data change,"
+" there is no GSUP server\n",
+subscr->imsi);
return;
+ }
+
+ LOGP(DLGSUP, LOGL_DEBUG,
+"IMSI %s: Notifying peers of subscriber data change"
+" (VLR number: '%s', SGSN number: '%s')\n",
+subscr->imsi, subscr->vlr_number, subscr->sgsn_number);
llist_for_each_entry(co, &g_hlr->gs->clients, list) {
struct osmo_gsup_message gsup = { };
@@ -72,20 +76,48 @@
struct msgb *msg_out;
uint8_t *peer;
int peer_len;
+ size_t peer_strlen;
+ const char *peer_compare;
enum osmo_gsup_cn_domain cn_domain;
- if (co->supports_ps)
+ if (co->supports_ps) {
cn_domain = OSMO_GSUP_CN_DOMAIN_PS;
- else if (co->supports_cs)
+ peer_compare = subscr->sgsn_number;
+ } else if (co->supports_cs) {
cn_domain = OSMO_GSUP_CN_DOMAIN_CS;
- else {
- /* We have not yet received a location update from this
subscriber .*/
+ peer_compare = subscr->vlr_number;
+ } else {
+ /* We have not yet received a location update from this
GSUP client.*/
continue;
}
+ peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR);
+ if (peer_len < 0) {
+ LOGP(DLGSUP, LOGL_ERROR,
+ "IMSI='%s': cannot get peer name for connection
%s:%u\n", subscr->imsi,
+ co && co->conn && co->conn->server?
co->conn->server->addr : "unset",
+ co && co->conn && co->conn->server?
co->conn->server->port : 0);
+ continue;
+ }
+
+ peer_strlen = strnlen((const char*)peer, peer_len);
+ if (strlen(peer_compare) != peer_strlen ||
strncmp(peer_compare, (const char *)peer, peer_len)) {
+ /* Mismatch. The subscriber is not subscribed with this
GSUP client. */
+ /* I hope peer is always nul terminated... */
+ if (peer_strlen < peer_len)
+ LOGP(DLGSUP, LOGL_DEBUG,
+"IMSI %s: subscriber change: skipping %s
peer %s\n",
+subscr->imsi, cn_domain ==
OSMO_GSUP_CN_DOMAIN_PS ? "PS" : "CS", peer);
+ continue;
+ }
+
+ LOGP(DLGSUP, LOGL_DEBUG,
+"IMSI %s: subscriber change: notifying %s peer %s\n",
+subscr->imsi, cn_domain == OSMO_GSUP_CN_DOMAIN_PS ? "PS" :
"CS", peer_compare);
+
if (osmo_gsup_create_insert_subscriber_data_msg(&gsup,
subscr->imsi, subscr->msisdn, msisdn_enc,
sizeof(msisdn_enc), apn, sizeof(apn), cn_domain) != 0) {
- LOGP(DMAIN, LOGL_ERROR,
+ LOGP(DLGSUP, LOGL_ERROR,
"IMSI='%s': Cannot notify GSUP client; could not
create gsup message "
"for %s:%u\n", subscr->imsi,
co &
Change in osmo-bsc[master]: osmo_bsc_main.c: initialize rate counters
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11229 Change subject: osmo_bsc_main.c: initialize rate counters .. osmo_bsc_main.c: initialize rate counters main() was missing a call to rate_ctr_init(). Without it, the counters increased properly, but the times per second / minute / hour etc. values would always stay at zero. Change-Id: I4466a7aec51673c79b67614c9dde987633e379e0 Related: OS#3579 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/29/11229/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 60175e1..468b58e 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -805,6 +805,7 @@ osmo_init_logging2(tall_bsc_ctx, &log_info); osmo_stats_init(tall_bsc_ctx); + rate_ctr_init(tall_bsc_ctx); /* Allocate global gsm_network struct */ rc = bsc_network_alloc(); -- To view, visit https://gerrit.osmocom.org/11229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4466a7aec51673c79b67614c9dde987633e379e0 Gerrit-Change-Number: 11229 Gerrit-PatchSet: 1 Gerrit-Owner: osmith
Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: add 'lazy' mode for as_meas_res()
Vadim Yanitskiy has uploaded this change for review. (
https://gerrit.osmocom.org/11226
Change subject: BTS_Tests.ttcn: add 'lazy' mode for as_meas_res()
..
BTS_Tests.ttcn: add 'lazy' mode for as_meas_res()
This mode would be useful for test cases, which expect to receive
the RSL_MEAS_RES messages, but don't care about their correctness.
Change-Id: I39118d6e64c767fad2c9618ec0ef4532dc60e715
---
M bts/BTS_Tests.ttcn
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/26/11226/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index fe59fd3..9c749b4 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -1296,8 +1296,9 @@
}
/* verify we regularly receive measurement reports with incrementing numbers */
-altstep as_meas_res() runs on ConnHdlr {
+altstep as_meas_res(boolean verify_meas := true) runs on ConnHdlr {
var RSL_Message rsl;
+ [not verify_meas] RSL.receive(tr_RSL_MEAS_RES(?)) { repeat; }
[] RSL.receive(f_build_meas_res_tmpl()) -> value rsl {
/* increment counter of next to-be-expected meas rep */
g_next_meas_res_nr := (g_next_meas_res_nr + 1) mod 256;
--
To view, visit https://gerrit.osmocom.org/11226
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39118d6e64c767fad2c9618ec0ef4532dc60e715
Gerrit-Change-Number: 11226
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy
Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: don't overwrite the expected meas results
Vadim Yanitskiy has uploaded this change for review. (
https://gerrit.osmocom.org/11228
Change subject: BTS_Tests.ttcn: fix: don't overwrite the expected meas results
..
BTS_Tests.ttcn: fix: don't overwrite the expected meas results
Since OS#2988 was fixed, we should not overwrite nor ignore the
measurement results in f_build_meas_res_tmpl().
Change-Id: Ie902bfc7619181b528eafbce367c87e0b062243a
---
M bts/BTS_Tests.ttcn
1 file changed, 0 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/28/11228/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 61fe1a7..cdf2722 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -1272,11 +1272,6 @@
toa256_std_dev := ?
}
}
- /* HACK HACK HACK FIXME HACK HACK HACK see
https://osmocom.org/issues/2988 */
- ul_meas.rxlev_f_u := ?;
- ul_meas.rxlev_s_u := ?;
- ul_meas.rxq_f_u := ?;
- ul_meas.rxq_s_u := ?;
var template RSL_IE_BS_Power bs_power := {
reserved := 0,
epc := false,
--
To view, visit https://gerrit.osmocom.org/11228
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie902bfc7619181b528eafbce367c87e0b062243a
Gerrit-Change-Number: 11228
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy
Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: expect RSL_MEAS_RES messages
Vadim Yanitskiy has uploaded this change for review. (
https://gerrit.osmocom.org/11227
Change subject: BTS_Tests.ttcn: fix: expect RSL_MEAS_RES messages
..
BTS_Tests.ttcn: fix: expect RSL_MEAS_RES messages
Since both Calypso PHY and trxcon (since OS#2988 is fixed) are
always sending the Measurement Reports in dedicated mode, the
test cases should expect to 'see' the RSL_MEAS_RES messages,
and ignore them if they are out of the testing scope.
This change makes the following test cases pass:
- TC_rll_est_ind,
- TC_rll_rel_ind_DCCH_0,
- TC_rll_rel_ind_DCCH_3,
- TC_rll_rel_ind_ACCH_0,
- TC_rll_rel_ind_ACCH_3,
by adding the 'lazy' version of as_meas_res() alt-step.
Change-Id: I34227b981f76377c338fad4ff9560ba2042abce4
---
M bts/BTS_Tests.ttcn
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/27/11227/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index f89025f..61fe1a7 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -3396,6 +3396,8 @@
mtc.stop;
}
}
+ /* We also expect to receive the measurements */
+ [] as_meas_res(verify_meas := false);
[tc.exp] T.timeout {
setverdict(fail, "Timeout waiting for EST IND");
mtc.stop;
@@ -3560,6 +3562,8 @@
[] RSL.receive(tr_RSL_REL_IND(g_chan_nr, tc.link_id)) {
setverdict(pass);
}
+ /* We also expect to receive the measurements */
+ [] as_meas_res(verify_meas := false);
}
/* release the channel */
--
To view, visit https://gerrit.osmocom.org/11227
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34227b981f76377c338fad4ff9560ba2042abce4
Gerrit-Change-Number: 11227
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy
Change in osmo-gsm-tester[master]: defaults.conf: Add SDCCH8 ts in TRX1 cfg
Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11225 Change subject: defaults.conf: Add SDCCH8 ts in TRX1 cfg .. defaults.conf: Add SDCCH8 ts in TRX1 cfg This way we can test too if SDCH8 channels are allocated and used correctly in TRX1 in multiTRX setups. Change-Id: I9d08f3d019a28cf775d70d941c5a60a7e7ca20a9 --- M example/defaults.conf 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/25/11225/1 diff --git a/example/defaults.conf b/example/defaults.conf index 42258a6..9894b1b 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -50,7 +50,7 @@ max_power_red: 0 arfcn: 872 timeslot_list: -- phys_chan_config: TCH/F +- phys_chan_config: SDCCH8 - phys_chan_config: TCH/F - phys_chan_config: TCH/F - phys_chan_config: TCH/F -- To view, visit https://gerrit.osmocom.org/11225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9d08f3d019a28cf775d70d941c5a60a7e7ca20a9 Gerrit-Change-Number: 11225 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol
Change in osmo-sip-connector[master]: cosmetic: call.h: spaces -> tabs for consistency
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11198 to look at the new patch set (#2). Change subject: cosmetic: call.h: spaces -> tabs for consistency .. cosmetic: call.h: spaces -> tabs for consistency Change-Id: I1ae638af50fa3741e84e421687270d2177e1be2d --- M src/call.h 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/98/11198/2 -- To view, visit https://gerrit.osmocom.org/11198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1ae638af50fa3741e84e421687270d2177e1be2d Gerrit-Change-Number: 11198 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Harald Welte
Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly detect RSL_MEAS_RES messages
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11224 ) Change subject: BTS_Tests.ttcn: fix: properly detect RSL_MEAS_RES messages .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11224/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11224/1/bts/BTS_Tests.ttcn@a3739 PS1, Line 3739: My assumption that the DL Measurement Reports are being sent as regular RSL_INITDATA_IND messages was wrong. Actually, they are combined with the UL measurements and then being sent as RSL_MEAS_RES. -- To view, visit https://gerrit.osmocom.org/11224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iea5ee868ede8bfe1e2b1cbf5abcbf2844d3fe9a4 Gerrit-Change-Number: 11224 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 04 Oct 2018 08:49:20 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly detect RSL_MEAS_RES messages
Vadim Yanitskiy has uploaded this change for review. (
https://gerrit.osmocom.org/11224
Change subject: BTS_Tests.ttcn: fix: properly detect RSL_MEAS_RES messages
..
BTS_Tests.ttcn: fix: properly detect RSL_MEAS_RES messages
Change-Id: Iea5ee868ede8bfe1e2b1cbf5abcbf2844d3fe9a4
---
M bts/BTS_Tests.ttcn
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/24/11224/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index fe59fd3..4c1c193 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -3734,11 +3734,11 @@
}
}
-/* Expect (or not expect) SACCH messages (Measurement Reports) */
+/* Expect (or not expect) RSL_MEAS_RES messages (Measurement Reports) */
private altstep as_rsl_sacch_ind(boolean exp_sacch) runs on ConnHdlr {
- [exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr,
tr_RslLinkID_SACCH(?))) { repeat; }
- [not exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr,
tr_RslLinkID_SACCH(?))) {
- setverdict(fail, "Unexpected (SACCH) UNIT_DATA_IND message!");
+ [exp_sacch] RSL.receive(tr_RSL_MEAS_RES(g_chan_nr)) { repeat; }
+ [not exp_sacch] RSL.receive(tr_RSL_MEAS_RES(g_chan_nr)) {
+ setverdict(fail, "Unexpected RSL_MEAS_RES message!");
mtc.stop;
}
}
--
To view, visit https://gerrit.osmocom.org/11224
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea5ee868ede8bfe1e2b1cbf5abcbf2844d3fe9a4
Gerrit-Change-Number: 11224
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy
Change in osmo-sgsn[master]: gprs_llc: remove the FCS from the msgb by trim'ing the msgb
lynxis lazus has submitted this change and it was merged. (
https://gerrit.osmocom.org/11022 )
Change subject: gprs_llc: remove the FCS from the msgb by trim'ing the msgb
..
gprs_llc: remove the FCS from the msgb by trim'ing the msgb
After checking the FCS, it's no use. The FCS should also not
appear on `hexdump(msgb_l3(MSG), msgb_l3len(MSG))`.
Change-Id: I27e061ead86395a336b67c7aead93d305a0f2ae8
---
M src/gprs/gprs_llc.c
M src/gprs/gprs_sndcp.c
2 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/gprs/gprs_llc.c b/src/gprs/gprs_llc.c
index 6c92f83..abbb742 100644
--- a/src/gprs/gprs_llc.c
+++ b/src/gprs/gprs_llc.c
@@ -945,6 +945,9 @@
LOGP(DLLC, LOGL_INFO, "Dropping frame with invalid FCS\n");
return -EIO;
}
+ /* set l3 layer & remove the fcs */
+ msg->l3h = llhp.data;
+ msgb_l3trim(msg, llhp.data_len);
/* Update LLE's (BVCI, NSEI) tuple */
lle->llme->bvci = msgb_bvci(msg);
@@ -960,7 +963,6 @@
/* llhp.data is only set when we need to send LL_[UNIT]DATA_IND up */
if (llhp.cmd == GPRS_LLC_UI && llhp.data && llhp.data_len) {
- msgb_gmmh(msg) = llhp.data;
switch (llhp.sapi) {
case GPRS_SAPI_GMM:
/* send LL_UNITDATA_IND to GMM */
diff --git a/src/gprs/gprs_sndcp.c b/src/gprs/gprs_sndcp.c
index 77f8ca6..52eeb75 100644
--- a/src/gprs/gprs_sndcp.c
+++ b/src/gprs/gprs_sndcp.c
@@ -792,7 +792,7 @@
npdu_num = (suh->npdu_high << 8) | suh->npdu_low;
npdu = (uint8_t *)suh + sizeof(*suh);
- npdu_len = (msg->data + msg->len) - npdu - 3; /* -3 'removes' the FCS
*/
+ npdu_len = (msg->data + msg->len) - npdu;
if (npdu_len <= 0) {
LOGP(DSNDCP, LOGL_ERROR, "Short SNDCP N-PDU: %d\n", npdu_len);
--
To view, visit https://gerrit.osmocom.org/11022
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I27e061ead86395a336b67c7aead93d305a0f2ae8
Gerrit-Change-Number: 11022
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: lynxis lazus
Change in osmo-sgsn[master]: sgsn_libgtp: fix a potential memleak when the GGSN is not reachable
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/11019 ) Change subject: sgsn_libgtp: fix a potential memleak when the GGSN is not reachable .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4575f7f80f785a62ae3b7f165d236a9dd818aabf Gerrit-Change-Number: 11019 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 04 Oct 2018 08:28:55 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-sgsn[master]: sgsn_libgtp: fix a potential memleak when the GGSN is not reachable
lynxis lazus has submitted this change and it was merged. (
https://gerrit.osmocom.org/11019 )
Change subject: sgsn_libgtp: fix a potential memleak when the GGSN is not
reachable
..
sgsn_libgtp: fix a potential memleak when the GGSN is not reachable
When a MS does the following
- MS: GMM Attach
- MS: Activate PDP CTX
- SGSN: send PDP CTX Request to GGSN which GGSN does not answer
- GMM Detach (MM ctx get freed)
- libgtp retrans timeout of the first answer
- sgsn_libgtp.c: create_pdp_conf() which ignores this ctx because of emtpy MM
ctx
Change-Id: I4575f7f80f785a62ae3b7f165d236a9dd818aabf
---
M src/gprs/sgsn_libgtp.c
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c
index 7829796..478d402 100644
--- a/src/gprs/sgsn_libgtp.c
+++ b/src/gprs/sgsn_libgtp.c
@@ -390,15 +390,13 @@
static int create_pdp_conf(struct pdp_t *pdp, void *cbp, int cause)
{
struct sgsn_pdp_ctx *pctx = cbp;
- uint8_t reject_cause;
+ uint8_t reject_cause = 0;
LOGPDPCTXP(LOGL_INFO, pctx, "Received CREATE PDP CTX CONF,
cause=%d(%s)\n",
cause, get_value_string(gtp_cause_strs, cause));
if (!pctx->mm) {
- LOGP(DGPRS, LOGL_INFO,
-"No MM context, aborting CREATE PDP CTX CONF\n");
- return -EIO;
+ goto reject;
}
/* Check for cause value if it was really successful */
@@ -452,9 +450,11 @@
if (pdp)
pdp_freepdp(pdp);
+
/* Send PDP CTX ACT REJ to MS */
- gsm48_tx_gsm_act_pdp_rej(pctx->mm, pctx->ti, reject_cause,
- 0, NULL);
+ if (pctx->mm)
+ gsm48_tx_gsm_act_pdp_rej(pctx->mm, pctx->ti, reject_cause,
+0, NULL);
sgsn_pdp_ctx_free(pctx);
return EOF;
--
To view, visit https://gerrit.osmocom.org/11019
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I4575f7f80f785a62ae3b7f165d236a9dd818aabf
Gerrit-Change-Number: 11019
Gerrit-PatchSet: 5
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: lynxis lazus
Change in osmo-sgsn[master]: gprs_llc: remove the FCS from the msgb by trim'ing the msgb
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/11022 ) Change subject: gprs_llc: remove the FCS from the msgb by trim'ing the msgb .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I27e061ead86395a336b67c7aead93d305a0f2ae8 Gerrit-Change-Number: 11022 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 04 Oct 2018 08:28:15 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-sgsn[master]: gprs_gmm: Fix missing Security Command for 3G when attaching
lynxis lazus has submitted this change and it was merged. (
https://gerrit.osmocom.org/11150 )
Change subject: gprs_gmm: Fix missing Security Command for 3G when attaching
..
gprs_gmm: Fix missing Security Command for 3G when attaching
Introduce a new FSM step in GMM Attach to send the
Security Command to the RNC after completing the
Authentication.
Fixes: f7198d7dbb84 ("gprs_gmm: introduce a GMM Attach Request FSM")
Change-Id: I1e12b0a32e58c6f78dba7b548f7d7016567229db
---
M include/osmocom/sgsn/gprs_gmm_attach.h
M src/gprs/gprs_gmm.c
M src/gprs/gprs_gmm_attach.c
3 files changed, 44 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/include/osmocom/sgsn/gprs_gmm_attach.h
b/include/osmocom/sgsn/gprs_gmm_attach.h
index 22fbd6f..0aa2123 100644
--- a/include/osmocom/sgsn/gprs_gmm_attach.h
+++ b/include/osmocom/sgsn/gprs_gmm_attach.h
@@ -11,6 +11,7 @@
ST_RETRIEVE_AUTH,
ST_AUTH,
ST_ASK_VLR,
+ ST_IU_SECURITY_CMD,
ST_ACCEPT,
ST_REJECT
};
@@ -20,6 +21,7 @@
E_IDEN_RESP_RECV,
E_AUTH_RESP_RECV_SUCCESS,
E_AUTH_RESP_RECV_RESYNC,
+ E_IU_SECURITY_CMD_COMPLETE,
E_ATTACH_ACCEPTED,
E_ATTACH_ACCEPT_SENT,
E_ATTACH_COMPLETE_RECV,
diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c
index a86fe2b..a0221ea 100644
--- a/src/gprs/gprs_gmm.c
+++ b/src/gprs/gprs_gmm.c
@@ -205,7 +205,7 @@
REQUIRE_MM
/* Continue authentication here */
mm->iu.ue_ctx->integrity_active = 1;
- rc = gsm48_gmm_authorize(mm);
+ osmo_fsm_inst_dispatch(mm->gmm_att_req.fsm,
E_IU_SECURITY_CMD_COMPLETE, NULL);
break;
default:
LOGP(DRANAP, LOGL_NOTICE, "Unknown event received: %i\n", type);
diff --git a/src/gprs/gprs_gmm_attach.c b/src/gprs/gprs_gmm_attach.c
index 272fec7..60c4398 100644
--- a/src/gprs/gprs_gmm_attach.c
+++ b/src/gprs/gprs_gmm_attach.c
@@ -157,7 +157,12 @@
switch (event) {
case E_AUTH_RESP_RECV_SUCCESS:
sgsn_auth_request(ctx);
- osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350,
3350);
+#ifdef BUILD_IU
+ if (ctx->ran_type == MM_CTX_T_UTRAN_Iu &&
!ctx->iu.ue_ctx->integrity_active)
+ osmo_fsm_inst_state_chg(fi, ST_IU_SECURITY_CMD,
sgsn->cfg.timers.T3350, 3350);
+ else
+#endif /* BUILD_IU */
+ osmo_fsm_inst_state_chg(fi, ST_ACCEPT,
sgsn->cfg.timers.T3350, 3350);
break;
case E_AUTH_RESP_RECV_RESYNC:
if (ctx->gmm_att_req.auth_reattempt <= 1)
@@ -228,6 +233,32 @@
}
}
+static void st_iu_security_cmd_on_enter(struct osmo_fsm_inst *fi, uint32_t
prev_state)
+{
+#ifdef BUILD_IU
+ struct sgsn_mm_ctx *ctx = fi->priv;
+ int rc = 0;
+
+ /* TODO: shouldn't this set always? not only when the integrity_active?
*/
+ if (ctx->iu.ue_ctx->integrity_active) {
+ osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350,
3350);
+ return;
+ }
+
+ ranap_iu_tx_sec_mode_cmd(ctx->iu.ue_ctx, &ctx->auth_triplet.vec, 0,
ctx->iu.new_key);
+ ctx->iu.new_key = 0;
+#endif
+}
+
+static void st_iu_security_cmd(struct osmo_fsm_inst *fi, uint32_t event, void
*data)
+{
+ switch(event) {
+ case E_IU_SECURITY_CMD_COMPLETE:
+ osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350,
3350);
+ break;
+ }
+}
+
static struct osmo_fsm_state gmm_attach_req_fsm_states[] = {
/* default state for non-DTX and DTX when SPEECH is in progress */
[ST_INIT] = {
@@ -252,11 +283,18 @@
},
[ST_AUTH] = {
.in_event_mask = X(E_AUTH_RESP_RECV_SUCCESS) |
X(E_AUTH_RESP_RECV_RESYNC),
- .out_state_mask = X(ST_INIT) | X(ST_AUTH) | X(ST_ACCEPT) |
X(ST_ASK_VLR) | X(ST_REJECT),
+ .out_state_mask = X(ST_INIT) | X(ST_AUTH) |
X(ST_IU_SECURITY_CMD) | X(ST_ACCEPT) | X(ST_ASK_VLR) | X(ST_REJECT),
.name = "Authenticate",
.onenter = st_auth_on_enter,
.action = st_auth,
},
+ [ST_IU_SECURITY_CMD] = {
+ .in_event_mask = X(E_IU_SECURITY_CMD_COMPLETE),
+ .out_state_mask = X(ST_INIT) | X(ST_AUTH) | X(ST_ACCEPT) |
X(ST_REJECT),
+ .name = "IuSecurityCommand",
+ .onenter = st_iu_security_cmd_on_enter,
+ .action = st_iu_security_cmd,
+ },
[ST_ACCEPT] = {
.in_event_mask = X(E_ATTACH_COMPLETE_RECV),
.out_state_mask = X(ST_INIT) | X(ST_REJECT),
@@ -280,6 +318,7 @@
{ E_ATTACH_ACCEPTED,"Attach accepted" },
{ E_ATTACH_ACCEPT_SENT, "Attach accept sent" },
{ E_ATTACH_COMPLETE_R
