February 2024 - gerrit-log - lists.osmocom.org

[M] Change in ...osmo-epdg[master]: epdg: Do SWm STR+STA upon rx of Delete Bearer Req

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35864?usp=email ) Change subject: epdg: Do SWm STR+STA upon rx of Delete Bearer Req ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35864?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I795d973dc472f55d18048025ef4ffe1552dfdf26 Gerrit-Change-Number: 35864 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Feb 2024 17:46:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: aaa_ue_fsm: S6b AAR should trigger SWx SAR with type=PGW_UPDATE

by laforge

Attention is currently required from: lynxis lazus, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35863?usp=email ) Change subject: aaa_ue_fsm: S6b AAR should trigger SWx SAR with type=PGW_UPDATE ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35863?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: If0f0bfa21117c65c0ef7c831746b50eb83908778 Gerrit-Change-Number: 35863 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 06 Feb 2024 17:46:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmocom-bb[master]: mobile: fix GAPK I/O producing too many UL frames

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35870?usp=email ) Change subject: mobile: fix GAPK I/O producing too many UL frames ...................................................................... mobile: fix GAPK I/O producing too many UL frames GAPK I/O is currently generating too many UL voice frames, causing Tx queue overflow in the L1 PHY. Change the logic to make DL voice frames drive the Uplink processing chain, like we do for CSD. Change-Id: I3a7fa223cb592acd5b850819e0682c9c8f81e9d1 --- M src/host/layer23/include/osmocom/bb/mobile/gapk_io.h M src/host/layer23/include/osmocom/bb/mobile/tch.h M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/gapk_io.c M src/host/layer23/src/mobile/tch.c M src/host/layer23/src/mobile/tch_voice.c 6 files changed, 31 insertions(+), 71 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/host/layer23/include/osmocom/bb/mobile/gapk_io.h b/src/host/layer23/include/osmocom/bb/mobile/gapk_io.h index b9f1bc5..ab8b657 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/gapk_io.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gapk_io.h @@ -42,6 +42,6 @@ void gapk_io_state_free(struct gapk_io_state *state); void gapk_io_enqueue_dl(struct gapk_io_state *state, struct msgb *msg); -int gapk_io_serve_ms(struct osmocom_ms *ms, struct gapk_io_state *state); +void gapk_io_dequeue_ul(struct osmocom_ms *ms, struct gapk_io_state *state); #endif /* WITH_GAPK_IO */ diff --git a/src/host/layer23/include/osmocom/bb/mobile/tch.h b/src/host/layer23/include/osmocom/bb/mobile/tch.h index 293397d..b026bd5 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/tch.h +++ b/src/host/layer23/include/osmocom/bb/mobile/tch.h @@ -24,6 +24,5 @@ }; int tch_init(struct osmocom_ms *ms); -int tch_serve_ms(struct osmocom_ms *ms); int tch_send_msg(struct osmocom_ms *ms, struct msgb *msg); int tch_send_mncc_frame(struct osmocom_ms *ms, const struct gsm_data_frame *frame); diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 453990e..477c4fa 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -81,7 +81,6 @@ w |= gsm322_cs_dequeue(ms); w |= gsm_sim_job_dequeue(ms); w |= mncc_dequeue(ms); - w |= tch_serve_ms(ms); if (w) work = 1; } while (w); diff --git a/src/host/layer23/src/mobile/gapk_io.c b/src/host/layer23/src/mobile/gapk_io.c index 4699bae..cc756b0 100644 --- a/src/host/layer23/src/mobile/gapk_io.c +++ b/src/host/layer23/src/mobile/gapk_io.c @@ -503,6 +503,7 @@ return gapk_io_state_alloc(ms, codec); } +/* Enqueue a Downlink TCH frame */ void gapk_io_enqueue_dl(struct gapk_io_state *state, struct msgb *msg) { if (state->tch_dl_fb_len >= GAPK_ULDL_QUEUE_LIMIT) { @@ -513,49 +514,23 @@ msgb_enqueue_count(&state->tch_dl_fb, msg, &state->tch_dl_fb_len); + + /* Decode and play a received DL TCH frame */ + osmo_gapk_pq_execute(state->pq_sink); } -/* Serves both UL/DL TCH frame I/O buffers */ -int gapk_io_serve_ms(struct osmocom_ms *ms, struct gapk_io_state *state) +/* Dequeue an Uplink TCH frame */ +void gapk_io_dequeue_ul(struct osmocom_ms *ms, struct gapk_io_state *state) { - int work = 0; + struct msgb *msg; - /** - * Make sure we have at least two DL frames - * to prevent discontinuous playback. - */ - if (state->tch_dl_fb_len < 2) - return 0; + /* Record and encode an UL TCH frame */ + osmo_gapk_pq_execute(state->pq_source); - /** - * TODO: if there is an active call, but no TCH frames - * in DL buffer, put silence frames using the upcoming - * ECU (Error Concealment Unit) of libosmocodec. - */ - while (!llist_empty(&state->tch_dl_fb)) { - /* Decode and play a received DL TCH frame */ - osmo_gapk_pq_execute(state->pq_sink); - - /* Record and encode an UL TCH frame back */ - osmo_gapk_pq_execute(state->pq_source); - - work |= 1; - } - - while (!llist_empty(&state->tch_ul_fb)) { - struct msgb *tch_msg; - - /* Obtain one TCH frame from the UL buffer */ - tch_msg = msgb_dequeue_count(&state->tch_ul_fb, - &state->tch_ul_fb_len); - - /* Push a voice frame to the lower layers */ - tch_send_msg(ms, tch_msg); - - work |= 1; - } - - return work; + /* Obtain one TCH frame from the UL buffer */ + msg = msgb_dequeue_count(&state->tch_ul_fb, &state->tch_ul_fb_len); + if (msg != NULL) + tch_send_msg(ms, msg); } /** diff --git a/src/host/layer23/src/mobile/tch.c b/src/host/layer23/src/mobile/tch.c index 5acdef2..b78682f 100644 --- a/src/host/layer23/src/mobile/tch.c +++ b/src/host/layer23/src/mobile/tch.c @@ -45,7 +45,6 @@ int tch_voice_recv(struct osmocom_ms *ms, struct msgb *msg); int tch_data_recv(struct osmocom_ms *ms, struct msgb *msg); -int tch_voice_serve_ms(struct osmocom_ms *ms); /* Receive a Downlink traffic (voice/data) frame from the lower layers */ static int tch_recv_cb(struct osmocom_ms *ms, struct msgb *msg) @@ -116,20 +115,6 @@ return tch_send_msg(ms, nmsg); } -int tch_serve_ms(struct osmocom_ms *ms) -{ - struct tch_state *state = ms->tch_state; - int rc = 0; - - if (state == NULL) - return 0; - if (state->is_voice) - rc = tch_voice_serve_ms(ms); - /* TODO: else tch_data_serve_ms() */ - - return rc; -} - static void tch_trans_cstate_active_cb(struct gsm_trans *trans, bool rx_only) { struct osmocom_ms *ms = trans->ms; diff --git a/src/host/layer23/src/mobile/tch_voice.c b/src/host/layer23/src/mobile/tch_voice.c index a85d7dc..ac793e8 100644 --- a/src/host/layer23/src/mobile/tch_voice.c +++ b/src/host/layer23/src/mobile/tch_voice.c @@ -90,11 +90,12 @@ return tch_forward_mncc(ms, msg); case TCH_VOICE_IOH_GAPK: #ifdef WITH_GAPK_IO - /* Enqueue a frame to the DL TCH buffer */ - if (state->gapk_io != NULL) + if (state->gapk_io != NULL) { gapk_io_enqueue_dl(state->gapk_io, msg); - else + gapk_io_dequeue_ul(ms, state->gapk_io); + } else { msgb_free(msg); + } break; #endif case TCH_VOICE_IOH_L1PHY: @@ -107,18 +108,6 @@ return 0; } -int tch_voice_serve_ms(struct osmocom_ms *ms) -{ -#ifdef WITH_GAPK_IO - struct tch_voice_state *state = &ms->tch_state->voice; - - if (state->handler == TCH_VOICE_IOH_GAPK) - return gapk_io_serve_ms(ms, state->gapk_io); -#endif - - return 0; -} - int tch_voice_state_init(struct gsm_trans *trans, struct tch_voice_state *state) { struct osmocom_ms *ms = trans->ms; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35870?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3a7fa223cb592acd5b850819e0682c9c8f81e9d1 Gerrit-Change-Number: 35870 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in osmo-bsc[master]: abis_nm: fix -Wunused-but-set-variable (bug)

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35791?usp=email ) Change subject: abis_nm: fix -Wunused-but-set-variable (bug) ...................................................................... abis_nm: fix -Wunused-but-set-variable (bug) clang warns us about 'len' being set, but not used: And this is abis_nm.c:2172:10: warning: variable 'len' set but not used [-Wunused-but-set-variable] uint8_t len = attr_len; ^ This is actually a bug, because in the case of NACK we append 2 more bytes {NM_ATT_NACK_CAUSES, NM_NACK_OBJCLASS_NOTSUPP}, and we need to pass the final length to fill_om_fom_hdr(), including those optional two bytes. Passing 'attr_len' (length of 'attr') is wrong. Change-Id: I3ca8e761fdf99dd498a979ccc9d53c6c3e03e2cc --- M src/osmo-bsc/abis_nm.c 1 file changed, 21 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 7a9789b..afb7abc 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -2183,7 +2183,7 @@ } oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); - fill_om_fom_hdr(oh, attr_len, msgtype, obj_class, i1, i2, i3); + fill_om_fom_hdr(oh, len, msgtype, obj_class, i1, i2, i3); if (attr != NULL && attr_len > 0) memcpy(msgb_put(msg, attr_len), attr, attr_len); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35791?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3ca8e761fdf99dd498a979ccc9d53c6c3e03e2cc Gerrit-Change-Number: 35791 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in osmo-bsc[master]: abis_nm: fix -Wunused-but-set-variable (bug)

