September 2023 - gerrit-log - lists.osmocom.org

[L] Change in osmocom-bb[master]: modem: grr: implement RACH.req retransmission

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34514?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: modem: grr: implement RACH.req retransmission ...................................................................... modem: grr: implement RACH.req retransmission Sometimes sending one Access Burst is not enough, so we need to repeat sending it a few more more times changing the 3 LSBs randomly. This is what we already do in the mobile app, but not in the modem app. * Rename GRR_EV_RACH_{REQ,CNF} to GRR_EV_CHAN_ACCESS_{REQ,CNF}. * Rename VTY command 'grr tx-chan-req' to 'grr start-chan-access'. * Add an intermediate state GRR_ST_PACKET_ACCESS. ** The GRR_EV_CHAN_ACCESS_REQ transitions to this state. ** One RACH.req gets transmitted when entering this state. ** The GRR_EV_CHAN_ACCESS_CNF confirms transmission of a RACH.req. ** Upon the timeout (300 ms) expiry, a loop state transition happens. ** After 3 loop-transitions, transition to GRR_ST_PACKET_NOT_READY. Change-Id: Iab6d9147f6e0aeb99239affacf318a3897fd6ffe Related: libosmo-gprs.git If0de3ed86b1e2897d70183f3b0f4fbfd7d2bda80 Related: OS#5500, OS#6131 --- M src/host/layer23/include/osmocom/bb/modem/grr.h M src/host/layer23/src/modem/grr.c M src/host/layer23/src/modem/rlcmac.c M src/host/layer23/src/modem/vty.c 4 files changed, 189 insertions(+), 78 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/14/34514/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34514?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: Iab6d9147f6e0aeb99239affacf318a3897fd6ffe Gerrit-Change-Number: 34514 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: deal with RACH retransmissions (drop rach_req_ra)

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34512?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: rlcmac: deal with RACH retransmissions (drop rach_req_ra) ...................................................................... rlcmac: deal with RACH retransmissions (drop rach_req_ra) The RA value does change during RACH retransmissions, so we cannot expect a specific value in gprs_rlcmac_handle_ccch_imm_ass_ul_tbf() anymore. Offload checking it to the lower layers. * Rename submit_rach_req() to submit_packet_access_req(). * Get rid of gen_chan_req(), indicate only the access cause. Ideally, we should also rename the OSMO_GPRS_RLCMAC_L1CTL_RACH to something like OSMO_GPRS_RLCMAC_L1CTL_PKT_CHAN_ACCESS, but let's better do this separately. Change-Id: If0de3ed86b1e2897d70183f3b0f4fbfd7d2bda80 Related: osmocom-bb.git Iab6d9147f6e0aeb99239affacf318a3897fd6ffe Related: OS#5500, OS#6131 --- M include/osmocom/gprs/rlcmac/tbf_ul_ass_fsm.h M src/rlcmac/rlcmac.c M src/rlcmac/tbf_ul_ass_fsm.c M tests/rlcmac/rlcmac_prim_test.err 4 files changed, 57 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/12/34512/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34512?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: If0de3ed86b1e2897d70183f3b0f4fbfd7d2bda80 Gerrit-Change-Number: 34512 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[S] Change in osmocom-bb[master]: modem: grr: clarify a comment in forward_to_rlcmac()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34513?usp=email ) Change subject: modem: grr: clarify a comment in forward_to_rlcmac() ...................................................................... modem: grr: clarify a comment in forward_to_rlcmac() Change-Id: I11286777c70c776c9f6990be988401ebd5b84f0f --- M src/host/layer23/src/modem/grr.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/13/34513/1 diff --git a/src/host/layer23/src/modem/grr.c b/src/host/layer23/src/modem/grr.c index 1f4a3d7..af773a3 100644 --- a/src/host/layer23/src/modem/grr.c +++ b/src/host/layer23/src/modem/grr.c @@ -97,7 +97,7 @@ struct osmo_gprs_rlcmac_prim *rlcmac_prim; const uint32_t fn = *(uint32_t *)(&msg->cb[0]); - /* Forward SI13 to RLC/MAC layer */ + /* Forward a CCCH/BCCH block to the RLC/MAC layer */ rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_l1ctl_ccch_data_ind(fn, msgb_l3(msg)); return osmo_gprs_rlcmac_prim_lower_up(rlcmac_prim); } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34513?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: I11286777c70c776c9f6990be988401ebd5b84f0f Gerrit-Change-Number: 34513 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[L] Change in osmocom-bb[master]: modem: grr: implement RACH.req retransmission

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34514?usp=email ) Change subject: modem: grr: implement RACH.req retransmission ...................................................................... modem: grr: implement RACH.req retransmission Sometimes sending one Access Burst is not enough, so we need to repeat sending it a few more more times changing the 3 LSBs randomly. This is what we already do in the mobile app, but not in the modem app. * Rename GRR_EV_RACH_{REQ,CNF} to GRR_EV_CHAN_ACCESS_{REQ,CNF}. * Rename VTY command 'grr tx-chan-req' to 'grr start-chan-access'. * Add an intermediate state GRR_ST_PACKET_ACCESS. ** The GRR_EV_CHAN_ACCESS_REQ transitions to this state. ** One RACH.req gets transmitted when entering this state. ** The GRR_EV_CHAN_ACCESS_CNF confirms transmission of a RACH.req. ** Upon the timeout (300 ms) expiry, a loop state transition happens. ** After 3 loop-transitions, transition to GRR_ST_PACKET_NOT_READY. Change-Id: Iab6d9147f6e0aeb99239affacf318a3897fd6ffe Related: libosmo-gprs.git If0de3ed86b1e2897d70183f3b0f4fbfd7d2bda80 Related: OS#5500, OS#6131 --- M src/host/layer23/include/osmocom/bb/modem/grr.h M src/host/layer23/src/modem/grr.c M src/host/layer23/src/modem/rlcmac.c M src/host/layer23/src/modem/vty.c 4 files changed, 189 insertions(+), 78 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/14/34514/1 diff --git a/src/host/layer23/include/osmocom/bb/modem/grr.h b/src/host/layer23/include/osmocom/bb/modem/grr.h index 8235d59..99800ad 100644 --- a/src/host/layer23/include/osmocom/bb/modem/grr.h +++ b/src/host/layer23/include/osmocom/bb/modem/grr.h @@ -11,14 +11,15 @@ enum grr_fsm_state { GRR_ST_PACKET_NOT_READY, GRR_ST_PACKET_IDLE, + GRR_ST_PACKET_ACCESS, GRR_ST_PACKET_TRANSFER, }; enum grr_fsm_event { GRR_EV_BCCH_BLOCK_IND, GRR_EV_PCH_AGCH_BLOCK_IND, - GRR_EV_RACH_REQ, - GRR_EV_RACH_CNF, + GRR_EV_CHAN_ACCESS_REQ, + GRR_EV_CHAN_ACCESS_CNF, GRR_EV_PDCH_ESTABLISH_REQ, GRR_EV_PDCH_RELEASE_REQ, GRR_EV_PDCH_UL_TBF_CFG_REQ, @@ -31,4 +32,3 @@ extern struct osmo_fsm grr_fsm_def; int modem_grr_rslms_cb(struct msgb *msg, struct lapdm_entity *le, void *ctx); -uint8_t modem_grr_gen_chan_req(bool single_block); diff --git a/src/host/layer23/src/modem/grr.c b/src/host/layer23/src/modem/grr.c index af773a3..a029dd8 100644 --- a/src/host/layer23/src/modem/grr.c +++ b/src/host/layer23/src/modem/grr.c @@ -63,7 +63,7 @@ } /* Generate an 8-bit CHANNEL REQUEST message as per 3GPP TS 44.018, 9.1.8 */ -uint8_t modem_grr_gen_chan_req(bool single_block) +static uint8_t grr_gen_chan_req(bool single_block) { uint8_t rnd = (uint8_t)rand(); @@ -408,7 +408,7 @@ switch (ch->c.msg_type) { case RSL_MT_CHAN_CONF: /* RACH.conf */ - return osmo_fsm_inst_dispatch(ms->grr_fi, GRR_EV_RACH_CNF, + return osmo_fsm_inst_dispatch(ms->grr_fi, GRR_EV_CHAN_ACCESS_CNF, (void *)&ch->data[1]); default: LOGP(DRSL, LOGL_NOTICE, "Unhandled RSLms CCHAN message " @@ -449,6 +449,78 @@ #include <osmocom/gsm/gsm0502.h> // XXX +/* RACH re-transmission delay value (in ms) */ +#define GRR_PACKET_ACCESS_DELAY_MS 300 +/* RACH max number of transmissions */ +#define GRR_PACKET_ACCESS_MAX_CHAN_REQ 3 + +static void handle_chan_access_req(struct osmo_fsm_inst *fi, + const struct osmo_gprs_rlcmac_l1ctl_prim *lp) +{ + struct osmocom_ms *ms = fi->priv; + struct gsm48_rrlayer *rr = &ms->rrlayer; + + if (lp->rach_req.is_11bit) { /* TODO: implement 11-bit RACH */ + LOGPFSML(fi, LOGL_ERROR, "11-bit RACH is not supported\n"); + return; + } + + memset(&rr->cr_hist[0], 0x00, sizeof(rr->cr_hist)); + rr->chan_req_val = lp->rach_req.ra & ~0x07; + rr->n_chan_req = GRR_PACKET_ACCESS_MAX_CHAN_REQ; + rr->state = GSM48_RR_ST_CONN_PEND; + + osmo_fsm_inst_state_chg_ms(fi, GRR_ST_PACKET_ACCESS, + GRR_PACKET_ACCESS_DELAY_MS, 0); +} + +static void handle_pdch_establish_req(struct osmo_fsm_inst *fi, + const struct osmo_gprs_rlcmac_l1ctl_prim *lp) +{ + struct osmocom_ms *ms = fi->priv; + + if (!lp->pdch_est_req.fh) { + LOGPFSML(fi, LOGL_INFO, + "PDCH Establish.Req: TSC=%u, H0, ARFCN=%u\n", + lp->pdch_est_req.tsc, lp->pdch_est_req.arfcn); + l1ctl_tx_dm_est_req_h0(ms, lp->pdch_est_req.arfcn, + RSL_CHAN_OSMO_PDCH | lp->pdch_est_req.ts_nr, + lp->pdch_est_req.tsc, GSM48_CMODE_SIGN, 0); + } else { + /* Hopping */ + uint8_t ma_len = 0; + uint16_t ma[64]; + + LOGPFSML(fi, LOGL_INFO, + "PDCH Establish.Req: TSC=%u, H1, HSN=%u, MAIO=%u\n", + lp->pdch_est_req.tsc, + lp->pdch_est_req.fhp.hsn, + lp->pdch_est_req.fhp.maio); + + for (unsigned int i = 1, j = 0; i <= 1024; i++) { + unsigned int arfcn = i & 1023; + unsigned int k; + + if (~ms->cellsel.sel_si.freq[arfcn].mask & 0x01) + continue; + + k = lp->pdch_est_req.fhp.ma_len - (j >> 3) - 1; + if (lp->pdch_est_req.fhp.ma[k] & (1 << (j & 7))) + ma[ma_len++] = arfcn; + j++; + } + + l1ctl_tx_dm_est_req_h1(ms, + lp->pdch_est_req.fhp.maio, + lp->pdch_est_req.fhp.hsn, + &ma[0], ma_len, + RSL_CHAN_OSMO_PDCH | lp->pdch_est_req.ts_nr, + lp->pdch_est_req.tsc, GSM48_CMODE_SIGN, 0); + } + + osmo_fsm_inst_state_chg(fi, GRR_ST_PACKET_TRANSFER, 0, 0); +} + static void handle_pdch_block_ind(struct osmocom_ms *ms, struct msgb *msg) { const struct l1ctl_gprs_dl_block_ind *ind = (void *)msg->l1h; @@ -547,27 +619,60 @@ case GRR_EV_PCH_AGCH_BLOCK_IND: grr_rx_ccch(ms, (struct msgb *)data); break; - case GRR_EV_RACH_REQ: - { - const struct osmo_gprs_rlcmac_l1ctl_prim *lp = data; - struct gsm48_rrlayer *rr = &ms->rrlayer; - - if (lp->rach_req.is_11bit) { /* TODO: implement 11-bit RACH */ - LOGPFSML(fi, LOGL_ERROR, "11-bit RACH is not supported\n"); - return; - } - - rr->cr_ra = lp->rach_req.ra; - memset(&rr->cr_hist[0], 0x00, sizeof(rr->cr_hist)); - - LOGPFSML(fi, LOGL_INFO, "Sending CHANNEL REQUEST (0x%02x)\n", rr->cr_ra); - l1ctl_tx_rach_req(ms, RSL_CHAN_RACH, 0x00, rr->cr_ra, 0, - ms->cellsel.ccch_mode == CCCH_MODE_COMBINED); - - rr->state = GSM48_RR_ST_CONN_PEND; + case GRR_EV_CHAN_ACCESS_REQ: + handle_chan_access_req(fi, data); break; + case GRR_EV_PDCH_ESTABLISH_REQ: + handle_pdch_establish_req(fi, data); + break; + default: + OSMO_ASSERT(0); } - case GRR_EV_RACH_CNF: +} + +static void grr_st_packet_access_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct osmocom_ms *ms = fi->priv; + struct gsm48_rrlayer *rr = &ms->rrlayer; + + if (rr->n_chan_req == 0) { + LOGPFSML(fi, LOGL_ERROR, "Packet access failed (no more attempts left)\n"); + osmo_fsm_inst_state_chg(fi, GRR_ST_PACKET_NOT_READY, 0, 0); + return; + } + + /* (re-)generate the RA value */ + if ((rr->chan_req_val >> 3) == 0x0e) /* 01110xxx */ + rr->cr_ra = grr_gen_chan_req(true); + else /* 011110xx or 01111x0x or 01111xx0 */ + rr->cr_ra = grr_gen_chan_req(false); + rr->n_chan_req--; + + LOGPFSML(fi, LOGL_INFO, + "Sending CHANNEL REQUEST (ra=0x%02x, num_attempts=%u)\n", + rr->cr_ra, rr->n_chan_req); + + l1ctl_tx_rach_req(ms, RSL_CHAN_RACH, 0x00, rr->cr_ra, 0, + ms->cellsel.ccch_mode == CCCH_MODE_COMBINED); +} + +static void grr_st_packet_access_action(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + struct osmocom_ms *ms = fi->priv; + + switch (event) { + case GRR_EV_BCCH_BLOCK_IND: + grr_rx_bcch(ms, (struct msgb *)data); + if (!grr_cell_is_usable(ms)) { + LOGPFSML(fi, LOGL_NOTICE, "Cell is not usable, GRR becomes not ready\n"); + osmo_fsm_inst_state_chg(fi, GRR_ST_PACKET_NOT_READY, 0, 0); + } + break; + case GRR_EV_PCH_AGCH_BLOCK_IND: + grr_rx_ccch(ms, (struct msgb *)data); + break; + case GRR_EV_CHAN_ACCESS_CNF: { struct gsm48_rrlayer *rr = &ms->rrlayer; const struct gsm48_req_ref *ref = data; @@ -591,50 +696,8 @@ break; } case GRR_EV_PDCH_ESTABLISH_REQ: - { - const struct osmo_gprs_rlcmac_l1ctl_prim *lp = data; - - if (!lp->pdch_est_req.fh) { - LOGPFSML(fi, LOGL_INFO, - "PDCH Establish.Req: TSC=%u, H0, ARFCN=%u\n", - lp->pdch_est_req.tsc, lp->pdch_est_req.arfcn); - l1ctl_tx_dm_est_req_h0(ms, lp->pdch_est_req.arfcn, - RSL_CHAN_OSMO_PDCH | lp->pdch_est_req.ts_nr, - lp->pdch_est_req.tsc, GSM48_CMODE_SIGN, 0); - } else { - /* Hopping */ - uint8_t ma_len = 0; - uint16_t ma[64]; - - LOGPFSML(fi, LOGL_INFO, - "PDCH Establish.Req: TSC=%u, H1, HSN=%u, MAIO=%u\n", - lp->pdch_est_req.tsc, - lp->pdch_est_req.fhp.hsn, - lp->pdch_est_req.fhp.maio); - - for (unsigned int i = 1, j = 0; i <= 1024; i++) { - unsigned int arfcn = i & 1023; - unsigned int k; - - if (~ms->cellsel.sel_si.freq[arfcn].mask & 0x01) - continue; - - k = lp->pdch_est_req.fhp.ma_len - (j >> 3) - 1; - if (lp->pdch_est_req.fhp.ma[k] & (1 << (j & 7))) - ma[ma_len++] = arfcn; - j++; - } - - l1ctl_tx_dm_est_req_h1(ms, - lp->pdch_est_req.fhp.maio, - lp->pdch_est_req.fhp.hsn, - &ma[0], ma_len, - RSL_CHAN_OSMO_PDCH | lp->pdch_est_req.ts_nr, - lp->pdch_est_req.tsc, GSM48_CMODE_SIGN, 0); - } - osmo_fsm_inst_state_chg(fi, GRR_ST_PACKET_TRANSFER, 0, 0); + handle_pdch_establish_req(fi, data); break; - } default: OSMO_ASSERT(0); } @@ -704,6 +767,19 @@ } } +static int grr_fsm_timer_cb(struct osmo_fsm_inst *fi) +{ + switch (fi->state) { + case GRR_ST_PACKET_ACCESS: + /* perform a loop transaction, restarting the timer */ + osmo_fsm_inst_state_chg_ms(fi, GRR_ST_PACKET_ACCESS, + GRR_PACKET_ACCESS_DELAY_MS, 0); + return 0; + default: + OSMO_ASSERT(0); + } +} + static const struct osmo_fsm_state grr_fsm_states[] = { [GRR_ST_PACKET_NOT_READY] = { .name = "PACKET_NOT_READY", @@ -715,15 +791,26 @@ [GRR_ST_PACKET_IDLE] = { .name = "PACKET_IDLE", .out_state_mask = S(GRR_ST_PACKET_NOT_READY) + | S(GRR_ST_PACKET_ACCESS) | S(GRR_ST_PACKET_TRANSFER), .in_event_mask = S(GRR_EV_BCCH_BLOCK_IND) | S(GRR_EV_PCH_AGCH_BLOCK_IND) - | S(GRR_EV_RACH_REQ) - | S(GRR_EV_RACH_CNF) - | S(GRR_EV_PDCH_ESTABLISH_REQ), + | S(GRR_EV_CHAN_ACCESS_REQ) + | S(GRR_EV_PDCH_ESTABLISH_REQ), /* DL TBF ASS */ .action = &grr_st_packet_idle_action, .onenter = &grr_st_packet_idle_onenter, }, + [GRR_ST_PACKET_ACCESS] = { + .name = "PACKET_ACCESS", + .out_state_mask = S(GRR_ST_PACKET_NOT_READY) + | S(GRR_ST_PACKET_TRANSFER), + .in_event_mask = S(GRR_EV_BCCH_BLOCK_IND) + | S(GRR_EV_PCH_AGCH_BLOCK_IND) + | S(GRR_EV_CHAN_ACCESS_CNF) + | S(GRR_EV_PDCH_ESTABLISH_REQ), /* UL TBF ASS */ + .onenter = &grr_st_packet_access_onenter, + .action = &grr_st_packet_access_action, + }, [GRR_ST_PACKET_TRANSFER] = { .name = "PACKET_TRANSFER", .out_state_mask = S(GRR_ST_PACKET_NOT_READY), @@ -742,8 +829,8 @@ static const struct value_string grr_fsm_event_names[] = { OSMO_VALUE_STRING(GRR_EV_BCCH_BLOCK_IND), OSMO_VALUE_STRING(GRR_EV_PCH_AGCH_BLOCK_IND), - OSMO_VALUE_STRING(GRR_EV_RACH_REQ), - OSMO_VALUE_STRING(GRR_EV_RACH_CNF), + OSMO_VALUE_STRING(GRR_EV_CHAN_ACCESS_REQ), + OSMO_VALUE_STRING(GRR_EV_CHAN_ACCESS_CNF), OSMO_VALUE_STRING(GRR_EV_PDCH_ESTABLISH_REQ), OSMO_VALUE_STRING(GRR_EV_PDCH_RELEASE_REQ), OSMO_VALUE_STRING(GRR_EV_PDCH_UL_TBF_CFG_REQ), @@ -760,6 +847,7 @@ .states = grr_fsm_states, .num_states = ARRAY_SIZE(grr_fsm_states), .event_names = grr_fsm_event_names, + .timer_cb = &grr_fsm_timer_cb, }; static __attribute__((constructor)) void on_dso_load(void) diff --git a/src/host/layer23/src/modem/rlcmac.c b/src/host/layer23/src/modem/rlcmac.c index 5037d99..a9588f7 100644 --- a/src/host/layer23/src/modem/rlcmac.c +++ b/src/host/layer23/src/modem/rlcmac.c @@ -145,7 +145,7 @@ switch (OSMO_PRIM_HDR(&prim->oph)) { case OSMO_PRIM(OSMO_GPRS_RLCMAC_L1CTL_RACH, PRIM_OP_REQUEST): - return osmo_fsm_inst_dispatch(ms->grr_fi, GRR_EV_RACH_REQ, lp); + return osmo_fsm_inst_dispatch(ms->grr_fi, GRR_EV_CHAN_ACCESS_REQ, lp); case OSMO_PRIM(OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA, PRIM_OP_REQUEST): return osmo_fsm_inst_dispatch(ms->grr_fi, GRR_EV_PDCH_BLOCK_REQ, lp); case OSMO_PRIM(OSMO_GPRS_RLCMAC_L1CTL_CFG_UL_TBF, PRIM_OP_REQUEST): diff --git a/src/host/layer23/src/modem/vty.c b/src/host/layer23/src/modem/vty.c index da29165..f487e38 100644 --- a/src/host/layer23/src/modem/vty.c +++ b/src/host/layer23/src/modem/vty.c @@ -73,27 +73,26 @@ /* testing commands */ DEFUN_HIDDEN(test_grr_tx_chan_req, test_grr_tx_chan_req_cmd, - "test MS_NAME grr tx-chan-req (1phase|2phase)", + "test MS_NAME grr start-chan-access (1phase|2phase)", TEST_CMD_DESC MS_NAME_DESC GRR_CMDG_DESC "Send a CHANNEL REQUEST (RACH) to the network\n" "One-phase packet access (011110xx or 01111x0x or 01111xx0)\n" "Two-phase (single block) packet access (01110xxx)\n") { struct osmocom_ms *ms; - uint8_t chan_req; if ((ms = l23_vty_get_ms(argv[0], vty)) == NULL) return CMD_WARNING; - chan_req = modem_grr_gen_chan_req(argv[1][0] == '2'); const struct osmo_gprs_rlcmac_l1ctl_prim lp = { .rach_req = { .is_11bit = false, - .ra = chan_req, + /* the 3 LSBs are randomized during (re)transmission */ + .ra = argv[1][0] == '1' ? 0x70 : 0x78, } }; - if (osmo_fsm_inst_dispatch(ms->grr_fi, GRR_EV_RACH_REQ, (void *)&lp)) { + if (osmo_fsm_inst_dispatch(ms->grr_fi, GRR_EV_CHAN_ACCESS_REQ, (void *)&lp)) { vty_out(vty, "Failed to send a CHANNEL REQUEST%s", VTY_NEWLINE); return CMD_WARNING; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34514?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: Iab6d9147f6e0aeb99239affacf318a3897fd6ffe Gerrit-Change-Number: 34514 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: deal with RACH retransmissions (drop rach_req_ra)

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34512?usp=email ) Change subject: rlcmac: deal with RACH retransmissions (drop rach_req_ra) ...................................................................... rlcmac: deal with RACH retransmissions (drop rach_req_ra) The RA value does change during RACH retransmissions, so we cannot expect a specific value in gprs_rlcmac_handle_ccch_imm_ass_ul_tbf() anymore. Offload checking it to the lower layers. * Rename submit_rach_req() to submit_packet_access_req(). * Get rid of gen_chan_req(), indicate only the access cause. Ideally, we should also rename the OSMO_GPRS_RLCMAC_L1CTL_RACH to something like OSMO_GPRS_RLCMAC_L1CTL_PKT_CHAN_ACCESS, but let's better do this separately. Change-Id: If0de3ed86b1e2897d70183f3b0f4fbfd7d2bda80 Related: osmocom-bb.git Iab6d9147f6e0aeb99239affacf318a3897fd6ffe Related: OS#5500, OS#6131 --- M include/osmocom/gprs/rlcmac/tbf_ul_ass_fsm.h M src/rlcmac/rlcmac.c M src/rlcmac/tbf_ul_ass_fsm.c 3 files changed, 42 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/12/34512/1 diff --git a/include/osmocom/gprs/rlcmac/tbf_ul_ass_fsm.h b/include/osmocom/gprs/rlcmac/tbf_ul_ass_fsm.h index ad32471..162517d 100644 --- a/include/osmocom/gprs/rlcmac/tbf_ul_ass_fsm.h +++ b/include/osmocom/gprs/rlcmac/tbf_ul_ass_fsm.h @@ -35,7 +35,6 @@ }; const struct gprs_rlcmac_dl_tbf *dl_tbf; /* Not null if assignment was started by a DL TBF ACK/NACK */ enum gprs_rlcmac_tbf_ul_ass_type ass_type; - uint8_t rach_req_ra; struct gprs_rlcmac_ul_tbf_allocation phase1_alloc; struct gprs_rlcmac_ul_tbf_allocation phase2_alloc; bool tbf_starting_time_exists; @@ -85,7 +84,7 @@ int gprs_rlcmac_tbf_ul_ass_start_from_dl_tbf_ack_nack(struct gprs_rlcmac_ul_tbf *ul_tbf, const struct gprs_rlcmac_dl_tbf *dl_tbf, uint8_t tn); bool gprs_rlcmac_tbf_ul_ass_pending(struct gprs_rlcmac_ul_tbf *ul_tbf); -bool gprs_rlcmac_tbf_ul_ass_match_rach_req(struct gprs_rlcmac_ul_tbf *ul_tbf, uint8_t ra); +bool gprs_rlcmac_tbf_ul_ass_wait_ccch_imm_ass(const struct gprs_rlcmac_ul_tbf *ul_tbf); bool gprs_rlcmac_tbf_ul_ass_waiting_tbf_starting_time(const struct gprs_rlcmac_ul_tbf *ul_tbf); void gprs_rlcmac_tbf_ul_ass_fn_tick(const struct gprs_rlcmac_ul_tbf *ul_tbf, uint32_t fn, uint8_t ts_nr); bool gprs_rlcmac_tbf_ul_ass_rts(const struct gprs_rlcmac_ul_tbf *ul_tbf, const struct gprs_rlcmac_rts_block_ind *bi); diff --git a/src/rlcmac/rlcmac.c b/src/rlcmac/rlcmac.c index 212b801..2c809ec 100644 --- a/src/rlcmac/rlcmac.c +++ b/src/rlcmac/rlcmac.c @@ -219,7 +219,7 @@ ul_tbf = gre->ul_tbf; if (!ul_tbf) continue; - if (!gprs_rlcmac_tbf_ul_ass_match_rach_req(ul_tbf, ia->req_ref.ra)) + if (!gprs_rlcmac_tbf_ul_ass_wait_ccch_imm_ass(ul_tbf)) continue; rc = osmo_fsm_inst_dispatch(ul_tbf->ul_ass_fsm.fi, GPRS_RLCMAC_TBF_UL_ASS_EV_RX_CCCH_IMM_ASS, diff --git a/src/rlcmac/tbf_ul_ass_fsm.c b/src/rlcmac/tbf_ul_ass_fsm.c index 5587ddb..64797aa 100644 --- a/src/rlcmac/tbf_ul_ass_fsm.c +++ b/src/rlcmac/tbf_ul_ass_fsm.c @@ -103,27 +103,24 @@ return NULL; } -/* Generate a 8-bit CHANNEL REQUEST message as per 3GPP TS 44.018, 9.1.8 */ -static uint8_t gen_chan_req(bool single_block) -{ - uint8_t rnd = (uint8_t)rand(); - - if (single_block) /* 01110xxx */ - return 0x70 | (rnd & 0x07); - - /* 011110xx or 01111x0x or 01111xx0 */ - if ((rnd & 0x07) == 0x07) - return 0x78; - return 0x78 | (rnd & 0x07); -} - -static int submit_rach_req(struct gprs_rlcmac_tbf_ul_ass_fsm_ctx *ctx) +static int submit_packet_access_req(const struct gprs_rlcmac_tbf_ul_ass_fsm_ctx *ctx) { struct osmo_gprs_rlcmac_prim *rlcmac_prim; - ctx->rach_req_ra = gen_chan_req(ctx->ass_type == GPRS_RLCMAC_TBF_UL_ASS_TYPE_2PHASE); - LOGPFSML(ctx->fi, LOGL_INFO, "Send RACH.req ra=0x%02x\n", ctx->rach_req_ra); - rlcmac_prim = gprs_rlcmac_prim_alloc_l1ctl_rach8_req(ctx->rach_req_ra); + switch (ctx->ass_type) { + case GPRS_RLCMAC_TBF_UL_ASS_TYPE_1PHASE: + /* 3GPP TS 44.018, table 9.1.8.1: cause 011110xx or 01111x0x or 01111xx0 */ + LOGPFSML(ctx->fi, LOGL_INFO, "Requesting one-phase packet access using CCCH\n"); + rlcmac_prim = gprs_rlcmac_prim_alloc_l1ctl_rach8_req(0x78); + break; + case GPRS_RLCMAC_TBF_UL_ASS_TYPE_2PHASE: + /* 3GPP TS 44.018, table 9.1.8.1: cause 011110xx */ + LOGPFSML(ctx->fi, LOGL_INFO, "Requesting two-phase packet access using CCCH\n"); + rlcmac_prim = gprs_rlcmac_prim_alloc_l1ctl_rach8_req(0x70); + break; + /* TODO: EGPRS specific modes (11-bit RACH) */ + } + return gprs_rlcmac_prim_call_down_cb(rlcmac_prim); } @@ -271,7 +268,7 @@ /* Inform the main TBF state about the assignment starting: */ osmo_fsm_inst_dispatch(ctx->ul_tbf->state_fsm.fi, GPRS_RLCMAC_TBF_UL_EV_UL_ASS_START, NULL); ctx->ass_type = *(enum gprs_rlcmac_tbf_ul_ass_type *)data; - rc = submit_rach_req(ctx); + rc = submit_packet_access_req(ctx); if (rc < 0) { osmo_fsm_inst_dispatch(ctx->ul_tbf->state_fsm.fi, GPRS_RLCMAC_TBF_UL_EV_UL_ASS_REJ, NULL); break; @@ -702,10 +699,9 @@ return ul_tbf->ul_ass_fsm.fi->state != GPRS_RLCMAC_TBF_UL_ASS_ST_IDLE; } -bool gprs_rlcmac_tbf_ul_ass_match_rach_req(struct gprs_rlcmac_ul_tbf *ul_tbf, uint8_t ra) +bool gprs_rlcmac_tbf_ul_ass_wait_ccch_imm_ass(const struct gprs_rlcmac_ul_tbf *ul_tbf) { - return ul_tbf->ul_ass_fsm.fi->state == GPRS_RLCMAC_TBF_UL_ASS_ST_WAIT_CCCH_IMM_ASS && - ul_tbf->ul_ass_fsm.rach_req_ra == ra; + return ul_tbf->ul_ass_fsm.fi->state == GPRS_RLCMAC_TBF_UL_ASS_ST_WAIT_CCCH_IMM_ASS; } bool gprs_rlcmac_tbf_ul_ass_waiting_tbf_starting_time(const struct gprs_rlcmac_ul_tbf *ul_tbf) -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34512?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: If0de3ed86b1e2897d70183f3b0f4fbfd7d2bda80 Gerrit-Change-Number: 34512 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: sccplite: Support multiple MGW in MGW pool

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34511?usp=email ) Change subject: sccplite: Support multiple MGW in MGW pool ...................................................................... sccplite: Support multiple MGW in MGW pool Before this patch, the MGW was selected at startup, and the MGCP data was always forwarded to that same MGW. If several MGW were configured in the MGW pool, then osmo-bsc would select any of those from the pool, and start configured the BTS-side connection on an endpoint in that MGW. However, when the MSC submitted the MGCP encapsulated in IPA to the BSC, the BSC would always forward the MGCP message to that same MGW selected at startup. As a result, multiple MGWs configured with osmo-bsc using SCCPlite was broken. This commit fixes support for multiple MGWs by looking up the already selected MGW (to setup the BTS-side conn on the endpoint), based on the CIC (MGCP Endpoint) which was provided by the MSC upon AssignReq. Related: OS#6189 Depends: libosmocore.git Change-Id Iee361d740845257fa62c9093e30e8079fa933827 Depends: osmo-mgw.git Change-Id I18d7bdf650c0ec87ae16ed4944aed9f495400137 Change-Id: Ia106a21b7692eb5b2ac3b5ac2b358bedbc3b9da6 --- M TODO-RELEASE M src/osmo-bsc/osmo_bsc_mgcp.c M src/osmo-bsc/osmo_bsc_msc.c 3 files changed, 144 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/11/34511/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..7a7ec22 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmocore > 1.9.0 working (compiling) OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL diff --git a/src/osmo-bsc/osmo_bsc_mgcp.c b/src/osmo-bsc/osmo_bsc_mgcp.c index 1b8e089..de11f44 100644 --- a/src/osmo-bsc/osmo_bsc_mgcp.c +++ b/src/osmo-bsc/osmo_bsc_mgcp.c @@ -2,6 +2,7 @@ * SCCPlite MGCP handling * * (C) 2018 by Harald Welte <laforge(a)gnumonks.org> + * (C) 2023 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> * All Rights Reserved * * This program is free software; you can redistribute it and/or modify @@ -19,6 +20,15 @@ * */ +#include <string.h> + +#include <osmocom/core/utils.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/socket.h> +#include <osmocom/core/sockaddr_str.h> +#include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h> +#include <osmocom/mgcp_client/mgcp_client.h> + #include <osmocom/bsc/bsc_msc_data.h> #include <osmocom/bsc/osmo_bsc.h> #include <osmocom/bsc/gsm_data.h> @@ -46,22 +56,121 @@ return osmo_msc_data_find(bsc_gsmnet, msc_nr); } +/* negative on error, filled buf size upon success */ +static int parse_local_endpoint_name(char *buf, size_t buf_len, const char *data) +{ + char line[1024]; + char *epstart, *sep; + const char *start = data; + char *eol = strpbrk(start, "\r\n"); + if (!eol) + return -1; + + if (eol - start > sizeof(line)) + return -1; + memcpy(line, start, eol - start); + line[eol - start] = '\0'; + + if (!(epstart = strchr(line, ' '))) + return -1; + epstart++; + /* epstart now points to trans */ + + if (!(epstart = strchr(epstart, ' '))) + return -1; + epstart++; + /* epstart now points to endpoint */ + if (!(sep = strchr(epstart, '@'))) + return -1; + if (sep - epstart >= buf_len) + return -1; + + *sep = '\0'; + osmo_strlcpy(buf, epstart, buf_len); + return 0; +} + /* We received an IPA-encapsulated MGCP message from a MSC. Transfers msg ownership. */ int bsc_sccplite_rx_mgcp(struct osmo_ss7_asp *asp, struct msgb *msg) { struct bsc_msc_data *msc; + struct gsm_subscriber_connection *conn; + char rcv_ep_local_name[1024]; + struct osmo_sockaddr_str osa_str = {}; + struct osmo_sockaddr osa = {}; + socklen_t dest_len; + struct mgcp_client *mgcp_cli = NULL; int rc; LOGP(DMSC, LOGL_NOTICE, "%s: Received IPA-encapsulated MGCP: %s\n", osmo_ss7_asp_get_name(asp), msg->l2h); - msc = msc_from_asp(asp); - if (msc) { - /* we don't have a write queue here as we simply expect the socket buffers - * to be large enough to deal with whatever small/infrequent MGCP messages */ - rc = send(msc->mgcp_ipa.ofd.fd, msgb_l2(msg), msgb_l2len(msg), 0); - } else - rc = 0; + msc = msc_from_asp(asp); + if (!msc) { + rc = 0; + goto free_msg_ret; + } + + rc = parse_local_endpoint_name(rcv_ep_local_name, sizeof(rcv_ep_local_name), (const char *)msg->l2h); + if (rc < 0) { + LOGP(DMSC, LOGL_ERROR, "(%s:) Received IPA-encapsulated MGCP: Failed to parse CIC\n", + osmo_ss7_asp_get_name(asp)); + goto free_msg_ret; + } + + /* Lookup which conn attached to the MSC holds an MGW endpoint the same + * Endpoint Number as the one provided in the MGCP msg we received from + * MSC. Sine CIC are unique per MSC, that's the same MGW in the pool + * where we have to forward the MGCP message. */ + llist_for_each_entry(conn, &bsc_gsmnet->subscr_conns, entry) { + const char *ep_local_name; + if (conn->sccp.msc != msc) + continue; /* Only conns belonging to this MSC */ + if (!conn->user_plane.mgw_endpoint) + continue; + ep_local_name = osmo_mgcpc_ep_local_name(conn->user_plane.mgw_endpoint); + LOGPFSMSL(conn->fi, DMSC, LOGL_NOTICE, "ep_local_name='%s' vs rcv_ep_local_name='%s'\n", ep_local_name, rcv_ep_local_name); + if (!ep_local_name) + continue; + if (strcmp(ep_local_name, rcv_ep_local_name) != 0) + continue; + mgcp_cli = osmo_mgcpc_ep_client(conn->user_plane.mgw_endpoint); + if (!mgcp_cli) + continue; + break; + } + + if (!mgcp_cli) { + LOGP(DMSC, LOGL_ERROR, "(%s:) Received IPA-encapsulated MGCP: Failed to find associated MGW\n", + osmo_ss7_asp_get_name(asp)); + rc = 0; + goto free_msg_ret; + } + + rc = osmo_sockaddr_str_from_str(&osa_str, mgcp_client_remote_addr_str(mgcp_cli), + mgcp_client_remote_port(mgcp_cli)); + if (rc < 0) { + LOGP(DMSC, LOGL_ERROR, "(%s:) Received IPA-encapsulated MGCP: Failed to parse MGCP address %s:%u\n", + osmo_ss7_asp_get_name(asp), mgcp_client_remote_addr_str(mgcp_cli), mgcp_client_remote_port(mgcp_cli)); + goto free_msg_ret; + } + + LOGP(DMSC, LOGL_NOTICE, "%s: Forwarding IPA-encapsulated MGCP to MGW at " OSMO_SOCKADDR_STR_FMT "\n", + osmo_ss7_asp_get_name(asp), OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL(&osa_str)); + + rc = osmo_sockaddr_str_to_sockaddr(&osa_str, &osa.u.sas); + if (rc < 0) { + LOGP(DMSC, LOGL_ERROR, "(%s:) Received IPA-encapsulated MGCP: Failed to parse MGCP address " OSMO_SOCKADDR_STR_FMT "\n", + osmo_ss7_asp_get_name(asp), OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL(&osa_str)); + goto free_msg_ret; + } + dest_len = osmo_sockaddr_size(&osa); + + /* we don't have a write queue here as we simply expect the socket buffers + * to be large enough to deal with whatever small/infrequent MGCP messages */ + rc = sendto(msc->mgcp_ipa.ofd.fd, msgb_l2(msg), msgb_l2len(msg), 0, &osa.u.sa, dest_len); + +free_msg_ret: msgb_free(msg); return rc; } diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index dfba2de..2425592 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -376,26 +376,15 @@ int osmo_bsc_msc_init(struct bsc_msc_data *msc) { - struct gsm_network *net = msc->network; - struct mgcp_client *mgcp_cli; int rc; /* Everything below refers to SCCP-Lite MSC connections only. */ if (msc_is_aoip(msc)) return 0; - /* Note: MGW is preselected here at startup, which means currently - * osmo-bsc configured for SCCPLite doesn't support MGW pools with more - * than 1 MGW. - */ - mgcp_cli = mgcp_client_pool_get(net->mgw.mgw_pool); - OSMO_ASSERT(mgcp_cli); rc = osmo_sock_init2_ofd(&msc->mgcp_ipa.ofd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, msc->mgcp_ipa.local_addr, msc->mgcp_ipa.local_port, - mgcp_client_remote_addr_str(mgcp_cli), - mgcp_client_remote_port(mgcp_cli), - OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT); - mgcp_client_pool_put(mgcp_cli); + NULL, 0, OSMO_SOCK_F_BIND); if (rc < 0) { LOGP(DMSC, LOGL_ERROR, "msc %u: Could not create/connect/bind MGCP proxy socket: %d\n", msc->nr, rc); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34511?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: Ia106a21b7692eb5b2ac3b5ac2b358bedbc3b9da6 Gerrit-Change-Number: 34511 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp-client: Introduce API osmo_mgcpc_ep_local_name()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34510?usp=email ) Change subject: mgcp-client: Introduce API osmo_mgcpc_ep_local_name() ...................................................................... mgcp-client: Introduce API osmo_mgcpc_ep_local_name() Change-Id: I18d7bdf650c0ec87ae16ed4944aed9f495400137 --- M include/osmocom/mgcp_client/mgcp_client_endpoint_fsm.h M src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c 2 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/10/34510/1 diff --git a/include/osmocom/mgcp_client/mgcp_client_endpoint_fsm.h b/include/osmocom/mgcp_client/mgcp_client_endpoint_fsm.h index f21f40e..3daa09d 100644 --- a/include/osmocom/mgcp_client/mgcp_client_endpoint_fsm.h +++ b/include/osmocom/mgcp_client/mgcp_client_endpoint_fsm.h @@ -45,6 +45,7 @@ void osmo_mgcpc_ep_clear(struct osmo_mgcpc_ep *ep); const char *osmo_mgcpc_ep_name(const struct osmo_mgcpc_ep *ep); +const char *osmo_mgcpc_ep_local_name(const struct osmo_mgcpc_ep *ep); const char *osmo_mgcpc_ep_ci_name(const struct osmo_mgcpc_ep_ci *ci); const char *osmo_mgcpc_ep_ci_id(const struct osmo_mgcpc_ep_ci *ci); struct mgcp_client *osmo_mgcpc_ep_client(const struct osmo_mgcpc_ep *ep); diff --git a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c index a01bbdc..25e776e 100644 --- a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c @@ -173,6 +173,29 @@ return osmo_fsm_inst_name(ep->fi); } +/*! Get "local endpoint name" part of the endpoint name: (local-endpoint-name@domain-name) + * + * \param ep The MGCP Endpoint + * \returns the local endpoint name if found, NULL on error. + */ +const char *osmo_mgcpc_ep_local_name(const struct osmo_mgcpc_ep *ep) +{ + static char buf[1024]; + const char *sep; + OSMO_ASSERT(ep); + sep = strchr(ep->endpoint, '@'); + if (!sep) { + OSMO_STRLCPY_ARRAY(buf, ep->endpoint); + return buf; + } + if (sep - ep->endpoint >= sizeof(buf)) + return NULL; + + memcpy(buf, ep->endpoint, sep - ep->endpoint); + buf[sep - ep->endpoint] = '\0'; + return buf; +} + const char *mgcp_conn_peer_name(const struct mgcp_conn_peer *info) { /* I'd be fine with a smaller buffer and accept truncation, but gcc possibly refuses to build if -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34510?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I18d7bdf650c0ec87ae16ed4944aed9f495400137 Gerrit-Change-Number: 34510 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: Make BSSGP timers configurable

