November 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[arehbein/ttcn3-dumpcap-changes]: WIP: dumpcap-start/stop: Make script fail, not hang on sudo prompt

by msuraev

Attention is currently required from: arehbein. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30127 ) Change subject: WIP: dumpcap-start/stop: Make script fail, not hang on sudo prompt ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: It's better to mark WIP using "Mark as work in progress" feature from gerrit's menu - makes it easier to filter. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: arehbein/ttcn3-dumpcap-changes Gerrit-Change-Id: Id160384bf624a4eb0f419cb8ba07d8b69bb693f3 Gerrit-Change-Number: 30127 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Sat, 26 Nov 2022 13:20:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: fsms: use configurable timers instead of T23042

by neels

Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30307 ) Change subject: fsms: use configurable timers instead of T23042 ...................................................................... Patch Set 1: (7 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/30307/comment/59b6a3be_4d7e915c PS1, Line 9: It looks like T23042 was a placeholder for timers to be filled in later, i can confirm that it actually 100% was nothing but a placeholder, "obvious" when familiar with use of the numbers 23 and 42 as placeholders (like "foo" and "bar"). I mean to say, you can just write that it was a placeholder period. https://gerrit.osmocom.org/c/osmo-bsc/+/30307/comment/6612b98d_409e6c9d PS1, Line 15: Previous timeout for the states was 5s. ", from using the default of 5 for undefined timers." https://gerrit.osmocom.org/c/osmo-bsc/+/30307/comment/5983b7af_1f86ab81 PS1, Line 20: ll "immediately" https://gerrit.osmocom.org/c/osmo-bsc/+/30307/comment/81aef53b_86ea2464 PS1, Line 28: * Use new X29, 10s (5s from X5 + 5s from X6) I think the right thing here is to remove this timeout; this needs no timeout at all because we can rely on the lchan_fsm to either return HO_EV_LCHAN_ACTIVE or HO_EV_LCHAN_ERROR after the usual timeouts set for lchan activation. IOW since it is internal to osmo-bsc one of the two events is guaranteed to occur. If we superimpose a timer on top of the lchan timeouts, configuring larger lchan activation timeouts becomes complex, because the user has to take care to also allow a larger timeout for the same procedure during HO. https://gerrit.osmocom.org/c/osmo-bsc/+/30307/comment/98dc5864_97cc46af PS1, Line 46: * Use new X30, 5s i thiiink that this timeout should also be dropped, because again we have existing timeouts for the indivdiual steps this is waiting for, and we would introduce a secondary timeout on top of the existing ones. but it's not so clear to see through the guaranteed handling of all failure cases of those individual steps. WAIT_LCHAN_ESTABLISHED waits for both RSL/RR and RTP/MGW to be complete. If RSL/RR is done first, this state waits for RTP/MGW to also complete, before we go on to mark the new lchan as the primary lchan for the subscriber connection. (it helps a bit to look at the handover.png chart, `make -C osmo-bsc/doc/ msc`) - RSL/RR should be guarded by T3103 above, it is completed on RR HO Complete. - RTP/MGW is guarded by the lchan_rtp_fsm. If that fails/times out, it dispatches LCHAN_EV_RTP_ERROR to the lchan_fsm, then - lchan_fail()/_lchan_on_activation_error() dispatches HO_EV_LCHAN_ERROR to the handover_fsm. - And, if I see correctly, there is a bug: handover_fsm does not permit HO_EV_LCHAN_ERROR in this state HO_ST_WAIT_LCHAN_ESTABLISHED. I'm afraid we need to check whether we have a ttcn3 test for an RTP/MGW aka MGCP timeout during handover, or need to create one if it is missing. Then if I'm correct we should see during that test a log error like "HO_EV_LCHAN_ERROR not permitted" in state HO_ST_WAIT_LCHAN_ESTABLISHED. So if I'm correct, we add HO_EV_LCHAN_ERROR to the in_event_mask, make that event trigger a ho_fail(), and then don't need X30. Could you check on that? Feel free to nudge if you'd like some support with this. Patchset: PS1: On a closer look I notice that two of the timers should probably not be there at all, which i apparently didn't figure out properly when i wrote the ho fsm... File src/osmo-bsc/net_init.c: https://gerrit.osmocom.org/c/osmo-bsc/+/30307/comment/f6df55f5_a64e175e PS1, Line 77: { .T = -30, .default_val = 5, .desc = "Timeout for establishing new lchan at the end of handover" }, (if X30 needs to stay, i'd put a desc = "Timeout for establishing MGW endpoint for handover target lchan") -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id0d4d0788f609f3272fc81c80a754383dde25c16 Gerrit-Change-Number: 30307 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Sat, 26 Nov 2022 03:39:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: UPF_Tests.cfg: fix wrong mp_verify_gtp name

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30322 ) Change subject: UPF_Tests.cfg: fix wrong mp_verify_gtp name ...................................................................... UPF_Tests.cfg: fix wrong mp_verify_gtp name The proper name is mp_verify_gtp_actions. jenkins is not affected because it uses another .cfg from docker-playground.git. Change-Id: Ia13407db795021a2c3e2923c08b63ad6cdd6b0f9 --- M upf/UPF_Tests.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/30322/1 diff --git a/upf/UPF_Tests.cfg b/upf/UPF_Tests.cfg index fc410b6..06ef1d0 100644 --- a/upf/UPF_Tests.cfg +++ b/upf/UPF_Tests.cfg @@ -11,7 +11,7 @@ [TESTPORT_PARAMETERS] [MODULE_PARAMETERS] -UPF_Tests.mp_verify_gtp := false; +UPF_Tests.mp_verify_gtp_actions := false; [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30322 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: Ia13407db795021a2c3e2923c08b63ad6cdd6b0f9 Gerrit-Change-Number: 30322 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: upf: in PFCP Sess Est, use local F-TEID = CHOOSE

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30323 ) Change subject: upf: in PFCP Sess Est, use local F-TEID = CHOOSE ...................................................................... upf: in PFCP Sess Est, use local F-TEID = CHOOSE So far the test asked osmo-upf to use an actual IP address and TEID, but normally it is sent with CHOOSE = 1 so that osmo-upf picks a new local TEID and returns it with the proper local IP address in the response. This is making the test more realistic, and also prepares for testing Network Instance handling, where osmo-upf will need to return the proper IP addresses for specific Network Instance names. Change-Id: Iaba372cbb2e0cf0c5bee80b09d346f9bcb78bfbe --- M upf/UPF_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/30323/1 diff --git a/upf/UPF_Tests.ttcn b/upf/UPF_Tests.ttcn index fb4ef08..3dd469b 100644 --- a/upf/UPF_Tests.ttcn +++ b/upf/UPF_Tests.ttcn @@ -633,7 +633,7 @@ private function f_ruleset_tunend(GTP_Action gtp) return PFCP_Ruleset { var PFCP_Ruleset rules := { {}, {} }; - f_ruleset_add_GTP_decaps(rules, ts_PFCP_F_TEID_ipv4(gtp.teid_access_l, gtp.gtp_access_ip)); + f_ruleset_add_GTP_decaps(rules, ts_PFCP_F_TEID_choose_v4()); f_ruleset_add_GTP_encaps(rules, gtp.core_ip, gtp.teid_access_r, gtp.gtp_access_ip); return rules; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30323 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: Iaba372cbb2e0cf0c5bee80b09d346f9bcb78bfbe Gerrit-Change-Number: 30323 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in libosmo-pfcp[master]: osmo_pfcp_ip_addrs_set(): do not set port number

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/30321 ) Change subject: osmo_pfcp_ip_addrs_set(): do not set port number ...................................................................... osmo_pfcp_ip_addrs_set(): do not set port number struct osmo_pfcp_ip_addrs uses an osmo_sockaddr for storing IP addresses. Even though osmo_sockaddr contains a port number, no port number gets encoded in PFCP messages. Hence always set the port to 0. I noticed that when osmo_pfcp_ip_addrs_set() is invoked with an osmo_sockaddr that incidentally has a port number set, subsequent logging of e.g. a PFCP F-TEID shows a port number, which is confusing. Change-Id: Ib29a123c06d459c99d7c1c0b9a7694fb78cd9fd8 --- M src/libosmo-pfcp/pfcp_msg.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/21/30321/1 diff --git a/src/libosmo-pfcp/pfcp_msg.c b/src/libosmo-pfcp/pfcp_msg.c index ff8860a..18b9113 100644 --- a/src/libosmo-pfcp/pfcp_msg.c +++ b/src/libosmo-pfcp/pfcp_msg.c @@ -494,16 +494,20 @@ return *next_seid_state; } +/* Set either dst->v4 or dst->v6 to addr, depending on addr->family. Set the IP address to addr and port to 0, not + * copying the port information from addr. Return zero on success, negative on error (i.e. no known family in addr). */ int osmo_pfcp_ip_addrs_set(struct osmo_pfcp_ip_addrs *dst, const struct osmo_sockaddr *addr) { switch (addr->u.sas.ss_family) { case AF_INET: dst->v4_present = true; dst->v4 = *addr; + osmo_sockaddr_set_port(&dst->v4.u.sa, 0); return 0; case AF_INET6: dst->v6_present = true; dst->v6 = *addr; + osmo_sockaddr_set_port(&dst->v6.u.sa, 0); return 0; default: return -ENOTSUP; -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/30321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Ib29a123c06d459c99d7c1c0b9a7694fb78cd9fd8 Gerrit-Change-Number: 30321 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in libosmo-pfcp[master]: add osmo_pfcp_ip_addrs_to_str_*()

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/30320 ) Change subject: add osmo_pfcp_ip_addrs_to_str_*() ...................................................................... add osmo_pfcp_ip_addrs_to_str_*() Move static function ip_addrs_to_str_buf() to public API as osmo_pfcp_ip_addrs_to_str_buf() and osmo_pfcp_ip_addrs_to_str_c(). So far the static function was only used in places where it follows other strings, so that it made sense to always start with a comma. Move this comma out of the function to the callers. Sensibly handle a NULL pointer and an empty address set. Rationale: osmo-upf would like to print an osmo_pfcp_ip_addrs struct in logging. Change-Id: I5f67db8d347690cbb1ce273a2d072636859f1bf6 --- M include/osmocom/pfcp/pfcp_ies_custom.h M src/libosmo-pfcp/pfcp_ies_custom.c 2 files changed, 33 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/20/30320/1 diff --git a/include/osmocom/pfcp/pfcp_ies_custom.h b/include/osmocom/pfcp/pfcp_ies_custom.h index f273a87..565fee2 100644 --- a/include/osmocom/pfcp/pfcp_ies_custom.h +++ b/include/osmocom/pfcp/pfcp_ies_custom.h @@ -37,6 +37,8 @@ }; int osmo_pfcp_ip_addrs_set(struct osmo_pfcp_ip_addrs *dst, const struct osmo_sockaddr *addr); +int osmo_pfcp_ip_addrs_to_str_buf(char *buf, size_t buflen, const struct osmo_pfcp_ip_addrs *addrs); +char *osmo_pfcp_ip_addrs_to_str_c(void *ctx, const struct osmo_pfcp_ip_addrs *addrs); /* 3GPP TS 29.244 8.2.38, IETF RFC 1035 3.1 */ struct osmo_pfcp_ie_node_id { diff --git a/src/libosmo-pfcp/pfcp_ies_custom.c b/src/libosmo-pfcp/pfcp_ies_custom.c index 0175c6f..422b6a9 100644 --- a/src/libosmo-pfcp/pfcp_ies_custom.c +++ b/src/libosmo-pfcp/pfcp_ies_custom.c @@ -514,26 +514,41 @@ return 0; } -static int ip_addrs_to_str_buf(char *buf, size_t buflen, const struct osmo_pfcp_ip_addrs *addrs) +int osmo_pfcp_ip_addrs_to_str_buf(char *buf, size_t buflen, const struct osmo_pfcp_ip_addrs *addrs) { struct osmo_strbuf sb = { .buf = buf, .len = buflen }; + if (!addrs) { + OSMO_STRBUF_PRINTF(sb, "NULL-addr"); + return sb.chars_needed; + } + if (!(addrs->v4_present || addrs->v6_present)) { + OSMO_STRBUF_PRINTF(sb, "empty:-addr"); + return sb.chars_needed; + } if (addrs->v4_present) { - OSMO_STRBUF_PRINTF(sb, ",v4:"); + OSMO_STRBUF_PRINTF(sb, "v4:"); OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &addrs->v4); } + if (addrs->v4_present && addrs->v6_present) + OSMO_STRBUF_PRINTF(sb, ","); if (addrs->v6_present) { - OSMO_STRBUF_PRINTF(sb, ",v6:"); + OSMO_STRBUF_PRINTF(sb, "v6:"); OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &addrs->v6); } return sb.chars_needed; } +char *osmo_pfcp_ip_addrs_to_str_c(void *ctx, const struct osmo_pfcp_ip_addrs *addrs) +{ + OSMO_NAME_C_IMPL(ctx, 32, "ERROR", osmo_pfcp_ip_addrs_to_str_buf, addrs) +} + int osmo_pfcp_enc_to_str_f_seid(char *buf, size_t buflen, const void *encode_from) { const struct osmo_pfcp_ie_f_seid *f_seid = encode_from; struct osmo_strbuf sb = { .buf = buf, .len = buflen }; - OSMO_STRBUF_PRINTF(sb, "0x%"PRIx64, f_seid->seid); - OSMO_STRBUF_APPEND(sb, ip_addrs_to_str_buf, &f_seid->ip_addr); + OSMO_STRBUF_PRINTF(sb, "0x%"PRIx64",", f_seid->seid); + OSMO_STRBUF_APPEND(sb, osmo_pfcp_ip_addrs_to_str_buf, &f_seid->ip_addr); return sb.chars_needed; } @@ -640,8 +655,8 @@ if (ft->choose.choose_id_present) OSMO_STRBUF_PRINTF(sb, "-id%u", ft->choose.choose_id); } else { - OSMO_STRBUF_PRINTF(sb, "TEID-0x%x", ft->fixed.teid); - OSMO_STRBUF_APPEND(sb, ip_addrs_to_str_buf, &ft->fixed.ip_addr); + OSMO_STRBUF_PRINTF(sb, "TEID-0x%x,", ft->fixed.teid); + OSMO_STRBUF_APPEND(sb, osmo_pfcp_ip_addrs_to_str_buf, &ft->fixed.ip_addr); } return sb.chars_needed; } @@ -849,7 +864,10 @@ OSMO_STRBUF_APPEND(sb, osmo_pfcp_bits_to_str_buf, ohc->desc_bits, osmo_pfcp_outer_header_creation_strs); if (ohc->teid_present) OSMO_STRBUF_PRINTF(sb, ",TEID:0x%x", ohc->teid); - OSMO_STRBUF_APPEND(sb, ip_addrs_to_str_buf, &ohc->ip_addr); + + OSMO_STRBUF_PRINTF(sb, ","); + OSMO_STRBUF_APPEND(sb, osmo_pfcp_ip_addrs_to_str_buf, &ohc->ip_addr); + if (ohc->port_number_present) OSMO_STRBUF_PRINTF(sb, ",port:%u", ohc->port_number); if (ohc->c_tag_present) @@ -1015,7 +1033,11 @@ OSMO_STRBUF_PRINTF(sb, "%schv4", sb.pos ? "," : ""); if (uia->ip_is_destination) OSMO_STRBUF_PRINTF(sb, "%sdst", sb.pos ? "," : ""); - OSMO_STRBUF_APPEND(sb, ip_addrs_to_str_buf, &uia->ip_addr); + + if (sb.pos) + OSMO_STRBUF_PRINTF(sb, ","); + OSMO_STRBUF_APPEND(sb, osmo_pfcp_ip_addrs_to_str_buf, &uia->ip_addr); + if (uia->ipv6_prefix_delegation_bits_present) OSMO_STRBUF_PRINTF(sb, ",ipv6-prefix-deleg:%x", uia->ipv6_prefix_delegation_bits); if (uia->ipv6_prefix_length_present) -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/30320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I5f67db8d347690cbb1ce273a2d072636859f1bf6 Gerrit-Change-Number: 30320 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: trxcon_fsm: separate handling of TRXCON_EV_DCCH_EST_REQ

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30317 ) Change subject: trxcon: trxcon_fsm: separate handling of TRXCON_EV_DCCH_EST_REQ ...................................................................... trxcon: trxcon_fsm: separate handling of TRXCON_EV_DCCH_EST_REQ This new function will be re-used in a follow up patch implementing handling of TRXCON_EV_DCCH_EST_REQ in TRXCON_ST_{DEDICATED,PACKET_DATA}. Change-Id: I8db93fcdace7aaa8bc3876b14e441304349a36d5 Related: OS#5599 --- M src/host/trxcon/src/trxcon_fsm.c 1 file changed, 70 insertions(+), 66 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/17/30317/1 diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index ba7f429..84bbcaf 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -289,12 +289,78 @@ LOGPFSML(fi, LOGL_ERROR, "Failed to enqueue a prim\n"); } +static void handle_dcch_est_req(struct osmo_fsm_inst *fi, + const struct trxcon_param_dcch_est_req *req) +{ + struct trxcon_inst *trxcon = fi->priv; + enum gsm_phys_chan_config config; + struct l1sched_ts *ts; + int rc; + + config = l1sched_chan_nr2pchan_config(req->chan_nr); + if (config == GSM_PCHAN_NONE) { + LOGPFSML(fi, LOGL_ERROR, "Failed to determine channel config\n"); + return; + } + + if (req->hopping) { + const struct trxcon_phyif_cmd phycmd = { + .type = TRXCON_PHYIF_CMDT_SETFREQ_H1, + .param.setfreq_h1 = { + .hsn = req->h1.hsn, + .maio = req->h1.maio, + .ma = &req->h1.ma[0], + .ma_len = req->h1.n, + }, + }; + + /* Apply the freq. hopping parameters */ + if (trxcon_phyif_handle_cmd(trxcon->phyif, &phycmd) != 0) + return; + + /* Set current ARFCN to an invalid value */ + trxcon->l1p.band_arfcn = 0xffff; + } else { + const struct trxcon_phyif_cmd phycmd = { + .type = TRXCON_PHYIF_CMDT_SETFREQ_H0, + .param.setfreq_h0 = { + .band_arfcn = req->h0.band_arfcn, + }, + }; + + /* Tune transceiver to required ARFCN */ + if (trxcon_phyif_handle_cmd(trxcon->phyif, &phycmd) != 0) + return; + + /* Update current ARFCN */ + trxcon->l1p.band_arfcn = req->h0.band_arfcn; + } + + rc = l1sched_configure_ts(trxcon->sched, req->chan_nr & 0x07, config); + if (rc) + return; + ts = trxcon->sched->ts[req->chan_nr & 0x07]; + OSMO_ASSERT(ts != NULL); + + l1sched_deactivate_all_lchans(ts); + + /* Activate only requested lchans */ + rc = l1sched_set_lchans(ts, req->chan_nr, 1, req->tch_mode, req->tsc); + if (rc) { + LOGPFSML(fi, LOGL_ERROR, "Failed to activate requested lchans\n"); + return; + } + + if (config == GSM_PCHAN_PDCH) + osmo_fsm_inst_state_chg(fi, TRXCON_ST_PACKET_DATA, 0, 0); + else + osmo_fsm_inst_state_chg(fi, TRXCON_ST_DEDICATED, 0, 0); +} + static void trxcon_st_bcch_ccch_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct trxcon_inst *trxcon = fi->priv; - struct l1sched_ts *ts; - int rc; switch (event) { case TRXCON_EV_TX_ACCESS_BURST_REQ: @@ -307,9 +373,9 @@ { struct trxcon_param_set_ccch_tch_mode_req *req = data; enum gsm_phys_chan_config chan_config = req->mode; + struct l1sched_ts *ts = trxcon->sched->ts[0]; /* Make sure that TS0 is allocated and configured */ - ts = trxcon->sched->ts[0]; if (ts == NULL || ts->mf_layout == NULL) { LOGPFSML(fi, LOGL_ERROR, "TS0 is not configured\n"); return; @@ -322,70 +388,8 @@ break; } case TRXCON_EV_DCCH_EST_REQ: - { - const struct trxcon_param_dcch_est_req *req = data; - enum gsm_phys_chan_config config; - - config = l1sched_chan_nr2pchan_config(req->chan_nr); - if (config == GSM_PCHAN_NONE) { - LOGPFSML(fi, LOGL_ERROR, "Failed to determine channel config\n"); - return; - } - - if (req->hopping) { - const struct trxcon_phyif_cmd phycmd = { - .type = TRXCON_PHYIF_CMDT_SETFREQ_H1, - .param.setfreq_h1 = { - .hsn = req->h1.hsn, - .maio = req->h1.maio, - .ma = &req->h1.ma[0], - .ma_len = req->h1.n, - }, - }; - - /* Apply the freq. hopping parameters */ - if (trxcon_phyif_handle_cmd(trxcon->phyif, &phycmd) != 0) - return; - - /* Set current ARFCN to an invalid value */ - trxcon->l1p.band_arfcn = 0xffff; - } else { - const struct trxcon_phyif_cmd phycmd = { - .type = TRXCON_PHYIF_CMDT_SETFREQ_H0, - .param.setfreq_h0 = { - .band_arfcn = req->h0.band_arfcn, - }, - }; - - /* Tune transceiver to required ARFCN */ - if (trxcon_phyif_handle_cmd(trxcon->phyif, &phycmd) != 0) - return; - - /* Update current ARFCN */ - trxcon->l1p.band_arfcn = req->h0.band_arfcn; - } - - rc = l1sched_configure_ts(trxcon->sched, req->chan_nr & 0x07, config); - if (rc) - return; - ts = trxcon->sched->ts[req->chan_nr & 0x07]; - OSMO_ASSERT(ts != NULL); - - l1sched_deactivate_all_lchans(ts); - - /* Activate only requested lchans */ - rc = l1sched_set_lchans(ts, req->chan_nr, 1, req->tch_mode, req->tsc); - if (rc) { - LOGPFSML(fi, LOGL_ERROR, "Failed to activate requested lchans\n"); - return; - } - - if (config == GSM_PCHAN_PDCH) - osmo_fsm_inst_state_chg(fi, TRXCON_ST_PACKET_DATA, 0, 0); - else - osmo_fsm_inst_state_chg(fi, TRXCON_ST_DEDICATED, 0, 0); + handle_dcch_est_req(fi, (const struct trxcon_param_dcch_est_req *)data); break; - } case TRXCON_EV_RX_DATA_IND: l1ctl_tx_dt_ind(trxcon, (const struct trxcon_param_rx_data_ind *)data); break; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8db93fcdace7aaa8bc3876b14e441304349a36d5 Gerrit-Change-Number: 30317 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: trxcon_fsm: permit direct {TCH,DCCH}/PDCH transitions

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30319 ) Change subject: trxcon: trxcon_fsm: permit direct {TCH,DCCH}/PDCH transitions ...................................................................... trxcon: trxcon_fsm: permit direct {TCH,DCCH}/PDCH transitions It may happen that the MS needs to go directly from a PDCH to a TCH or SDCCH, e.g. in case of a Mobile Terminated call. I don't know if the opposite transition is needed on practice, but let's simply allow direct transitions for both TRXCON_ST_{DEDICATED,PACKET_DATA}. Change-Id: I1a854e4683f102c40f1c174a291b6dc638f49b5c Related: OS#5599 --- M src/host/trxcon/src/trxcon_fsm.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/19/30319/1 diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index bf952de..c7c229b 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -608,7 +608,8 @@ .name = "DEDICATED", .out_state_mask = S(TRXCON_ST_RESET) | S(TRXCON_ST_FBSB_SEARCH) - | S(TRXCON_ST_DEDICATED), + | S(TRXCON_ST_DEDICATED) + | S(TRXCON_ST_PACKET_DATA), .in_event_mask = S(TRXCON_EV_DCCH_REL_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_CNF) @@ -623,6 +624,7 @@ .name = "PACKET_DATA", .out_state_mask = S(TRXCON_ST_RESET) | S(TRXCON_ST_FBSB_SEARCH) + | S(TRXCON_ST_DEDICATED) | S(TRXCON_ST_PACKET_DATA), .in_event_mask = S(TRXCON_EV_DCCH_REL_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_REQ) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1a854e4683f102c40f1c174a291b6dc638f49b5c Gerrit-Change-Number: 30319 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: trxcon_fsm: permit loop DCH transitions

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30318 ) Change subject: trxcon: trxcon_fsm: permit loop DCH transitions ...................................................................... trxcon: trxcon_fsm: permit loop DCH transitions According to 3GPP TS 44.004, Figure 5.1, it's absolutely legal to perform loop transitions in state 'DCH' (i.e. from 'DCH' to 'DCH'). This kind of transition is needed in the following cases: * on reciept of RR FREQUENCY REDEFINITION, * on reciept of RR ASSIGNMENT REQUEST, * on reciept of RR HANDOVER REQUEST, when going back from state 'DCH' to state 'BCH' is not required nor actually desired. In context of the trxcon_fsm, this applies to both TRXCON_ST_DEDICATED and TRXCON_ST_PACKET_DATA. Change-Id: I3b402ec84610a5df744d9b06e5f7dab7a9a3ddad Related: OS#5599 --- M src/host/trxcon/src/trxcon_fsm.c 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/18/30318/1 diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 84bbcaf..bf952de 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -336,6 +336,9 @@ trxcon->l1p.band_arfcn = req->h0.band_arfcn; } + /* Remove all active timeslots */ + l1sched_reset(trxcon->sched, false); + rc = l1sched_configure_ts(trxcon->sched, req->chan_nr & 0x07, config); if (rc) return; @@ -410,6 +413,9 @@ case TRXCON_EV_TX_ACCESS_BURST_CNF: l1ctl_tx_rach_conf(trxcon, (const struct trxcon_param_tx_access_burst_cnf *)data); break; + case TRXCON_EV_DCCH_EST_REQ: + handle_dcch_est_req(fi, (const struct trxcon_param_dcch_est_req *)data); + break; case TRXCON_EV_DCCH_REL_REQ: l1sched_reset(trxcon->sched, false); osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); @@ -601,7 +607,8 @@ [TRXCON_ST_DEDICATED] = { .name = "DEDICATED", .out_state_mask = S(TRXCON_ST_RESET) - | S(TRXCON_ST_FBSB_SEARCH), + | S(TRXCON_ST_FBSB_SEARCH) + | S(TRXCON_ST_DEDICATED), .in_event_mask = S(TRXCON_EV_DCCH_REL_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_CNF) @@ -615,7 +622,8 @@ [TRXCON_ST_PACKET_DATA] = { .name = "PACKET_DATA", .out_state_mask = S(TRXCON_ST_RESET) - | S(TRXCON_ST_FBSB_SEARCH), + | S(TRXCON_ST_FBSB_SEARCH) + | S(TRXCON_ST_PACKET_DATA), .in_event_mask = S(TRXCON_EV_DCCH_REL_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_CNF) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3b402ec84610a5df744d9b06e5f7dab7a9a3ddad Gerrit-Change-Number: 30318 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: trxcon_fsm: disallow invalid state transitions

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30315 ) Change subject: trxcon: trxcon_fsm: disallow invalid state transitions ...................................................................... trxcon: trxcon_fsm: disallow invalid state transitions According to 3GPP TS 44.004, Figure 5.1, transitioning from state 'DCH' directly to state 'BCH' is not permitted. Speaking in terms of the trxcon_fsm, the following state transitions are invalid: * TRXCON_ST_DEDICATED -> TRXCON_ST_BCCH_CCCH, * TRXCON_ST_PACKET_DATA -> TRXCON_ST_BCCH_CCCH. We never do such transitions anyway, so we are good. Change-Id: I14ebfc5c86d37765ad06fa91321a469dea46e50f Related: OS#5599 --- M src/host/trxcon/src/trxcon_fsm.c 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/15/30315/1 diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 164d6fb..2c59e8d 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -597,8 +597,7 @@ [TRXCON_ST_DEDICATED] = { .name = "DEDICATED", .out_state_mask = S(TRXCON_ST_RESET) - | S(TRXCON_ST_FBSB_SEARCH) - | S(TRXCON_ST_BCCH_CCCH), + | S(TRXCON_ST_FBSB_SEARCH), .in_event_mask = S(TRXCON_EV_DEDICATED_RELEASE_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_CNF) @@ -612,8 +611,7 @@ [TRXCON_ST_PACKET_DATA] = { .name = "PACKET_DATA", .out_state_mask = S(TRXCON_ST_RESET) - | S(TRXCON_ST_FBSB_SEARCH) - | S(TRXCON_ST_BCCH_CCCH), + | S(TRXCON_ST_FBSB_SEARCH), .in_event_mask = S(TRXCON_EV_DEDICATED_RELEASE_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_CNF) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I14ebfc5c86d37765ad06fa91321a469dea46e50f Gerrit-Change-Number: 30315 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022