by pespin

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35791?usp=email ) Change subject: abis_nm: fix -Wunused-but-set-variable (bug) ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35791?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3ca8e761fdf99dd498a979ccc9d53c6c3e03e2cc Gerrit-Change-Number: 35791 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Feb 2024 15:00:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in osmo-bsc[master]: abis_nm_sw_act_req_ack: attr_len should be unsigned

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35856?usp=email ) Change subject: abis_nm_sw_act_req_ack: attr_len should be unsigned ...................................................................... abis_nm_sw_act_req_ack: attr_len should be unsigned Change-Id: I5c0ba76b5cc2464c7e362a850325c94770f38397 --- M include/osmocom/bsc/abis_nm.h M src/osmo-bsc/abis_nm.c 2 files changed, 17 insertions(+), 3 deletions(-) Approvals: jolly: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmocom/bsc/abis_nm.h b/include/osmocom/bsc/abis_nm.h index 59a6dc9..f55c29c 100644 --- a/include/osmocom/bsc/abis_nm.h +++ b/include/osmocom/bsc/abis_nm.h @@ -87,7 +87,7 @@ int abis_nm_set_channel_attr(struct gsm_bts_trx_ts *ts, uint8_t chan_comb); int abis_nm_sw_act_req_ack(struct gsm_bts *bts, uint8_t obj_class, uint8_t i1, uint8_t i2, uint8_t i3, int nack, - const uint8_t *attr, int attr_len); + const uint8_t *attr, unsigned int attr_len); int abis_nm_raw_msg(struct gsm_bts *bts, int len, uint8_t *msg); int abis_nm_event_reports(struct gsm_bts *bts, int on); int abis_nm_reset_resource(struct gsm_bts *bts); diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index e8327dd..7a9789b 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -756,11 +756,16 @@ DEBUGPFOH(DNM, foh, "Software Activate Request, ACKing and Activating\n"); + if (oh->length < sizeof(*foh)) { + LOGPFOH(DNM, LOGL_ERROR, foh, "Software Activate Request with length too small: %u\n", oh->length); + return -EINVAL; + } + ret = abis_nm_sw_act_req_ack(sign_link->trx->bts, foh->obj_class, foh->obj_inst.bts_nr, foh->obj_inst.trx_nr, foh->obj_inst.ts_nr, 0, - foh->data, oh->length-sizeof(*foh)); + foh->data, oh->length - sizeof(*foh)); if (ret != 0) { LOGPFOH(DNM, LOGL_ERROR, foh, "Sending SW ActReq ACK failed: %d\n", ret); return ret; @@ -2165,7 +2170,7 @@ int abis_nm_sw_act_req_ack(struct gsm_bts *bts, uint8_t obj_class, uint8_t i1, uint8_t i2, uint8_t i3, int nack, - const uint8_t *attr, int attr_len) + const uint8_t *attr, unsigned int attr_len) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35856?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5c0ba76b5cc2464c7e362a850325c94770f38397 Gerrit-Change-Number: 35856 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in osmo-bsc[master]: abis_nm: misc/cosmetic changes to abis_nm_sw_act_req_ack()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35794?usp=email ) Change subject: abis_nm: misc/cosmetic changes to abis_nm_sw_act_req_ack() ...................................................................... abis_nm: misc/cosmetic changes to abis_nm_sw_act_req_ack() Change-Id: I2849a22647805e7477d66055c18614a3a9f80748 --- M include/osmocom/bsc/abis_nm.h M src/osmo-bsc/abis_nm.c 2 files changed, 17 insertions(+), 8 deletions(-) Approvals: jolly: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/abis_nm.h b/include/osmocom/bsc/abis_nm.h index 7f1ec74..59a6dc9 100644 --- a/include/osmocom/bsc/abis_nm.h +++ b/include/osmocom/bsc/abis_nm.h @@ -86,7 +86,8 @@ int abis_nm_set_radio_attr(struct gsm_bts_trx *trx, uint8_t *attr, int attr_len); int abis_nm_set_channel_attr(struct gsm_bts_trx_ts *ts, uint8_t chan_comb); int abis_nm_sw_act_req_ack(struct gsm_bts *bts, uint8_t obj_class, uint8_t i1, - uint8_t i2, uint8_t i3, int nack, uint8_t *attr, int att_len); + uint8_t i2, uint8_t i3, int nack, + const uint8_t *attr, int attr_len); int abis_nm_raw_msg(struct gsm_bts *bts, int len, uint8_t *msg); int abis_nm_event_reports(struct gsm_bts *bts, int on); int abis_nm_reset_resource(struct gsm_bts *bts); diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 81a0272..e8327dd 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -2164,12 +2164,13 @@ } int abis_nm_sw_act_req_ack(struct gsm_bts *bts, uint8_t obj_class, uint8_t i1, - uint8_t i2, uint8_t i3, int nack, uint8_t *attr, int att_len) + uint8_t i2, uint8_t i3, int nack, + const uint8_t *attr, int attr_len) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); uint8_t msgtype = NM_MT_SW_ACT_REQ_ACK; - uint8_t len = att_len; + uint8_t len = attr_len; if (nack) { len += 2; @@ -2177,12 +2178,10 @@ } oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); - fill_om_fom_hdr(oh, att_len, msgtype, obj_class, i1, i2, i3); + fill_om_fom_hdr(oh, attr_len, msgtype, obj_class, i1, i2, i3); - if (attr) { - uint8_t *ptr = msgb_put(msg, att_len); - memcpy(ptr, attr, att_len); - } + if (attr != NULL && attr_len > 0) + memcpy(msgb_put(msg, attr_len), attr, attr_len); if (nack) msgb_tv_put(msg, NM_ATT_NACK_CAUSES, NM_NACK_OBJCLASS_NOTSUPP); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35794?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2849a22647805e7477d66055c18614a3a9f80748 Gerrit-Change-Number: 35794 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in osmo-bsc[master]: abis_nm: misc/cosmetic changes to abis_nm_sw_act_req_ack()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35794?usp=email ) Change subject: abis_nm: misc/cosmetic changes to abis_nm_sw_act_req_ack() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35794?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2849a22647805e7477d66055c18614a3a9f80748 Gerrit-Change-Number: 35794 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Feb 2024 14:59:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmocom-bb[master]: mobile: fix GAPK I/O producing too many UL frames