by pespin

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31882?usp=email ) Change subject: Make BSSGP timers configurable ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: Again, the timers should be per-BTS configurable and probably on a separate tdef group of it own. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31882?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: Id4779f033b5eb1742462d4efc28a0398645acfe6 Gerrit-Change-Number: 31882 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Sep 2023 16:53:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: Make NSE timing data configurable

by pespin

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31880?usp=email ) Change subject: Make NSE timing data configurable ...................................................................... Patch Set 2: (5 comments) Patchset: PS2: Again this should be per BTS. File include/osmocom/bsc/bts.h: https://gerrit.osmocom.org/c/osmo-bsc/+/31880/comment/81c13d98_bee9d723 PS2, Line 326: #define GSM_BTS_TDEF_ID_TNS_BLOCK_NEG29 (-29) Better leave some space in the number series so that we can later on add similar timers next to the existing ones. File src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31880/comment/cb9190bc_b2e5811e PS2, Line 187: struct osmo_tdef *tdefs = bts->network->T_defs; Again, this needs to be per BTS. File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31880/comment/bf555dbd_2e2108c9 PS2, Line 76: static const int gprs_ns_timer_tdef_data[][2] = { AFAICT this is only used in cfg_bts_gprs_ns_timer_cmd, so it can be moved there. https://gerrit.osmocom.org/c/osmo-bsc/+/31880/comment/63253556_aa03e90e PS2, Line 1627: int idx = get_string_value(gprs_ns_timer_strs, argv[0]); so you are converting to an index here once, and in line 1637 again. This looks ptoentially wrong. Why isn't this get_string_value providing the interesting idx directly? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31880?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: Ie46ec5cb7095bc1dfe3effd0e76d6ccfd6bd2f3f Gerrit-Change-Number: 31880 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Sep 2023 16:50:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: Make RLC timing data configurable

by pespin

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email ) Change subject: Make RLC timing data configurable ...................................................................... Patch Set 2: Code-Review-1 (4 comments) File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/a61bd56e_ec5da31f PS2, Line 50: #define GSM_N3101_STRICT_LOWER_BOUND 8UL STRICT_LOWER_BOUND means simply "MIN" ? :D File src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/e034c27c_d4b4cc66 PS2, Line 234: struct osmo_tdef *tdefs = bts->network->T_defs; Nope! this should be per BTS. File src/osmo-bsc/net_init.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/8374a212_e60bc359 PS2, Line 51: { .T = 3142, .default_val = 20, I know tons of parameters are already added here, but we should not continue adding BTS-specific parameters here, it just doesn't make sense. Some of them even may not be configurable on other BTS types. So we really need to add a osmo_tdef group per bts object. You can have a look at asp->cfg.T_defs_lm in libosmo-sccp/src/osmo_ss7_asp.c:673 to find out how to add a T_def instance per object (as opposed to a single structure per process like the gsm_network_T_defs here). Basically: """ asp->cfg.T_defs_lm = talloc_memdup(asp, ss7_asp_lm_timer_defaults, sizeof(ss7_asp_lm_timer_defaults)); osmo_tdefs_reset(asp->cfg.T_defs_lm); """ BTW, when doing so, also create different T_Def groups, like done in this same file here (see bsc_tdef_group below). File tests/nanobts_omlattr/nanobts_omlattr_test.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/3ef734d5_8dabb0d1 PS2, Line 228: 0x02, 0x00, 0x02, 0xa3, 0x00, 0x09, why is this changing? are you changing the default values? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31878?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: I2c24110d8c977d6cc74c3c8e77bcc709ad9d2675 Gerrit-Change-Number: 31878 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Sep 2023 16:42:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023