by Hoernchen

Attention is currently required from: fixeria, laforge. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35870?usp=email ) Change subject: mobile: fix GAPK I/O producing too many UL frames ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35870?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3a7fa223cb592acd5b850819e0682c9c8f81e9d1 Gerrit-Change-Number: 35870 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Feb 2024 14:39:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Introduce test TC_ho_lte_to_wifi

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35884?usp=email ) Change subject: epdg: Introduce test TC_ho_lte_to_wifi ...................................................................... epdg: Introduce test TC_ho_lte_to_wifi This test emulates a UE doing handover to ePDG, when it may create extra dedicated bearers. Change-Id: Ibdfeda1fa5d7016b1952d64b306cd501cb33f61b --- M epdg/EPDG_Tests.ttcn M library/GTPv2_Templates.ttcn 2 files changed, 137 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/35884/1 diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index e5cdafd..14bb060 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -488,6 +488,47 @@ } } +/* Expect CreateBearerResponse */ +private altstep as_GTP2C_CreateBearer_success() runs on EPDG_ConnHdlr { + var PDU_GTPCv2 rx_msg; + + [] GTP2.receive(tr_GTP2C_CreateBearerResp(g_pars.teic_local)) -> value rx_msg { + setverdict(pass); + } + [] GTP2.receive(PDU_GTPCv2:?) -> value rx_msg { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected GTP2C msg rx: ", rx_msg)); + } +} +private function f_GTP2C_CreateBearer_success(uint4_t dedicated_bearer_id := 6) runs on EPDG_ConnHdlr { + + var template (value) FullyQualifiedTEID fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S2bU_ePDG_GTPU, g_pars.bearer.teid_local, dedicated_bearer_id, + f_inet_addr(mp_s2b_local_ip), omit); + var template (value) FullyQualifiedTEID_List teid_list := { fteid_u_ie }; + + var template (value) FullyQualifiedPDN_ConnectionSetID pgw_fq_csid := ts_GTP2C_FQCSID_IPv4(f_inet_addr(mp_s2b_local_ip), int2oct(dedicated_bearer_id, 2)); + var template (value) FullyQualifiedPDN_ConnectionSetID_List csid_list := { pgw_fq_csid }; + + var template (value) BearerContextGrouped_List bcg_list := { + ts_GTP2C_BcGrouped({ + ePS_Bearer_ID := ts_GTP2C_EpsBearerId(dedicated_bearer_id), + cause := omit, + ePS_Bearer_TFT := omit, + fullyQualifiedTEID := teid_list, + bearerLevel_QoS := ts_GTP2C_BearerQos('09'O, 0,0,0,0), + chargingID := ts_GTP2C_ChargingID(f_rnd_octstring(4)), + bearerFlags := omit, + transactionIdentifier := omit, + protocolConfigOptions := omit, + rAN_NASCause := omit, + additionalProtocolConfigOptions := omit, + extendedProtocolConfigOptions := omit + }) + }; + GTP2.send(ts_GTP2C_CreateBearerReq(g_pars.teic_remote, omit, g_pars.bearer.ebi, + dedicated_bearer_id, bcg_list, csid_list)); + as_GTP2C_CreateBearer_success(); +} + /* Expect DeleteBearerResponse */ private altstep as_GTP2C_DeleteBearer_success() runs on EPDG_ConnHdlr { var PDU_GTPCv2 rx_msg; @@ -618,6 +659,23 @@ setverdict(pass); } +private function f_TC_ho_lte_to_wifi(charstring id) runs on EPDG_ConnHdlr { + f_initial_attach(); + /* Whenever UE comes from 3GPP, PGW may activate a dedicated S2b bearer + * and notify ePDG with a Create Bearer Request */ + f_GTP2C_CreateBearer_success(); + f_GSUP_PurgeMS_success(); +} + +testcase TC_ho_lte_to_wifi() runs on MTC_CT { + var EPDG_ConnHdlrPars pars := f_init_pars(); + var EPDG_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_ho_lte_to_wifi), pars); + vc_conn.done; + setverdict(pass); +} + private function f_TC_ho_wifi_to_lte(charstring id) runs on EPDG_ConnHdlr { f_initial_attach(); /* Whenever UE goes back to 3GPP, PGW will notify ePDG with a Delete Bearer Request @@ -636,6 +694,7 @@ control { execute ( TC_authinfo_normal() ); + execute ( TC_ho_lte_to_wifi() ); execute ( TC_ho_wifi_to_lte() ); } diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn index afe0138..9f242ee 100644 --- a/library/GTPv2_Templates.ttcn +++ b/library/GTPv2_Templates.ttcn @@ -671,6 +671,13 @@ pTI_Value := pti, additionalOctets := omit } +private function f_ts_GTP2C_ProcTransId_omit(template (omit) integer pti) +return template (omit) ProcedureTransactionID { + if (istemplatekind(pti, "omit")) { + return omit; + } + return ts_GTP2C_ProcTransId(pti); +} template (present) ProcedureTransactionID tr_GTP2C_ProcTransId(template (present) integer pti) := { elementIdentifier := '64'O, @@ -725,7 +732,35 @@ additionalOctets := * } - +/* 8.62 Fully qualified PDN Connection Set Identifier (FQ-CSID) */ +template (value) NodeID ts_GTP2C_FQCSID_NodeID_IPv4(template (value) OCT4 addr) := { + globalUnicastIPv4 := addr +} +template (value) FullyQualifiedPDN_ConnectionSetID +ts_GTP2C_FQCSID(template (value) integer nRofCSIDs, + template (value) integer nodeIDType, + template (value) NodeID nodeID, + template (value) PDN_CSID_List pDN_CSID_List, + template (value) uint4_t instance := 0) := { + elementIdentifier := '84'O, + lengthIndicator := 0, /* overwritten */ + instance := int2bit(valueof(instance), 4), + spare := '0000'B, + nRofCSIDs := nRofCSIDs, + nodeIDType := nodeIDType, + nodeID := nodeID, + pDN_CSID_List := pDN_CSID_List, + additionalOctets := omit +} +template (value) FullyQualifiedPDN_ConnectionSetID +ts_GTP2C_FQCSID_IPv4(template (value) OCT4 addr, + template (value) OCT2 csid, + template (value) uint4_t instance := 0) := +ts_GTP2C_FQCSID(nRofCSIDs := 1, + nodeIDType := 0, + nodeID := ts_GTP2C_FQCSID_NodeID_IPv4(addr), + pDN_CSID_List := {csid}, + instance := instance); template (value) PDU_GTPCv2 ts_PDU_GTP2C(template (omit) OCT4 teid, template (value) OCT3 seq, @@ -1068,33 +1103,19 @@ template (value) PDU_GTPCv2 ts_GTP2C_CreateBearerReq(template (value) OCT4 d_teid, - template (value) integer proc_trans_id, + template (omit) integer proc_trans_id, template (value) uint4_t linked_id, template (value) uint4_t bearer_id, - template (omit) FullyQualifiedTEID_List teid_list, + template (value) BearerContextGrouped_List bearer_ctx_list, + template (omit) FullyQualifiedPDN_ConnectionSetID_List csid := omit, template (value) Bearer_QoS qos := ts_GTP2C_BearerQos('09'O, 0,0,0,0)) := ts_PDU_GTP2C(d_teid, '000000'O, '5F'O, { createBearerRequest := { - procedureTransactionID := ts_GTP2C_ProcTransId(proc_trans_id), + procedureTransactionID := f_ts_GTP2C_ProcTransId_omit(proc_trans_id), linkedEPS_BearerID := ts_GTP2C_EpsBearerId(linked_id), protocolConfigOptions := omit, - bearerContextGrouped := { - ts_GTP2C_BcGrouped({ - ePS_Bearer_ID := ts_GTP2C_EpsBearerId(bearer_id), - cause := omit, - ePS_Bearer_TFT := omit, - fullyQualifiedTEID := teid_list, - bearerLevel_QoS := qos, - chargingID := omit, - bearerFlags := omit, - transactionIdentifier := omit, - protocolConfigOptions := omit, - rAN_NASCause := omit, - additionalProtocolConfigOptions := omit, - extendedProtocolConfigOptions := omit - }) - }, - csid := omit, + bearerContextGrouped := bearer_ctx_list, + csid := csid, changeReportingAction := omit, cSG_InformationReportingAction := omit, heNBInformationReporting := omit, @@ -1105,6 +1126,30 @@ nBIFOMContainer := omit, privateExtension := omit }}); +template (present) PDU_GTPCv2 +tr_GTP2C_CreateBearerResp(template (present) OCT4 d_teid, + template (present) OCT3 seq := ?, + template (present) GTP2C_Cause cause := ? + ) := +tr_PDU_GTP2C(d_teid, seq, { + createBearerResponse := { + cause := tr_GTP2C_Cause(cause), + bearerContextGrouped := *, + recovery := *, + csid := *, + protocolConfigOptions := *, + uE_TimeZone := *, + uLI := *, + trustedWLANAccessNetworkIdentifier := *, + overloadControlInformationGrouped := *, + presenceReportingAreaInformation := *, + iP_Addr := *, + wLANLocationTimestamp := *, + portNumber := *, + nBIFOMContainer := *, + extendedProtocolConfigOptions := *, + privateExtension:= * + }}); template (present) PDU_GTPCv2 tr_GTP2C_ModifyBearerReq(template (present) OCT4 d_teid := ?, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35884?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibdfeda1fa5d7016b1952d64b306cd501cb33f61b Gerrit-Change-Number: 35884 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024