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

Change in osmo-msc[master]: sdp_msg: add sdp_audio_codecs_cmp(), add compare flags

by dexter

Attention is currently required from: neels, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28783 ) Change subject: sdp_msg: add sdp_audio_codecs_cmp(), add compare flags ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I18d33e189674229501afec950aa1c732386455a2 Gerrit-Change-Number: 28783 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 15:07:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: sdp_msg: s/sdp_audio_codec_/sdp_audio_codecs_

by dexter

Attention is currently required from: neels, fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28784 ) Change subject: sdp_msg: s/sdp_audio_codec_/sdp_audio_codecs_ ...................................................................... Patch Set 3: Code-Review+1 (1 comment) Patchset: PS3: I cannot tell which version of API is better. This is probably equivalent. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id87eb350c1f17f8dbf776909824bfa06634c1d04 Gerrit-Change-Number: 28784 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 14:55:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: tests/ranap_rab_ass: fix potential NULL pointer dereferences

by dexter

Attention is currently required from: fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28837 ) Change subject: tests/ranap_rab_ass: fix potential NULL pointer dereferences ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File tests/ranap_rab_ass/ranap_rab_ass_test.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28837/comment/f6404d21_1c9baf0e PS2, Line 67: if (encoded != NULL) { maybe use OSMO_ASSERT here as well. There should be an encoded result, otherwise the test is failed. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I16fea7b2a8cb1d693e01c91d7633550e2e599ceb Gerrit-Change-Number: 28837 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 14:44:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-tetra[master]: Added basic link FCS validation in LLC

by wbokslag

wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28851 ) Change subject: Added basic link FCS validation in LLC ...................................................................... Added basic link FCS validation in LLC tetra_llc_pdu.c now parses the FCS (Frame Check Sequence) for basic link pdus that use it. Some changes were made to the tetra_resrc_decoded struct definition. The have_fcs field designates the FCS was present, while the FCS field holds the extracted FCS, and FCS_invalid designates an FCS was present but differs from the computed value. Change-Id: I81941110801d00ca06bdafdcc0a7afaf7b7617d3 --- M src/tetra_llc_pdu.c M src/tetra_llc_pdu.h 2 files changed, 69 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/51/28851/1 diff --git a/src/tetra_llc_pdu.c b/src/tetra_llc_pdu.c index 9f7880c..65d37d9 100644 --- a/src/tetra_llc_pdu.c +++ b/src/tetra_llc_pdu.c @@ -82,42 +82,97 @@ return get_value_string(pdut_dec_names, pdut); } +static uint32_t tetra_llc_compute_fcs(const uint8_t *buf, int len) { + uint32_t crc = 0xFFFFFFFF; + if (len < 32) { + crc <<= (32 - len); + } + + for(size_t i = 0; i < len; i++) { + uint8_t bit = (buf[i] ^ (crc >> 31)) & 1; + crc <<= 1; + if (bit) { + crc = crc ^ 0x04C11DB7; + } + } + return ~crc; +} + +static int tetra_llc_check_fcs(struct tetra_llc_pdu *lpp, uint8_t *buf, int len) { + uint32_t computed_fcs = tetra_llc_compute_fcs(buf, len); + return lpp->fcs == computed_fcs; +} + int tetra_llc_pdu_parse(struct tetra_llc_pdu *lpp, uint8_t *buf, int len) { uint8_t *cur = buf; uint8_t pdu_type; + lpp->have_fcs = 0; + lpp->fcs = 0; pdu_type = bits_to_uint(cur, 4); cur += 4; switch (pdu_type) { - case TLLC_PDUT_BL_ADATA_FCS: - /* FIXME */ - len -= 32; + case TLLC_PDUT_BL_ADATA: + case TLLC_PDUT_BL_ADATA_FCS: lpp->nr = *cur++; lpp->ns = *cur++; lpp->tl_sdu = cur; lpp->tl_sdu_len = len - (cur - buf); lpp->pdu_type = TLLC_PDUT_DEC_BL_ADATA; + + if (pdu_type == TLLC_PDUT_BL_ADATA_FCS) { + if (lpp->tl_sdu_len < 32) { + printf("\nWARNING frame too small for FCS (%d)\n", lpp->tl_sdu_len); + return cur-buf; + } + lpp->tl_sdu_len -= 32; + lpp->have_fcs = 1; + lpp->fcs = bits_to_uint(buf + len - 32, 32); + lpp->fcs_invalid = !tetra_llc_check_fcs(lpp, cur, lpp->tl_sdu_len); + } break; - case TLLC_PDUT_BL_DATA_FCS: - /* FIXME */ - len -= 32; + + case TLLC_PDUT_BL_DATA: + case TLLC_PDUT_BL_DATA_FCS: lpp->ns = *cur++; lpp->tl_sdu = cur; lpp->tl_sdu_len = len - (cur - buf); lpp->pdu_type = TLLC_PDUT_DEC_BL_DATA; + + if (pdu_type == TLLC_PDUT_BL_DATA_FCS) { + if (lpp->tl_sdu_len < 32) { + printf("\nWARNING frame too small for FCS (%d)\n", lpp->tl_sdu_len); + return cur-buf; + } + lpp->tl_sdu_len -= 32; + lpp->have_fcs = 1; + lpp->fcs = bits_to_uint(buf + len - 32, 32); + lpp->fcs_invalid = !tetra_llc_check_fcs(lpp, cur, lpp->tl_sdu_len); + } break; - case TLLC_PDUT_BL_UDATA_FCS: - /* FIXME */ - len -= 32; + case TLLC_PDUT_BL_UDATA: + case TLLC_PDUT_BL_UDATA_FCS: lpp->tl_sdu = cur; lpp->tl_sdu_len = len - (cur - buf); lpp->pdu_type = TLLC_PDUT_DEC_BL_UDATA; + + if (pdu_type == TLLC_PDUT_BL_UDATA_FCS) { + if (lpp->tl_sdu_len < 32) { + printf("\nWARNING frame too small for FCS (%d)\n", lpp->tl_sdu_len); + return cur-buf; + } + lpp->tl_sdu_len -= 32; + lpp->have_fcs = 1; + lpp->fcs = bits_to_uint(buf + len - 32, 32); + lpp->fcs_invalid = !tetra_llc_check_fcs(lpp, cur, lpp->tl_sdu_len); + } break; + case TLLC_PDUT_AL_DATA_FINAL: if (*cur++) { /* FINAL */ diff --git a/src/tetra_llc_pdu.h b/src/tetra_llc_pdu.h index e2ce6fd..9dc3592 100644 --- a/src/tetra_llc_pdu.h +++ b/src/tetra_llc_pdu.h @@ -72,8 +72,11 @@ uint8_t nr; /* N(R) PDU number (receive) */ uint8_t ns; /* N(S) PDU number (sent) */ uint8_t ss; /* S(S) Segment (sent) */ - uint32_t _fcs; - uint32_t *fcs; + + uint8_t have_fcs; /* 1 if LLC PDU defines FCS is present */ + uint32_t fcs; /* FCS value extracted from pdu */ + uint8_t fcs_invalid; /* 1 if extracted FCS does not match computed FCS */ + uint8_t *tl_sdu; /* pointer to bitbuf */ uint8_t tl_sdu_len; /* in bits */ }; -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I81941110801d00ca06bdafdcc0a7afaf7b7617d3 Gerrit-Change-Number: 28851 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-tetra[master]: Improved parsing in macpdu_decode_resource

by wbokslag

wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28850 ) Change subject: Improved parsing in macpdu_decode_resource ...................................................................... Improved parsing in macpdu_decode_resource fill_bits and grant_position bits are now parsed and stored in the tetra_resrc_decoded struct A flag is_encrypted is set to to true if resource was not encrypted or if the calling function states that the frame has been decrypted successfully before passing it to tetra_resrc_decoded. Lastly, the channel_alloc element is only parsed if the frame is unencrypted. Change-Id: I6c85c93b70a34e01fd1a96a863f0e113be6424d3 --- M src/tetra_mac_pdu.c M src/tetra_mac_pdu.h M src/tetra_upper_mac.c 3 files changed, 18 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/50/28850/1 diff --git a/src/tetra_mac_pdu.c b/src/tetra_mac_pdu.c index b395b7c..931b452 100644 --- a/src/tetra_mac_pdu.c +++ b/src/tetra_mac_pdu.c @@ -91,7 +91,7 @@ }; /* 21.5.2 */ -static int decode_chan_alloc(struct tetra_chan_alloc_decoded *cad, const uint8_t *bits) +static int macpdu_decode_chan_alloc(struct tetra_chan_alloc_decoded *cad, const uint8_t *bits) { const uint8_t *cur = bits; @@ -182,12 +182,15 @@ return -EINVAL; } -/* Section 21.4.3.1 MAC-RESOURCE */ -int macpdu_decode_resource(struct tetra_resrc_decoded *rsd, const uint8_t *bits) -{ - const uint8_t *cur = bits + 4; +/* Section 21.4.3.1 MAC-RESOURCE */ +int macpdu_decode_resource(struct tetra_resrc_decoded *rsd, const uint8_t *bits, uint8_t is_decrypted) +{ + const uint8_t *cur = bits + 2; + rsd->fill_bits = bits_to_uint(cur, 1); cur += 1; + rsd->grant_position = bits_to_uint(cur, 1); cur += 1; rsd->encryption_mode = bits_to_uint(cur, 2); cur += 2; + rsd->is_encrypted = rsd->encryption_mode > 0 && !is_decrypted; rsd->rand_acc_flag = *cur++; rsd->macpdu_length = decode_length(bits_to_uint(cur, 6)); cur += 6; rsd->addr.type = bits_to_uint(cur, 3); cur += 3; @@ -239,11 +242,11 @@ #endif } rsd->chan_alloc_pres = *cur++; - /* FIXME: If encryption is enabled, Channel Allocation is encrypted !!! */ - if (rsd->chan_alloc_pres) - cur += decode_chan_alloc(&rsd->cad, cur); - /* FIXME: TM-SDU */ - + + if (rsd->chan_alloc_pres && !rsd->is_encrypted) + // We can only determine length if the frame is unencrypted + cur += macpdu_decode_chan_alloc(&rsd->cad, cur); + return cur - bits; } diff --git a/src/tetra_mac_pdu.h b/src/tetra_mac_pdu.h index 051e47a..d243062 100644 --- a/src/tetra_mac_pdu.h +++ b/src/tetra_mac_pdu.h @@ -213,7 +213,10 @@ }; struct tetra_resrc_decoded { + uint8_t fill_bits; + uint8_t grant_position; uint8_t encryption_mode; + uint8_t is_encrypted; // Set to 0 if not encrypted or decrypted successfully uint8_t rand_acc_flag; int macpdu_length; struct tetra_addr addr; @@ -229,7 +232,7 @@ uint8_t chan_alloc_pres; struct tetra_chan_alloc_decoded cad; }; -int macpdu_decode_resource(struct tetra_resrc_decoded *rsd, const uint8_t *bits); +int macpdu_decode_resource(struct tetra_resrc_decoded *rsd, const uint8_t *bits, uint8_t is_decrypted); const char *tetra_addr_dump(const struct tetra_addr *addr); diff --git a/src/tetra_upper_mac.c b/src/tetra_upper_mac.c index a4c7e59..0e090cf 100644 --- a/src/tetra_upper_mac.c +++ b/src/tetra_upper_mac.c @@ -157,7 +157,7 @@ int tmpdu_offset; memset(&rsd, 0, sizeof(rsd)); - tmpdu_offset = macpdu_decode_resource(&rsd, msg->l1h); + tmpdu_offset = macpdu_decode_resource(&rsd, msg->l1h, 0); msg->l2h = msg->l1h + tmpdu_offset; printf("RESOURCE Encr=%u, Length=%d Addr=%s ", -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I6c85c93b70a34e01fd1a96a863f0e113be6424d3 Gerrit-Change-Number: 28850 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: abstract out 'struct trxcon_inst' from L1CTL/TRXC/TRXD

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28835 ) Change subject: trxcon: abstract out 'struct trxcon_inst' from L1CTL/TRXC/TRXD ...................................................................... trxcon: abstract out 'struct trxcon_inst' from L1CTL/TRXC/TRXD This allows replacing L1CTL and/or TRXC/TRXD with something else. Change-Id: I7282da6dd16216bb4295c4d18f993251defbdf0a Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/trxcon.c M src/host/trxcon/src/trxcon_fsm.c 3 files changed, 35 insertions(+), 35 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 7b459ec..69ac01e 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -1,8 +1,6 @@ #pragma once struct l1sched_state; -struct trx_instance; -struct l1ctl_client; extern struct osmo_fsm trxcon_fsm_def; @@ -136,9 +134,10 @@ /* The L1 scheduler */ struct l1sched_state *sched; - /* L1/L2 interfaces */ - struct trx_instance *trx; - struct l1ctl_client *l1c; + /* PHY interface (e.g. TRXC/TRXD) */ + void *phyif; + /* L2 interface (e.g. L1CTL) */ + void *l2if; /* L1 parameters */ struct { diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index fe3d663..35687d7 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -112,7 +112,7 @@ switch (cr->type) { case L1SCHED_CFG_PCHAN_COMB: - return trx_if_cmd_setslot(trxcon->trx, + return trx_if_cmd_setslot(trxcon->phyif, cr->pchan_comb.tn, cr->pchan_comb.pchan); default: @@ -127,7 +127,7 @@ { struct trxcon_inst *trxcon = sched->priv; - return trx_if_tx_burst(trxcon->trx, br); + return trx_if_tx_burst(trxcon->phyif, br); } /* External L2 API for the scheduler */ @@ -211,12 +211,12 @@ switch (dt) { case L1SCHED_DT_TRAFFIC: case L1SCHED_DT_PACKET_DATA: - rc = l1ctl_tx_dt_conf(trxcon->l1c, &dl_hdr, true); + rc = l1ctl_tx_dt_conf(trxcon->l2if, &dl_hdr, true); data_len = lchan->prim->payload_len; data = lchan->prim->payload; break; case L1SCHED_DT_SIGNALING: - rc = l1ctl_tx_dt_conf(trxcon->l1c, &dl_hdr, false); + rc = l1ctl_tx_dt_conf(trxcon->l2if, &dl_hdr, false); data_len = lchan->prim->payload_len; data = lchan->prim->payload; break; @@ -226,7 +226,7 @@ rach = (struct l1sched_ts_prim_rach *)lchan->prim->payload; - rc = l1ctl_tx_rach_conf(trxcon->l1c, trxcon->l1p.band_arfcn, fn); + rc = l1ctl_tx_rach_conf(trxcon->l2if, trxcon->l1p.band_arfcn, fn); if (lchan->prim->type == L1SCHED_PRIM_RACH11) { ra_buf[0] = (uint8_t)(rach->ra >> 3); ra_buf[1] = (uint8_t)(rach->ra & 0x07); @@ -271,11 +271,11 @@ trxcon->log_prefix = talloc_asprintf(trxcon, "%s: ", osmo_fsm_inst_name(trxcon->fi)); /* Init transceiver interface */ - trxcon->trx = trx_if_open(trxcon, + trxcon->phyif = trx_if_open(trxcon, app_data.trx_bind_ip, app_data.trx_remote_ip, app_data.trx_base_port); - if (trxcon->trx == NULL) { + if (trxcon->phyif == NULL) { trxcon_inst_free(trxcon); return NULL; } @@ -301,10 +301,10 @@ if (trxcon->sched != NULL) l1sched_free(trxcon->sched); /* Close active connections */ - if (trxcon->l1c != NULL) - l1ctl_client_conn_close(trxcon->l1c); - if (trxcon->trx != NULL) - trx_if_close(trxcon->trx); + if (trxcon->l2if != NULL) + l1ctl_client_conn_close(trxcon->l2if); + if (trxcon->phyif != NULL) + trx_if_close(trxcon->phyif); if (trxcon->fi != NULL) osmo_fsm_inst_free(trxcon->fi); @@ -323,7 +323,7 @@ l1c->log_prefix = talloc_strdup(l1c, trxcon->log_prefix); l1c->priv = trxcon; - trxcon->l1c = l1c; + trxcon->l2if = l1c; } static void l1ctl_conn_close_cb(struct l1ctl_client *l1c) @@ -335,8 +335,8 @@ osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_L2IF_FAILURE, NULL); - /* l1c is free()ed by the caller */ - trxcon->l1c = NULL; + /* l2if is free()ed by the caller */ + trxcon->l2if = NULL; trxcon_inst_free(trxcon); } diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 0f06c29..5329a92 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -55,8 +55,8 @@ if (fi->state != TRXCON_ST_RESET) osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); l1sched_reset(trxcon->sched, true); - trx_if_cmd_poweroff(trxcon->trx); - trx_if_cmd_echo(trxcon->trx); + trx_if_cmd_poweroff(trxcon->phyif); + trx_if_cmd_echo(trxcon->phyif); break; case TRXCON_EV_RESET_SCHED_REQ: l1sched_reset(trxcon->sched, false); @@ -66,7 +66,7 @@ const struct trxcon_param_set_config_req *req = data; if (trxcon->l1p.ta != req->timing_advance) - trx_if_cmd_setta(trxcon->trx, req->timing_advance); + trx_if_cmd_setta(trxcon->phyif, req->timing_advance); trxcon->l1p.tx_power = req->tx_power; trxcon->l1p.ta = req->timing_advance; break; @@ -82,7 +82,7 @@ switch (fi->state) { case TRXCON_ST_FBSB_SEARCH: - l1ctl_tx_fbsb_fail(trxcon->l1c, trxcon->l1p.band_arfcn); + l1ctl_tx_fbsb_fail(trxcon->l2if, trxcon->l1p.band_arfcn); osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); return 0; default: @@ -99,6 +99,7 @@ case TRXCON_EV_FBSB_SEARCH_REQ: { const struct trxcon_param_fbsb_search_req *req = data; + const struct trx_instance *trx = trxcon->phyif; osmo_fsm_inst_state_chg_ms(fi, TRXCON_ST_FBSB_SEARCH, req->timeout_ms, 0); @@ -110,14 +111,14 @@ trxcon->l1p.band_arfcn = req->band_arfcn; /* Tune transceiver to required ARFCN */ - trx_if_cmd_rxtune(trxcon->trx, req->band_arfcn); - trx_if_cmd_txtune(trxcon->trx, req->band_arfcn); + trx_if_cmd_rxtune(trxcon->phyif, req->band_arfcn); + trx_if_cmd_txtune(trxcon->phyif, req->band_arfcn); } /* Transceiver might have been powered on before, e.g. * in case of sending L1CTL_FBSB_REQ due to signal loss. */ - if (!trxcon->trx->powered_up) - trx_if_cmd_poweron(trxcon->trx); + if (!trx->powered_up) + trx_if_cmd_poweron(trxcon->phyif); break; } case TRXCON_EV_FULL_POWER_SCAN_REQ: @@ -125,7 +126,7 @@ const struct trxcon_param_full_power_scan_req *req = data; osmo_fsm_inst_state_chg(fi, TRXCON_ST_FULL_POWER_SCAN, 0, 0); /* TODO: timeout */ - trx_if_cmd_measure(trxcon->trx, req->band_arfcn_start, req->band_arfcn_stop); + trx_if_cmd_measure(trxcon->phyif, req->band_arfcn_start, req->band_arfcn_stop); break; } default: @@ -143,7 +144,7 @@ { const struct trxcon_param_full_power_scan_res *res = data; - l1ctl_tx_pm_conf(trxcon->l1c, res->band_arfcn, res->dbm, res->last_result); + l1ctl_tx_pm_conf(trxcon->l2if, res->band_arfcn, res->dbm, res->last_result); break; } default: @@ -159,7 +160,7 @@ switch (event) { case TRXCON_EV_FBSB_SEARCH_RES: osmo_fsm_inst_state_chg(fi, TRXCON_ST_BCCH_CCCH, 0, 0); - l1ctl_tx_fbsb_conf(trxcon->l1c, + l1ctl_tx_fbsb_conf(trxcon->l2if, trxcon->l1p.band_arfcn, trxcon->sched->bsic); break; @@ -231,7 +232,7 @@ if (req->hopping) { /* Apply the freq. hopping parameters */ - rc = trx_if_cmd_setfh(trxcon->trx, + rc = trx_if_cmd_setfh(trxcon->phyif, req->h1.hsn, req->h1.maio, &req->h1.ma[0], req->h1.n); if (rc) @@ -241,9 +242,9 @@ trxcon->l1p.band_arfcn = 0xffff; } else { /* Tune transceiver to required ARFCN */ - if (trx_if_cmd_rxtune(trxcon->trx, req->h0.band_arfcn)) + if (trx_if_cmd_rxtune(trxcon->phyif, req->h0.band_arfcn)) return; - if (trx_if_cmd_txtune(trxcon->trx, req->h0.band_arfcn)) + if (trx_if_cmd_txtune(trxcon->phyif, req->h0.band_arfcn)) return; /* Update current ARFCN */ @@ -282,7 +283,7 @@ /* TODO: set proper .snr */ }; - l1ctl_tx_dt_ind(trxcon->l1c, &dl_hdr, ind->data, ind->data_len, false); + l1ctl_tx_dt_ind(trxcon->l2if, &dl_hdr, ind->data, ind->data_len, false); break; } default: @@ -377,7 +378,7 @@ /* TODO: set proper .snr */ }; - l1ctl_tx_dt_ind(trxcon->l1c, &dl_hdr, + l1ctl_tx_dt_ind(trxcon->l2if, &dl_hdr, ind->data, ind->data_len, event == TRXCON_EV_RX_TRAFFIC_IND); break; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7282da6dd16216bb4295c4d18f993251defbdf0a Gerrit-Change-Number: 28835 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: extended RACH != 11-bit RACH, correct logging messages

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28836 ) Change subject: trxcon: extended RACH != 11-bit RACH, correct logging messages ...................................................................... trxcon: extended RACH != 11-bit RACH, correct logging messages Change-Id: I7f977d5d2b68741a230c706f5b16cf307bc267d1 --- M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/sched_lchan_rach.c 2 files changed, 9 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 96dde73..5f95e1c 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -472,7 +472,7 @@ return rc; } -static int l1ctl_rx_rach_req(struct l1ctl_client *l1c, struct msgb *msg, bool ext) +static int l1ctl_rx_rach_req(struct l1ctl_client *l1c, struct msgb *msg, bool is_11bit) { struct trxcon_param_tx_access_burst_req req; struct trxcon_inst *trxcon = l1c->priv; @@ -480,8 +480,7 @@ ul = (struct l1ctl_info_ul *) msg->l1h; - /* Is it extended (11-bit) RACH or not? */ - if (ext) { + if (is_11bit) { const struct l1ctl_ext_rach_req *rr = (void *)ul->payload; req = (struct trxcon_param_tx_access_burst_req) { @@ -492,7 +491,7 @@ }; LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, - "Received extended (11-bit) RACH request " + "Received 11-bit RACH request " "(offset=%u, synch_seq=%u, ra11=0x%02hx)\n", req.offset, req.synch_seq, req.ra); } else { @@ -504,7 +503,7 @@ }; LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, - "Received regular (8-bit) RACH request " + "Received 8-bit RACH request " "(offset=%u, ra=0x%02x)\n", req.offset, req.ra); } diff --git a/src/host/trxcon/src/sched_lchan_rach.c b/src/host/trxcon/src/sched_lchan_rach.c index e7422b2..8fd7fcc 100644 --- a/src/host/trxcon/src/sched_lchan_rach.c +++ b/src/host/trxcon/src/sched_lchan_rach.c @@ -84,7 +84,6 @@ if (rach->offset-- > 0) return 0; - /* Is it extended (11-bit) RACH or not? */ if (L1SCHED_PRIM_IS_RACH11(lchan->prim)) { /* Check requested synch. sequence */ if (rach->synch_seq >= RACH_SYNCH_SEQ_NUM) { @@ -97,11 +96,11 @@ return -ENOTSUP; } - /* Encode extended (11-bit) payload */ + /* Encode 11-bit payload */ rc = gsm0503_rach_ext_encode(payload, rach->ra, bsic, true); if (rc) { LOGP_LCHAND(lchan, LOGL_ERROR, - "Could not encode extended RACH burst (ra=%u bsic=%u)\n", + "Could not encode 11-bit RACH burst (ra=%u bsic=%u)\n", rach->ra, bsic); /* Forget this primitive */ @@ -111,7 +110,7 @@ } else if (L1SCHED_PRIM_IS_RACH8(lchan->prim)) { rach->synch_seq = RACH_SYNCH_SEQ_TS0; - /* Encode regular (8-bit) payload */ + /* Encode 8-bit payload */ rc = gsm0503_rach_ext_encode(payload, rach->ra, bsic, false); if (rc) { LOGP_LCHAND(lchan, LOGL_ERROR, @@ -147,8 +146,8 @@ memset(burst_ptr, 0, br->burst + GSM_BURST_LEN - burst_ptr); br->burst_len = GSM_BURST_LEN; - LOGP_LCHAND(lchan, LOGL_NOTICE, "Scheduled %s RACH (%s) at fn=%u\n", - L1SCHED_PRIM_IS_RACH11(lchan->prim) ? "extended (11-bit)" : "regular (8-bit)", + LOGP_LCHAND(lchan, LOGL_NOTICE, "Scheduled %s-bit RACH (%s) at fn=%u\n", + L1SCHED_PRIM_IS_RACH11(lchan->prim) ? "11" : "8", get_value_string(rach_synch_seq_names, rach->synch_seq), br->fn); /* Confirm RACH request */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7f977d5d2b68741a230c706f5b16cf307bc267d1 Gerrit-Change-Number: 28836 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: move L1 params from struct trx_instance to trxcon_inst

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28834 ) Change subject: trxcon: move L1 params from struct trx_instance to trxcon_inst ...................................................................... trxcon: move L1 params from struct trx_instance to trxcon_inst Change-Id: Ifbd9bb17d63ab1d8712d0c8022a62117a48c6384 Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/sched_prim.c M src/host/trxcon/src/trxcon.c M src/host/trxcon/src/trxcon_fsm.c 5 files changed, 23 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h b/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h index 18d71cc..1faa610 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h @@ -39,9 +39,6 @@ /* GSM L1 specific */ uint16_t pm_band_arfcn_start; uint16_t pm_band_arfcn_stop; - uint16_t band_arfcn; - uint8_t tx_power; - int8_t ta; }; struct trx_ctrl_msg { diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index b982193..7b459ec 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -139,6 +139,13 @@ /* L1/L2 interfaces */ struct trx_instance *trx; struct l1ctl_client *l1c; + + /* L1 parameters */ + struct { + uint16_t band_arfcn; + uint8_t tx_power; + int8_t ta; + } l1p; }; struct trxcon_inst *trxcon_inst_alloc(void *ctx, unsigned int id); diff --git a/src/host/trxcon/src/sched_prim.c b/src/host/trxcon/src/sched_prim.c index 33d48de..9b6d28d 100644 --- a/src/host/trxcon/src/sched_prim.c +++ b/src/host/trxcon/src/sched_prim.c @@ -186,7 +186,7 @@ * decide whether to update the cached L1 SACCH header here. */ if (!cached) { -#warning "FIXME: no direct access to trx->{tx_power,ta}" +#warning "FIXME: no direct access to trxcon->l1p.{tx_power,ta}" #if 0 prim->payload[0] = lchan->ts->sched->trx->tx_power; prim->payload[1] = lchan->ts->sched->trx->ta; diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index d4f4214..fe3d663 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -180,7 +180,7 @@ if (data != NULL && data_len > 0) { trxcon_gsmtap_send(lchan_desc, meas->fn, lchan->ts->index, - trxcon->trx->band_arfcn, meas->rssi, 0, + trxcon->l1p.band_arfcn, meas->rssi, 0, data, data_len); } @@ -205,7 +205,7 @@ .chan_nr = lchan_desc->chan_nr | lchan->ts->index, .link_id = lchan_desc->link_id, .frame_nr = htonl(fn), - .band_arfcn = htons(trxcon->trx->band_arfcn), + .band_arfcn = htons(trxcon->l1p.band_arfcn), }; switch (dt) { @@ -226,7 +226,7 @@ rach = (struct l1sched_ts_prim_rach *)lchan->prim->payload; - rc = l1ctl_tx_rach_conf(trxcon->l1c, trxcon->trx->band_arfcn, fn); + rc = l1ctl_tx_rach_conf(trxcon->l1c, trxcon->l1p.band_arfcn, fn); if (lchan->prim->type == L1SCHED_PRIM_RACH11) { ra_buf[0] = (uint8_t)(rach->ra >> 3); ra_buf[1] = (uint8_t)(rach->ra & 0x07); @@ -247,7 +247,7 @@ } trxcon_gsmtap_send(lchan_desc, fn, lchan->ts->index, - trxcon->trx->band_arfcn | ARFCN_UPLINK, + trxcon->l1p.band_arfcn | ARFCN_UPLINK, 0, 0, data, data_len); return rc; diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 1d3b515..0f06c29 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -65,10 +65,10 @@ { const struct trxcon_param_set_config_req *req = data; - if (trxcon->trx->ta != req->timing_advance) + if (trxcon->l1p.ta != req->timing_advance) trx_if_cmd_setta(trxcon->trx, req->timing_advance); - trxcon->trx->tx_power = req->tx_power; - trxcon->trx->ta = req->timing_advance; + trxcon->l1p.tx_power = req->tx_power; + trxcon->l1p.ta = req->timing_advance; break; } default: @@ -82,7 +82,7 @@ switch (fi->state) { case TRXCON_ST_FBSB_SEARCH: - l1ctl_tx_fbsb_fail(trxcon->l1c, trxcon->trx->band_arfcn); + l1ctl_tx_fbsb_fail(trxcon->l1c, trxcon->l1p.band_arfcn); osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); return 0; default: @@ -105,9 +105,9 @@ l1sched_configure_ts(trxcon->sched, 0, req->pchan_config); /* Only if current ARFCN differs */ - if (trxcon->trx->band_arfcn != req->band_arfcn) { + if (trxcon->l1p.band_arfcn != req->band_arfcn) { /* Update current ARFCN */ - trxcon->trx->band_arfcn = req->band_arfcn; + trxcon->l1p.band_arfcn = req->band_arfcn; /* Tune transceiver to required ARFCN */ trx_if_cmd_rxtune(trxcon->trx, req->band_arfcn); @@ -160,7 +160,7 @@ case TRXCON_EV_FBSB_SEARCH_RES: osmo_fsm_inst_state_chg(fi, TRXCON_ST_BCCH_CCCH, 0, 0); l1ctl_tx_fbsb_conf(trxcon->l1c, - trxcon->trx->band_arfcn, + trxcon->l1p.band_arfcn, trxcon->sched->bsic); break; default: @@ -238,7 +238,7 @@ return; /* Set current ARFCN to an invalid value */ - trxcon->trx->band_arfcn = 0xffff; + trxcon->l1p.band_arfcn = 0xffff; } else { /* Tune transceiver to required ARFCN */ if (trx_if_cmd_rxtune(trxcon->trx, req->h0.band_arfcn)) @@ -247,7 +247,7 @@ return; /* Update current ARFCN */ - trxcon->trx->band_arfcn = req->h0.band_arfcn; + trxcon->l1p.band_arfcn = req->h0.band_arfcn; } rc = l1sched_configure_ts(trxcon->sched, req->chan_nr & 0x07, config); @@ -275,7 +275,7 @@ .chan_nr = ind->chan_nr, .link_id = ind->link_id, .frame_nr = htonl(ind->frame_nr), - .band_arfcn = htons(trxcon->trx->band_arfcn), + .band_arfcn = htons(trxcon->l1p.band_arfcn), .fire_crc = ind->data_len > 0 ? 0 : 2, .rx_level = dbm2rxlev(ind->rssi), .num_biterr = ind->n_errors, @@ -370,7 +370,7 @@ .chan_nr = ind->chan_nr, .link_id = ind->link_id, .frame_nr = htonl(ind->frame_nr), - .band_arfcn = htons(trxcon->trx->band_arfcn), + .band_arfcn = htons(trxcon->l1p.band_arfcn), .fire_crc = ind->data_len > 0 ? 0 : 2, .rx_level = dbm2rxlev(ind->rssi), .num_biterr = ind->n_errors, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifbd9bb17d63ab1d8712d0c8022a62117a48c6384 Gerrit-Change-Number: 28834 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework trxcon_fsm, move into a separate file

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28809 ) Change subject: trxcon: rework trxcon_fsm, move into a separate file ...................................................................... trxcon: rework trxcon_fsm, move into a separate file The original trxcon_fsm I wrote back in 2017 [1] was more like a boolean flag, as there were only two states: IDLE and MANAGED. Not surprising, given that until recently handling of multiple L1CTL connections was not supported. Now that we have this implemented, lifetime of a trxcon_fsm instance is limited by lifetime of a L1CTL connection, what renders the FSM useless. This change removes the old 'boolean' trxcon_fsm and introduces the new one, which will allows us to abstract the L1CTL interface from the TRXC/TRXD interfaces, as well as the scheduler. The new FSM will also simplify development of the RLC/MAC layer for GPRS. Change-Id: Ifaf63ead9dd180181358e771367b2a686ba159ca Related: [1] I7ee6fc891abe5f775f5b7ebbf093181a97950dea Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/Makefile.am M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trx_if.c M src/host/trxcon/src/trxcon.c A src/host/trxcon/src/trxcon_fsm.c 8 files changed, 787 insertions(+), 411 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 2c48eae..3f7dae0 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -4,6 +4,8 @@ #include <stdint.h> #include <stdbool.h> +#include <arpa/inet.h> + #include <osmocom/core/bits.h> #include <osmocom/core/utils.h> #include <osmocom/gsm/protocol/gsm_04_08.h> diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h index e15d5a2..9518bb9 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h @@ -9,8 +9,8 @@ /* Event handlers */ int l1ctl_rx_cb(struct l1ctl_client *l1c, struct msgb *msg); -int l1ctl_tx_fbsb_conf(struct l1ctl_client *l1c, uint8_t result, - const struct l1ctl_info_dl *dl_info, uint8_t bsic); +int l1ctl_tx_fbsb_conf(struct l1ctl_client *l1c, uint16_t band_arfcn, uint8_t bsic); +int l1ctl_tx_fbsb_fail(struct l1ctl_client *l1c, uint16_t band_arfcn); int l1ctl_tx_ccch_mode_conf(struct l1ctl_client *l1c, uint8_t mode); int l1ctl_tx_pm_conf(struct l1ctl_client *l1c, uint16_t band_arfcn, int dbm, int last); diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index da47f8b..b982193 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -4,19 +4,127 @@ struct trx_instance; struct l1ctl_client; +extern struct osmo_fsm trxcon_fsm_def; + enum trxcon_fsm_states { - TRXCON_STATE_IDLE = 0, - TRXCON_STATE_MANAGED, + TRXCON_ST_RESET, + TRXCON_ST_FULL_POWER_SCAN, + TRXCON_ST_FBSB_SEARCH, + TRXCON_ST_BCCH_CCCH, + TRXCON_ST_DEDICATED, }; enum trxcon_fsm_events { - /* L1CTL specific events */ - L1CTL_EVENT_CONNECT, - L1CTL_EVENT_DISCONNECT, + TRXCON_EV_L1IF_FAILURE, + TRXCON_EV_L2IF_FAILURE, + TRXCON_EV_RESET_FULL_REQ, + TRXCON_EV_RESET_SCHED_REQ, + TRXCON_EV_FULL_POWER_SCAN_REQ, + TRXCON_EV_FULL_POWER_SCAN_RES, + TRXCON_EV_FBSB_SEARCH_REQ, + TRXCON_EV_FBSB_SEARCH_RES, + TRXCON_EV_SET_CCCH_MODE_REQ, + TRXCON_EV_SET_TCH_MODE_REQ, + TRXCON_EV_SET_CONFIG_REQ, + TRXCON_EV_TX_ACCESS_BURST_REQ, + TRXCON_EV_DEDICATED_ESTABLISH_REQ, + TRXCON_EV_DEDICATED_RELEASE_REQ, + TRXCON_EV_TX_TRAFFIC_REQ, + TRXCON_EV_RX_TRAFFIC_IND, + TRXCON_EV_TX_DATA_REQ, + TRXCON_EV_RX_DATA_IND, + TRXCON_EV_CRYPTO_REQ, +}; - /* TRX specific events */ - TRX_EVENT_RSP_ERROR, - TRX_EVENT_OFFLINE, +/* param of TRXCON_EV_FULL_POWER_SCAN_REQ */ +struct trxcon_param_full_power_scan_req { + uint16_t band_arfcn_start; + uint16_t band_arfcn_stop; +}; + +/* param of TRXCON_EV_FULL_POWER_SCAN_RES */ +struct trxcon_param_full_power_scan_res { + bool last_result; + uint16_t band_arfcn; + int dbm; +}; + +/* param of TRXCON_EV_FBSB_SEARCH_REQ */ +struct trxcon_param_fbsb_search_req { + uint16_t band_arfcn; + uint16_t timeout_ms; + uint8_t pchan_config; +}; + +/* param of TRXCON_EV_SET_{CCCH,TCH}_MODE_REQ */ +struct trxcon_param_set_ccch_tch_mode_req { + uint8_t mode; + bool applied; +}; + +/* param of TRXCON_EV_SET_CONFIG_REQ */ +struct trxcon_param_set_config_req { + uint8_t timing_advance; + uint8_t tx_power; +}; + +/* param of TRXCON_EV_TX_{TRAFFIC,DATA}_REQ */ +struct trxcon_param_tx_traffic_data_req { + uint8_t chan_nr; + uint8_t link_id; + size_t data_len; + const uint8_t *data; +}; + +/* param of TRXCON_EV_RX_{TRAFFIC,DATA}_IND */ +struct trxcon_param_rx_traffic_data_ind { + uint8_t chan_nr; + uint8_t link_id; + uint32_t frame_nr; + int16_t toa256; + int8_t rssi; + int n_errors; + int n_bits_total; + size_t data_len; + const uint8_t *data; +}; + +/* param of TRXCON_EV_TX_ACCESS_BURST_REQ */ +struct trxcon_param_tx_access_burst_req { + uint8_t chan_nr; + uint8_t link_id; + uint8_t offset; + uint8_t synch_seq; + uint16_t ra; + bool is_11bit; +}; + +/* param of TRXCON_EV_DEDICATED_ESTABLISH_REQ */ +struct trxcon_param_dedicated_establish_req { + uint8_t chan_nr; + uint8_t tch_mode; + uint8_t tsc; + + bool hopping; + union { + struct { /* hopping=false */ + uint16_t band_arfcn; + } h0; + struct { /* hopping=true */ + uint8_t hsn; + uint8_t maio; + uint8_t n; + uint16_t ma[64]; + } h1; + }; +}; + +/* param of TRXCON_EV_CRYPTO_REQ */ +struct trxcon_param_crypto_req { + uint8_t chan_nr; + uint8_t a5_algo; /* 0 is A5/0 */ + uint8_t key_len; + const uint8_t *key; }; struct trxcon_inst { @@ -31,10 +139,6 @@ /* L1/L2 interfaces */ struct trx_instance *trx; struct l1ctl_client *l1c; - - /* TODO: implement this as an FSM state with timeout */ - struct osmo_timer_list fbsb_timer; - bool fbsb_conf_sent; }; struct trxcon_inst *trxcon_inst_alloc(void *ctx, unsigned int id); diff --git a/src/host/trxcon/src/Makefile.am b/src/host/trxcon/src/Makefile.am index cf1357f..3af004d 100644 --- a/src/host/trxcon/src/Makefile.am +++ b/src/host/trxcon/src/Makefile.am @@ -42,6 +42,7 @@ l1ctl.c \ trx_if.c \ logging.c \ + trxcon_fsm.c \ trxcon.c \ $(NULL) diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 5e40af5..96dde73 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -30,18 +30,18 @@ #include <arpa/inet.h> +#include <osmocom/core/fsm.h> #include <osmocom/core/msgb.h> #include <osmocom/core/talloc.h> #include <osmocom/core/select.h> + +#include <osmocom/gsm/gsm0502.h> #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/protocol/gsm_08_58.h> #include <osmocom/bb/trxcon/logging.h> #include <osmocom/bb/trxcon/l1ctl_server.h> #include <osmocom/bb/trxcon/l1ctl_proto.h> - -#include <osmocom/bb/trxcon/trx_if.h> -#include <osmocom/bb/l1sched/l1sched.h> #include <osmocom/bb/trxcon/trxcon.h> static const char *arfcn2band_name(uint16_t arfcn) @@ -166,33 +166,52 @@ return conf; } -int l1ctl_tx_fbsb_conf(struct l1ctl_client *l1c, uint8_t result, - const struct l1ctl_info_dl *dl_info, uint8_t bsic) +int l1ctl_tx_fbsb_fail(struct l1ctl_client *l1c, uint16_t band_arfcn) { struct trxcon_inst *trxcon = l1c->priv; - struct l1ctl_fbsb_conf *conf; + struct l1ctl_info_dl *dl; struct msgb *msg; msg = l1ctl_alloc_msg(L1CTL_FBSB_CONF); if (msg == NULL) return -ENOMEM; - put_dl_info_hdr(msg, dl_info); + dl = put_dl_info_hdr(msg, NULL); - conf = fbsb_conf_make(msg, result, bsic); + /* Fill in current ARFCN */ + dl->band_arfcn = htons(band_arfcn); + + fbsb_conf_make(msg, 255, 0); + + LOGPFSMSL(trxcon->fi, DL1C, LOGL_DEBUG, "Send FBSB Conf (timeout)\n"); + + return l1ctl_client_send(l1c, msg); +} + +int l1ctl_tx_fbsb_conf(struct l1ctl_client *l1c, uint16_t band_arfcn, uint8_t bsic) +{ + struct trxcon_inst *trxcon = l1c->priv; + struct l1ctl_fbsb_conf *conf; + struct l1ctl_info_dl *dl; + struct msgb *msg; + + msg = l1ctl_alloc_msg(L1CTL_FBSB_CONF); + if (msg == NULL) + return -ENOMEM; + + dl = put_dl_info_hdr(msg, NULL); + + /* Fill in current ARFCN */ + dl->band_arfcn = htons(band_arfcn); + + conf = fbsb_conf_make(msg, 0, bsic); /* FIXME: set proper value */ conf->initial_freq_err = 0; - /* Ask SCH handler not to send L1CTL_FBSB_CONF anymore */ - trxcon->fbsb_conf_sent = true; - - /* Abort FBSB expire timer */ - osmo_timer_del(&trxcon->fbsb_timer); - LOGPFSMSL(trxcon->fi, DL1C, LOGL_DEBUG, "Send FBSB Conf (result=%u, bsic=%u)\n", - result, bsic); + conf->result, conf->bsic); return l1ctl_client_send(l1c, msg); } @@ -299,44 +318,10 @@ } } -/* FBSB expire timer */ -static void fbsb_timer_cb(void *data) -{ - struct l1ctl_client *l1c = (struct l1ctl_client *) data; - struct trxcon_inst *trxcon = l1c->priv; - struct l1ctl_info_dl *dl; - struct msgb *msg; - - msg = l1ctl_alloc_msg(L1CTL_FBSB_CONF); - if (msg == NULL) - return; - - LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, - "FBSB timer fired for ARFCN %u\n", - trxcon->trx->band_arfcn & ~ARFCN_FLAG_MASK); - - dl = put_dl_info_hdr(msg, NULL); - - /* Fill in current ARFCN */ - dl->band_arfcn = htons(trxcon->trx->band_arfcn); - - fbsb_conf_make(msg, 255, 0); - - /* Ask SCH handler not to send L1CTL_FBSB_CONF anymore */ - trxcon->fbsb_conf_sent = true; - - LOGPFSMSL(trxcon->fi, DL1C, LOGL_DEBUG, "Send FBSB Conf (timeout)\n"); - - l1ctl_client_send(l1c, msg); -} - static int l1ctl_rx_fbsb_req(struct l1ctl_client *l1c, struct msgb *msg) { struct trxcon_inst *trxcon = l1c->priv; - enum gsm_phys_chan_config ch_config; struct l1ctl_fbsb_req *fbsb; - uint16_t band_arfcn; - uint16_t timeout; int rc = 0; fbsb = (struct l1ctl_fbsb_req *) msg->l1h; @@ -348,44 +333,19 @@ goto exit; } - ch_config = l1ctl_ccch_mode2pchan_config(fbsb->ccch_mode); - band_arfcn = ntohs(fbsb->band_arfcn); - timeout = ntohs(fbsb->timeout); + struct trxcon_param_fbsb_search_req req = { + .pchan_config = l1ctl_ccch_mode2pchan_config(fbsb->ccch_mode), + .timeout_ms = ntohs(fbsb->timeout) * GSM_TDMA_FN_DURATION_uS / 1000, + .band_arfcn = ntohs(fbsb->band_arfcn), + }; - LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, "Received FBSB request (%s %d)\n", - arfcn2band_name(band_arfcn), band_arfcn & ~ARFCN_FLAG_MASK); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, + "Received FBSB request (%s %d, timeout %u ms)\n", + arfcn2band_name(req.band_arfcn), + req.band_arfcn & ~ARFCN_FLAG_MASK, + req.timeout_ms); - /* Reset scheduler and clock counter */ - l1sched_reset(trxcon->sched, true); - - /* Configure a single timeslot */ - l1sched_configure_ts(trxcon->sched, 0, ch_config); - - /* Ask SCH handler to send L1CTL_FBSB_CONF */ - trxcon->fbsb_conf_sent = false; - - /* Only if current ARFCN differs */ - if (trxcon->trx->band_arfcn != band_arfcn) { - /* Update current ARFCN */ - trxcon->trx->band_arfcn = band_arfcn; - - /* Tune transceiver to required ARFCN */ - trx_if_cmd_rxtune(trxcon->trx, band_arfcn); - trx_if_cmd_txtune(trxcon->trx, band_arfcn); - } - - /* Transceiver might have been powered on before, e.g. - * in case of sending L1CTL_FBSB_REQ due to signal loss. */ - if (!trxcon->trx->powered_up) - trx_if_cmd_poweron(trxcon->trx); - - /* Start FBSB expire timer */ - trxcon->fbsb_timer.data = l1c; - trxcon->fbsb_timer.cb = fbsb_timer_cb; - LOGPFSMSL(trxcon->fi, DL1C, LOGL_INFO, "Starting FBSB timer %u ms\n", - timeout * GSM_TDMA_FN_DURATION_uS / 1000); - osmo_timer_schedule(&trxcon->fbsb_timer, 0, - timeout * GSM_TDMA_FN_DURATION_uS); + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_FBSB_SEARCH_REQ, &req); exit: msgb_free(msg); @@ -394,7 +354,6 @@ static int l1ctl_rx_pm_req(struct l1ctl_client *l1c, struct msgb *msg) { - uint16_t band_arfcn_start, band_arfcn_stop; struct trxcon_inst *trxcon = l1c->priv; struct l1ctl_pm_req *pmr; int rc = 0; @@ -408,17 +367,18 @@ goto exit; } - band_arfcn_start = ntohs(pmr->range.band_arfcn_from); - band_arfcn_stop = ntohs(pmr->range.band_arfcn_to); + struct trxcon_param_full_power_scan_req req = { + .band_arfcn_start = ntohs(pmr->range.band_arfcn_from), + .band_arfcn_stop = ntohs(pmr->range.band_arfcn_to), + }; LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, "Received power measurement request (%s: %d -> %d)\n", - arfcn2band_name(band_arfcn_start), - band_arfcn_start & ~ARFCN_FLAG_MASK, - band_arfcn_stop & ~ARFCN_FLAG_MASK); + arfcn2band_name(req.band_arfcn_start), + req.band_arfcn_start & ~ARFCN_FLAG_MASK, + req.band_arfcn_stop & ~ARFCN_FLAG_MASK); - /* Send measurement request to transceiver */ - rc = trx_if_cmd_measure(trxcon->trx, band_arfcn_start, band_arfcn_stop); + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_FULL_POWER_SCAN_REQ, &req); exit: msgb_free(msg); @@ -445,13 +405,10 @@ switch (res->type) { case L1CTL_RES_T_FULL: - /* TODO: implement trx_if_reset() */ - trx_if_cmd_poweroff(trxcon->trx); - trx_if_cmd_echo(trxcon->trx); - - /* Fall through */ + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_RESET_FULL_REQ, NULL); + break; case L1CTL_RES_T_SCHED: - l1sched_reset(trxcon->sched, true); + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_RESET_SCHED_REQ, NULL); break; default: LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, @@ -486,13 +443,11 @@ static int l1ctl_rx_ccch_mode_req(struct l1ctl_client *l1c, struct msgb *msg) { struct trxcon_inst *trxcon = l1c->priv; - enum gsm_phys_chan_config ch_config; - struct l1ctl_ccch_mode_req *req; - struct l1sched_ts *ts; - int rc = 0; + struct l1ctl_ccch_mode_req *mode_req; + int rc; - req = (struct l1ctl_ccch_mode_req *) msg->l1h; - if (msgb_l1len(msg) < sizeof(*req)) { + mode_req = (struct l1ctl_ccch_mode_req *)msg->l1h; + if (msgb_l1len(msg) < sizeof(*mode_req)) { LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, "MSG too short Reset Req: %u\n", msgb_l1len(msg)); @@ -501,26 +456,16 @@ } LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, "Received CCCH mode request (%u)\n", - req->ccch_mode); /* TODO: add value-string for ccch_mode */ + mode_req->ccch_mode); /* TODO: add value-string for ccch_mode */ - /* Make sure that TS0 is allocated and configured */ - ts = trxcon->sched->ts[0]; - if (ts == NULL || ts->mf_layout == NULL) { - LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, "TS0 is not configured"); - rc = -EINVAL; - goto exit; - } + struct trxcon_param_set_ccch_tch_mode_req req = { + /* Choose corresponding channel combination */ + .mode = l1ctl_ccch_mode2pchan_config(mode_req->ccch_mode), + }; - /* Choose corresponding channel combination */ - ch_config = l1ctl_ccch_mode2pchan_config(req->ccch_mode); - - /* Do nothing if the current mode matches required */ - if (ts->mf_layout->chan_config != ch_config) - rc = l1sched_configure_ts(trxcon->sched, 0, ch_config); - - /* Confirm reconfiguration */ - if (!rc) - rc = l1ctl_tx_ccch_mode_conf(l1c, req->ccch_mode); + rc = osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_SET_CCCH_MODE_REQ, &req); + if (rc == 0 && req.applied) + l1ctl_tx_ccch_mode_conf(l1c, mode_req->ccch_mode); exit: msgb_free(msg); @@ -529,40 +474,38 @@ static int l1ctl_rx_rach_req(struct l1ctl_client *l1c, struct msgb *msg, bool ext) { + struct trxcon_param_tx_access_burst_req req; struct trxcon_inst *trxcon = l1c->priv; struct l1ctl_info_ul *ul; - struct l1sched_ts_prim *prim; - struct l1sched_ts_prim_rach rach; - enum l1sched_ts_prim_type prim_type; - int rc; ul = (struct l1ctl_info_ul *) msg->l1h; /* Is it extended (11-bit) RACH or not? */ if (ext) { - const struct l1ctl_ext_rach_req *req = (void *)ul->payload; + const struct l1ctl_ext_rach_req *rr = (void *)ul->payload; - rach = (struct l1sched_ts_prim_rach) { - .ra = ntohs(req->ra11), - .synch_seq = req->synch_seq, - .offset = ntohs(req->offset), + req = (struct trxcon_param_tx_access_burst_req) { + .offset = ntohs(rr->offset), + .synch_seq = rr->synch_seq, + .ra = ntohs(rr->ra11), + .is_11bit = true, }; LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, "Received extended (11-bit) RACH request " "(offset=%u, synch_seq=%u, ra11=0x%02hx)\n", - rach.offset, rach.synch_seq, rach.ra); + req.offset, req.synch_seq, req.ra); } else { - const struct l1ctl_rach_req *req = (void *)ul->payload; + const struct l1ctl_rach_req *rr = (void *)ul->payload; - rach = (struct l1sched_ts_prim_rach) { - .ra = req->ra, - .offset = ntohs(req->offset), + req = (struct trxcon_param_tx_access_burst_req) { + .offset = ntohs(rr->offset), + .ra = rr->ra, }; LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, "Received regular (8-bit) RACH request " - "(offset=%u, ra=0x%02x)\n", rach.offset, rach.ra); + "(offset=%u, ra=0x%02x)\n", req.offset, req.ra); } /* The controlling L1CTL side always does include the UL info header, @@ -570,55 +513,38 @@ if (ul->chan_nr == 0x00) { LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, "The UL info header is empty, assuming RACH is on TS0\n"); - ul->chan_nr = RSL_CHAN_RACH; + req.chan_nr = RSL_CHAN_RACH; + req.link_id = 0x00; + } else { + req.chan_nr = ul->chan_nr; + req.link_id = ul->link_id; } - /** - * Push this primitive to the transmit queue. - * Indicated timeslot needs to be configured. - */ - prim_type = ext ? L1SCHED_PRIM_RACH11 : L1SCHED_PRIM_RACH8; - prim = l1sched_prim_push(trxcon->sched, prim_type, ul->chan_nr, ul->link_id, - (const uint8_t *)&rach, sizeof(rach)); - if (prim == NULL) - rc = -ENOMEM; + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_TX_ACCESS_BURST_REQ, &req); msgb_free(msg); - return rc; + return 0; } -static int l1ctl_proc_est_req_h0(struct trxcon_inst *trxcon, struct l1ctl_h0 *h) +static int l1ctl_proc_est_req_h0(struct trxcon_inst *trxcon, + struct trxcon_param_dedicated_establish_req *req, + const struct l1ctl_h0 *h) { - struct trx_instance *trx = trxcon->trx; - uint16_t band_arfcn; - int rc = 0; - - band_arfcn = ntohs(h->band_arfcn); + req->h0.band_arfcn = ntohs(h->band_arfcn); LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, - "L1CTL_DM_EST_REQ indicates a single ARFCN=%u\n", - band_arfcn & ~ARFCN_FLAG_MASK); - - /* Do we need to retune? */ - if (trx->band_arfcn == band_arfcn) - return 0; - - /* Tune transceiver to required ARFCN */ - rc |= trx_if_cmd_rxtune(trx, band_arfcn); - rc |= trx_if_cmd_txtune(trx, band_arfcn); - if (rc) - return rc; - - /* Update current ARFCN */ - trx->band_arfcn = band_arfcn; + "L1CTL_DM_EST_REQ indicates single ARFCN %s %u\n", + arfcn2band_name(req->h0.band_arfcn), + req->h0.band_arfcn & ~ARFCN_FLAG_MASK); return 0; } -static int l1ctl_proc_est_req_h1(struct trxcon_inst *trxcon, struct l1ctl_h1 *h) +static int l1ctl_proc_est_req_h1(struct trxcon_inst *trxcon, + struct trxcon_param_dedicated_establish_req *req, + const struct l1ctl_h1 *h) { - uint16_t ma[64]; - int i, rc; + unsigned int i; LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, "L1CTL_DM_EST_REQ indicates a Frequency " @@ -630,7 +556,7 @@ LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, "No channels in mobile allocation?!?\n"); return -EINVAL; - } else if (h->n > ARRAY_SIZE(ma)) { + } else if (h->n > ARRAY_SIZE(h->ma)) { LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, "More than 64 channels in mobile allocation?!?\n"); return -EINVAL; @@ -638,75 +564,45 @@ /* Convert from network to host byte order */ for (i = 0; i < h->n; i++) - ma[i] = ntohs(h->ma[i]); + req->h1.ma[i] = ntohs(h->ma[i]); + req->h1.n = h->n; + req->h1.hsn = h->hsn; + req->h1.maio = h->maio; - /* Forward hopping parameters to TRX */ - rc = trx_if_cmd_setfh(trxcon->trx, h->hsn, h->maio, ma, h->n); - if (rc) - return rc; - - /** - * TODO: update the state of trx_instance somehow - * in order to indicate that it is in hopping mode... - */ return 0; } static int l1ctl_rx_dm_est_req(struct l1ctl_client *l1c, struct msgb *msg) { struct trxcon_inst *trxcon = l1c->priv; - enum gsm_phys_chan_config config; struct l1ctl_dm_est_req *est_req; struct l1ctl_info_ul *ul; - struct l1sched_ts *ts; - uint8_t chan_nr, tn; int rc; ul = (struct l1ctl_info_ul *) msg->l1h; est_req = (struct l1ctl_dm_est_req *) ul->payload; - chan_nr = ul->chan_nr; - tn = chan_nr & 0x07; + struct trxcon_param_dedicated_establish_req req = { + .chan_nr = ul->chan_nr, + .tch_mode = est_req->tch_mode, + .tsc = est_req->tsc, + .hopping = est_req->h, + }; LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, "Received L1CTL_DM_EST_REQ " "(tn=%u, chan_nr=0x%02x, tsc=%u, tch_mode=0x%02x)\n", - tn, chan_nr, est_req->tsc, est_req->tch_mode); - - /* Determine channel config */ - config = l1sched_chan_nr2pchan_config(chan_nr); - if (config == GSM_PCHAN_NONE) { - LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, "Couldn't determine channel config\n"); - rc = -EINVAL; - goto exit; - } + req.chan_nr & 0x07, req.chan_nr, req.tsc, req.tch_mode); /* Frequency hopping? */ if (est_req->h) - rc = l1ctl_proc_est_req_h1(trxcon, &est_req->h1); + rc = l1ctl_proc_est_req_h1(trxcon, &req, &est_req->h1); else /* Single ARFCN */ - rc = l1ctl_proc_est_req_h0(trxcon, &est_req->h0); + rc = l1ctl_proc_est_req_h0(trxcon, &req, &est_req->h0); if (rc) goto exit; - /* Configure requested TS */ - rc = l1sched_configure_ts(trxcon->sched, tn, config); - ts = trxcon->sched->ts[tn]; - if (rc) { - rc = -EINVAL; - goto exit; - } - - /* Deactivate all lchans */ - l1sched_deactivate_all_lchans(ts); - - /* Activate only requested lchans */ - rc = l1sched_set_lchans(ts, chan_nr, 1, est_req->tch_mode, est_req->tsc); - if (rc) { - LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, "Couldn't activate requested lchans\n"); - rc = -EINVAL; - goto exit; - } + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_DEDICATED_ESTABLISH_REQ, &req); exit: msgb_free(msg); @@ -717,11 +613,9 @@ { struct trxcon_inst *trxcon = l1c->priv; - LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, - "Received L1CTL_DM_REL_REQ, resetting scheduler\n"); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, "Received L1CTL_DM_REL_REQ\n"); - /* Reset scheduler */ - l1sched_reset(trxcon->sched, false); + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_DEDICATED_RELEASE_REQ, NULL); msgb_free(msg); return 0; @@ -735,34 +629,29 @@ { struct trxcon_inst *trxcon = l1c->priv; struct l1ctl_info_ul *ul; - struct l1sched_ts_prim *prim; - uint8_t chan_nr, link_id; - size_t payload_len; - int rc; /* Extract UL frame header */ ul = (struct l1ctl_info_ul *) msg->l1h; - - /* Calculate the payload len */ msg->l2h = ul->payload; - payload_len = msgb_l2len(msg); - /* Obtain channel description */ - chan_nr = ul->chan_nr; - link_id = ul->link_id & 0x40; + struct trxcon_param_tx_traffic_data_req req = { + .chan_nr = ul->chan_nr, + .link_id = ul->link_id & 0x40, + .data_len = msgb_l2len(msg), + .data = ul->payload, + }; LOGPFSMSL(trxcon->fi, DL1D, LOGL_DEBUG, "Recv %s Req (chan_nr=0x%02x, link_id=0x%02x, len=%zu)\n", - traffic ? "TRAFFIC" : "DATA", chan_nr, link_id, payload_len); + traffic ? "TRAFFIC" : "DATA", req.chan_nr, req.link_id, req.data_len); - /* Push this primitive to transmit queue */ - prim = l1sched_prim_push(trxcon->sched, L1SCHED_PRIM_DATA, - chan_nr, link_id, ul->payload, payload_len); - if (prim == NULL) - rc = -ENOMEM; + if (traffic) + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_TX_TRAFFIC_REQ, &req); + else + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_TX_DATA_REQ, &req); msgb_free(msg); - return rc; + return 0; } static int l1ctl_rx_param_req(struct l1ctl_client *l1c, struct msgb *msg) @@ -778,13 +667,12 @@ "Received L1CTL_PARAM_REQ (ta=%d, tx_power=%u)\n", par_req->ta, par_req->tx_power); - /* Instruct TRX to use new TA value */ - if (trxcon->trx->ta != par_req->ta) { - trx_if_cmd_setta(trxcon->trx, par_req->ta); - trxcon->trx->ta = par_req->ta; - } + struct trxcon_param_set_config_req req = { + .timing_advance = par_req->ta, + .tx_power = par_req->tx_power, + }; - trxcon->trx->tx_power = par_req->tx_power; + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_SET_CONFIG_REQ, &req); msgb_free(msg); return 0; @@ -793,41 +681,27 @@ static int l1ctl_rx_tch_mode_req(struct l1ctl_client *l1c, struct msgb *msg) { struct trxcon_inst *trxcon = l1c->priv; - struct l1ctl_tch_mode_req *req; - struct l1sched_lchan_state *lchan; - struct l1sched_ts *ts; - unsigned int tn; + struct l1ctl_tch_mode_req *mode_req; + int rc; - req = (struct l1ctl_tch_mode_req *) msg->l1h; + mode_req = (struct l1ctl_tch_mode_req *)msg->l1h; LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, "Received L1CTL_TCH_MODE_REQ (tch_mode=%u, audio_mode=%u)\n", - req->tch_mode, req->audio_mode); - - /* Iterate over timeslot list */ - for (tn = 0; tn < ARRAY_SIZE(trxcon->sched->ts); tn++) { - /* Timeslot is not allocated */ - ts = trxcon->sched->ts[tn]; - if (ts == NULL) - continue; - - /* Timeslot is not configured */ - if (ts->mf_layout == NULL) - continue; - - /* Iterate over all allocated lchans */ - llist_for_each_entry(lchan, &ts->lchans, list) { - /* Omit inactive channels */ - if (!lchan->active) - continue; - - /* Set TCH mode */ - lchan->tch_mode = req->tch_mode; - } - } + mode_req->tch_mode, mode_req->audio_mode); /* TODO: do we need to care about audio_mode? */ + struct trxcon_param_set_ccch_tch_mode_req req = { + .mode = mode_req->tch_mode, + }; + + rc = osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_SET_TCH_MODE_REQ, &req); + if (rc != 0 || !req.applied) { + talloc_free(msg); + return rc; + } + /* Re-use the original message as confirmation */ struct l1ctl_hdr *l1h = (struct l1ctl_hdr *) msg->data; l1h->msg_type = L1CTL_TCH_MODE_CONF; @@ -838,41 +712,27 @@ static int l1ctl_rx_crypto_req(struct l1ctl_client *l1c, struct msgb *msg) { struct trxcon_inst *trxcon = l1c->priv; - struct l1ctl_crypto_req *req; + struct l1ctl_crypto_req *cr; struct l1ctl_info_ul *ul; - struct l1sched_ts *ts; - uint8_t tn; - int rc = 0; ul = (struct l1ctl_info_ul *) msg->l1h; - req = (struct l1ctl_crypto_req *) ul->payload; + cr = (struct l1ctl_crypto_req *) ul->payload; + + struct trxcon_param_crypto_req req = { + .chan_nr = ul->chan_nr, + .a5_algo = cr->algo, + .key_len = cr->key_len, + .key = cr->key, + }; LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, "L1CTL_CRYPTO_REQ (algo=A5/%u, key_len=%u)\n", - req->algo, req->key_len); + req.a5_algo, req.key_len); - /* Determine TS index */ - tn = ul->chan_nr & 0x7; + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_CRYPTO_REQ, &req); - /* Make sure that required TS is allocated and configured */ - ts = trxcon->sched->ts[tn]; - if (ts == NULL || ts->mf_layout == NULL) { - LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, "TS %u is not configured\n", tn); - rc = -EINVAL; - goto exit; - } - - /* Poke scheduler */ - rc = l1sched_start_ciphering(ts, req->algo, req->key, req->key_len); - if (rc) { - LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, "Couldn't configure ciphering\n"); - rc = -EINVAL; - goto exit; - } - -exit: msgb_free(msg); - return rc; + return 0; } int l1ctl_rx_cb(struct l1ctl_client *l1c, struct msgb *msg) diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index 92b9d12..d51c9d1 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -40,7 +40,6 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/bb/l1sched/l1sched.h> -#include <osmocom/bb/trxcon/l1ctl.h> #include <osmocom/bb/trxcon/trxcon.h> #include <osmocom/bb/trxcon/trx_if.h> #include <osmocom/bb/trxcon/logging.h> @@ -163,7 +162,6 @@ static void trx_ctrl_timer_cb(void *data) { struct trx_instance *trx = (struct trx_instance *) data; - struct trxcon_inst *trxcon = trx->trxcon; struct trx_ctrl_msg *tcm; /* Queue may be cleaned at this moment */ @@ -176,7 +174,7 @@ if (++tcm->retry_cnt > 3) { LOGPFSML(trx->fi, LOGL_NOTICE, "Transceiver offline\n"); osmo_fsm_inst_state_chg(trx->fi, TRX_STATE_OFFLINE, 0, 0); - osmo_fsm_inst_dispatch(trxcon->fi, TRX_EVENT_OFFLINE, trx); + osmo_fsm_inst_term(trx->fi, OSMO_FSM_TERM_TIMEOUT, NULL); return; } @@ -388,9 +386,13 @@ return; } - /* Send L1CTL_PM_CONF */ - l1ctl_tx_pm_conf(trxcon->l1c, band_arfcn, dbm, - band_arfcn == trx->pm_band_arfcn_stop); + struct trxcon_param_full_power_scan_res res = { + .last_result = band_arfcn == trx->pm_band_arfcn_stop, + .band_arfcn = band_arfcn, + .dbm = dbm, + }; + + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_FULL_POWER_SCAN_RES, &res); /* Schedule a next measurement */ if (band_arfcn != trx->pm_band_arfcn_stop) @@ -479,7 +481,6 @@ static int trx_ctrl_read_cb(struct osmo_fd *ofd, unsigned int what) { struct trx_instance *trx = ofd->data; - struct trxcon_inst *trxcon = trx->trxcon; struct trx_ctrl_msg *tcm; int resp, rsp_len; char buf[TRXC_BUF_SIZE], *p; @@ -560,8 +561,7 @@ return 0; rsp_error: - /* Notify higher layers about the problem */ - osmo_fsm_inst_dispatch(trxcon->fi, TRX_EVENT_RSP_ERROR, trx); + osmo_fsm_inst_term(trx->fi, OSMO_FSM_TERM_ERROR, NULL); return -EIO; } @@ -712,7 +712,7 @@ } /* Allocate a new dedicated state machine */ - trx->fi = osmo_fsm_inst_alloc_child(&trx_fsm, trxcon->fi, TRX_EVENT_OFFLINE); + trx->fi = osmo_fsm_inst_alloc_child(&trx_fsm, trxcon->fi, TRXCON_EV_L1IF_FAILURE); if (trx->fi == NULL) { LOGPFSML(trxcon->fi, LOGL_ERROR, "Failed to allocate an instance " "of FSM '%s'\n", trx_fsm.name); diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 14354d1..d4f4214 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -49,8 +49,6 @@ #include <osmocom/bb/trxcon/l1ctl_proto.h> #include <osmocom/bb/l1sched/l1sched.h> -#define S(x) (1 << (x)) - #define COPYRIGHT \ "Copyright (C) 2016-2022 by Vadim Yanitskiy <axilirator(a)gmail.com>\n" \ "Contributions by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>\n" \ @@ -142,35 +140,35 @@ const struct l1sched_lchan_desc *lchan_desc; struct l1sched_state *sched = lchan->ts->sched; struct trxcon_inst *trxcon = sched->priv; - struct l1ctl_info_dl dl_hdr; int rc; lchan_desc = &l1sched_lchan_desc[lchan->type]; - dl_hdr = (struct l1ctl_info_dl) { + struct trxcon_param_rx_traffic_data_ind ind = { .chan_nr = lchan_desc->chan_nr | lchan->ts->index, .link_id = lchan_desc->link_id, - .frame_nr = htonl(meas->fn), - .band_arfcn = htons(trxcon->trx->band_arfcn), - .fire_crc = data_len > 0 ? 0 : 2, - .rx_level = dbm2rxlev(meas->rssi), - .num_biterr = n_errors, - /* TODO: set proper .snr */ + .frame_nr = meas->fn, + .toa256 = meas->toa256, + .rssi = meas->rssi, + .n_errors = n_errors, + .n_bits_total = n_bits_total, + .data_len = data_len, + .data = data, }; switch (dt) { case L1SCHED_DT_TRAFFIC: case L1SCHED_DT_PACKET_DATA: - rc = l1ctl_tx_dt_ind(trxcon->l1c, &dl_hdr, data, data_len, true); + rc = osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_RX_TRAFFIC_IND, &ind); break; case L1SCHED_DT_SIGNALING: - rc = l1ctl_tx_dt_ind(trxcon->l1c, &dl_hdr, data, data_len, false); + rc = osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_RX_DATA_IND, &ind); break; case L1SCHED_DT_OTHER: if (lchan->type == L1SCHED_SCH) { - if (trxcon->fbsb_conf_sent) + if (trxcon->fi->state != TRXCON_ST_FBSB_SEARCH) return 0; - rc = l1ctl_tx_fbsb_conf(trxcon->l1c, 0, &dl_hdr, sched->bsic); + rc = osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_FBSB_SEARCH_RES, NULL); break; } /* fall through */ @@ -255,75 +253,6 @@ return rc; } -/* The trxcon state machine */ -static void trxcon_fsm_idle_action(struct osmo_fsm_inst *fi, - uint32_t event, void *data) -{ - if (event == L1CTL_EVENT_CONNECT) - osmo_fsm_inst_state_chg(fi, TRXCON_STATE_MANAGED, 0, 0); -} - -static void trxcon_fsm_managed_action(struct osmo_fsm_inst *fi, - uint32_t event, void *data) -{ - struct trxcon_inst *trxcon = fi->priv; - - switch (event) { - case L1CTL_EVENT_DISCONNECT: - osmo_fsm_inst_state_chg(fi, TRXCON_STATE_IDLE, 0, 0); - - if (trxcon->trx->fi->state != TRX_STATE_OFFLINE) { - /* Reset scheduler and clock counter */ - l1sched_reset(trxcon->sched, true); - - /* TODO: implement trx_if_reset() */ - trx_if_cmd_poweroff(trxcon->trx); - trx_if_cmd_echo(trxcon->trx); - } - break; - case TRX_EVENT_RSP_ERROR: - case TRX_EVENT_OFFLINE: - /* TODO: notify L2 & L3 about that */ - break; - default: - LOGPFSML(fi, LOGL_ERROR, "Unhandled event %u\n", event); - } -} - -static struct osmo_fsm_state trxcon_fsm_states[] = { - [TRXCON_STATE_IDLE] = { - .in_event_mask = S(L1CTL_EVENT_CONNECT), - .out_state_mask = S(TRXCON_STATE_MANAGED), - .name = "IDLE", - .action = trxcon_fsm_idle_action, - }, - [TRXCON_STATE_MANAGED] = { - .in_event_mask = ( - S(L1CTL_EVENT_DISCONNECT) | - S(TRX_EVENT_RSP_ERROR) | - S(TRX_EVENT_OFFLINE)), - .out_state_mask = S(TRXCON_STATE_IDLE), - .name = "MANAGED", - .action = trxcon_fsm_managed_action, - }, -}; - -static const struct value_string trxcon_fsm_event_names[] = { - OSMO_VALUE_STRING(L1CTL_EVENT_CONNECT), - OSMO_VALUE_STRING(L1CTL_EVENT_DISCONNECT), - OSMO_VALUE_STRING(TRX_EVENT_OFFLINE), - OSMO_VALUE_STRING(TRX_EVENT_RSP_ERROR), - { 0, NULL } -}; - -static struct osmo_fsm trxcon_fsm_def = { - .name = "trxcon", - .states = trxcon_fsm_states, - .num_states = ARRAY_SIZE(trxcon_fsm_states), - .log_subsys = DAPP, - .event_names = trxcon_fsm_event_names, -}; - struct trxcon_inst *trxcon_inst_alloc(void *ctx, unsigned int id) { struct trxcon_inst *trxcon; @@ -377,8 +306,6 @@ if (trxcon->trx != NULL) trx_if_close(trxcon->trx); - osmo_timer_del(&trxcon->fbsb_timer); - if (trxcon->fi != NULL) osmo_fsm_inst_free(trxcon->fi); talloc_free(trxcon); @@ -406,6 +333,8 @@ if (trxcon == NULL) return; + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_L2IF_FAILURE, NULL); + /* l1c is free()ed by the caller */ trxcon->l1c = NULL; trxcon_inst_free(trxcon); @@ -560,6 +489,8 @@ log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_BASENAME); log_set_print_filename_pos(osmo_stderr_target, LOG_FILENAME_POS_LINE_END); + osmo_fsm_log_timeouts(true); + /* Optional GSMTAP */ if (app_data.gsmtap_ip != NULL) { app_data.gsmtap = gsmtap_source_init(app_data.gsmtap_ip, GSMTAP_UDP_PORT, 1); @@ -571,9 +502,6 @@ gsmtap_source_add_sink(app_data.gsmtap); } - /* Register the trxcon state machine */ - OSMO_ASSERT(osmo_fsm_register(&trxcon_fsm_def) == 0); - /* Start the L1CTL server */ server_cfg = (struct l1ctl_server_cfg) { .sock_path = app_data.bind_socket, diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c new file mode 100644 index 0000000..1d3b515 --- /dev/null +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -0,0 +1,481 @@ +/* + * OsmocomBB <-> SDR connection bridge + * + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <stdio.h> +#include <stdint.h> +#include <string.h> +#include <errno.h> + +#include <arpa/inet.h> + +#include <osmocom/core/fsm.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> + +#include <osmocom/bb/trxcon/trxcon.h> +#include <osmocom/bb/trxcon/trx_if.h> +#include <osmocom/bb/trxcon/logging.h> +#include <osmocom/bb/trxcon/l1ctl.h> +#include <osmocom/bb/trxcon/l1ctl_server.h> +#include <osmocom/bb/trxcon/l1ctl_proto.h> +#include <osmocom/bb/l1sched/l1sched.h> + +#define S(x) (1 << (x)) + +static void trxcon_allstate_action(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + struct trxcon_inst *trxcon = fi->priv; + + switch (event) { + case TRXCON_EV_L1IF_FAILURE: + case TRXCON_EV_L2IF_FAILURE: + LOGPFSML(fi, LOGL_NOTICE, "Event %s is not handled\n", + osmo_fsm_event_name(&trxcon_fsm_def, event)); + /* TODO: osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); */ + break; + case TRXCON_EV_RESET_FULL_REQ: + if (fi->state != TRXCON_ST_RESET) + osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); + l1sched_reset(trxcon->sched, true); + trx_if_cmd_poweroff(trxcon->trx); + trx_if_cmd_echo(trxcon->trx); + break; + case TRXCON_EV_RESET_SCHED_REQ: + l1sched_reset(trxcon->sched, false); + break; + case TRXCON_EV_SET_CONFIG_REQ: + { + const struct trxcon_param_set_config_req *req = data; + + if (trxcon->trx->ta != req->timing_advance) + trx_if_cmd_setta(trxcon->trx, req->timing_advance); + trxcon->trx->tx_power = req->tx_power; + trxcon->trx->ta = req->timing_advance; + break; + } + default: + OSMO_ASSERT(0); + } +} + +static int trxcon_timer_cb(struct osmo_fsm_inst *fi) +{ + struct trxcon_inst *trxcon = fi->priv; + + switch (fi->state) { + case TRXCON_ST_FBSB_SEARCH: + l1ctl_tx_fbsb_fail(trxcon->l1c, trxcon->trx->band_arfcn); + osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); + return 0; + default: + OSMO_ASSERT(0); + } +} + +static void trxcon_st_reset_action(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + struct trxcon_inst *trxcon = fi->priv; + + switch (event) { + case TRXCON_EV_FBSB_SEARCH_REQ: + { + const struct trxcon_param_fbsb_search_req *req = data; + + osmo_fsm_inst_state_chg_ms(fi, TRXCON_ST_FBSB_SEARCH, req->timeout_ms, 0); + + l1sched_configure_ts(trxcon->sched, 0, req->pchan_config); + + /* Only if current ARFCN differs */ + if (trxcon->trx->band_arfcn != req->band_arfcn) { + /* Update current ARFCN */ + trxcon->trx->band_arfcn = req->band_arfcn; + + /* Tune transceiver to required ARFCN */ + trx_if_cmd_rxtune(trxcon->trx, req->band_arfcn); + trx_if_cmd_txtune(trxcon->trx, req->band_arfcn); + } + + /* Transceiver might have been powered on before, e.g. + * in case of sending L1CTL_FBSB_REQ due to signal loss. */ + if (!trxcon->trx->powered_up) + trx_if_cmd_poweron(trxcon->trx); + break; + } + case TRXCON_EV_FULL_POWER_SCAN_REQ: + { + const struct trxcon_param_full_power_scan_req *req = data; + + osmo_fsm_inst_state_chg(fi, TRXCON_ST_FULL_POWER_SCAN, 0, 0); /* TODO: timeout */ + trx_if_cmd_measure(trxcon->trx, req->band_arfcn_start, req->band_arfcn_stop); + break; + } + default: + OSMO_ASSERT(0); + } +} + +static void trxcon_st_full_power_scan_action(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + struct trxcon_inst *trxcon = fi->priv; + + switch (event) { + case TRXCON_EV_FULL_POWER_SCAN_RES: + { + const struct trxcon_param_full_power_scan_res *res = data; + + l1ctl_tx_pm_conf(trxcon->l1c, res->band_arfcn, res->dbm, res->last_result); + break; + } + default: + OSMO_ASSERT(0); + } +} + +static void trxcon_st_fbsb_search_action(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + struct trxcon_inst *trxcon = fi->priv; + + switch (event) { + case TRXCON_EV_FBSB_SEARCH_RES: + osmo_fsm_inst_state_chg(fi, TRXCON_ST_BCCH_CCCH, 0, 0); + l1ctl_tx_fbsb_conf(trxcon->l1c, + trxcon->trx->band_arfcn, + trxcon->sched->bsic); + break; + default: + OSMO_ASSERT(0); + } +} + +static void handle_tx_access_burst_req(struct osmo_fsm_inst *fi, + const struct trxcon_param_tx_access_burst_req *req) +{ + struct trxcon_inst *trxcon = fi->priv; + enum l1sched_ts_prim_type prim_type; + const struct l1sched_ts_prim *prim; + + const struct l1sched_ts_prim_rach rach = { + .synch_seq = req->synch_seq, + .offset = req->offset, + .ra = req->ra, + }; + + prim_type = req->is_11bit ? L1SCHED_PRIM_RACH11 : L1SCHED_PRIM_RACH8; + prim = l1sched_prim_push(trxcon->sched, prim_type, + req->chan_nr, req->link_id, + (const uint8_t *)&rach, sizeof(rach)); + if (prim == NULL) + LOGPFSML(fi, LOGL_ERROR, "Failed to enqueue a prim\n"); +} + +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: + handle_tx_access_burst_req(fi, data); + break; + case TRXCON_EV_SET_CCCH_MODE_REQ: + { + struct trxcon_param_set_ccch_tch_mode_req *req = data; + enum gsm_phys_chan_config chan_config = req->mode; + + /* 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; + } + + /* Do nothing if the current mode matches required */ + if (ts->mf_layout->chan_config != chan_config) + l1sched_configure_ts(trxcon->sched, 0, chan_config); + req->applied = true; + break; + } + case TRXCON_EV_DEDICATED_ESTABLISH_REQ: + { + const struct trxcon_param_dedicated_establish_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) { + /* Apply the freq. hopping parameters */ + rc = trx_if_cmd_setfh(trxcon->trx, + req->h1.hsn, req->h1.maio, + &req->h1.ma[0], req->h1.n); + if (rc) + return; + + /* Set current ARFCN to an invalid value */ + trxcon->trx->band_arfcn = 0xffff; + } else { + /* Tune transceiver to required ARFCN */ + if (trx_if_cmd_rxtune(trxcon->trx, req->h0.band_arfcn)) + return; + if (trx_if_cmd_txtune(trxcon->trx, req->h0.band_arfcn)) + return; + + /* Update current ARFCN */ + trxcon->trx->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; + } + + osmo_fsm_inst_state_chg(fi, TRXCON_ST_DEDICATED, 0, 0); + break; + } + case TRXCON_EV_RX_DATA_IND: + { + const struct trxcon_param_rx_traffic_data_ind *ind = data; + const struct l1ctl_info_dl dl_hdr = { + .chan_nr = ind->chan_nr, + .link_id = ind->link_id, + .frame_nr = htonl(ind->frame_nr), + .band_arfcn = htons(trxcon->trx->band_arfcn), + .fire_crc = ind->data_len > 0 ? 0 : 2, + .rx_level = dbm2rxlev(ind->rssi), + .num_biterr = ind->n_errors, + /* TODO: set proper .snr */ + }; + + l1ctl_tx_dt_ind(trxcon->l1c, &dl_hdr, ind->data, ind->data_len, false); + break; + } + default: + OSMO_ASSERT(0); + } +} + +static void trxcon_st_dedicated_action(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + struct trxcon_inst *trxcon = fi->priv; + + switch (event) { + case TRXCON_EV_TX_ACCESS_BURST_REQ: + handle_tx_access_burst_req(fi, data); + break; + case TRXCON_EV_DEDICATED_RELEASE_REQ: + l1sched_reset(trxcon->sched, false); + osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); + break; + case TRXCON_EV_SET_TCH_MODE_REQ: + { + struct trxcon_param_set_ccch_tch_mode_req *req = data; + unsigned int tn; + + /* Iterate over timeslot list */ + for (tn = 0; tn < ARRAY_SIZE(trxcon->sched->ts); tn++) { + struct l1sched_ts *ts = trxcon->sched->ts[tn]; + struct l1sched_lchan_state *lchan; + + /* Timeslot is not allocated */ + if (ts == NULL || ts->mf_layout == NULL) + continue; + + /* Iterate over all allocated lchans */ + llist_for_each_entry(lchan, &ts->lchans, list) { + /* Omit inactive channels */ + if (!lchan->active) + continue; + lchan->tch_mode = req->mode; + req->applied = true; + } + } + break; + } + case TRXCON_EV_CRYPTO_REQ: + { + const struct trxcon_param_crypto_req *req = data; + unsigned int tn = req->chan_nr & 0x07; + struct l1sched_ts *ts; + + /* Make sure that required TS is allocated and configured */ + ts = trxcon->sched->ts[tn]; + if (ts == NULL || ts->mf_layout == NULL) { + LOGPFSML(fi, LOGL_ERROR, "TS%u is not configured\n", tn); + return; + } + + if (l1sched_start_ciphering(ts, req->a5_algo, req->key, req->key_len) != 0) { + LOGPFSML(fi, LOGL_ERROR, "Failed to configure ciphering\n"); + return; + } + break; + } + case TRXCON_EV_TX_TRAFFIC_REQ: + case TRXCON_EV_TX_DATA_REQ: + { + const struct trxcon_param_tx_traffic_data_req *req = data; + struct l1sched_ts_prim *prim; + + prim = l1sched_prim_push(trxcon->sched, L1SCHED_PRIM_DATA, + req->chan_nr, req->link_id, + req->data, req->data_len); + if (prim == NULL) { + LOGPFSML(fi, LOGL_ERROR, "Failed to enqueue a prim\n"); + return; + } + break; + } + case TRXCON_EV_RX_TRAFFIC_IND: + case TRXCON_EV_RX_DATA_IND: + { + const struct trxcon_param_rx_traffic_data_ind *ind = data; + const struct l1ctl_info_dl dl_hdr = { + .chan_nr = ind->chan_nr, + .link_id = ind->link_id, + .frame_nr = htonl(ind->frame_nr), + .band_arfcn = htons(trxcon->trx->band_arfcn), + .fire_crc = ind->data_len > 0 ? 0 : 2, + .rx_level = dbm2rxlev(ind->rssi), + .num_biterr = ind->n_errors, + /* TODO: set proper .snr */ + }; + + l1ctl_tx_dt_ind(trxcon->l1c, &dl_hdr, + ind->data, ind->data_len, + event == TRXCON_EV_RX_TRAFFIC_IND); + break; + } + default: + OSMO_ASSERT(0); + } +} + +static const struct osmo_fsm_state trxcon_fsm_states[] = { + [TRXCON_ST_RESET] = { + .name = "RESET", + .out_state_mask = S(TRXCON_ST_FBSB_SEARCH) + | S(TRXCON_ST_FULL_POWER_SCAN), + .in_event_mask = S(TRXCON_EV_FBSB_SEARCH_REQ) + | S(TRXCON_EV_FULL_POWER_SCAN_REQ), + .action = &trxcon_st_reset_action, + }, + [TRXCON_ST_FULL_POWER_SCAN] = { + .name = "FULL_POWER_SCAN", + .out_state_mask = S(TRXCON_ST_RESET), + .in_event_mask = S(TRXCON_EV_FULL_POWER_SCAN_RES), + .action = &trxcon_st_full_power_scan_action, + }, + [TRXCON_ST_FBSB_SEARCH] = { + .name = "FBSB_SEARCH", + .out_state_mask = S(TRXCON_ST_RESET) + | S(TRXCON_ST_BCCH_CCCH), + .in_event_mask = S(TRXCON_EV_FBSB_SEARCH_RES), + .action = &trxcon_st_fbsb_search_action, + }, + [TRXCON_ST_BCCH_CCCH] = { + .name = "BCCH_CCCH", + .out_state_mask = S(TRXCON_ST_RESET) + | S(TRXCON_ST_FBSB_SEARCH) + | S(TRXCON_ST_DEDICATED), + .in_event_mask = S(TRXCON_EV_RX_DATA_IND) + | S(TRXCON_EV_SET_CCCH_MODE_REQ) + | S(TRXCON_EV_TX_ACCESS_BURST_REQ) + | S(TRXCON_EV_DEDICATED_ESTABLISH_REQ), + .action = &trxcon_st_bcch_ccch_action, + }, + [TRXCON_ST_DEDICATED] = { + .name = "DEDICATED", + .out_state_mask = S(TRXCON_ST_RESET) + | S(TRXCON_ST_FBSB_SEARCH) + | S(TRXCON_ST_BCCH_CCCH), + .in_event_mask = S(TRXCON_EV_DEDICATED_RELEASE_REQ) + | S(TRXCON_EV_TX_ACCESS_BURST_REQ) + | S(TRXCON_EV_SET_TCH_MODE_REQ) + | S(TRXCON_EV_TX_TRAFFIC_REQ) + | S(TRXCON_EV_RX_TRAFFIC_IND) + | S(TRXCON_EV_TX_DATA_REQ) + | S(TRXCON_EV_RX_DATA_IND) + | S(TRXCON_EV_CRYPTO_REQ), + .action = &trxcon_st_dedicated_action, + }, +}; + +static const struct value_string trxcon_fsm_event_names[] = { + OSMO_VALUE_STRING(TRXCON_EV_L1IF_FAILURE), + OSMO_VALUE_STRING(TRXCON_EV_L2IF_FAILURE), + OSMO_VALUE_STRING(TRXCON_EV_RESET_FULL_REQ), + OSMO_VALUE_STRING(TRXCON_EV_RESET_SCHED_REQ), + OSMO_VALUE_STRING(TRXCON_EV_FULL_POWER_SCAN_REQ), + OSMO_VALUE_STRING(TRXCON_EV_FULL_POWER_SCAN_RES), + OSMO_VALUE_STRING(TRXCON_EV_FBSB_SEARCH_REQ), + OSMO_VALUE_STRING(TRXCON_EV_FBSB_SEARCH_RES), + OSMO_VALUE_STRING(TRXCON_EV_SET_CCCH_MODE_REQ), + OSMO_VALUE_STRING(TRXCON_EV_SET_TCH_MODE_REQ), + OSMO_VALUE_STRING(TRXCON_EV_SET_CONFIG_REQ), + OSMO_VALUE_STRING(TRXCON_EV_TX_ACCESS_BURST_REQ), + OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_ESTABLISH_REQ), + OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_RELEASE_REQ), + OSMO_VALUE_STRING(TRXCON_EV_TX_TRAFFIC_REQ), + OSMO_VALUE_STRING(TRXCON_EV_RX_TRAFFIC_IND), + OSMO_VALUE_STRING(TRXCON_EV_TX_DATA_REQ), + OSMO_VALUE_STRING(TRXCON_EV_RX_DATA_IND), + OSMO_VALUE_STRING(TRXCON_EV_CRYPTO_REQ), + { 0, NULL } +}; + +struct osmo_fsm trxcon_fsm_def = { + .name = "trxcon", + .states = trxcon_fsm_states, + .num_states = ARRAY_SIZE(trxcon_fsm_states), + .log_subsys = DAPP, + .event_names = trxcon_fsm_event_names, + .allstate_event_mask = S(TRXCON_EV_L1IF_FAILURE) + | S(TRXCON_EV_L2IF_FAILURE) + | S(TRXCON_EV_RESET_FULL_REQ) + | S(TRXCON_EV_RESET_SCHED_REQ) + | S(TRXCON_EV_SET_CONFIG_REQ), + .allstate_action = &trxcon_allstate_action, + .timer_cb = &trxcon_timer_cb, +}; + +static __attribute__((constructor)) void on_dso_load(void) +{ + OSMO_ASSERT(osmo_fsm_register(&trxcon_fsm_def) == 0); +} -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifaf63ead9dd180181358e771367b2a686ba159ca Gerrit-Change-Number: 28809 Gerrit-PatchSet: 4 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: extended RACH != 11-bit RACH, correct logging messages

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28836 ) Change subject: trxcon: extended RACH != 11-bit RACH, correct logging messages ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7f977d5d2b68741a230c706f5b16cf307bc267d1 Gerrit-Change-Number: 28836 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 14:22:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: abstract out 'struct trxcon_inst' from L1CTL/TRXC/TRXD

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28835 ) Change subject: trxcon: abstract out 'struct trxcon_inst' from L1CTL/TRXC/TRXD ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7282da6dd16216bb4295c4d18f993251defbdf0a Gerrit-Change-Number: 28835 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 14:21:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: move L1 params from struct trx_instance to trxcon_inst

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28834 ) Change subject: trxcon: move L1 params from struct trx_instance to trxcon_inst ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifbd9bb17d63ab1d8712d0c8022a62117a48c6384 Gerrit-Change-Number: 28834 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 14:21:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework trxcon_fsm, move into a separate file

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28809 ) Change subject: trxcon: rework trxcon_fsm, move into a separate file ...................................................................... Patch Set 4: Code-Review+2 (2 comments) Patchset: PS4: 1+1 File src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h: https://gerrit.osmocom.org/c/osmocom-bb/+/28809/comment/789b6112_331abde9 PS4, Line 61: uint8_t mode; > this used to be enum gsm_phys_chan_config in previous patch versions? I introduced this structure in the last patchset. It is used by both TRXCON_EV_SET_{CCCH,TCH}_MODE_REQ, while enum gsm_phys_chan_config is only applicable to TRXCON_EV_SET_CCCH_MODE_REQ. This is why I am using uint8_t. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifaf63ead9dd180181358e771367b2a686ba159ca Gerrit-Change-Number: 28809 Gerrit-PatchSet: 4 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 14:21:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: Split event list for smscb_message_fsm and smscb_peer_fsm

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28826 ) Change subject: Split event list for smscb_message_fsm and smscb_peer_fsm ...................................................................... Split event list for smscb_message_fsm and smscb_peer_fsm It really doesn't make sense to share the event list betwen those for several reasons. First, because ech of those FSM relate to different things: * smscb_message_fsm: Handling/scheduling of 1 smscb towards all peers * smscb_peer_fsm: Handling/scheduling of 1 smscb towards 1 peer. The former has higher level interface used by the REST API, plus some mid level interface used by smscb_peer_fsm. The later has a mid level interface used by smscb_message_fsm to interact, and a lower level interface used by the SBcAP/CBSP links to talk to. Furthermore, this makes it a lot easier understanding which events are sent from one to another FSM. Change-Id: I909474d1ff4ec7ed20aff0981da47074397df6cb --- M include/osmocom/cbc/Makefile.am M include/osmocom/cbc/smscb_message_fsm.h A include/osmocom/cbc/smscb_peer_fsm.h M src/cbc_message.c M src/cbsp_link_fsm.c M src/sbcap_link_fsm.c M src/smscb_message_fsm.c M src/smscb_peer_fsm.c 8 files changed, 197 insertions(+), 179 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/cbc/Makefile.am b/include/osmocom/cbc/Makefile.am index dc3a21f..c4bc639 100644 --- a/include/osmocom/cbc/Makefile.am +++ b/include/osmocom/cbc/Makefile.am @@ -13,4 +13,5 @@ sbcap_link_fsm.h \ rest_it_op.h \ smscb_message_fsm.h \ + smscb_peer_fsm.h \ $(NULL) diff --git a/include/osmocom/cbc/smscb_message_fsm.h b/include/osmocom/cbc/smscb_message_fsm.h index dec719b..7970fd5 100644 --- a/include/osmocom/cbc/smscb_message_fsm.h +++ b/include/osmocom/cbc/smscb_message_fsm.h @@ -3,36 +3,28 @@ #include <stdint.h> #include <osmocom/core/fsm.h> -enum smscb_fsm_event { - SMSCB_E_CHILD_DIED, +enum smscb_message_fsm_event { + SMSCB_MSG_E_CHILD_DIED, /* create a message (from REST) */ - SMSCB_E_CREATE, + SMSCB_MSG_E_CREATE, /* replace a message (from REST) */ - SMSCB_E_REPLACE, + SMSCB_MSG_E_REPLACE, /* get status of a message (from REST) */ - SMSCB_E_STATUS, + SMSCB_MSG_E_STATUS, /* delete a message (from REST) */ - SMSCB_E_DELETE, - /* CBSP peer confirms write */ - SMSCB_E_CBSP_WRITE_ACK, - SMSCB_E_CBSP_WRITE_NACK, - /* CBSP peer confirms replace */ - SMSCB_E_CBSP_REPLACE_ACK, - SMSCB_E_CBSP_REPLACE_NACK, - /* CBSP peer confirms delete */ - SMSCB_E_CBSP_DELETE_ACK, - SMSCB_E_CBSP_DELETE_NACK, - /* CBSP peer confirms status query */ - SMSCB_E_CBSP_STATUS_ACK, - SMSCB_E_CBSP_STATUS_NACK, - /* SBc-AP peer confirms write */ - SMSCB_E_SBCAP_WRITE_ACK, - SMSCB_E_SBCAP_WRITE_NACK, - /* SBc-AP peer confirms delete */ - SMSCB_E_SBCAP_DELETE_ACK, - SMSCB_E_SBCAP_DELETE_NACK, - /* SBc-AP peer sends Write Replace Warning Indication to us */ - SMSCB_E_SBCAP_WRITE_IND, + SMSCB_MSG_E_DELETE, + /* peer confirms write */ + SMSCB_MSG_E_WRITE_ACK, + SMSCB_MSG_E_WRITE_NACK, + /* peer confirms replace */ + SMSCB_MSG_E_REPLACE_ACK, + SMSCB_MSG_E_REPLACE_NACK, + /* peer confirms delete */ + SMSCB_MSG_E_DELETE_ACK, + SMSCB_MSG_E_DELETE_NACK, + /* peer confirms status query */ + SMSCB_MSG_E_STATUS_ACK, + SMSCB_MSG_E_STATUS_NACK }; enum smscb_fsm_state { @@ -58,4 +50,4 @@ T_WAIT_DELETE_ACK, }; -extern const struct value_string smscb_fsm_event_names[]; +extern const struct value_string smscb_message_fsm_event_names[]; diff --git a/include/osmocom/cbc/smscb_peer_fsm.h b/include/osmocom/cbc/smscb_peer_fsm.h new file mode 100644 index 0000000..7bf1c54 --- /dev/null +++ b/include/osmocom/cbc/smscb_peer_fsm.h @@ -0,0 +1,37 @@ +#pragma once + +#include <stdint.h> +#include <osmocom/core/fsm.h> + +enum smscb_peer_fsm_event { + /* create a message (from REST) */ + SMSCB_PEER_E_CREATE, + /* replace a message (from REST) */ + SMSCB_PEER_E_REPLACE, + /* get status of a message (from REST) */ + SMSCB_PEER_E_STATUS, + /* delete a message (from REST) */ + SMSCB_PEER_E_DELETE, + /* CBSP peer confirms write */ + SMSCB_PEER_E_CBSP_WRITE_ACK, + SMSCB_PEER_E_CBSP_WRITE_NACK, + /* CBSP peer confirms replace */ + SMSCB_PEER_E_CBSP_REPLACE_ACK, + SMSCB_PEER_E_CBSP_REPLACE_NACK, + /* CBSP peer confirms delete */ + SMSCB_PEER_E_CBSP_DELETE_ACK, + SMSCB_PEER_E_CBSP_DELETE_NACK, + /* CBSP peer confirms status query */ + SMSCB_PEER_E_CBSP_STATUS_ACK, + SMSCB_PEER_E_CBSP_STATUS_NACK, + /* SBc-AP peer confirms write */ + SMSCB_PEER_E_SBCAP_WRITE_ACK, + SMSCB_PEER_E_SBCAP_WRITE_NACK, + /* SBc-AP peer confirms delete */ + SMSCB_PEER_E_SBCAP_DELETE_ACK, + SMSCB_PEER_E_SBCAP_DELETE_NACK, + /* SBc-AP peer sends Write Replace Warning Indication to us */ + SMSCB_PEER_E_SBCAP_WRITE_IND, +}; + +extern const struct value_string smscb_peer_fsm_event_names[]; diff --git a/src/cbc_message.c b/src/cbc_message.c index 029abcb..a2bf86a 100644 --- a/src/cbc_message.c +++ b/src/cbc_message.c @@ -130,7 +130,7 @@ } /* kick off the state machine[s] */ - if (osmo_fsm_inst_dispatch(cbcmsg->fi, SMSCB_E_CREATE, op) < 0) { + if (osmo_fsm_inst_dispatch(cbcmsg->fi, SMSCB_MSG_E_CREATE, op) < 0) { rest_it_op_set_http_result(op, 500, "Illegal FSM event"); rest_it_op_complete(op); } @@ -142,7 +142,7 @@ void cbc_message_delete(struct cbc_message *cbcmsg, struct rest_it_op *op) { - if (osmo_fsm_inst_dispatch(cbcmsg->fi, SMSCB_E_DELETE, op) < 0) { + if (osmo_fsm_inst_dispatch(cbcmsg->fi, SMSCB_MSG_E_DELETE, op) < 0) { rest_it_op_set_http_result(op, 500, "Illegal FSM event"); rest_it_op_complete(op); } diff --git a/src/cbsp_link_fsm.c b/src/cbsp_link_fsm.c index eba21a7..40414d0 100644 --- a/src/cbsp_link_fsm.c +++ b/src/cbsp_link_fsm.c @@ -27,7 +27,7 @@ #include <osmocom/cbc/cbsp_link.h> #include <osmocom/cbc/cbsp_link_fsm.h> #include <osmocom/cbc/debug.h> -#include <osmocom/cbc/smscb_message_fsm.h> +#include <osmocom/cbc/smscb_peer_fsm.h> #define S(x) (1 << (x)) @@ -339,22 +339,22 @@ switch (dec->msg_type) { case CBSP_MSGT_WRITE_REPLACE_COMPL: if (dec->u.write_replace_compl.old_serial_nr) - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_CBSP_REPLACE_ACK, dec); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_CBSP_REPLACE_ACK, dec); else - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_CBSP_WRITE_ACK, dec); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_CBSP_WRITE_ACK, dec); case CBSP_MSGT_WRITE_REPLACE_FAIL: if (dec->u.write_replace_fail.old_serial_nr) - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_CBSP_REPLACE_NACK, dec); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_CBSP_REPLACE_NACK, dec); else - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_CBSP_WRITE_NACK, dec); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_CBSP_WRITE_NACK, dec); case CBSP_MSGT_KILL_COMPL: - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_CBSP_DELETE_ACK, dec); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_CBSP_DELETE_ACK, dec); case CBSP_MSGT_KILL_FAIL: - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_CBSP_DELETE_NACK, dec); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_CBSP_DELETE_NACK, dec); case CBSP_MSGT_MSG_STATUS_QUERY_COMPL: - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_CBSP_STATUS_ACK, dec); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_CBSP_STATUS_ACK, dec); case CBSP_MSGT_MSG_STATUS_QUERY_FAIL: - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_CBSP_STATUS_NACK, dec); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_CBSP_STATUS_NACK, dec); default: LOGPCC(link, LOGL_ERROR, "unknown message %s\n", get_value_string(cbsp_msg_type_names, dec->msg_type)); diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index f2cbe82..685ce7d 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -31,7 +31,7 @@ #include <osmocom/cbc/sbcap_msg.h> #include <osmocom/cbc/debug.h> #include <osmocom/cbc/cbc_peer.h> -#include <osmocom/cbc/smscb_message_fsm.h> +#include <osmocom/cbc/smscb_peer_fsm.h> #define S(x) (1 << (x)) @@ -249,7 +249,7 @@ A_SEQUENCE_OF(void) *as_pdu; SBcAP_Write_Replace_Warning_Response_IEs_t *ie; SBcAP_SBC_AP_PDU_t *err_ind_pdu; - int ev = SMSCB_E_SBCAP_WRITE_ACK; + int ev = SMSCB_PEER_E_SBCAP_WRITE_ACK; as_pdu = (void *)&pdu->choice.successfulOutcome.value.choice.Write_Replace_Warning_Response.protocolIEs.list; @@ -257,9 +257,9 @@ ie = sbcap_as_find_ie(as_pdu, 1); if (ie) { if (ie->value.choice.Cause != SBcAP_Cause_message_accepted) - ev = SMSCB_E_SBCAP_WRITE_NACK; + ev = SMSCB_PEER_E_SBCAP_WRITE_NACK; } else { /* This shouldn't happen, the IE is Mandatory... */ - ev = SMSCB_E_SBCAP_WRITE_NACK; + ev = SMSCB_PEER_E_SBCAP_WRITE_NACK; err_ind_pdu = sbcap_gen_error_ind(link, SBcAP_Cause_missing_mandatory_element, pdu); if (err_ind_pdu) @@ -362,7 +362,7 @@ case SBcAP_SBC_AP_PDU_PR_initiatingMessage: switch (pdu->choice.initiatingMessage.procedureCode) { case SBcAP_ProcedureId_Write_Replace_Warning_Indication: - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_SBCAP_WRITE_IND, pdu); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_SBCAP_WRITE_IND, pdu); default: break; } @@ -371,11 +371,11 @@ switch (pdu->choice.successfulOutcome.procedureCode) { case SBcAP_ProcedureId_Write_Replace_Warning: //if (dec->u.write_replace_compl.old_serial_nr) - // return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_SBcAP_REPLACE_ACK, dec); + // return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_SBcAP_REPLACE_ACK, dec); //else return cbc_sbcap_link_rx_write_replace_warn_resp(link, mp, pdu); case SBcAP_ProcedureId_Stop_Warning: - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_SBCAP_DELETE_ACK, pdu); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_SBCAP_DELETE_ACK, pdu); default: break; } @@ -383,7 +383,7 @@ case SBcAP_SBC_AP_PDU_PR_unsuccessfulOutcome: switch (pdu->choice.unsuccessfulOutcome.procedureCode) { case SBcAP_ProcedureId_Stop_Warning: - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_SBCAP_DELETE_NACK, pdu); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_SBCAP_DELETE_NACK, pdu); default: break; } diff --git a/src/smscb_message_fsm.c b/src/smscb_message_fsm.c index 40d4535..9281736 100644 --- a/src/smscb_message_fsm.c +++ b/src/smscb_message_fsm.c @@ -35,20 +35,38 @@ #include <osmocom/cbc/debug.h> #include <osmocom/cbc/rest_it_op.h> #include <osmocom/cbc/smscb_message_fsm.h> +#include <osmocom/cbc/smscb_peer_fsm.h> #define S(x) (1 << (x)) +const struct value_string smscb_message_fsm_event_names[] = { + { SMSCB_MSG_E_CHILD_DIED, "CHILD_DIED" }, + { SMSCB_MSG_E_CREATE, "CREATE" }, + { SMSCB_MSG_E_REPLACE, "REPLACE" }, + { SMSCB_MSG_E_STATUS, "STATUS" }, + { SMSCB_MSG_E_DELETE, "DELETE" }, + { SMSCB_MSG_E_WRITE_ACK, "WRITE_ACK" }, + { SMSCB_MSG_E_WRITE_NACK, "WRITE_NACK" }, + { SMSCB_MSG_E_REPLACE_ACK, "REPLACE_ACK" }, + { SMSCB_MSG_E_REPLACE_NACK, "REPLACE_NACK" }, + { SMSCB_MSG_E_DELETE_ACK, "DELETE_ACK" }, + { SMSCB_MSG_E_DELETE_NACK, "DELETE_NACK" }, + { SMSCB_MSG_E_STATUS_ACK, "STATUS_ACK" }, + { SMSCB_MSG_E_STATUS_NACK, "STATUS_NACK" }, + { 0, NULL } +}; + static void smscb_fsm_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct cbc_message *cbcmsg = fi->priv; switch (event) { - case SMSCB_E_CREATE: + case SMSCB_MSG_E_CREATE: OSMO_ASSERT(!cbcmsg->it_op); cbcmsg->it_op = data; osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 15, T_WAIT_WRITE_ACK); /* forward this event to all child FSMs (i.e. all smscb_message_peer) */ - osmo_fsm_inst_broadcast_children(fi, SMSCB_E_CREATE, NULL); + osmo_fsm_inst_broadcast_children(fi, SMSCB_PEER_E_CREATE, NULL); break; default: OSMO_ASSERT(0); @@ -61,10 +79,8 @@ struct osmo_fsm_inst *peer_fi; switch (event) { - case SMSCB_E_CBSP_WRITE_ACK: - case SMSCB_E_CBSP_WRITE_NACK: - case SMSCB_E_SBCAP_WRITE_ACK: - case SMSCB_E_SBCAP_WRITE_NACK: + case SMSCB_MSG_E_WRITE_ACK: + case SMSCB_MSG_E_WRITE_NACK: /* check if any per-peer children have not yet received the ACK or * timed out */ llist_for_each_entry(peer_fi, &fi->proc.children, proc.child) { @@ -92,26 +108,26 @@ struct cbc_message *cbcmsg = fi->priv; switch (event) { - case SMSCB_E_REPLACE: + case SMSCB_MSG_E_REPLACE: OSMO_ASSERT(!cbcmsg->it_op); cbcmsg->it_op = data; osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_REPLACE_ACK, 15, T_WAIT_REPLACE_ACK); /* forward this event to all child FSMs (i.e. all smscb_message_peer) */ - osmo_fsm_inst_broadcast_children(fi, SMSCB_E_REPLACE, data); + osmo_fsm_inst_broadcast_children(fi, SMSCB_PEER_E_REPLACE, data); break; - case SMSCB_E_STATUS: + case SMSCB_MSG_E_STATUS: OSMO_ASSERT(!cbcmsg->it_op); cbcmsg->it_op = data; osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_STATUS_ACK, 15, T_WAIT_STATUS_ACK); /* forward this event to all child FSMs (i.e. all smscb_message_peer) */ - osmo_fsm_inst_broadcast_children(fi, SMSCB_E_STATUS, data); + osmo_fsm_inst_broadcast_children(fi, SMSCB_PEER_E_STATUS, data); break; - case SMSCB_E_DELETE: + case SMSCB_MSG_E_DELETE: OSMO_ASSERT(!cbcmsg->it_op); cbcmsg->it_op = data; osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_DELETE_ACK, 15, T_WAIT_DELETE_ACK); /* forward this event to all child FSMs (i.e. all smscb_message_peer) */ - osmo_fsm_inst_broadcast_children(fi, SMSCB_E_DELETE, data); + osmo_fsm_inst_broadcast_children(fi, SMSCB_PEER_E_DELETE, data); break; default: OSMO_ASSERT(0); @@ -124,8 +140,8 @@ struct osmo_fsm_inst *peer_fi; switch (event) { - case SMSCB_E_CBSP_REPLACE_ACK: - case SMSCB_E_CBSP_REPLACE_NACK: + case SMSCB_MSG_E_REPLACE_ACK: + case SMSCB_MSG_E_REPLACE_NACK: llist_for_each_entry(peer_fi, &fi->proc.children, proc.child) { if (peer_fi->state == SMSCB_S_WAIT_REPLACE_ACK) return; @@ -152,8 +168,8 @@ struct osmo_fsm_inst *peer_fi; switch (event) { - case SMSCB_E_CBSP_STATUS_ACK: - case SMSCB_E_CBSP_STATUS_NACK: + case SMSCB_MSG_E_STATUS_ACK: + case SMSCB_MSG_E_STATUS_NACK: llist_for_each_entry(peer_fi, &fi->proc.children, proc.child) { if (peer_fi->state == SMSCB_S_WAIT_STATUS_ACK) return; @@ -180,10 +196,8 @@ struct osmo_fsm_inst *peer_fi; switch (event) { - case SMSCB_E_CBSP_DELETE_ACK: - case SMSCB_E_CBSP_DELETE_NACK: - case SMSCB_E_SBCAP_DELETE_ACK: - case SMSCB_E_SBCAP_DELETE_NACK: + case SMSCB_MSG_E_DELETE_ACK: + case SMSCB_MSG_E_DELETE_NACK: llist_for_each_entry(peer_fi, &fi->proc.children, proc.child) { if (peer_fi->state != SMSCB_S_DELETED) return; @@ -223,25 +237,23 @@ static struct osmo_fsm_state smscb_fsm_states[] = { [SMSCB_S_INIT] = { .name = "INIT", - .in_event_mask = S(SMSCB_E_CREATE), + .in_event_mask = S(SMSCB_MSG_E_CREATE), .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK), .action = smscb_fsm_init, }, [SMSCB_S_WAIT_WRITE_ACK] = { .name = "WAIT_WRITE_ACK", - .in_event_mask = S(SMSCB_E_CBSP_WRITE_ACK) | - S(SMSCB_E_CBSP_WRITE_NACK) | - S(SMSCB_E_SBCAP_WRITE_ACK) | - S(SMSCB_E_SBCAP_WRITE_NACK), + .in_event_mask = S(SMSCB_MSG_E_WRITE_ACK) | + S(SMSCB_MSG_E_WRITE_NACK), .out_state_mask = S(SMSCB_S_ACTIVE), .action = smscb_fsm_wait_write_ack, .onleave = smscb_fsm_wait_write_ack_onleave, }, [SMSCB_S_ACTIVE] = { .name = "ACTIVE", - .in_event_mask = S(SMSCB_E_REPLACE) | - S(SMSCB_E_STATUS) | - S(SMSCB_E_DELETE), + .in_event_mask = S(SMSCB_MSG_E_REPLACE) | + S(SMSCB_MSG_E_STATUS) | + S(SMSCB_MSG_E_DELETE), .out_state_mask = S(SMSCB_S_ACTIVE) | S(SMSCB_S_WAIT_REPLACE_ACK) | S(SMSCB_S_WAIT_STATUS_ACK) | @@ -250,26 +262,24 @@ }, [SMSCB_S_WAIT_REPLACE_ACK] = { .name = "WAIT_REPLACE_ACK", - .in_event_mask = S(SMSCB_E_CBSP_REPLACE_ACK) | - S(SMSCB_E_CBSP_REPLACE_NACK), + .in_event_mask = S(SMSCB_MSG_E_REPLACE_ACK) | + S(SMSCB_MSG_E_REPLACE_NACK), .out_state_mask = S(SMSCB_S_ACTIVE), .action = smscb_fsm_wait_replace_ack, .onleave = smscb_fsm_wait_replace_ack_onleave, }, [SMSCB_S_WAIT_STATUS_ACK] = { .name = "WAIT_STATUS_ACK", - .in_event_mask = S(SMSCB_E_CBSP_STATUS_ACK) | - S(SMSCB_E_CBSP_STATUS_NACK), + .in_event_mask = S(SMSCB_MSG_E_STATUS_ACK) | + S(SMSCB_MSG_E_STATUS_NACK), .out_state_mask = S(SMSCB_S_ACTIVE), .action = smscb_fsm_wait_status_ack, .onleave = smscb_fsm_wait_status_ack_onleave, }, [SMSCB_S_WAIT_DELETE_ACK] = { .name = "WAIT_DELETE_ACK", - .in_event_mask = S(SMSCB_E_CBSP_DELETE_ACK) | - S(SMSCB_E_CBSP_DELETE_NACK) | - S(SMSCB_E_SBCAP_DELETE_ACK) | - S(SMSCB_E_SBCAP_DELETE_NACK), + .in_event_mask = S(SMSCB_MSG_E_DELETE_ACK) | + S(SMSCB_MSG_E_DELETE_NACK), .out_state_mask = S(SMSCB_S_DELETED), .action = smscb_fsm_wait_delete_ack, .onleave = smscb_fsm_wait_delete_ack_onleave, @@ -311,7 +321,7 @@ static void smscb_fsm_allstate(struct osmo_fsm_inst *Fi, uint32_t event, void *data) { switch (event) { - case SMSCB_E_CHILD_DIED: + case SMSCB_MSG_E_CHILD_DIED: break; default: OSMO_ASSERT(0); @@ -332,11 +342,11 @@ .name = "SMSCB", .states = smscb_fsm_states, .num_states = ARRAY_SIZE(smscb_fsm_states), - .allstate_event_mask = S(SMSCB_E_CHILD_DIED), + .allstate_event_mask = S(SMSCB_MSG_E_CHILD_DIED), .allstate_action = smscb_fsm_allstate, .timer_cb = smscb_fsm_timer_cb, .log_subsys = DSMSCB, - .event_names = smscb_fsm_event_names, + .event_names = smscb_message_fsm_event_names, .cleanup= smscb_fsm_cleanup, }; diff --git a/src/smscb_peer_fsm.c b/src/smscb_peer_fsm.c index 2c1edab..589a832 100644 --- a/src/smscb_peer_fsm.c +++ b/src/smscb_peer_fsm.c @@ -40,29 +40,29 @@ #include <osmocom/cbc/sbcap_link.h> #include <osmocom/cbc/sbcap_msg.h> #include <osmocom/cbc/debug.h> +#include <osmocom/cbc/smscb_peer_fsm.h> #include <osmocom/cbc/smscb_message_fsm.h> #define S(x) (1 << (x)) -const struct value_string smscb_fsm_event_names[] = { - { SMSCB_E_CHILD_DIED, "CHILD_DIED" }, - { SMSCB_E_CREATE, "CREATE" }, - { SMSCB_E_REPLACE, "REPLACE" }, - { SMSCB_E_STATUS, "STATUS" }, - { SMSCB_E_DELETE, "DELETE" }, - { SMSCB_E_CBSP_WRITE_ACK, "CBSP_WRITE_ACK" }, - { SMSCB_E_CBSP_WRITE_NACK, "CBSP_WRITE_NACK" }, - { SMSCB_E_CBSP_REPLACE_ACK, "CBSP_REPLACE_ACK" }, - { SMSCB_E_CBSP_REPLACE_NACK, "CBSP_REPLACE_NACK" }, - { SMSCB_E_CBSP_DELETE_ACK, "CBSP_DELETE_ACK" }, - { SMSCB_E_CBSP_DELETE_NACK, "CBSP_DELETE_NACK" }, - { SMSCB_E_CBSP_STATUS_ACK, "CBSP_STATUS_ACK" }, - { SMSCB_E_CBSP_STATUS_NACK, "CBSP_STATUS_NACK" }, - { SMSCB_E_SBCAP_WRITE_ACK, "SBcAP_WRITE_ACK" }, - { SMSCB_E_SBCAP_WRITE_NACK, "SBcAP_WRITE_NACK" }, - { SMSCB_E_SBCAP_DELETE_ACK, "SBcAP_DELETE_ACK" }, - { SMSCB_E_SBCAP_DELETE_NACK, "SBcAP_DELETE_NACK" }, - { SMSCB_E_SBCAP_WRITE_IND, "SBcAP_WRITE_IND" }, +const struct value_string smscb_peer_fsm_event_names[] = { + { SMSCB_PEER_E_CREATE, "CREATE" }, + { SMSCB_PEER_E_REPLACE, "REPLACE" }, + { SMSCB_PEER_E_STATUS, "STATUS" }, + { SMSCB_PEER_E_DELETE, "DELETE" }, + { SMSCB_PEER_E_CBSP_WRITE_ACK, "CBSP_WRITE_ACK" }, + { SMSCB_PEER_E_CBSP_WRITE_NACK, "CBSP_WRITE_NACK" }, + { SMSCB_PEER_E_CBSP_REPLACE_ACK, "CBSP_REPLACE_ACK" }, + { SMSCB_PEER_E_CBSP_REPLACE_NACK, "CBSP_REPLACE_NACK" }, + { SMSCB_PEER_E_CBSP_DELETE_ACK, "CBSP_DELETE_ACK" }, + { SMSCB_PEER_E_CBSP_DELETE_NACK, "CBSP_DELETE_NACK" }, + { SMSCB_PEER_E_CBSP_STATUS_ACK, "CBSP_STATUS_ACK" }, + { SMSCB_PEER_E_CBSP_STATUS_NACK, "CBSP_STATUS_NACK" }, + { SMSCB_PEER_E_SBCAP_WRITE_ACK, "SBcAP_WRITE_ACK" }, + { SMSCB_PEER_E_SBCAP_WRITE_NACK, "SBcAP_WRITE_NACK" }, + { SMSCB_PEER_E_SBCAP_DELETE_ACK, "SBcAP_DELETE_ACK" }, + { SMSCB_PEER_E_SBCAP_DELETE_NACK, "SBcAP_DELETE_NACK" }, + { SMSCB_PEER_E_SBCAP_WRITE_IND, "SBcAP_WRITE_IND" }, { 0, NULL } }; @@ -349,7 +349,7 @@ int rc; switch (event) { - case SMSCB_E_CREATE: + case SMSCB_PEER_E_CREATE: /* send it to peer */ rc = peer_new_cbc_message(mp->peer, mp->cbcmsg); if (rc == 0) { @@ -372,24 +372,24 @@ SBcAP_Write_Replace_Warning_Response_IEs_t *ie; switch (event) { - case SMSCB_E_CBSP_WRITE_ACK: + case SMSCB_PEER_E_CBSP_WRITE_ACK: dec = data; msg_peer_append_cbsp_compl(mp, &dec->u.write_replace_compl.num_compl_list); msg_peer_append_cbsp_cell(mp, &dec->u.write_replace_compl.cell_list); osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_WRITE_ACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_ACK, mp); break; - case SMSCB_E_CBSP_WRITE_NACK: + case SMSCB_PEER_E_CBSP_WRITE_NACK: dec = data; msg_peer_append_cbsp_compl(mp, &dec->u.write_replace_fail.num_compl_list); msg_peer_append_cbsp_cell(mp, &dec->u.write_replace_fail.cell_list); msg_peer_append_cbsp_fail(mp, &dec->u.write_replace_fail.fail_list); osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_WRITE_NACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_NACK, mp); break; - case SMSCB_E_SBCAP_WRITE_ACK: + case SMSCB_PEER_E_SBCAP_WRITE_ACK: sbcap = data; OSMO_ASSERT(sbcap->present == SBcAP_SBC_AP_PDU_PR_successfulOutcome); OSMO_ASSERT(sbcap->choice.successfulOutcome.procedureCode == SBcAP_ProcedureId_Write_Replace_Warning); @@ -402,12 +402,12 @@ } osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_SBCAP_WRITE_ACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_ACK, mp); break; - case SMSCB_E_SBCAP_WRITE_NACK: + case SMSCB_PEER_E_SBCAP_WRITE_NACK: osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_SBCAP_WRITE_NACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_NACK, mp); break; default: OSMO_ASSERT(0); @@ -420,7 +420,7 @@ struct osmo_cbsp_decoded *cbsp; switch (event) { - case SMSCB_E_REPLACE: /* send WRITE-REPLACE to BSC */ + case SMSCB_PEER_E_REPLACE: /* send WRITE-REPLACE to BSC */ cbsp = osmo_cbsp_decoded_alloc(mp->peer, CBSP_MSGT_WRITE_REPLACE); OSMO_ASSERT(cbsp); cbsp->u.write_replace.msg_id = mp->cbcmsg->msg.message_id; @@ -432,7 +432,7 @@ cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_REPLACE_ACK, 10, T_WAIT_REPLACE_ACK); break; - case SMSCB_E_STATUS: /* send MSG-STATUS-QUERY to BSC */ + case SMSCB_PEER_E_STATUS: /* send MSG-STATUS-QUERY to BSC */ cbsp = osmo_cbsp_decoded_alloc(mp->peer, CBSP_MSGT_MSG_STATUS_QUERY); OSMO_ASSERT(cbsp); cbsp->u.msg_status_query.msg_id = mp->cbcmsg->msg.message_id; @@ -453,20 +453,20 @@ struct osmo_cbsp_decoded *dec = NULL; switch (event) { - case SMSCB_E_CBSP_STATUS_ACK: + case SMSCB_PEER_E_CBSP_STATUS_ACK: dec = data; msg_peer_append_cbsp_compl(mp, &dec->u.msg_status_query_compl.num_compl_list); osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_STATUS_ACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_STATUS_ACK, mp); break; - case SMSCB_E_CBSP_STATUS_NACK: + case SMSCB_PEER_E_CBSP_STATUS_NACK: dec = data; msg_peer_append_cbsp_compl(mp, &dec->u.msg_status_query_fail.num_compl_list); msg_peer_append_cbsp_fail(mp, &dec->u.msg_status_query_fail.fail_list); osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_STATUS_NACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_STATUS_NACK, mp); break; default: OSMO_ASSERT(0); @@ -480,22 +480,22 @@ struct osmo_cbsp_decoded *dec = NULL; switch (event) { - case SMSCB_E_CBSP_REPLACE_ACK: + case SMSCB_PEER_E_CBSP_REPLACE_ACK: dec = data; msg_peer_append_cbsp_compl(mp, &dec->u.write_replace_compl.num_compl_list); msg_peer_append_cbsp_cell(mp, &dec->u.write_replace_compl.cell_list); osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_REPLACE_ACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_REPLACE_ACK, mp); break; - case SMSCB_E_CBSP_REPLACE_NACK: + case SMSCB_PEER_E_CBSP_REPLACE_NACK: dec = data; msg_peer_append_cbsp_compl(mp, &dec->u.write_replace_fail.num_compl_list); msg_peer_append_cbsp_cell(mp, &dec->u.write_replace_fail.cell_list); msg_peer_append_cbsp_fail(mp, &dec->u.write_replace_fail.fail_list); osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_REPLACE_NACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_REPLACE_NACK, mp); break; default: OSMO_ASSERT(0); @@ -509,16 +509,16 @@ //SBcAP_SBC_AP_PDU_t *pdu = NULL; switch (event) { - case SMSCB_E_CBSP_DELETE_ACK: + case SMSCB_PEER_E_CBSP_DELETE_ACK: dec = data; /* append results */ msg_peer_append_cbsp_compl(mp, &dec->u.kill_compl.num_compl_list); msg_peer_append_cbsp_cell(mp, &dec->u.kill_compl.cell_list); osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_DELETE_ACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_ACK, mp); break; - case SMSCB_E_CBSP_DELETE_NACK: + case SMSCB_PEER_E_CBSP_DELETE_NACK: dec = data; /* append results */ msg_peer_append_cbsp_compl(mp, &dec->u.kill_fail.num_compl_list); @@ -526,19 +526,19 @@ msg_peer_append_cbsp_fail(mp, &dec->u.kill_fail.fail_list); osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_DELETE_NACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_NACK, mp); break; - case SMSCB_E_SBCAP_DELETE_ACK: + case SMSCB_PEER_E_SBCAP_DELETE_ACK: //pdu = data; osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_SBCAP_DELETE_ACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_ACK, mp); break; - case SMSCB_E_SBCAP_DELETE_NACK: + case SMSCB_PEER_E_SBCAP_DELETE_NACK: //pdu = data; osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_SBCAP_DELETE_NACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_NACK, mp); break; default: OSMO_ASSERT(0); @@ -549,44 +549,22 @@ static int smscb_p_fsm_timer_cb(struct osmo_fsm_inst *fi) { - struct cbc_message_peer *mp = (struct cbc_message_peer *)fi->priv; - int ev; switch (fi->T) { case T_WAIT_WRITE_ACK: osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); - switch (mp->peer->proto) { - case CBC_PEER_PROTO_CBSP: - ev = SMSCB_E_CBSP_WRITE_NACK; - break; - case CBC_PEER_PROTO_SBcAP: - ev = SMSCB_E_SBCAP_WRITE_NACK; - break; - default: - OSMO_ASSERT(0); - } - osmo_fsm_inst_dispatch(fi->proc.parent, ev, NULL); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_NACK, NULL); break; case T_WAIT_REPLACE_ACK: osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_REPLACE_NACK, NULL); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_REPLACE_NACK, NULL); break; case T_WAIT_STATUS_ACK: osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_STATUS_NACK, NULL); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_STATUS_NACK, NULL); break; case T_WAIT_DELETE_ACK: osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); - switch (mp->peer->proto) { - case CBC_PEER_PROTO_CBSP: - ev = SMSCB_E_CBSP_DELETE_NACK; - break; - case CBC_PEER_PROTO_SBcAP: - ev = SMSCB_E_SBCAP_DELETE_NACK; - break; - default: - OSMO_ASSERT(0); - } - osmo_fsm_inst_dispatch(fi->proc.parent, ev, NULL); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_NACK, NULL); break; default: OSMO_ASSERT(0); @@ -603,7 +581,7 @@ SBcAP_Write_Replace_Warning_Indication_IEs_t *ie; switch (event) { - case SMSCB_E_DELETE: /* send KILL to BSC */ + case SMSCB_PEER_E_DELETE: /* send KILL to BSC */ switch (fi->state) { case SMSCB_S_DELETED: case SMSCB_S_INIT: @@ -640,11 +618,11 @@ break; case CBC_PEER_PROTO_SABP: default: - osmo_panic("SMSCB_E_DELETE not implemented for proto %u", mp->peer->proto); + osmo_panic("SMSCB_PEER_E_DELETE not implemented for proto %u", mp->peer->proto); } osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_DELETE_ACK, 10, T_WAIT_DELETE_ACK); break; - case SMSCB_E_SBCAP_WRITE_IND: + case SMSCB_PEER_E_SBCAP_WRITE_IND: sbcap = (SBcAP_SBC_AP_PDU_t *)data; OSMO_ASSERT(sbcap->present == SBcAP_SBC_AP_PDU_PR_initiatingMessage); OSMO_ASSERT(sbcap->choice.initiatingMessage.procedureCode == SBcAP_ProcedureId_Write_Replace_Warning_Indication); @@ -671,24 +649,24 @@ static const struct osmo_fsm_state smscb_p_fsm_states[] = { [SMSCB_S_INIT] = { .name = "INIT", - .in_event_mask = S(SMSCB_E_CREATE), + .in_event_mask = S(SMSCB_PEER_E_CREATE), .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK), .action = smscb_p_fsm_init, }, [SMSCB_S_WAIT_WRITE_ACK] = { .name = "WAIT_WRITE_ACK", - .in_event_mask = S(SMSCB_E_CBSP_WRITE_ACK) | - S(SMSCB_E_CBSP_WRITE_NACK) | - S(SMSCB_E_SBCAP_WRITE_ACK) | - S(SMSCB_E_SBCAP_WRITE_NACK), + .in_event_mask = S(SMSCB_PEER_E_CBSP_WRITE_ACK) | + S(SMSCB_PEER_E_CBSP_WRITE_NACK) | + S(SMSCB_PEER_E_SBCAP_WRITE_ACK) | + S(SMSCB_PEER_E_SBCAP_WRITE_NACK), .out_state_mask = S(SMSCB_S_ACTIVE) | S(SMSCB_S_WAIT_DELETE_ACK), .action = smscb_p_fsm_wait_write_ack, }, [SMSCB_S_ACTIVE] = { .name = "ACTIVE", - .in_event_mask = S(SMSCB_E_REPLACE) | - S(SMSCB_E_STATUS), + .in_event_mask = S(SMSCB_PEER_E_REPLACE) | + S(SMSCB_PEER_E_STATUS), .out_state_mask = S(SMSCB_S_WAIT_REPLACE_ACK) | S(SMSCB_S_WAIT_STATUS_ACK) | S(SMSCB_S_WAIT_DELETE_ACK), @@ -696,26 +674,26 @@ }, [SMSCB_S_WAIT_STATUS_ACK] = { .name = "WAIT_STATUS_ACK", - .in_event_mask = S(SMSCB_E_CBSP_STATUS_ACK) | - S(SMSCB_E_CBSP_STATUS_NACK), + .in_event_mask = S(SMSCB_PEER_E_CBSP_STATUS_ACK) | + S(SMSCB_PEER_E_CBSP_STATUS_NACK), .out_state_mask = S(SMSCB_S_ACTIVE) | S(SMSCB_S_WAIT_DELETE_ACK), .action = smscb_p_fsm_wait_status_ack, }, [SMSCB_S_WAIT_REPLACE_ACK] = { .name = "WAIT_REPLACE_ACK", - .in_event_mask = S(SMSCB_E_CBSP_REPLACE_ACK) | - S(SMSCB_E_CBSP_REPLACE_NACK), + .in_event_mask = S(SMSCB_PEER_E_CBSP_REPLACE_ACK) | + S(SMSCB_PEER_E_CBSP_REPLACE_NACK), .out_state_mask = S(SMSCB_S_ACTIVE) | S(SMSCB_S_WAIT_DELETE_ACK), .action = smscb_p_fsm_wait_replace_ack, }, [SMSCB_S_WAIT_DELETE_ACK] = { .name = "WAIT_DELETE_ACK", - .in_event_mask = S(SMSCB_E_CBSP_DELETE_ACK) | - S(SMSCB_E_CBSP_DELETE_NACK) | - S(SMSCB_E_SBCAP_DELETE_ACK) | - S(SMSCB_E_SBCAP_DELETE_NACK), + .in_event_mask = S(SMSCB_PEER_E_CBSP_DELETE_ACK) | + S(SMSCB_PEER_E_CBSP_DELETE_NACK) | + S(SMSCB_PEER_E_SBCAP_DELETE_ACK) | + S(SMSCB_PEER_E_SBCAP_DELETE_NACK), .out_state_mask = S(SMSCB_S_DELETED), .action = smscb_p_fsm_wait_delete_ack, }, @@ -728,12 +706,12 @@ .name = "SMSCB-PEER", .states = smscb_p_fsm_states, .num_states = ARRAY_SIZE(smscb_p_fsm_states), - .allstate_event_mask = S(SMSCB_E_DELETE) | - S(SMSCB_E_SBCAP_WRITE_IND), + .allstate_event_mask = S(SMSCB_PEER_E_DELETE) | + S(SMSCB_PEER_E_SBCAP_WRITE_IND), .allstate_action = smscb_p_fsm_allstate, .timer_cb = smscb_p_fsm_timer_cb, .log_subsys = DCBSP, - .event_names = smscb_fsm_event_names, + .event_names = smscb_peer_fsm_event_names, .cleanup = smscb_p_fsm_cleanup, }; @@ -747,7 +725,7 @@ struct cbc_message_peer *mp; struct osmo_fsm_inst *fi; - fi = osmo_fsm_inst_alloc_child(&smscb_p_fsm, cbcmsg->fi, SMSCB_E_CHILD_DIED); + fi = osmo_fsm_inst_alloc_child(&smscb_p_fsm, cbcmsg->fi, SMSCB_MSG_E_CHILD_DIED); if (!fi) return NULL; /* include the peer name in the ID of the child FSM */ -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I909474d1ff4ec7ed20aff0981da47074397df6cb Gerrit-Change-Number: 28826 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: Split smscb_peer_fsm into CBSP and SBcAP specific FSMs

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28828 ) Change subject: Split smscb_peer_fsm into CBSP and SBcAP specific FSMs ...................................................................... Split smscb_peer_fsm into CBSP and SBcAP specific FSMs This further simplifies tracking of events and simplifies and clears code on each of the FSMs. Change-Id: I0fd00b60cdc6bc6a088be1336d849548ca89c847 --- M include/osmocom/cbc/smscb_peer_fsm.h M src/Makefile.am A src/cbsp_smscb_peer_fsm.c A src/sbcap_smscb_peer_fsm.c M src/smscb_peer_fsm.c 5 files changed, 952 insertions(+), 665 deletions(-) Approvals: pespin: Looks good to me, approved; Verified osmith: Looks good to me, but someone else must approve diff --git a/include/osmocom/cbc/smscb_peer_fsm.h b/include/osmocom/cbc/smscb_peer_fsm.h index 7bf1c54..7ae8968 100644 --- a/include/osmocom/cbc/smscb_peer_fsm.h +++ b/include/osmocom/cbc/smscb_peer_fsm.h @@ -35,3 +35,6 @@ }; extern const struct value_string smscb_peer_fsm_event_names[]; + +extern struct osmo_fsm cbsp_smscb_peer_fsm; +extern struct osmo_fsm sbcap_smscb_peer_fsm; diff --git a/src/Makefile.am b/src/Makefile.am index de40dea..ade53d0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,14 +18,16 @@ cbsp_link.c \ cbsp_link_fsm.c \ cbsp_msg.c \ + cbsp_smscb_peer_fsm.c \ rest_api.c \ charset.c \ rest_it_op.c \ sbcap_msg.c \ sbcap_link.c \ sbcap_link_fsm.c \ - smscb_peer_fsm.c \ + sbcap_smscb_peer_fsm.c \ smscb_message_fsm.c \ + smscb_peer_fsm.c \ $(NULL) osmo_cbc_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \ diff --git a/src/cbsp_smscb_peer_fsm.c b/src/cbsp_smscb_peer_fsm.c new file mode 100644 index 0000000..872008c --- /dev/null +++ b/src/cbsp_smscb_peer_fsm.c @@ -0,0 +1,563 @@ +/* SMSCB Peer FSM: Represents state of one SMSCB for one peer (BSC) */ + +/* This FSM exists per tuple of (message, bsc peer) */ + +/* (C) 2019 by Harald Welte <laforge(a)gnumonks.org> + * All Rights Reserved + * + * SPDX-License-Identifier: AGPL-3.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <osmocom/core/utils.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/fsm.h> + +#include <osmocom/gsm/gsm23003.h> +#include <osmocom/gsm/protocol/gsm_08_08.h> +#include <osmocom/gsm/gsm0808_utils.h> +#include <osmocom/gsm/cbsp.h> + +#include <osmocom/sbcap/sbcap_common.h> + +#include <osmocom/cbc/cbc_message.h> +#include <osmocom/cbc/cbc_peer.h> +#include <osmocom/cbc/cbsp_link.h> +#include <osmocom/cbc/sbcap_link.h> +#include <osmocom/cbc/sbcap_msg.h> +#include <osmocom/cbc/debug.h> +#include <osmocom/cbc/smscb_peer_fsm.h> +#include <osmocom/cbc/smscb_message_fsm.h> + +#define S(x) (1 << (x)) + +/*********************************************************************** + * Helper functions + ***********************************************************************/ + +/* covert TS 08.08 Cell Identity value to CBC internal type */ +static enum cbc_cell_id_type cci_discr_from_cell_id(enum CELL_IDENT id_discr) +{ + switch (id_discr) { + case CELL_IDENT_NO_CELL: + return CBC_CELL_ID_NONE; + case CELL_IDENT_WHOLE_GLOBAL: + return CBC_CELL_ID_CGI; + case CELL_IDENT_LAC_AND_CI: + return CBC_CELL_ID_LAC_CI; + case CELL_IDENT_CI: + return CBC_CELL_ID_CI; + case CELL_IDENT_LAI: + return CBC_CELL_ID_LAI; + case CELL_IDENT_LAC: + return CBC_CELL_ID_LAC; + case CELL_IDENT_BSS: + return CBC_CELL_ID_BSS; + default: + return -1; + } +} + +/* covert CBC internal type to TS 08.08 Cell Identity */ +static enum CELL_IDENT cell_id_from_ccid_discr(enum cbc_cell_id_type in) +{ + switch (in) { + case CBC_CELL_ID_NONE: + return CELL_IDENT_NO_CELL; + case CBC_CELL_ID_CGI: + return CELL_IDENT_WHOLE_GLOBAL; + case CBC_CELL_ID_LAC_CI: + return CELL_IDENT_LAC_AND_CI; + case CBC_CELL_ID_CI: + return CELL_IDENT_CI; + case CBC_CELL_ID_LAI: + return CELL_IDENT_LAI; + case CBC_CELL_ID_LAC: + return CELL_IDENT_LAC; + case CBC_CELL_ID_BSS: + return CELL_IDENT_BSS; + default: + return -1; + } +} + +/* convert TS 08.08 Cell Identifier Union to CBC internal type */ +static void cci_from_cbsp(struct cbc_cell_id *cci, enum CELL_IDENT id_discr, + const union gsm0808_cell_id_u *u) +{ + cci->id_discr = cci_discr_from_cell_id(id_discr); + + switch (id_discr) { + case CELL_IDENT_NO_CELL: + break; + case CELL_IDENT_WHOLE_GLOBAL: + cci->u.cgi = u->global; + break; + case CELL_IDENT_LAC_AND_CI: + cci->u.lac_and_ci = u->lac_and_ci; + break; + case CELL_IDENT_CI: + cci->u.ci = u->ci; + break; + case CELL_IDENT_LAI: + cci->u.lai = u->lai_and_lac; + break; + case CELL_IDENT_LAC: + cci->u.lac = u->lac; + break; + case CELL_IDENT_BSS: + break; + default: + break; + } +} + +/* convert TS 08.08 Cell Identifier Union to CBC internal type */ +static void cbsp_from_cci(union gsm0808_cell_id_u *u, const struct cbc_cell_id *cci) +{ + switch (cci->id_discr) { + case CBC_CELL_ID_NONE: + break; + case CBC_CELL_ID_CGI: + u->global = cci->u.cgi; + printf("u->gobal: %s\n", osmo_hexdump((uint8_t *) &u->global, sizeof(u->global))); + break; + case CBC_CELL_ID_LAC_CI: + u->lac_and_ci = cci->u.lac_and_ci; + break; + case CBC_CELL_ID_CI: + u->ci = cci->u.ci; + break; + case CBC_CELL_ID_LAI: + u->lai_and_lac = cci->u.lai; + break; + case CBC_CELL_ID_LAC: + u->lac = cci->u.lac; + break; + case CBC_CELL_ID_BSS: + break; + default: + OSMO_ASSERT(0); + } +} + +/* read a single osmo_cbsp_num_compl_ent and add it to cbc_message_peer */ +static void cci_from_cbsp_compl_ent(struct cbc_message_peer *mp, + struct osmo_cbsp_num_compl_ent *ce, enum CELL_IDENT id_discr) +{ + struct cbc_cell_id *cci; + + cci = NULL; // FIXME: lookup + if (!cci) { + cci = talloc_zero(mp, struct cbc_cell_id); + if (!cci) + return; + llist_add_tail(&cci->list, &mp->num_compl_list); + } + cci_from_cbsp(cci, id_discr, &ce->cell_id); + cci->num_compl.num_compl += ce->num_compl; + cci->num_compl.num_bcast_info += ce->num_bcast_info; +} +static void msg_peer_append_cbsp_compl(struct cbc_message_peer *mp, + struct osmo_cbsp_num_compl_list *nclist) +{ + struct osmo_cbsp_num_compl_ent *ce; + + llist_for_each_entry(ce, &nclist->list, list) + cci_from_cbsp_compl_ent(mp, ce, nclist->id_discr); +} + +/* read a single osmo_cbsp_cell_ent and add it to cbc_message_peer */ +static void cci_from_cbsp_cell_ent(struct cbc_message_peer *mp, + struct osmo_cbsp_cell_ent *ce, enum CELL_IDENT id_discr) +{ + struct cbc_cell_id *cci; + + cci = NULL; // FIXME: lookup + if (!cci) { + cci = talloc_zero(mp, struct cbc_cell_id); + if (!cci) + return; + llist_add_tail(&cci->list, &mp->cell_list); + } + cci_from_cbsp(cci, id_discr, &ce->cell_id); +} +static void msg_peer_append_cbsp_cell(struct cbc_message_peer *mp, + struct osmo_cbsp_cell_list *clist) +{ + struct osmo_cbsp_cell_ent *ce; + + llist_for_each_entry(ce, &clist->list, list) + cci_from_cbsp_cell_ent(mp, ce, clist->id_discr); +} + +/* read a single osmo_cbsp_fail_ent and add it to cbc_message_peer */ +static void cci_from_cbsp_fail_ent(struct cbc_message_peer *mp, + struct osmo_cbsp_fail_ent *fe) +{ + struct cbc_cell_id *cci; + cci = NULL; // lookup */ + if (!cci) { + cci = talloc_zero(mp, struct cbc_cell_id); + if (!cci) + return; + llist_add_tail(&cci->list, &mp->fail_list); + } + cci->id_discr = cci_discr_from_cell_id(fe->id_discr); + cci->fail.cause = fe->cause; +} +static void msg_peer_append_cbsp_fail(struct cbc_message_peer *mp, struct llist_head *flist) +{ + struct osmo_cbsp_fail_ent *fe; + + llist_for_each_entry(fe, flist, list) + cci_from_cbsp_fail_ent(mp, fe); +} + +/* append all cells from cbc_message_peer to given CBSP cell_list */ +static void cbsp_append_cell_list(struct osmo_cbsp_cell_list *out, void *ctx, + const struct cbc_message_peer *mp) +{ + struct cbc_cell_id *cci; + enum cbc_cell_id_type id_discr = CBC_CELL_ID_NONE; + + llist_for_each_entry(cci, &mp->cell_list, list) { + struct osmo_cbsp_cell_ent *ent; + + if (id_discr == CBC_CELL_ID_NONE) + id_discr = cci->id_discr; + else if (id_discr != cci->id_discr) { + LOGPFSML(mp->fi, LOGL_ERROR, "Cannot encode CBSP cell_list as not all " + "entries are of same type (%u != %u)\n", id_discr, cci->id_discr); + continue; + } + ent = talloc_zero(ctx, struct osmo_cbsp_cell_ent); + OSMO_ASSERT(ent); + cbsp_from_cci(&ent->cell_id, cci); + llist_add_tail(&ent->list, &out->list); + } + out->id_discr = cell_id_from_ccid_discr(id_discr); +} + +/*********************************************************************** + * actual FSM + ***********************************************************************/ + +static void smscb_p_fsm_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + int rc; + + switch (event) { + case SMSCB_PEER_E_CREATE: + /* send it to peer */ + rc = peer_new_cbc_message(mp->peer, mp->cbcmsg); + if (rc == 0) { + /* wait for peers' response */ + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 10, + T_WAIT_WRITE_ACK); + } + break; + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_wait_write_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + struct osmo_cbsp_decoded *dec = NULL; + + switch (event) { + case SMSCB_PEER_E_CBSP_WRITE_ACK: + dec = data; + msg_peer_append_cbsp_compl(mp, &dec->u.write_replace_compl.num_compl_list); + msg_peer_append_cbsp_cell(mp, &dec->u.write_replace_compl.cell_list); + osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); + /* Signal parent fsm about completion */ + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_ACK, mp); + break; + case SMSCB_PEER_E_CBSP_WRITE_NACK: + dec = data; + msg_peer_append_cbsp_compl(mp, &dec->u.write_replace_fail.num_compl_list); + msg_peer_append_cbsp_cell(mp, &dec->u.write_replace_fail.cell_list); + msg_peer_append_cbsp_fail(mp, &dec->u.write_replace_fail.fail_list); + osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); + /* Signal parent fsm about completion */ + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_NACK, mp); + break; + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + struct osmo_cbsp_decoded *cbsp; + + switch (event) { + case SMSCB_PEER_E_REPLACE: /* send WRITE-REPLACE to BSC */ + cbsp = osmo_cbsp_decoded_alloc(mp->peer, CBSP_MSGT_WRITE_REPLACE); + OSMO_ASSERT(cbsp); + cbsp->u.write_replace.msg_id = mp->cbcmsg->msg.message_id; + cbsp->u.write_replace.old_serial_nr = &mp->cbcmsg->msg.serial_nr; + //cbsp->u.write_replace.new_serial_nr + /* TODO: we assume that the replace will always affect all original cells */ + cbsp_append_cell_list(&cbsp->u.write_replace.cell_list, cbsp, mp); + // TODO: ALL OTHER DATA + cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_REPLACE_ACK, 10, T_WAIT_REPLACE_ACK); + break; + case SMSCB_PEER_E_STATUS: /* send MSG-STATUS-QUERY to BSC */ + cbsp = osmo_cbsp_decoded_alloc(mp->peer, CBSP_MSGT_MSG_STATUS_QUERY); + OSMO_ASSERT(cbsp); + cbsp->u.msg_status_query.msg_id = mp->cbcmsg->msg.message_id; + cbsp->u.msg_status_query.old_serial_nr = mp->cbcmsg->msg.serial_nr; + cbsp_append_cell_list(&cbsp->u.msg_status_query.cell_list, cbsp, mp); + cbsp->u.msg_status_query.channel_ind = CBSP_CHAN_IND_BASIC; + cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_STATUS_ACK, 10, T_WAIT_STATUS_ACK); + break; + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_wait_status_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + struct osmo_cbsp_decoded *dec = NULL; + + switch (event) { + case SMSCB_PEER_E_CBSP_STATUS_ACK: + dec = data; + msg_peer_append_cbsp_compl(mp, &dec->u.msg_status_query_compl.num_compl_list); + osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); + /* Signal parent fsm about completion */ + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_STATUS_ACK, mp); + break; + case SMSCB_PEER_E_CBSP_STATUS_NACK: + dec = data; + msg_peer_append_cbsp_compl(mp, &dec->u.msg_status_query_fail.num_compl_list); + msg_peer_append_cbsp_fail(mp, &dec->u.msg_status_query_fail.fail_list); + osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); + /* Signal parent fsm about completion */ + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_STATUS_NACK, mp); + break; + default: + OSMO_ASSERT(0); + } +} + + +static void smscb_p_fsm_wait_replace_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + struct osmo_cbsp_decoded *dec = NULL; + + switch (event) { + case SMSCB_PEER_E_CBSP_REPLACE_ACK: + dec = data; + msg_peer_append_cbsp_compl(mp, &dec->u.write_replace_compl.num_compl_list); + msg_peer_append_cbsp_cell(mp, &dec->u.write_replace_compl.cell_list); + osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); + /* Signal parent fsm about completion */ + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_REPLACE_ACK, mp); + break; + case SMSCB_PEER_E_CBSP_REPLACE_NACK: + dec = data; + msg_peer_append_cbsp_compl(mp, &dec->u.write_replace_fail.num_compl_list); + msg_peer_append_cbsp_cell(mp, &dec->u.write_replace_fail.cell_list); + msg_peer_append_cbsp_fail(mp, &dec->u.write_replace_fail.fail_list); + osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); + /* Signal parent fsm about completion */ + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_REPLACE_NACK, mp); + break; + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_wait_delete_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + struct osmo_cbsp_decoded *dec = NULL; + + switch (event) { + case SMSCB_PEER_E_CBSP_DELETE_ACK: + dec = data; + /* append results */ + msg_peer_append_cbsp_compl(mp, &dec->u.kill_compl.num_compl_list); + msg_peer_append_cbsp_cell(mp, &dec->u.kill_compl.cell_list); + osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); + /* Signal parent fsm about completion */ + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_ACK, mp); + break; + case SMSCB_PEER_E_CBSP_DELETE_NACK: + dec = data; + /* append results */ + msg_peer_append_cbsp_compl(mp, &dec->u.kill_fail.num_compl_list); + msg_peer_append_cbsp_cell(mp, &dec->u.kill_fail.cell_list); + msg_peer_append_cbsp_fail(mp, &dec->u.kill_fail.fail_list); + osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); + /* Signal parent fsm about completion */ + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_NACK, mp); + break; + default: + OSMO_ASSERT(0); + } +} + + + +static int smscb_p_fsm_timer_cb(struct osmo_fsm_inst *fi) +{ + switch (fi->T) { + case T_WAIT_WRITE_ACK: + osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_PEER_E_CBSP_WRITE_NACK, NULL); + break; + case T_WAIT_REPLACE_ACK: + osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_REPLACE_NACK, NULL); + break; + case T_WAIT_STATUS_ACK: + osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_STATUS_NACK, NULL); + break; + case T_WAIT_DELETE_ACK: + osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_PEER_E_CBSP_DELETE_NACK, NULL); + break; + default: + OSMO_ASSERT(0); + } + return 0; +} + +static void smscb_p_fsm_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + struct osmo_cbsp_decoded *cbsp; + + switch (event) { + case SMSCB_PEER_E_DELETE: /* send KILL to BSC */ + switch (fi->state) { + case SMSCB_S_DELETED: + case SMSCB_S_INIT: + LOGPFSML(fi, LOGL_ERROR, "Event %s not permitted\n", + osmo_fsm_event_name(fi->fsm, event)); + return; + default: + break; + } + cbsp = osmo_cbsp_decoded_alloc(mp->peer, CBSP_MSGT_KILL); + OSMO_ASSERT(cbsp); + cbsp->u.kill.msg_id = mp->cbcmsg->msg.message_id; + cbsp->u.kill.old_serial_nr = mp->cbcmsg->msg.serial_nr; + /* TODO: we assume that the delete will always affect all original cells */ + cbsp_append_cell_list(&cbsp->u.kill.cell_list, cbsp, mp); + if (!mp->cbcmsg->msg.is_etws) { + /* Channel Indication IE is only present in CBS, not in ETWS! */ + cbsp->u.kill.channel_ind = talloc_zero(cbsp, enum cbsp_channel_ind); + OSMO_ASSERT(cbsp->u.kill.channel_ind); + *(cbsp->u.kill.channel_ind) = CBSP_CHAN_IND_BASIC; + } + cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_DELETE_ACK, 10, T_WAIT_DELETE_ACK); + break; + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + llist_del(&mp->list); + /* memory of mp is child of fi and hence automatically free'd */ +} + +static const struct osmo_fsm_state smscb_p_fsm_states[] = { + [SMSCB_S_INIT] = { + .name = "INIT", + .in_event_mask = S(SMSCB_PEER_E_CREATE), + .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK), + .action = smscb_p_fsm_init, + }, + [SMSCB_S_WAIT_WRITE_ACK] = { + .name = "WAIT_WRITE_ACK", + .in_event_mask = S(SMSCB_PEER_E_CBSP_WRITE_ACK) | + S(SMSCB_PEER_E_CBSP_WRITE_NACK), + .out_state_mask = S(SMSCB_S_ACTIVE) | + S(SMSCB_S_WAIT_DELETE_ACK), + .action = smscb_p_fsm_wait_write_ack, + }, + [SMSCB_S_ACTIVE] = { + .name = "ACTIVE", + .in_event_mask = S(SMSCB_PEER_E_REPLACE) | + S(SMSCB_PEER_E_STATUS), + .out_state_mask = S(SMSCB_S_WAIT_REPLACE_ACK) | + S(SMSCB_S_WAIT_STATUS_ACK) | + S(SMSCB_S_WAIT_DELETE_ACK), + .action = smscb_p_fsm_active, + }, + [SMSCB_S_WAIT_STATUS_ACK] = { + .name = "WAIT_STATUS_ACK", + .in_event_mask = S(SMSCB_PEER_E_CBSP_STATUS_ACK) | + S(SMSCB_PEER_E_CBSP_STATUS_NACK), + .out_state_mask = S(SMSCB_S_ACTIVE) | + S(SMSCB_S_WAIT_DELETE_ACK), + .action = smscb_p_fsm_wait_status_ack, + }, + [SMSCB_S_WAIT_REPLACE_ACK] = { + .name = "WAIT_REPLACE_ACK", + .in_event_mask = S(SMSCB_PEER_E_CBSP_REPLACE_ACK) | + S(SMSCB_PEER_E_CBSP_REPLACE_NACK), + .out_state_mask = S(SMSCB_S_ACTIVE) | + S(SMSCB_S_WAIT_DELETE_ACK), + .action = smscb_p_fsm_wait_replace_ack, + }, + [SMSCB_S_WAIT_DELETE_ACK] = { + .name = "WAIT_DELETE_ACK", + .in_event_mask = S(SMSCB_PEER_E_CBSP_DELETE_ACK) | + S(SMSCB_PEER_E_CBSP_DELETE_NACK), + .out_state_mask = S(SMSCB_S_DELETED), + .action = smscb_p_fsm_wait_delete_ack, + }, + [SMSCB_S_DELETED] = { + .name = "DELETED", + }, +}; + +struct osmo_fsm cbsp_smscb_peer_fsm = { + .name = "SMSCB-PEER-CBSP", + .states = smscb_p_fsm_states, + .num_states = ARRAY_SIZE(smscb_p_fsm_states), + .allstate_event_mask = S(SMSCB_PEER_E_DELETE), + .allstate_action = smscb_p_fsm_allstate, + .timer_cb = smscb_p_fsm_timer_cb, + .log_subsys = DCBSP, + .event_names = smscb_peer_fsm_event_names, + .cleanup = smscb_p_fsm_cleanup, +}; + +static __attribute__((constructor)) void on_dso_load_smscb_p_fsm(void) +{ + OSMO_ASSERT(osmo_fsm_register(&cbsp_smscb_peer_fsm) == 0); +} diff --git a/src/sbcap_smscb_peer_fsm.c b/src/sbcap_smscb_peer_fsm.c new file mode 100644 index 0000000..706a98f --- /dev/null +++ b/src/sbcap_smscb_peer_fsm.c @@ -0,0 +1,370 @@ +/* SMSCB Peer FSM: Represents state of one SMSCB for one peer (MME) */ + +/* This FSM exists per tuple of (message, mme peer) */ + +/* (C) 2019 by Harald Welte <laforge(a)gnumonks.org> + * All Rights Reserved + * + * SPDX-License-Identifier: AGPL-3.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <osmocom/core/utils.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/fsm.h> + +#include <osmocom/gsm/gsm23003.h> +#include <osmocom/gsm/protocol/gsm_08_08.h> +#include <osmocom/gsm/gsm0808_utils.h> + +#include <osmocom/sbcap/sbcap_common.h> + +#include <osmocom/cbc/cbc_message.h> +#include <osmocom/cbc/cbc_peer.h> +#include <osmocom/cbc/sbcap_link.h> +#include <osmocom/cbc/sbcap_msg.h> +#include <osmocom/cbc/debug.h> +#include <osmocom/cbc/smscb_peer_fsm.h> +#include <osmocom/cbc/smscb_message_fsm.h> + +#define S(x) (1 << (x)) + +/*********************************************************************** + * Helper functions + ***********************************************************************/ + +/* append SBcAP cells to msg_peer compl list */ +void msg_peer_append_compl_sbcap_bcast_area_list(struct cbc_message_peer *mp, + const SBcAP_Broadcast_Scheduled_Area_List_t *bcast) +{ + SBcAP_CellId_Broadcast_List_t *cell_id_bscat = bcast->cellId_Broadcast_List; + A_SEQUENCE_OF(struct SBcAP_CellId_Broadcast_List_Item) *as_cell_id_bcast; + SBcAP_CellId_Broadcast_List_Item_t *it; + unsigned int i; + + if (!cell_id_bscat) + return; + + as_cell_id_bcast = (void *) &cell_id_bscat->list; + for (i = 0; i < as_cell_id_bcast->count; i++) { + it = (SBcAP_CellId_Broadcast_List_Item_t *)(as_cell_id_bcast->array[i]); + OSMO_ASSERT(it); + struct cbc_cell_id *cci = NULL; // FIXME: lookup + if (!cci) { + cci = talloc_zero(mp, struct cbc_cell_id); + if (!cci) + return; + llist_add_tail(&cci->list, &mp->num_compl_list); + } + cci_from_sbcap_bcast_cell_id(cci, it); + LOGPFSML(mp->fi, LOGL_DEBUG, "Appending CellId %s to Broadcast Completed list\n", + cbc_cell_id2str(cci)); + cci->num_compl.num_compl += 1; + cci->num_compl.num_bcast_info += 1; + } +} + +/* append SBcAP cells to msg_peer fail list */ +void msg_peer_append_fail_sbcap_tai_list(struct cbc_message_peer *mp, + const SBcAP_List_of_TAIs_t *tais) +{ + A_SEQUENCE_OF(List_of_TAIs__Member) *as_tais = (void *)&tais->list; + List_of_TAIs__Member *it; + unsigned int i; + + for (i = 0; i < as_tais->count; i++) { + it = (List_of_TAIs__Member *)(as_tais->array[i]); + OSMO_ASSERT(it); + struct cbc_cell_id *cci = NULL; // FIXME: lookup + if (!cci) { + cci = talloc_zero(mp, struct cbc_cell_id); + if (!cci) + return; + llist_add_tail(&cci->list, &mp->fail_list); + } + cci_from_sbcap_tai(cci, &it->tai); + cci->fail.cause = SBcAP_Cause_tracking_area_not_valid; + LOGPFSML(mp->fi, LOGL_DEBUG, "Appending CellId %s (cause: %s) to Failed list\n", + cbc_cell_id2str(cci), sbcap_cause_str(cci->fail.cause)); + } +} + +/*********************************************************************** + * actual FSM + ***********************************************************************/ + +static void smscb_p_fsm_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + int rc; + + switch (event) { + case SMSCB_PEER_E_CREATE: + /* send it to peer */ + rc = peer_new_cbc_message(mp->peer, mp->cbcmsg); + if (rc == 0) { + /* wait for peers' response */ + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 10, + T_WAIT_WRITE_ACK); + } + break; + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_wait_write_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + SBcAP_SBC_AP_PDU_t *sbcap = NULL; + A_SEQUENCE_OF(void) *as_pdu; + SBcAP_Write_Replace_Warning_Response_IEs_t *ie; + + switch (event) { + case SMSCB_PEER_E_SBCAP_WRITE_ACK: + sbcap = data; + OSMO_ASSERT(sbcap->present == SBcAP_SBC_AP_PDU_PR_successfulOutcome); + OSMO_ASSERT(sbcap->choice.successfulOutcome.procedureCode == SBcAP_ProcedureId_Write_Replace_Warning); + as_pdu = (void *)&sbcap->choice.successfulOutcome.value.choice.Write_Replace_Warning_Response.protocolIEs.list; + /* static const long asn_VAL_21_SBcAP_id_Unknown_Tracking_Area_List = 22; */ + ie = sbcap_as_find_ie(as_pdu, 22); + if (ie) { /* IE is optional */ + OSMO_ASSERT(ie->value.present == SBcAP_Write_Replace_Warning_Response_IEs__value_PR_List_of_TAIs); + msg_peer_append_fail_sbcap_tai_list(mp, &ie->value.choice.List_of_TAIs); + } + osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); + /* Signal parent fsm about completion */ + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_ACK, mp); + break; + case SMSCB_PEER_E_SBCAP_WRITE_NACK: + osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); + /* Signal parent fsm about completion */ + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_NACK, mp); + break; + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + //struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + + switch (event) { + case SMSCB_PEER_E_REPLACE: /* send WRITE-REPLACE to MME */ + /* NOT IMPLEMENETED */ + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_REPLACE_ACK, 10, T_WAIT_REPLACE_ACK); + break; + case SMSCB_PEER_E_STATUS: + /* NOT IMPLEMENETED */ + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_STATUS_ACK, 10, T_WAIT_STATUS_ACK); + break; + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_wait_status_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + //struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + + switch (event) { + /* NOT IMPLEMENETED */ + default: + OSMO_ASSERT(0); + } +} + + +static void smscb_p_fsm_wait_replace_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + //struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + + switch (event) { + /* NOT IMPLEMENETED */ + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_wait_delete_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + + switch (event) { + case SMSCB_PEER_E_SBCAP_DELETE_ACK: + //pdu = data; + osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); + /* Signal parent fsm about completion */ + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_ACK, mp); + break; + case SMSCB_PEER_E_SBCAP_DELETE_NACK: + //pdu = data; + osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); + /* Signal parent fsm about completion */ + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_NACK, mp); + break; + default: + OSMO_ASSERT(0); + } +} + + + +static int smscb_p_fsm_timer_cb(struct osmo_fsm_inst *fi) +{ + switch (fi->T) { + case T_WAIT_WRITE_ACK: + osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_NACK, NULL); + break; + case T_WAIT_REPLACE_ACK: + osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_REPLACE_NACK, NULL); + break; + case T_WAIT_STATUS_ACK: + osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_STATUS_NACK, NULL); + break; + case T_WAIT_DELETE_ACK: + osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_NACK, NULL); + break; + default: + OSMO_ASSERT(0); + } + return 0; +} + +static void smscb_p_fsm_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + SBcAP_SBC_AP_PDU_t *sbcap; + A_SEQUENCE_OF(void) *as_pdu; + SBcAP_Write_Replace_Warning_Indication_IEs_t *ie; + + switch (event) { + case SMSCB_PEER_E_DELETE: /* send Stop-Warning to MME */ + switch (fi->state) { + case SMSCB_S_DELETED: + case SMSCB_S_INIT: + LOGPFSML(fi, LOGL_ERROR, "Event %s not permitted\n", + osmo_fsm_event_name(fi->fsm, event)); + return; + default: + break; + } + if ((sbcap = sbcap_gen_stop_warning_req(mp->peer, mp->cbcmsg))) { + cbc_sbcap_link_tx(mp->peer->link.sbcap, sbcap); + } else { + LOGP(DSBcAP, LOGL_ERROR, + "[%s] Tx SBc-AP Stop-Warning-Request: msg gen failed\n", + mp->peer->name); + } + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_DELETE_ACK, 10, T_WAIT_DELETE_ACK); + break; + case SMSCB_PEER_E_SBCAP_WRITE_IND: + sbcap = (SBcAP_SBC_AP_PDU_t *)data; + OSMO_ASSERT(sbcap->present == SBcAP_SBC_AP_PDU_PR_initiatingMessage); + OSMO_ASSERT(sbcap->choice.initiatingMessage.procedureCode == SBcAP_ProcedureId_Write_Replace_Warning_Indication); + as_pdu = (void *)&sbcap->choice.initiatingMessage.value.choice.Write_Replace_Warning_Indication.protocolIEs.list; + /* static const long asn_VAL_36_SBcAP_id_Broadcast_Scheduled_Area_List = 23; */ + ie = sbcap_as_find_ie(as_pdu, 23); + if (!ie) + return; /* IE is optional */ + OSMO_ASSERT(ie->value.present == SBcAP_Write_Replace_Warning_Indication_IEs__value_PR_Broadcast_Scheduled_Area_List); + msg_peer_append_compl_sbcap_bcast_area_list(mp, &ie->value.choice.Broadcast_Scheduled_Area_List); + break; + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + llist_del(&mp->list); + /* memory of mp is child of fi and hence automatically free'd */ +} + +static const struct osmo_fsm_state smscb_p_fsm_states[] = { + [SMSCB_S_INIT] = { + .name = "INIT", + .in_event_mask = S(SMSCB_PEER_E_CREATE), + .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK), + .action = smscb_p_fsm_init, + }, + [SMSCB_S_WAIT_WRITE_ACK] = { + .name = "WAIT_WRITE_ACK", + .in_event_mask = S(SMSCB_PEER_E_SBCAP_WRITE_ACK) | + S(SMSCB_PEER_E_SBCAP_WRITE_NACK), + .out_state_mask = S(SMSCB_S_ACTIVE) | + S(SMSCB_S_WAIT_DELETE_ACK), + .action = smscb_p_fsm_wait_write_ack, + }, + [SMSCB_S_ACTIVE] = { + .name = "ACTIVE", + .in_event_mask = S(SMSCB_PEER_E_REPLACE) | + S(SMSCB_PEER_E_STATUS), + .out_state_mask = S(SMSCB_S_WAIT_REPLACE_ACK) | + S(SMSCB_S_WAIT_STATUS_ACK) | + S(SMSCB_S_WAIT_DELETE_ACK), + .action = smscb_p_fsm_active, + }, + [SMSCB_S_WAIT_STATUS_ACK] = { + .name = "WAIT_STATUS_ACK", + .in_event_mask = 0 /* NOT IMPLEMENTED */, + .out_state_mask = S(SMSCB_S_ACTIVE) | + S(SMSCB_S_WAIT_DELETE_ACK), + .action = smscb_p_fsm_wait_status_ack, + }, + [SMSCB_S_WAIT_REPLACE_ACK] = { + .name = "WAIT_REPLACE_ACK", + .in_event_mask = 0 /* NOT IMPLEMENTED */, + .out_state_mask = S(SMSCB_S_ACTIVE) | + S(SMSCB_S_WAIT_DELETE_ACK), + .action = smscb_p_fsm_wait_replace_ack, + }, + [SMSCB_S_WAIT_DELETE_ACK] = { + .name = "WAIT_DELETE_ACK", + .in_event_mask = S(SMSCB_PEER_E_SBCAP_DELETE_ACK) | + S(SMSCB_PEER_E_SBCAP_DELETE_NACK), + .out_state_mask = S(SMSCB_S_DELETED), + .action = smscb_p_fsm_wait_delete_ack, + }, + [SMSCB_S_DELETED] = { + .name = "DELETED", + }, +}; + +struct osmo_fsm sbcap_smscb_peer_fsm = { + .name = "SMSCB-PEER-SBcAP", + .states = smscb_p_fsm_states, + .num_states = ARRAY_SIZE(smscb_p_fsm_states), + .allstate_event_mask = S(SMSCB_PEER_E_DELETE) | + S(SMSCB_PEER_E_SBCAP_WRITE_IND), + .allstate_action = smscb_p_fsm_allstate, + .timer_cb = smscb_p_fsm_timer_cb, + .log_subsys = DSBcAP, + .event_names = smscb_peer_fsm_event_names, + .cleanup = smscb_p_fsm_cleanup, +}; + +static __attribute__((constructor)) void on_dso_load_smscb_p_fsm(void) +{ + OSMO_ASSERT(osmo_fsm_register(&sbcap_smscb_peer_fsm) == 0); +} diff --git a/src/smscb_peer_fsm.c b/src/smscb_peer_fsm.c index 589a832..20eec95 100644 --- a/src/smscb_peer_fsm.c +++ b/src/smscb_peer_fsm.c @@ -27,13 +27,6 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/fsm.h> -#include <osmocom/gsm/gsm23003.h> -#include <osmocom/gsm/protocol/gsm_08_08.h> -#include <osmocom/gsm/gsm0808_utils.h> -#include <osmocom/gsm/cbsp.h> - -#include <osmocom/sbcap/sbcap_common.h> - #include <osmocom/cbc/cbc_message.h> #include <osmocom/cbc/cbc_peer.h> #include <osmocom/cbc/cbsp_link.h> @@ -43,8 +36,6 @@ #include <osmocom/cbc/smscb_peer_fsm.h> #include <osmocom/cbc/smscb_message_fsm.h> -#define S(x) (1 << (x)) - const struct value_string smscb_peer_fsm_event_names[] = { { SMSCB_PEER_E_CREATE, "CREATE" }, { SMSCB_PEER_E_REPLACE, "REPLACE" }, @@ -66,666 +57,24 @@ { 0, NULL } }; -#if 0 -static const struct value_string smscb_p_fsm_timer_names[] = { - OSMO_VALUE_STRING(T_WAIT_WRITE_ACK), - OSMO_VALUE_STRING(T_WAIT_REPLACE_ACK), - OSMO_VALUE_STRING(T_WAIT_DELETE_ACK), - { 0, NULL } -}; -#endif - -/*********************************************************************** - * Helper functions - ***********************************************************************/ - -/* covert TS 08.08 Cell Identity value to CBC internal type */ -static enum cbc_cell_id_type cci_discr_from_cell_id(enum CELL_IDENT id_discr) -{ - switch (id_discr) { - case CELL_IDENT_NO_CELL: - return CBC_CELL_ID_NONE; - case CELL_IDENT_WHOLE_GLOBAL: - return CBC_CELL_ID_CGI; - case CELL_IDENT_LAC_AND_CI: - return CBC_CELL_ID_LAC_CI; - case CELL_IDENT_CI: - return CBC_CELL_ID_CI; - case CELL_IDENT_LAI: - return CBC_CELL_ID_LAI; - case CELL_IDENT_LAC: - return CBC_CELL_ID_LAC; - case CELL_IDENT_BSS: - return CBC_CELL_ID_BSS; - default: - return -1; - } -} - -/* covert CBC internal type to TS 08.08 Cell Identity */ -static enum CELL_IDENT cell_id_from_ccid_discr(enum cbc_cell_id_type in) -{ - switch (in) { - case CBC_CELL_ID_NONE: - return CELL_IDENT_NO_CELL; - case CBC_CELL_ID_CGI: - return CELL_IDENT_WHOLE_GLOBAL; - case CBC_CELL_ID_LAC_CI: - return CELL_IDENT_LAC_AND_CI; - case CBC_CELL_ID_CI: - return CELL_IDENT_CI; - case CBC_CELL_ID_LAI: - return CELL_IDENT_LAI; - case CBC_CELL_ID_LAC: - return CELL_IDENT_LAC; - case CBC_CELL_ID_BSS: - return CELL_IDENT_BSS; - default: - return -1; - } -} - -/* convert TS 08.08 Cell Identifier Union to CBC internal type */ -static void cci_from_cbsp(struct cbc_cell_id *cci, enum CELL_IDENT id_discr, - const union gsm0808_cell_id_u *u) -{ - cci->id_discr = cci_discr_from_cell_id(id_discr); - - switch (id_discr) { - case CELL_IDENT_NO_CELL: - break; - case CELL_IDENT_WHOLE_GLOBAL: - cci->u.cgi = u->global; - break; - case CELL_IDENT_LAC_AND_CI: - cci->u.lac_and_ci = u->lac_and_ci; - break; - case CELL_IDENT_CI: - cci->u.ci = u->ci; - break; - case CELL_IDENT_LAI: - cci->u.lai = u->lai_and_lac; - break; - case CELL_IDENT_LAC: - cci->u.lac = u->lac; - break; - case CELL_IDENT_BSS: - break; - default: - break; - } -} - -/* convert TS 08.08 Cell Identifier Union to CBC internal type */ -static void cbsp_from_cci(union gsm0808_cell_id_u *u, const struct cbc_cell_id *cci) -{ - switch (cci->id_discr) { - case CBC_CELL_ID_NONE: - break; - case CBC_CELL_ID_CGI: - u->global = cci->u.cgi; - printf("u->gobal: %s\n", osmo_hexdump((uint8_t *) &u->global, sizeof(u->global))); - break; - case CBC_CELL_ID_LAC_CI: - u->lac_and_ci = cci->u.lac_and_ci; - break; - case CBC_CELL_ID_CI: - u->ci = cci->u.ci; - break; - case CBC_CELL_ID_LAI: - u->lai_and_lac = cci->u.lai; - break; - case CBC_CELL_ID_LAC: - u->lac = cci->u.lac; - break; - case CBC_CELL_ID_BSS: - break; - default: - OSMO_ASSERT(0); - } -} - -/* read a single osmo_cbsp_num_compl_ent and add it to cbc_message_peer */ -static void cci_from_cbsp_compl_ent(struct cbc_message_peer *mp, - struct osmo_cbsp_num_compl_ent *ce, enum CELL_IDENT id_discr) -{ - struct cbc_cell_id *cci; - - cci = NULL; // FIXME: lookup - if (!cci) { - cci = talloc_zero(mp, struct cbc_cell_id); - if (!cci) - return; - llist_add_tail(&cci->list, &mp->num_compl_list); - } - cci_from_cbsp(cci, id_discr, &ce->cell_id); - cci->num_compl.num_compl += ce->num_compl; - cci->num_compl.num_bcast_info += ce->num_bcast_info; -} -static void msg_peer_append_cbsp_compl(struct cbc_message_peer *mp, - struct osmo_cbsp_num_compl_list *nclist) -{ - struct osmo_cbsp_num_compl_ent *ce; - - llist_for_each_entry(ce, &nclist->list, list) - cci_from_cbsp_compl_ent(mp, ce, nclist->id_discr); -} - -/* read a single osmo_cbsp_cell_ent and add it to cbc_message_peer */ -static void cci_from_cbsp_cell_ent(struct cbc_message_peer *mp, - struct osmo_cbsp_cell_ent *ce, enum CELL_IDENT id_discr) -{ - struct cbc_cell_id *cci; - - cci = NULL; // FIXME: lookup - if (!cci) { - cci = talloc_zero(mp, struct cbc_cell_id); - if (!cci) - return; - llist_add_tail(&cci->list, &mp->cell_list); - } - cci_from_cbsp(cci, id_discr, &ce->cell_id); -} -static void msg_peer_append_cbsp_cell(struct cbc_message_peer *mp, - struct osmo_cbsp_cell_list *clist) -{ - struct osmo_cbsp_cell_ent *ce; - - llist_for_each_entry(ce, &clist->list, list) - cci_from_cbsp_cell_ent(mp, ce, clist->id_discr); -} - -/* read a single osmo_cbsp_fail_ent and add it to cbc_message_peer */ -static void cci_from_cbsp_fail_ent(struct cbc_message_peer *mp, - struct osmo_cbsp_fail_ent *fe) -{ - struct cbc_cell_id *cci; - cci = NULL; // lookup */ - if (!cci) { - cci = talloc_zero(mp, struct cbc_cell_id); - if (!cci) - return; - llist_add_tail(&cci->list, &mp->fail_list); - } - cci->id_discr = cci_discr_from_cell_id(fe->id_discr); - cci->fail.cause = fe->cause; -} -static void msg_peer_append_cbsp_fail(struct cbc_message_peer *mp, struct llist_head *flist) -{ - struct osmo_cbsp_fail_ent *fe; - - llist_for_each_entry(fe, flist, list) - cci_from_cbsp_fail_ent(mp, fe); -} - -/* append all cells from cbc_message_peer to given CBSP cell_list */ -static void cbsp_append_cell_list(struct osmo_cbsp_cell_list *out, void *ctx, - const struct cbc_message_peer *mp) -{ - struct cbc_cell_id *cci; - enum cbc_cell_id_type id_discr = CBC_CELL_ID_NONE; - - llist_for_each_entry(cci, &mp->cell_list, list) { - struct osmo_cbsp_cell_ent *ent; - - if (id_discr == CBC_CELL_ID_NONE) - id_discr = cci->id_discr; - else if (id_discr != cci->id_discr) { - LOGPFSML(mp->fi, LOGL_ERROR, "Cannot encode CBSP cell_list as not all " - "entries are of same type (%u != %u)\n", id_discr, cci->id_discr); - continue; - } - ent = talloc_zero(ctx, struct osmo_cbsp_cell_ent); - OSMO_ASSERT(ent); - cbsp_from_cci(&ent->cell_id, cci); - llist_add_tail(&ent->list, &out->list); - } - out->id_discr = cell_id_from_ccid_discr(id_discr); -} - -/* append SBcAP cells to msg_peer compl list */ -void msg_peer_append_compl_sbcap_bcast_area_list(struct cbc_message_peer *mp, - const SBcAP_Broadcast_Scheduled_Area_List_t *bcast) -{ - SBcAP_CellId_Broadcast_List_t *cell_id_bscat = bcast->cellId_Broadcast_List; - A_SEQUENCE_OF(struct SBcAP_CellId_Broadcast_List_Item) *as_cell_id_bcast; - SBcAP_CellId_Broadcast_List_Item_t *it; - unsigned int i; - - if (!cell_id_bscat) - return; - - as_cell_id_bcast = (void *) &cell_id_bscat->list; - for (i = 0; i < as_cell_id_bcast->count; i++) { - it = (SBcAP_CellId_Broadcast_List_Item_t *)(as_cell_id_bcast->array[i]); - OSMO_ASSERT(it); - struct cbc_cell_id *cci = NULL; // FIXME: lookup - if (!cci) { - cci = talloc_zero(mp, struct cbc_cell_id); - if (!cci) - return; - llist_add_tail(&cci->list, &mp->num_compl_list); - } - cci_from_sbcap_bcast_cell_id(cci, it); - LOGPFSML(mp->fi, LOGL_DEBUG, "Appending CellId %s to Broadcast Completed list\n", - cbc_cell_id2str(cci)); - cci->num_compl.num_compl += 1; - cci->num_compl.num_bcast_info += 1; - } -} - -/* append SBcAP cells to msg_peer fail list */ -void msg_peer_append_fail_sbcap_tai_list(struct cbc_message_peer *mp, - const SBcAP_List_of_TAIs_t *tais) -{ - A_SEQUENCE_OF(List_of_TAIs__Member) *as_tais = (void *)&tais->list; - List_of_TAIs__Member *it; - unsigned int i; - - for (i = 0; i < as_tais->count; i++) { - it = (List_of_TAIs__Member *)(as_tais->array[i]); - OSMO_ASSERT(it); - struct cbc_cell_id *cci = NULL; // FIXME: lookup - if (!cci) { - cci = talloc_zero(mp, struct cbc_cell_id); - if (!cci) - return; - llist_add_tail(&cci->list, &mp->fail_list); - } - cci_from_sbcap_tai(cci, &it->tai); - cci->fail.cause = SBcAP_Cause_tracking_area_not_valid; - LOGPFSML(mp->fi, LOGL_DEBUG, "Appending CellId %s (cause: %s) to Failed list\n", - cbc_cell_id2str(cci), sbcap_cause_str(cci->fail.cause)); - } -} - -/*********************************************************************** - * actual FSM - ***********************************************************************/ - -static void smscb_p_fsm_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; - int rc; - - switch (event) { - case SMSCB_PEER_E_CREATE: - /* send it to peer */ - rc = peer_new_cbc_message(mp->peer, mp->cbcmsg); - if (rc == 0) { - /* wait for peers' response */ - osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 10, - T_WAIT_WRITE_ACK); - } - break; - default: - OSMO_ASSERT(0); - } -} - -static void smscb_p_fsm_wait_write_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; - struct osmo_cbsp_decoded *dec = NULL; - SBcAP_SBC_AP_PDU_t *sbcap = NULL; - A_SEQUENCE_OF(void) *as_pdu; - SBcAP_Write_Replace_Warning_Response_IEs_t *ie; - - switch (event) { - case SMSCB_PEER_E_CBSP_WRITE_ACK: - dec = data; - msg_peer_append_cbsp_compl(mp, &dec->u.write_replace_compl.num_compl_list); - msg_peer_append_cbsp_cell(mp, &dec->u.write_replace_compl.cell_list); - osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); - /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_ACK, mp); - break; - case SMSCB_PEER_E_CBSP_WRITE_NACK: - dec = data; - msg_peer_append_cbsp_compl(mp, &dec->u.write_replace_fail.num_compl_list); - msg_peer_append_cbsp_cell(mp, &dec->u.write_replace_fail.cell_list); - msg_peer_append_cbsp_fail(mp, &dec->u.write_replace_fail.fail_list); - osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); - /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_NACK, mp); - break; - case SMSCB_PEER_E_SBCAP_WRITE_ACK: - sbcap = data; - OSMO_ASSERT(sbcap->present == SBcAP_SBC_AP_PDU_PR_successfulOutcome); - OSMO_ASSERT(sbcap->choice.successfulOutcome.procedureCode == SBcAP_ProcedureId_Write_Replace_Warning); - as_pdu = (void *)&sbcap->choice.successfulOutcome.value.choice.Write_Replace_Warning_Response.protocolIEs.list; - /* static const long asn_VAL_21_SBcAP_id_Unknown_Tracking_Area_List = 22; */ - ie = sbcap_as_find_ie(as_pdu, 22); - if (ie) { /* IE is optional */ - OSMO_ASSERT(ie->value.present == SBcAP_Write_Replace_Warning_Response_IEs__value_PR_List_of_TAIs); - msg_peer_append_fail_sbcap_tai_list(mp, &ie->value.choice.List_of_TAIs); - } - osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); - /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_ACK, mp); - break; - case SMSCB_PEER_E_SBCAP_WRITE_NACK: - osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); - /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_NACK, mp); - break; - default: - OSMO_ASSERT(0); - } -} - -static void smscb_p_fsm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; - struct osmo_cbsp_decoded *cbsp; - - switch (event) { - case SMSCB_PEER_E_REPLACE: /* send WRITE-REPLACE to BSC */ - cbsp = osmo_cbsp_decoded_alloc(mp->peer, CBSP_MSGT_WRITE_REPLACE); - OSMO_ASSERT(cbsp); - cbsp->u.write_replace.msg_id = mp->cbcmsg->msg.message_id; - cbsp->u.write_replace.old_serial_nr = &mp->cbcmsg->msg.serial_nr; - //cbsp->u.write_replace.new_serial_nr - /* TODO: we assume that the replace will always affect all original cells */ - cbsp_append_cell_list(&cbsp->u.write_replace.cell_list, cbsp, mp); - // TODO: ALL OTHER DATA - cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); - osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_REPLACE_ACK, 10, T_WAIT_REPLACE_ACK); - break; - case SMSCB_PEER_E_STATUS: /* send MSG-STATUS-QUERY to BSC */ - cbsp = osmo_cbsp_decoded_alloc(mp->peer, CBSP_MSGT_MSG_STATUS_QUERY); - OSMO_ASSERT(cbsp); - cbsp->u.msg_status_query.msg_id = mp->cbcmsg->msg.message_id; - cbsp->u.msg_status_query.old_serial_nr = mp->cbcmsg->msg.serial_nr; - cbsp_append_cell_list(&cbsp->u.msg_status_query.cell_list, cbsp, mp); - cbsp->u.msg_status_query.channel_ind = CBSP_CHAN_IND_BASIC; - cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); - osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_STATUS_ACK, 10, T_WAIT_STATUS_ACK); - break; - default: - OSMO_ASSERT(0); - } -} - -static void smscb_p_fsm_wait_status_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; - struct osmo_cbsp_decoded *dec = NULL; - - switch (event) { - case SMSCB_PEER_E_CBSP_STATUS_ACK: - dec = data; - msg_peer_append_cbsp_compl(mp, &dec->u.msg_status_query_compl.num_compl_list); - osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); - /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_STATUS_ACK, mp); - break; - case SMSCB_PEER_E_CBSP_STATUS_NACK: - dec = data; - msg_peer_append_cbsp_compl(mp, &dec->u.msg_status_query_fail.num_compl_list); - msg_peer_append_cbsp_fail(mp, &dec->u.msg_status_query_fail.fail_list); - osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); - /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_STATUS_NACK, mp); - break; - default: - OSMO_ASSERT(0); - } -} - - -static void smscb_p_fsm_wait_replace_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; - struct osmo_cbsp_decoded *dec = NULL; - - switch (event) { - case SMSCB_PEER_E_CBSP_REPLACE_ACK: - dec = data; - msg_peer_append_cbsp_compl(mp, &dec->u.write_replace_compl.num_compl_list); - msg_peer_append_cbsp_cell(mp, &dec->u.write_replace_compl.cell_list); - osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); - /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_REPLACE_ACK, mp); - break; - case SMSCB_PEER_E_CBSP_REPLACE_NACK: - dec = data; - msg_peer_append_cbsp_compl(mp, &dec->u.write_replace_fail.num_compl_list); - msg_peer_append_cbsp_cell(mp, &dec->u.write_replace_fail.cell_list); - msg_peer_append_cbsp_fail(mp, &dec->u.write_replace_fail.fail_list); - osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); - /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_REPLACE_NACK, mp); - break; - default: - OSMO_ASSERT(0); - } -} - -static void smscb_p_fsm_wait_delete_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; - struct osmo_cbsp_decoded *dec = NULL; - //SBcAP_SBC_AP_PDU_t *pdu = NULL; - - switch (event) { - case SMSCB_PEER_E_CBSP_DELETE_ACK: - dec = data; - /* append results */ - msg_peer_append_cbsp_compl(mp, &dec->u.kill_compl.num_compl_list); - msg_peer_append_cbsp_cell(mp, &dec->u.kill_compl.cell_list); - osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); - /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_ACK, mp); - break; - case SMSCB_PEER_E_CBSP_DELETE_NACK: - dec = data; - /* append results */ - msg_peer_append_cbsp_compl(mp, &dec->u.kill_fail.num_compl_list); - msg_peer_append_cbsp_cell(mp, &dec->u.kill_fail.cell_list); - msg_peer_append_cbsp_fail(mp, &dec->u.kill_fail.fail_list); - osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); - /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_NACK, mp); - break; - case SMSCB_PEER_E_SBCAP_DELETE_ACK: - //pdu = data; - osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); - /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_ACK, mp); - break; - case SMSCB_PEER_E_SBCAP_DELETE_NACK: - //pdu = data; - osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); - /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_NACK, mp); - break; - default: - OSMO_ASSERT(0); - } -} - - - -static int smscb_p_fsm_timer_cb(struct osmo_fsm_inst *fi) -{ - switch (fi->T) { - case T_WAIT_WRITE_ACK: - osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_NACK, NULL); - break; - case T_WAIT_REPLACE_ACK: - osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_REPLACE_NACK, NULL); - break; - case T_WAIT_STATUS_ACK: - osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_STATUS_NACK, NULL); - break; - case T_WAIT_DELETE_ACK: - osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_NACK, NULL); - break; - default: - OSMO_ASSERT(0); - } - return 0; -} - -static void smscb_p_fsm_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; - struct osmo_cbsp_decoded *cbsp; - SBcAP_SBC_AP_PDU_t *sbcap; - A_SEQUENCE_OF(void) *as_pdu; - SBcAP_Write_Replace_Warning_Indication_IEs_t *ie; - - switch (event) { - case SMSCB_PEER_E_DELETE: /* send KILL to BSC */ - switch (fi->state) { - case SMSCB_S_DELETED: - case SMSCB_S_INIT: - LOGPFSML(fi, LOGL_ERROR, "Event %s not permitted\n", - osmo_fsm_event_name(fi->fsm, event)); - return; - default: - break; - } - switch (mp->peer->proto) { - case CBC_PEER_PROTO_CBSP: - cbsp = osmo_cbsp_decoded_alloc(mp->peer, CBSP_MSGT_KILL); - OSMO_ASSERT(cbsp); - cbsp->u.kill.msg_id = mp->cbcmsg->msg.message_id; - cbsp->u.kill.old_serial_nr = mp->cbcmsg->msg.serial_nr; - /* TODO: we assume that the delete will always affect all original cells */ - cbsp_append_cell_list(&cbsp->u.kill.cell_list, cbsp, mp); - if (!mp->cbcmsg->msg.is_etws) { - /* Channel Indication IE is only present in CBS, not in ETWS! */ - cbsp->u.kill.channel_ind = talloc_zero(cbsp, enum cbsp_channel_ind); - OSMO_ASSERT(cbsp->u.kill.channel_ind); - *(cbsp->u.kill.channel_ind) = CBSP_CHAN_IND_BASIC; - } - cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); - break; - case CBC_PEER_PROTO_SBcAP: - if ((sbcap = sbcap_gen_stop_warning_req(mp->peer, mp->cbcmsg))) { - cbc_sbcap_link_tx(mp->peer->link.sbcap, sbcap); - } else { - LOGP(DSBcAP, LOGL_ERROR, - "[%s] Tx SBc-AP Stop-Warning-Request: msg gen failed\n", - mp->peer->name); - } - break; - case CBC_PEER_PROTO_SABP: - default: - osmo_panic("SMSCB_PEER_E_DELETE not implemented for proto %u", mp->peer->proto); - } - osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_DELETE_ACK, 10, T_WAIT_DELETE_ACK); - break; - case SMSCB_PEER_E_SBCAP_WRITE_IND: - sbcap = (SBcAP_SBC_AP_PDU_t *)data; - OSMO_ASSERT(sbcap->present == SBcAP_SBC_AP_PDU_PR_initiatingMessage); - OSMO_ASSERT(sbcap->choice.initiatingMessage.procedureCode == SBcAP_ProcedureId_Write_Replace_Warning_Indication); - as_pdu = (void *)&sbcap->choice.initiatingMessage.value.choice.Write_Replace_Warning_Indication.protocolIEs.list; - /* static const long asn_VAL_36_SBcAP_id_Broadcast_Scheduled_Area_List = 23; */ - ie = sbcap_as_find_ie(as_pdu, 23); - if (!ie) - return; /* IE is optional */ - OSMO_ASSERT(ie->value.present == SBcAP_Write_Replace_Warning_Indication_IEs__value_PR_Broadcast_Scheduled_Area_List); - msg_peer_append_compl_sbcap_bcast_area_list(mp, &ie->value.choice.Broadcast_Scheduled_Area_List); - break; - default: - OSMO_ASSERT(0); - } -} - -static void smscb_p_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) -{ - struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; - llist_del(&mp->list); - /* memory of mp is child of fi and hence automatically free'd */ -} - -static const struct osmo_fsm_state smscb_p_fsm_states[] = { - [SMSCB_S_INIT] = { - .name = "INIT", - .in_event_mask = S(SMSCB_PEER_E_CREATE), - .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK), - .action = smscb_p_fsm_init, - }, - [SMSCB_S_WAIT_WRITE_ACK] = { - .name = "WAIT_WRITE_ACK", - .in_event_mask = S(SMSCB_PEER_E_CBSP_WRITE_ACK) | - S(SMSCB_PEER_E_CBSP_WRITE_NACK) | - S(SMSCB_PEER_E_SBCAP_WRITE_ACK) | - S(SMSCB_PEER_E_SBCAP_WRITE_NACK), - .out_state_mask = S(SMSCB_S_ACTIVE) | - S(SMSCB_S_WAIT_DELETE_ACK), - .action = smscb_p_fsm_wait_write_ack, - }, - [SMSCB_S_ACTIVE] = { - .name = "ACTIVE", - .in_event_mask = S(SMSCB_PEER_E_REPLACE) | - S(SMSCB_PEER_E_STATUS), - .out_state_mask = S(SMSCB_S_WAIT_REPLACE_ACK) | - S(SMSCB_S_WAIT_STATUS_ACK) | - S(SMSCB_S_WAIT_DELETE_ACK), - .action = smscb_p_fsm_active, - }, - [SMSCB_S_WAIT_STATUS_ACK] = { - .name = "WAIT_STATUS_ACK", - .in_event_mask = S(SMSCB_PEER_E_CBSP_STATUS_ACK) | - S(SMSCB_PEER_E_CBSP_STATUS_NACK), - .out_state_mask = S(SMSCB_S_ACTIVE) | - S(SMSCB_S_WAIT_DELETE_ACK), - .action = smscb_p_fsm_wait_status_ack, - }, - [SMSCB_S_WAIT_REPLACE_ACK] = { - .name = "WAIT_REPLACE_ACK", - .in_event_mask = S(SMSCB_PEER_E_CBSP_REPLACE_ACK) | - S(SMSCB_PEER_E_CBSP_REPLACE_NACK), - .out_state_mask = S(SMSCB_S_ACTIVE) | - S(SMSCB_S_WAIT_DELETE_ACK), - .action = smscb_p_fsm_wait_replace_ack, - }, - [SMSCB_S_WAIT_DELETE_ACK] = { - .name = "WAIT_DELETE_ACK", - .in_event_mask = S(SMSCB_PEER_E_CBSP_DELETE_ACK) | - S(SMSCB_PEER_E_CBSP_DELETE_NACK) | - S(SMSCB_PEER_E_SBCAP_DELETE_ACK) | - S(SMSCB_PEER_E_SBCAP_DELETE_NACK), - .out_state_mask = S(SMSCB_S_DELETED), - .action = smscb_p_fsm_wait_delete_ack, - }, - [SMSCB_S_DELETED] = { - .name = "DELETED", - }, -}; - -struct osmo_fsm smscb_p_fsm = { - .name = "SMSCB-PEER", - .states = smscb_p_fsm_states, - .num_states = ARRAY_SIZE(smscb_p_fsm_states), - .allstate_event_mask = S(SMSCB_PEER_E_DELETE) | - S(SMSCB_PEER_E_SBCAP_WRITE_IND), - .allstate_action = smscb_p_fsm_allstate, - .timer_cb = smscb_p_fsm_timer_cb, - .log_subsys = DCBSP, - .event_names = smscb_peer_fsm_event_names, - .cleanup = smscb_p_fsm_cleanup, -}; - -static __attribute__((constructor)) void on_dso_load_smscb_p_fsm(void) -{ - OSMO_ASSERT(osmo_fsm_register(&smscb_p_fsm) == 0); -} - struct cbc_message_peer *smscb_peer_fsm_alloc(struct cbc_peer *peer, struct cbc_message *cbcmsg) { struct cbc_message_peer *mp; struct osmo_fsm_inst *fi; + struct osmo_fsm *fsm_def; - fi = osmo_fsm_inst_alloc_child(&smscb_p_fsm, cbcmsg->fi, SMSCB_MSG_E_CHILD_DIED); + switch (peer->proto) { + case CBC_PEER_PROTO_CBSP: + fsm_def = &cbsp_smscb_peer_fsm; + break; + case CBC_PEER_PROTO_SBcAP: + fsm_def = &sbcap_smscb_peer_fsm; + break; + case CBC_PEER_PROTO_SABP: + default: + osmo_panic("smscb_peer FSM not implemented for proto %u", peer->proto); + } + fi = osmo_fsm_inst_alloc_child(fsm_def, cbcmsg->fi, SMSCB_MSG_E_CHILD_DIED); if (!fi) return NULL; /* include the peer name in the ID of the child FSM */ -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0fd00b60cdc6bc6a088be1336d849548ca89c847 Gerrit-Change-Number: 28828 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: Introduce logging category smscb

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28825 ) Change subject: Introduce logging category smscb ...................................................................... Introduce logging category smscb The smscb_message_fsm is totally independent of CBSP. Change-Id: I6e686747ddde9540ff3f765ef461bfca812615ba --- M doc/examples/osmo-cbc/osmo-cbc.cfg M include/osmocom/cbc/debug.h M src/cbc_main.c M src/smscb_message_fsm.c 4 files changed, 13 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/doc/examples/osmo-cbc/osmo-cbc.cfg b/doc/examples/osmo-cbc/osmo-cbc.cfg index 7f5ebdc..9874a39 100644 --- a/doc/examples/osmo-cbc/osmo-cbc.cfg +++ b/doc/examples/osmo-cbc/osmo-cbc.cfg @@ -1,5 +1,6 @@ log stderr logging level main notice + logging level smscb notice logging level cbsp notice logging level sbcap notice logging level asn1c notice diff --git a/include/osmocom/cbc/debug.h b/include/osmocom/cbc/debug.h index c0b3864..e07cfdd 100644 --- a/include/osmocom/cbc/debug.h +++ b/include/osmocom/cbc/debug.h @@ -2,6 +2,7 @@ enum { DMAIN, + DSMSCB, DCBSP, DSBcAP, DASN1C, diff --git a/src/cbc_main.c b/src/cbc_main.c index 5096dc8..7e13e52 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -62,6 +62,13 @@ .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DSMSCB] = { + .name = "DSMSCB", + .description = "SMS Cell Broadcast handling", + .color = "\033[1;35m", + .enabled = 1, + .loglevel = LOGL_NOTICE, + }, [DCBSP] = { .name = "DCBSP", .description = "Cell Broadcast Service Protocol (CBC-BSC)", diff --git a/src/smscb_message_fsm.c b/src/smscb_message_fsm.c index ba17910..40d4535 100644 --- a/src/smscb_message_fsm.c +++ b/src/smscb_message_fsm.c @@ -335,7 +335,7 @@ .allstate_event_mask = S(SMSCB_E_CHILD_DIED), .allstate_action = smscb_fsm_allstate, .timer_cb = smscb_fsm_timer_cb, - .log_subsys = DCBSP, + .log_subsys = DSMSCB, .event_names = smscb_fsm_event_names, .cleanup= smscb_fsm_cleanup, }; @@ -349,7 +349,7 @@ char idbuf[32]; if (cbc_message_by_id(orig_msg->msg.message_id)) { - LOGP(DCBSP, LOGL_ERROR, "Cannot create message_id %u (already exists)\n", + LOGP(DSMSCB, LOGL_ERROR, "Cannot create message_id %u (already exists)\n", orig_msg->msg.message_id); return NULL; } @@ -357,13 +357,13 @@ snprintf(idbuf, sizeof(idbuf), "%s-%u", orig_msg->cbe_name, orig_msg->msg.message_id); fi = osmo_fsm_inst_alloc(&smscb_fsm, ctx, NULL, LOGL_INFO, idbuf); if (!fi) { - LOGP(DCBSP, LOGL_ERROR, "Cannot allocate cbc_message fsm\n"); + LOGP(DSMSCB, LOGL_ERROR, "Cannot allocate cbc_message fsm\n"); return NULL; } smscb = talloc(fi, struct cbc_message); if (!smscb) { - LOGP(DCBSP, LOGL_ERROR, "Cannot allocate cbc_message\n"); + LOGP(DSMSCB, LOGL_ERROR, "Cannot allocate cbc_message\n"); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); return NULL; } 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6e686747ddde9540ff3f765ef461bfca812615ba Gerrit-Change-Number: 28825 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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, 9 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Improve handling of WriteReplaceWarnResponse

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28824 ) Change subject: sbcap: Improve handling of WriteReplaceWarnResponse ...................................................................... sbcap: Improve handling of WriteReplaceWarnResponse If cause != accepted, submit a NACK to the upper layers. In that case, in the upper layers we don't want to parse the PDU IE "Unknown Tracking Area List" since it shouldn't be there. 3GPP TS 29.168 4.3.4.3.6 states: """ This IE shall only be included if the Cause IE indicates Message accepted, which means the MME will proceed with the request for Tracking Areas that are known to the MME. The Cause IE indicating Tracking area not valid is used when all Tracking Areas in the Request are invalid. """ Change-Id: I0a4d5bdbb6c4fd3870a4f4ebf226668b70fea06a --- M src/sbcap_link_fsm.c 1 file changed, 29 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index 6a50e91..f2cbe82 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -241,6 +241,34 @@ return 0; } +/* Rx Write Replace Warning Response from peer */ +static int cbc_sbcap_link_rx_write_replace_warn_resp(struct cbc_sbcap_link *link, + struct cbc_message_peer *mp, + SBcAP_SBC_AP_PDU_t *pdu) +{ + A_SEQUENCE_OF(void) *as_pdu; + SBcAP_Write_Replace_Warning_Response_IEs_t *ie; + SBcAP_SBC_AP_PDU_t *err_ind_pdu; + int ev = SMSCB_E_SBCAP_WRITE_ACK; + + as_pdu = (void *)&pdu->choice.successfulOutcome.value.choice.Write_Replace_Warning_Response.protocolIEs.list; + + /* static const long asn_VAL_19_SBcAP_id_Cause = 1; */ + ie = sbcap_as_find_ie(as_pdu, 1); + if (ie) { + if (ie->value.choice.Cause != SBcAP_Cause_message_accepted) + ev = SMSCB_E_SBCAP_WRITE_NACK; + } else { /* This shouldn't happen, the IE is Mandatory... */ + ev = SMSCB_E_SBCAP_WRITE_NACK; + err_ind_pdu = sbcap_gen_error_ind(link, + SBcAP_Cause_missing_mandatory_element, pdu); + if (err_ind_pdu) + cbc_sbcap_link_tx(link, err_ind_pdu); + } + + return osmo_fsm_inst_dispatch(mp->fi, ev, pdu); +} + /* message was received from remote SBc-AP peer (MME) */ int cbc_sbcap_link_rx_cb(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu) { @@ -345,7 +373,7 @@ //if (dec->u.write_replace_compl.old_serial_nr) // return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_SBcAP_REPLACE_ACK, dec); //else - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_SBCAP_WRITE_ACK, pdu); + return cbc_sbcap_link_rx_write_replace_warn_resp(link, mp, pdu); case SBcAP_ProcedureId_Stop_Warning: return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_SBCAP_DELETE_ACK, pdu); default: -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0a4d5bdbb6c4fd3870a4f4ebf226668b70fea06a Gerrit-Change-Number: 28824 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: Split smscb_peer_fsm into CBSP and SBcAP specific FSMs

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28828 ) Change subject: Split smscb_peer_fsm into CBSP and SBcAP specific FSMs ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0fd00b60cdc6bc6a088be1336d849548ca89c847 Gerrit-Change-Number: 28828 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 14:18:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: Split event list for smscb_message_fsm and smscb_peer_fsm

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28826 ) Change subject: Split event list for smscb_message_fsm and smscb_peer_fsm ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I909474d1ff4ec7ed20aff0981da47074397df6cb Gerrit-Change-Number: 28826 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 29 Jul 2022 14:18:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Improve handling of WriteReplaceWarnResponse

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28824 ) Change subject: sbcap: Improve handling of WriteReplaceWarnResponse ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0a4d5bdbb6c4fd3870a4f4ebf226668b70fea06a Gerrit-Change-Number: 28824 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 29 Jul 2022 14:18:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework trxcon_fsm, move into a separate file

by pespin

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28809 ) Change subject: trxcon: rework trxcon_fsm, move into a separate file ...................................................................... Patch Set 4: Code-Review+1 (1 comment) File src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h: https://gerrit.osmocom.org/c/osmocom-bb/+/28809/comment/37cb0513_0f22a7e1 PS4, Line 61: uint8_t mode; this used to be enum gsm_phys_chan_config in previous patch versions? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifaf63ead9dd180181358e771367b2a686ba159ca Gerrit-Change-Number: 28809 Gerrit-PatchSet: 4 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 14:17:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework trxcon_fsm, move into a separate file

by osmith

Attention is currently required from: laforge, fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28809 ) Change subject: trxcon: rework trxcon_fsm, move into a separate file ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifaf63ead9dd180181358e771367b2a686ba159ca Gerrit-Change-Number: 28809 Gerrit-PatchSet: 4 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 13:47:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: Split smscb_peer_fsm into CBSP and SBcAP specific FSMs

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28828 ) Change subject: Split smscb_peer_fsm into CBSP and SBcAP specific FSMs ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0fd00b60cdc6bc6a088be1336d849548ca89c847 Gerrit-Change-Number: 28828 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 13:42:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Improve handling of WriteReplaceWarnResponse

by osmith

Attention is currently required from: laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28824 ) Change subject: sbcap: Improve handling of WriteReplaceWarnResponse ...................................................................... Patch Set 4: Code-Review+1 (1 comment) File src/sbcap_link_fsm.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28824/comment/7042b8fe_dfdfbadd PS3, Line 264: SBcAP_Cause_missing_mandatory_element, pdu); > Sorry I'm not following you here. […] ah right, nvm then -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0a4d5bdbb6c4fd3870a4f4ebf226668b70fea06a Gerrit-Change-Number: 28824 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 13:41:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework trxcon_fsm, move into a separate file

by fixeria

Attention is currently required from: osmith, laforge, pespin. Hello osmith, Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28809 to look at the new patch set (#4). Change subject: trxcon: rework trxcon_fsm, move into a separate file ...................................................................... trxcon: rework trxcon_fsm, move into a separate file The original trxcon_fsm I wrote back in 2017 [1] was more like a boolean flag, as there were only two states: IDLE and MANAGED. Not surprising, given that until recently handling of multiple L1CTL connections was not supported. Now that we have this implemented, lifetime of a trxcon_fsm instance is limited by lifetime of a L1CTL connection, what renders the FSM useless. This change removes the old 'boolean' trxcon_fsm and introduces the new one, which will allows us to abstract the L1CTL interface from the TRXC/TRXD interfaces, as well as the scheduler. The new FSM will also simplify development of the RLC/MAC layer for GPRS. Change-Id: Ifaf63ead9dd180181358e771367b2a686ba159ca Related: [1] I7ee6fc891abe5f775f5b7ebbf093181a97950dea Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/Makefile.am M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trx_if.c M src/host/trxcon/src/trxcon.c A src/host/trxcon/src/trxcon_fsm.c 8 files changed, 787 insertions(+), 411 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/09/28809/4 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifaf63ead9dd180181358e771367b2a686ba159ca Gerrit-Change-Number: 28809 Gerrit-PatchSet: 4 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework trxcon_fsm, move into a separate file

by fixeria

Attention is currently required from: osmith, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28809 ) Change subject: trxcon: rework trxcon_fsm, move into a separate file ...................................................................... Patch Set 3: (2 comments) File src/host/trxcon/src/l1ctl.c: https://gerrit.osmocom.org/c/osmocom-bb/+/28809/comment/dedce64d_aa25e407 PS3, Line 467: /* FIXME: we cannot know for sure if the given mode was actually applied. > See for instance: […] Done File src/host/trxcon/src/trxcon_fsm.c: https://gerrit.osmocom.org/c/osmocom-bb/+/28809/comment/b198da57_8cbeb213 PS3, Line 210: "); > Nice catch! Thanks! Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifaf63ead9dd180181358e771367b2a686ba159ca Gerrit-Change-Number: 28809 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 13:35:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Handle each CBSP and SBc-AP on a separate component

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28830 ) Change subject: cbc: Handle each CBSP and SBc-AP on a separate component ...................................................................... cbc: Handle each CBSP and SBc-AP on a separate component * Each BSC_ConnectionHandler emulates a BSC and handles one TCP/CBSP conn. * Each MME_ConectionHandler emulates an MME and handles one SCTP/SBc-AP conn. * ECBE related functionalities are moved to its own file ECBE_Components.ttcn. * CBS_Message is moved to its own file since it is used by all modules. Related: OS#4945 Change-Id: Ia0300a2ae69bdf604373dbc484537958413c79a2 --- A cbc/BSC_ConnectionHandler.ttcn M cbc/CBC_Tests.ttcn A cbc/CBS_Message.ttcn A cbc/ECBE_Components.ttcn A cbc/MME_ConnectionHandler.ttcn 5 files changed, 608 insertions(+), 325 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/cbc/BSC_ConnectionHandler.ttcn b/cbc/BSC_ConnectionHandler.ttcn new file mode 100644 index 0000000..ec86f01 --- /dev/null +++ b/cbc/BSC_ConnectionHandler.ttcn @@ -0,0 +1,175 @@ +/* BSC (CBSP) Connection Handler of CBC test suite in TTCN-3 + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module BSC_ConnectionHandler { + +import from Osmocom_Types all; + +import from BSSAP_Types all; +import from BSSMAP_Templates all; +import from CBSP_Types all; +import from CBSP_Templates all; +import from CBSP_Adapter all; +import from CBSP_CodecPort all; + +import from CBS_Message all; + +type function void_fn() runs on BSC_ConnHdlr; + +/* this component represents a single subscriber connection */ +type component BSC_ConnHdlr extends CBSP_Adapter_CT { + var BSC_ConnHdlrPars g_pars; +} + +type record BSC_ConnHdlrPars { + integer bsc_cbsp_port, + charstring cbc_host, + integer cbc_cbsp_port, + void_fn start_fn, + CBS_Message exp_cbs_msg optional, + BSSMAP_FIELD_CellIdentificationList cell_list_success optional +}; + +function f_BSC_ConnHdlr_main(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + g_pars := pars; + CBSP_Adapter.f_connect(g_pars.cbc_host, g_pars.cbc_cbsp_port, "", g_pars.bsc_cbsp_port); + + var BSSMAP_FIELD_CellIdentificationList cell_list := { + cIl_allInBSS := ''O + }; + activate(as_cbsp_keepalive_ack(0)); + activate(as_cbsp_restart(0)); + f_cbsp_send(ts_CBSP_RESTART(cell_list, CBSP_BC_MSGT_CBS, CBSP_RI_DATA_LOST)); + f_cbsp_send(ts_CBSP_RESTART(cell_list, CBSP_BC_MSGT_EMERG, CBSP_RI_DATA_LOST)); + as_cbsp_reset(0); + + g_pars.start_fn.apply(); +} + +altstep as_cbsp_reset(integer idx) runs on CBSP_Adapter_CT { + var CBSP_RecvFrom rf; + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], tr_CBSP_RESET)) -> value rf { + var CBSP_IE ie; + f_cbsp_find_ie(rf.msg, CBSP_IEI_CELL_LIST, ie); + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], + ts_CBSP_RESET_COMPL(ie.body.cell_list.cell_id))); + } +} + +/* receive + acknowledge KEEP-ALIVE */ +altstep as_cbsp_keepalive_ack(integer idx) runs on CBSP_Adapter_CT { + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], tr_CBSP_KEEP_ALIVE)) { + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], ts_CBSP_KEEP_ALIVE_COMPL)); + } +} + +/* receive + ignore RESTART */ +altstep as_cbsp_restart(integer idx) runs on CBSP_Adapter_CT { + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], tr_CBSP_RESTART)); +} + +function f_cbsp_tx_write_compl(CBS_Message msg, integer idx := 0, + template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit, + template (omit) CBSP_IE_NumBcastComplList tx_compl_list := omit) +runs on BSC_ConnHdlr { + var template (value) CBSP_PDU tx; + var template (value) BSSMAP_FIELD_CellIdentificationList tx_list; + if (istemplatekind(tx_cell_list, "omit")) { + /* use the "expected list" when confirming the write-replace */ + tx_list := msg.cell_list; + } else { + /* use an user-provided different list of cells */ + tx_list := valueof(tx_cell_list); + } + if (istemplatekind(tx_compl_list, "omit")) { + tx := ts_CBSP_WRITE_CBS_COMPL(msg.msg_id, msg.ser_nr, tx_list, msg.channel_ind); + } else { + tx := ts_CBSP_REPLACE_CBS_COMPL(msg.msg_id, msg.ser_nr, msg.old_ser_nr, + valueof(tx_compl_list), tx_list, + msg.channel_ind); + } + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); +} + +function f_cbsp_tx_write_fail(CBS_Message msg, integer idx := 0, + template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit, + template (omit) CBSP_FailureListItems tx_fail_list := omit) +runs on BSC_ConnHdlr { + var template (value) CBSP_PDU tx; + tx := ts_CBSP_WRITE_CBS_FAIL(msg.msg_id, msg.ser_nr, valueof(tx_fail_list), + omit, tx_cell_list, msg.channel_ind); + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); +} + +/* handle a CBSP-WRITE-REPLACE and respond to it with COMPLETE or FAILURE depending on arguments */ +function f_cbsp_handle_write(CBS_Message msg, integer idx := 0, + template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit, + template (omit) CBSP_FailureListItems tx_fail_list := omit, + template (omit) CBSP_IE_NumBcastComplList tx_compl_list := omit) +runs on BSC_ConnHdlr { + var template CBSP_IEs content_ies := {}; + var template (present) CBSP_PDU rx_templ; + var CBSP_RecvFrom rf; + for (var integer i := 0; i < lengthof(msg.content); i := i+1) { + //content_ies[i] := tr_CbspMsgContent(msg.content[i].payload, msg.content[i].user_len); + content_ies[i] := tr_CbspMsgContent(?, ?); + } + rx_templ := tr_CBSP_WRITE_CBS(msg.msg_id, msg.ser_nr, msg.cell_list, msg.channel_ind, + msg.category, msg.rep_period, msg.num_bcast_req, msg.dcs, + content_ies); + alt { + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], rx_templ)) -> value rf { + var template (value) CBSP_PDU tx; + if (istemplatekind(tx_fail_list, "omit")) { + f_cbsp_tx_write_compl(msg, idx, tx_cell_list, tx_compl_list); + } else { + f_cbsp_tx_write_fail(msg, idx, tx_cell_list, tx_fail_list); + } + } + [] as_cbsp_keepalive_ack(idx) { repeat; } + [] CBSP[idx].receive { + setverdict(fail, "Received unexpected CBSP in index ", idx); + } + } +} + +/* handle a CBSP-KILL and respond to it with COMPLETE or FAILURE depending on arguments */ +function f_cbsp_handle_kill(integer idx, uint16_t msg_id, uint16_t ser_nr, + template BSSMAP_FIELD_CellIdentificationList exp_list, + template (omit) BSSMAP_FIELD_CellIdentificationList tx_list, + template (omit) CBSP_FailureListItems tx_fail_list := omit, + template (omit) CBSP_IE_NumBcastComplList tx_compl_list := omit, + template (omit) uint8_t channel_ind := omit) +runs on BSC_ConnHdlr { + var template (present) CBSP_PDU rx_templ; + var CBSP_RecvFrom rf; + + rx_templ := tr_CBSP_KILL(msg_id, ser_nr, exp_list, channel_ind); + alt { + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], rx_templ)) -> value rf { + var template (value) CBSP_PDU tx; + if (istemplatekind(tx_fail_list, "omit")) { + tx := ts_CBSP_KILL_COMPL(msg_id, ser_nr, tx_compl_list, tx_list, channel_ind); + } else { + tx := ts_CBSP_KILL_FAIL(msg_id, ser_nr, valueof(tx_fail_list), tx_compl_list, + tx_list, channel_ind); + } + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); + } + [] as_cbsp_keepalive_ack(idx) { repeat; } + [] CBSP[idx].receive { + setverdict(fail, "Received unexpected CBSP in index ", idx); + } + } +} + +} diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 2abd33e..11b8e5a 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -10,6 +10,11 @@ import from CBSP_Adapter all; import from CBSP_CodecPort all; +import from SABP_Types all; +import from SABP_Templates all; +import from SABP_IEs all; +import from SABP_PDU_Descriptions all; + import from SBC_AP_IEs all; import from SBC_AP_Constants all; import from SBC_AP_PDU_Contents all; @@ -23,6 +28,11 @@ import from HTTPmsg_Types all; import from ECBE_Types all; +import from CBS_Message all; +import from ECBE_Components all; +import from BSC_ConnectionHandler all; +import from MME_ConnectionHandler all; + modulepar { charstring mp_cbc_host := "127.0.0.1"; integer mp_cbc_cbsp_port := 48049; @@ -32,159 +42,144 @@ integer mp_local_sbcap_port := 9998; }; -type component test_CT extends CBSP_Adapter_CT, SBC_AP_Adapter_CT, http_CT { +const integer MAX_BSC := 3; +const integer MAX_MME := 3; + +type component test_CT extends CBSP_Adapter_CT, http_CT { + var integer g_num_bsc; + var integer g_num_mme; + var BSC_ConnHdlr g_vc_conn_BSC[MAX_BSC]; + var MME_ConnHdlr g_vc_conn_MME[MAX_MME]; + var BSC_ConnHdlrPars g_pars_BSC[MAX_BSC]; + var MME_ConnHdlrPars g_pars_MME[MAX_MME]; }; -/********************************************************************************* - * ECBE (REST) interface - *********************************************************************************/ - -function f_ecbe_tx_post_cbs(EcbeCbcMessage cbc) -runs on http_CT { - var charstring body := oct2char(enc_EcbeCbcMessage(cbc)); - log("TX POST CBS: ", body); - var HTTPMessage http_resp; - f_http_tx_request(url := "/api/ecbe/v1/message", method := "POST", body := body); -} - -function f_ecbe_rx_resp(template integer exp_sts := (200..299)) -runs on http_CT return HTTPResponse { - var HTTPMessage http_resp := f_http_rx_response(tr_HTTP_Resp(exp_sts), tout := 20.0); - return http_resp.response; -} - -/* run a HTTP POST to add a new CBC message */ -function f_ecbe_post_cbs(EcbeCbcMessage cbc, template integer exp_sts := 201) -runs on http_CT return HTTPResponse { - f_ecbe_tx_post_cbs(cbc); - return f_ecbe_rx_resp(exp_sts) -} - -function f_ecbe_tx_delete_cbs(integer msg_id) -runs on http_CT { - f_http_tx_request("/api/ecbe/v1/message/" & int2str(msg_id), method := "DELETE"); -} - -/* run a HTTP GET on specified URL expecting json in RSRES format as response */ -function f_ecbe_delete_cbs(integer msg_id, template integer exp_sts := 200) -runs on http_CT return HTTPResponse { - f_ecbe_tx_delete_cbs(msg_id); - return f_ecbe_rx_resp(exp_sts); -} - - -altstep as_cbsp_reset(integer idx) runs on CBSP_Adapter_CT { - var CBSP_RecvFrom rf; - [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], tr_CBSP_RESET)) -> value rf { - var CBSP_IE ie; - f_cbsp_find_ie(rf.msg, CBSP_IEI_CELL_LIST, ie); - CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], - ts_CBSP_RESET_COMPL(ie.body.cell_list.cell_id))); - } -} - -private function f_cbs2ecbe_category(CBSP_Category cat_in) return EcbeCategory -{ - select (cat_in) { - case (CBSP_CATEG_HIGH_PRIO) { return high_priority; } - case (CBSP_CATEG_BACKGROUND) { return background; } - case (CBSP_CATEG_NORMAL) { return normal; } - case else { mtc.stop } - } -} - -private function f_cbs2ecbe_page(CBS_MessageContent inp) return EcbePage -{ - return hex2str(oct2hex(inp.payload)); -} - -/* convert from CBS_Message to EcbeCbcMessage */ -function f_cbs2ecbe(CBS_Message inp, charstring cbe_name) return EcbeCbcMessage -{ - var EcbeCbcMessage ret := { - cbe_name := cbe_name, - category := f_cbs2ecbe_category(inp.category), - repetition_period := inp.rep_period, - num_of_bcast := inp.num_bcast_req, - scope := { scope_plmn := {} }, - smscb_message := { - serial_nr := { - serial_nr_encoded := inp.ser_nr - }, - message_id := inp.msg_id, - payload := { - payload_encoded := { - dcs := inp.dcs, - pages := { } /* appended below */ - } - } - } - }; - for (var integer i := 0; i < lengthof(inp.content); i := i+1) { - ret.smscb_message.payload.payload_encoded.pages := - ret.smscb_message.payload.payload_encoded.pages & { f_cbs2ecbe_page(inp.content[i]) }; - } - return ret; -} - -/********************************************************************************* - * CBSP interface - *********************************************************************************/ - -/* receive + acknowledge KEEP-ALIVE */ -altstep as_cbsp_keepalive_ack(integer idx) runs on CBSP_Adapter_CT { - [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], tr_CBSP_KEEP_ALIVE)) { - CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], ts_CBSP_KEEP_ALIVE_COMPL)); - } -} - -/* receive + ignore RESTART */ -altstep as_cbsp_restart(integer idx) runs on CBSP_Adapter_CT { - [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], tr_CBSP_RESTART)); -} - private function f_shutdown_helper() runs on test_CT { + /* Wait for all BSC cons to terminate */ + for (var integer i := 0; i < g_num_bsc; i := i + 1) { + g_vc_conn_BSC[i].done; + } + /* Wait for all MME cons to terminate */ + for (var integer i := 0; i < g_num_mme; i := i + 1) { + g_vc_conn_MME[i].done; + } all component.stop; setverdict(pass); mtc.stop; } -private function f_init(boolean raw := false) runs on test_CT { - f_http_init(mp_cbc_host, mp_cbc_ecbe_port); - CBSP_Adapter.f_connect(mp_cbc_host, mp_cbc_cbsp_port, "", mp_local_cbsp_port); - SBC_AP_Adapter.f_connect(mp_cbc_host, mp_cbc_sbcap_port, "", mp_local_sbcap_port); +/* + * BSC Conn Handler: + */ +private function f_BSC_ConnHdlr_start_fn_void() runs on BSC_ConnHdlr { + log("Default start_fn() function called!"); +} +private function f_init_pars_bsc(integer bsc_cbsp_port, charstring cbc_host, integer cbc_cbsp_port) + runs on test_CT return BSC_ConnHdlrPars { + var BSC_ConnHdlrPars pars := { + bsc_cbsp_port := bsc_cbsp_port, + cbc_host := cbc_host, + cbc_cbsp_port := cbc_cbsp_port, + start_fn := refers(f_BSC_ConnHdlr_start_fn_void), + exp_cbs_msg := omit, + cell_list_success := omit + }; + return pars; +} - if (not raw) { - var BSSMAP_FIELD_CellIdentificationList cell_list := { - cIl_allInBSS := ''O - }; - activate(as_cbsp_keepalive_ack(0)); - activate(as_cbsp_restart(0)); - f_cbsp_send(ts_CBSP_RESTART(cell_list, CBSP_BC_MSGT_CBS, CBSP_RI_DATA_LOST)); - f_cbsp_send(ts_CBSP_RESTART(cell_list, CBSP_BC_MSGT_EMERG, CBSP_RI_DATA_LOST)); - as_cbsp_reset(0); +private function f_init_bsc(integer idx, charstring id) runs on test_CT return BSC_ConnHdlr { + var BSC_ConnHdlr vc_conn; + id := id & "-BSC" & int2str(idx); + vc_conn := BSC_ConnHdlr.create(id) alive; + g_pars_BSC[idx] := f_init_pars_bsc(mp_local_cbsp_port + idx, mp_cbc_host, mp_cbc_cbsp_port); + return vc_conn; +} + +private function f_start_bsc(integer idx, charstring id, BSC_ConnHdlrPars pars) + runs on test_CT { + id := id & "-BSC" & int2str(idx); + g_vc_conn_BSC[idx] := f_init_bsc(idx, id); + g_vc_conn_BSC[idx].start(f_BSC_ConnHdlr_main(id, pars)); +} + +/* + * MME Conn Handler: + */ +private function f_MME_ConnHdlr_start_fn_void() runs on MME_ConnHdlr { + log("Default start_fn() function called!"); +} +private function f_init_pars_mme(integer mme_sbcap_port, charstring cbc_host, integer cbc_sbcap_port) + runs on test_CT return MME_ConnHdlrPars { + var MME_ConnHdlrPars pars := { + mme_sbcap_port := mme_sbcap_port, + cbc_host := cbc_host, + cbc_sbcap_port := cbc_sbcap_port, + start_fn := refers(f_MME_ConnHdlr_start_fn_void), + exp_cbs_msg := omit + }; + return pars; +} + +private function f_init_mme(integer idx, charstring id) runs on test_CT return MME_ConnHdlr { + var MME_ConnHdlr vc_conn; + id := id & "-MME" & int2str(idx); + vc_conn := MME_ConnHdlr.create(id) alive; + g_pars_MME[idx] := f_init_pars_mme(mp_local_sbcap_port + idx, mp_cbc_host, mp_cbc_sbcap_port); + return vc_conn; +} + +private function f_start_mme(integer idx, charstring id, MME_ConnHdlrPars pars) + runs on test_CT { + id := id & "-MME" & int2str(idx); + g_vc_conn_MME[idx] := f_init_mme(idx, id); + g_vc_conn_MME[idx].start(f_MME_ConnHdlr_main(id, pars)); +} + +private function f_init(integer num_bsc := 1, integer num_mme := 1) runs on test_CT { + f_http_init(mp_cbc_host, mp_cbc_ecbe_port); + + g_num_bsc := num_bsc; + for (var integer i := 0; i < g_num_bsc; i := i + 1) { + g_vc_conn_BSC[i] := f_init_bsc(i, testcasename()); + } + + g_num_mme := num_mme; + for (var integer i := 0; i < g_num_mme; i := i + 1) { + g_vc_conn_MME[i] := f_init_mme(i, testcasename()); } } +function f_start() runs on test_CT { + for (var integer i := 0; i < g_num_mme; i := i + 1) { + f_start_bsc(i, testcasename(), g_pars_BSC[i]); + } + for (var integer i := 0; i < g_num_mme; i := i + 1) { + f_start_mme(i, testcasename(), g_pars_MME[i]); + } + f_sleep(2.0); /* wait all conns connected */ +} + /* test whether or not we receive a valid KEEP-ALIVE from the CBC */ -testcase TC_rx_keepalive() runs on test_CT { +private function f_bsc_TC_rx_keepalive() runs on BSC_ConnHdlr { var CBSP_PDU rx; var CBSP_IE ie; - - f_init(); rx := f_cbsp_exp(tr_CBSP_KEEP_ALIVE(?)); f_cbsp_find_ie(rx, CBSP_IEI_KEEP_ALIVE_REP_PERIOD, ie); +} +testcase TC_rx_keepalive() runs on test_CT { + f_init(); + g_pars_BSC[0].start_fn := refers(f_bsc_TC_rx_keepalive); + f_start(); f_shutdown_helper(); } /* test whether CBC terminates connection if KEEP-ALIVE is not answered by BSC */ -testcase TC_rx_keepalive_timeout() runs on test_CT { +private function f_bsc_TC_rx_keepalive_timeout() runs on BSC_ConnHdlr { var CBSP_PDU rx; var CBSP_IE ie; var integer ka_rep_per_s; - f_init(); rx := f_cbsp_exp(tr_CBSP_KEEP_ALIVE(?)); f_cbsp_find_ie(rx, CBSP_IEI_KEEP_ALIVE_REP_PERIOD, ie); @@ -194,188 +189,22 @@ /* expect the CBSP connection to be closed */ CBSP[0].receive(PortEvent:{connClosed:=?}) - +} +testcase TC_rx_keepalive_timeout() runs on test_CT { + f_init(); + g_pars_BSC[0].start_fn := refers(f_bsc_TC_rx_keepalive_timeout); + f_start(); f_shutdown_helper(); } -type record CBS_Message { - uint16_t msg_id, - uint16_t ser_nr, - uint16_t old_ser_nr optional, - BSSMAP_FIELD_CellIdentificationList cell_list, - uint8_t channel_ind, - CBSP_Category category, - uint16_t rep_period, - uint16_t num_bcast_req, - uint8_t dcs, - CBS_MessageContents content -}; -type record CBS_MessageContent { - octetstring payload, - uint8_t user_len -}; -type record of CBS_MessageContent CBS_MessageContents; - -private function f_cbsp_tx_write_compl(CBS_Message msg, integer idx := 0, - template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit, - template (omit) CBSP_IE_NumBcastComplList tx_compl_list := omit) -runs on test_CT { - var template (value) CBSP_PDU tx; - var template (value) BSSMAP_FIELD_CellIdentificationList tx_list; - if (istemplatekind(tx_cell_list, "omit")) { - /* use the "expected list" when confirming the write-replace */ - tx_list := msg.cell_list; - } else { - /* use an user-provided different list of cells */ - tx_list := valueof(tx_cell_list); - } - if (istemplatekind(tx_compl_list, "omit")) { - tx := ts_CBSP_WRITE_CBS_COMPL(msg.msg_id, msg.ser_nr, tx_list, msg.channel_ind); - } else { - tx := ts_CBSP_REPLACE_CBS_COMPL(msg.msg_id, msg.ser_nr, msg.old_ser_nr, - valueof(tx_compl_list), tx_list, - msg.channel_ind); - } - CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); -} - -private function f_cbsp_tx_write_fail(CBS_Message msg, integer idx := 0, - template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit, - template (omit) CBSP_FailureListItems tx_fail_list := omit) -runs on test_CT { - var template (value) CBSP_PDU tx; - tx := ts_CBSP_WRITE_CBS_FAIL(msg.msg_id, msg.ser_nr, valueof(tx_fail_list), - omit, tx_cell_list, msg.channel_ind); - CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); -} - -/* handle a CBSP-WRITE-REPLACE and respond to it with COMPLETE or FAILURE depending on arguments */ -private function f_cbsp_handle_write(CBS_Message msg, integer idx := 0, - template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit, - template (omit) CBSP_FailureListItems tx_fail_list := omit, - template (omit) CBSP_IE_NumBcastComplList tx_compl_list := omit) -runs on test_CT { - var template CBSP_IEs content_ies := {}; - var template (present) CBSP_PDU rx_templ; - var CBSP_RecvFrom rf; - for (var integer i := 0; i < lengthof(msg.content); i := i+1) { - //content_ies[i] := tr_CbspMsgContent(msg.content[i].payload, msg.content[i].user_len); - content_ies[i] := tr_CbspMsgContent(?, ?); - } - rx_templ := tr_CBSP_WRITE_CBS(msg.msg_id, msg.ser_nr, msg.cell_list, msg.channel_ind, - msg.category, msg.rep_period, msg.num_bcast_req, msg.dcs, - content_ies); - alt { - [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], rx_templ)) -> value rf { - var template (value) CBSP_PDU tx; - if (istemplatekind(tx_fail_list, "omit")) { - f_cbsp_tx_write_compl(msg, idx, tx_cell_list, tx_compl_list); - } else { - f_cbsp_tx_write_fail(msg, idx, tx_cell_list, tx_fail_list); - } - } - [] as_cbsp_keepalive_ack(idx) { repeat; } - [] CBSP[idx].receive { - setverdict(fail, "Received unexpected CBSP in index ", idx); - } - } -} - -/* handle a CBSP-KILL and respond to it with COMPLETE or FAILURE depending on arguments */ -private function f_cbsp_handle_kill(integer idx, uint16_t msg_id, uint16_t ser_nr, - template BSSMAP_FIELD_CellIdentificationList exp_list, - template (omit) BSSMAP_FIELD_CellIdentificationList tx_list, - template (omit) CBSP_FailureListItems tx_fail_list := omit, - template (omit) CBSP_IE_NumBcastComplList tx_compl_list := omit, - template (omit) uint8_t channel_ind := omit) -runs on test_CT { - var template (present) CBSP_PDU rx_templ; - var CBSP_RecvFrom rf; - - rx_templ := tr_CBSP_KILL(msg_id, ser_nr, exp_list, channel_ind); - alt { - [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], rx_templ)) -> value rf { - var template (value) CBSP_PDU tx; - if (istemplatekind(tx_fail_list, "omit")) { - tx := ts_CBSP_KILL_COMPL(msg_id, ser_nr, tx_compl_list, tx_list, channel_ind); - } else { - tx := ts_CBSP_KILL_FAIL(msg_id, ser_nr, valueof(tx_fail_list), tx_compl_list, - tx_list, channel_ind); - } - CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); - } - [] as_cbsp_keepalive_ack(idx) { repeat; } - [] CBSP[idx].receive { - setverdict(fail, "Received unexpected CBSP in index ", idx); - } - } -} - -private function f_sbcap_tx_write_replace_warn_resp(CBS_Message msg, integer idx := 0) -runs on test_CT { - var template (value) SBC_AP_PDU tx; - /* TODO: pass Unknown Tracking Area List as parameter above (omit by default) */ - tx := ts_SBCAP_WRITE_WARNING_RESP(int2bit(msg.msg_id, 16), - int2bit(msg.ser_nr, 16)); - f_SBC_AP_send(tx, idx); -} - -private function f_sbcap_tx_stop_warn_resp(integer idx := 0, CBS_Message msg) -runs on test_CT { - var template (value) SBC_AP_PDU tx; - tx := ts_SBCAP_STOP_WARNING_RESP(int2bit(msg.msg_id, 16), - int2bit(msg.ser_nr, 16)); - f_SBC_AP_send(tx, idx); -} - -/* handle a SBc-AP Write-Replace Request and respond to it with Response or FAILURE depending on arguments */ -private function f_sbcap_handle_write_replace_warn_req(CBS_Message msg, integer idx := 0, - template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit) -runs on test_CT { - var template (present) SBC_AP_PDU rx_templ; - var SBC_AP_RecvFrom rf; - rx_templ := tr_SBCAP_WRITE_WARNING(int2bit(msg.msg_id, 16), - int2bit(msg.ser_nr, 16), - msg.rep_period, - msg.num_bcast_req); - alt { - [] SBC_AP[idx].receive(tr_SBC_AP_Recv(g_cbsp_conn_id[idx], rx_templ)) -> value rf { - var template (value) SBC_AP_PDU tx; - log ("received expected req:", rf); - f_sbcap_tx_write_replace_warn_resp(msg, idx); - } - [] SBC_AP[idx].receive { - setverdict(fail, "Received unexpected SBc-AP in index ", idx); - } - } -} - -/* handle a SBc-AP Stop-Warning-Request and respond to it with Response or FAILURE depending on arguments */ -private function f_sbcap_handle_stop_warn_req(integer idx := 0, CBS_Message msg) -runs on test_CT { - var template (present) SBC_AP_PDU rx_templ; - var SBC_AP_RecvFrom rf; - - rx_templ := tr_SBCAP_STOP_WARNING(int2bit(msg.msg_id, 16), - int2bit(msg.ser_nr, 16)); - alt { - [] SBC_AP[idx].receive(tr_SBC_AP_Recv(g_cbsp_conn_id[idx], rx_templ)) -> value rf { - var template (value) SBC_AP_PDU tx; - log ("received expected req:", rf); - f_sbcap_tx_stop_warn_resp(idx, msg); - } - [] SBC_AP[idx].receive { - setverdict(fail, "Received unexpected SBc-AP in index ", idx); - } - } -} - private const BSSMAP_FIELD_CellIdentificationList cil_BSS := { cIl_allInBSS := ''O }; - +private function f_bsc_TC_write_replace() runs on BSC_ConnHdlr { + f_cbsp_handle_write(g_pars.exp_cbs_msg); + f_sleep(100.0); +} testcase TC_write_replace() runs on test_CT { - f_init(); var CBS_Message msg := { msg_id := 42, ser_nr := 16752, @@ -390,8 +219,11 @@ { '00'O, 1 } } }; - f_cbsp_handle_write(msg); - f_sleep(100.0); + + f_init(); + g_pars_BSC[0].exp_cbs_msg := msg; + g_pars_BSC[0].start_fn := refers(f_bsc_TC_write_replace); + f_start(); f_shutdown_helper(); } @@ -427,11 +259,6 @@ log(dec_CBSP_PDU(c_kill_compl)); } -import from SABP_Types all; -import from SABP_Templates all; -import from SABP_IEs all; -import from SABP_PDU_Descriptions all; - testcase TC_selftest_sabp() runs on test_CT { const octetstring c_write := '00000080930000080006000211120007000240c0000f0010000113f0030282ec0613f0030282ec070001400100000d0002012a000900020000000400010100000056029f01b4d90d064297d9ec37e8fe96b3c9a0303bdd68341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d10012'O; @@ -457,26 +284,32 @@ log("Restart: ", enc_SABP_PDU(valueof(tx))); } -/********************************************************************************* - * ECBE interface (verifying expected procedures on CBSP) - *********************************************************************************/ +private function f_bsc_create_and_delete() runs on BSC_ConnHdlr { + var template (omit) BSSMAP_FIELD_CellIdentificationList cell_list_success := omit; + if (ispresent(g_pars.cell_list_success)) { + cell_list_success := g_pars.cell_list_success; + } + f_cbsp_handle_write(g_pars.exp_cbs_msg, 0, cell_list_success); + f_cbsp_handle_kill(0, g_pars.exp_cbs_msg.msg_id, g_pars.exp_cbs_msg.ser_nr, + exp_list:=cell_list_success, tx_list:=cell_list_success, + tx_fail_list:=omit, tx_compl_list:=omit, + channel_ind:=g_pars.exp_cbs_msg.channel_ind); +} -function f_create_and_delete(CBS_Message msg, - template (omit) BSSMAP_FIELD_CellIdentificationList cell_list_success) +private function f_mme_create_and_delete() runs on MME_ConnHdlr { + f_sbcap_handle_write_replace_warn_req(g_pars.exp_cbs_msg, 0); + f_sbcap_handle_stop_warn_req(0, g_pars.exp_cbs_msg); +} + +function f_create_and_delete(CBS_Message msg) runs on test_CT { var EcbeCbcMessage ecbe := f_cbs2ecbe(msg, "TTCN-3"); f_ecbe_tx_post_cbs(ecbe); - f_cbsp_handle_write(msg, 0, cell_list_success); - f_sbcap_handle_write_replace_warn_req(msg, 0); f_ecbe_rx_resp(201); f_sleep(2.0); f_ecbe_tx_delete_cbs(msg.msg_id); - /* FIXME: cbc segfaults if we terminate here (if we don't wait for Connect_result? */ - f_cbsp_handle_kill(0, msg.msg_id, msg.ser_nr, exp_list:=cell_list_success, tx_list:=cell_list_success, - tx_fail_list:=omit, tx_compl_list:=omit, channel_ind:=msg.channel_ind); - f_sbcap_handle_stop_warn_req(0, msg); f_ecbe_rx_resp(200); } @@ -506,7 +339,13 @@ ts_BSSMAP_CI_CGI('901'H, '70'H, 24, 42), ts_BSSMAP_CI_CGI('901'H, '70'H, 24, 43) }); - f_create_and_delete(valueof(msg), cell_list_success); + g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); + g_pars_BSC[0].exp_cbs_msg := valueof(msg); + g_pars_BSC[0].cell_list_success := valueof(cell_list_success); + g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); + g_pars_MME[0].exp_cbs_msg := valueof(msg); + f_start(); + f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_lac_ci() runs on test_CT { @@ -518,7 +357,13 @@ ts_BSSMAP_CI_LAC_CI(10002, 50002), ts_BSSMAP_CI_LAC_CI(10003, 50003) }); - f_create_and_delete(valueof(msg), cell_list_success); + g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); + g_pars_BSC[0].exp_cbs_msg := valueof(msg); + g_pars_BSC[0].cell_list_success := valueof(cell_list_success); + g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); + g_pars_MME[0].exp_cbs_msg := valueof(msg); + f_start(); + f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_lac() runs on test_CT { @@ -530,7 +375,13 @@ ts_BSSMAP_CI_LAC(10002), ts_BSSMAP_CI_LAC(10003) }); - f_create_and_delete(valueof(msg), cell_list_success); + g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); + g_pars_BSC[0].exp_cbs_msg := valueof(msg); + g_pars_BSC[0].cell_list_success := valueof(cell_list_success); + g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); + g_pars_MME[0].exp_cbs_msg := valueof(msg); + f_start(); + f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_ci() runs on test_CT { @@ -542,7 +393,13 @@ ts_BSSMAP_CI_CI(50002), ts_BSSMAP_CI_CI(50003) }); - f_create_and_delete(valueof(msg), cell_list_success); + g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); + g_pars_BSC[0].exp_cbs_msg := valueof(msg); + g_pars_BSC[0].cell_list_success := valueof(cell_list_success); + g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); + g_pars_MME[0].exp_cbs_msg := valueof(msg); + f_start(); + f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_lai() runs on test_CT { @@ -554,7 +411,13 @@ ts_BSSMAP_CI_LAI('901'H, '70'H, 26), ts_BSSMAP_CI_LAI('901'H, '70'H, 27) }); - f_create_and_delete(valueof(msg), cell_list_success); + g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); + g_pars_BSC[0].exp_cbs_msg := valueof(msg); + g_pars_BSC[0].cell_list_success := valueof(cell_list_success); + g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); + g_pars_MME[0].exp_cbs_msg := valueof(msg); + f_start(); + f_create_and_delete(valueof(msg)); f_shutdown_helper(); } diff --git a/cbc/CBS_Message.ttcn b/cbc/CBS_Message.ttcn new file mode 100644 index 0000000..6f77a1b --- /dev/null +++ b/cbc/CBS_Message.ttcn @@ -0,0 +1,38 @@ +/* ECBE (REST) interface client of osmo-cbc test suite in TTCN-3 + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module CBS_Message { + +import from Osmocom_Types all; + +import from BSSAP_Types all; +import from BSSMAP_Templates all; + +import from CBSP_Types all; + +type record CBS_Message { + uint16_t msg_id, + uint16_t ser_nr, + uint16_t old_ser_nr optional, + BSSMAP_FIELD_CellIdentificationList cell_list, + uint8_t channel_ind, + CBSP_Category category, + uint16_t rep_period, + uint16_t num_bcast_req, + uint8_t dcs, + CBS_MessageContents content +}; +type record CBS_MessageContent { + octetstring payload, + uint8_t user_len +}; +type record of CBS_MessageContent CBS_MessageContents; + +} diff --git a/cbc/ECBE_Components.ttcn b/cbc/ECBE_Components.ttcn new file mode 100644 index 0000000..eaf2772 --- /dev/null +++ b/cbc/ECBE_Components.ttcn @@ -0,0 +1,104 @@ +/* ECBE (REST) interface client of osmo-cbc test suite in TTCN-3 + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module ECBE_Components { + +import from Osmocom_Types all; + +import from HTTP_Adapter all; +import from HTTPmsg_Types all; +import from ECBE_Types all; + +import from CBSP_Types all; + +import from CBS_Message all; + +private function f_cbs2ecbe_category(CBSP_Category cat_in) return EcbeCategory +{ + select (cat_in) { + case (CBSP_CATEG_HIGH_PRIO) { return high_priority; } + case (CBSP_CATEG_BACKGROUND) { return background; } + case (CBSP_CATEG_NORMAL) { return normal; } + case else { mtc.stop } + } +} + +private function f_cbs2ecbe_page(CBS_MessageContent inp) return EcbePage +{ + return hex2str(oct2hex(inp.payload)); +} + +/* convert from CBS_Message to EcbeCbcMessage */ +function f_cbs2ecbe(CBS_Message inp, charstring cbe_name) return EcbeCbcMessage +{ + var EcbeCbcMessage ret := { + cbe_name := cbe_name, + category := f_cbs2ecbe_category(inp.category), + repetition_period := inp.rep_period, + num_of_bcast := inp.num_bcast_req, + scope := { scope_plmn := {} }, + smscb_message := { + serial_nr := { + serial_nr_encoded := inp.ser_nr + }, + message_id := inp.msg_id, + payload := { + payload_encoded := { + dcs := inp.dcs, + pages := { } /* appended below */ + } + } + } + }; + for (var integer i := 0; i < lengthof(inp.content); i := i+1) { + ret.smscb_message.payload.payload_encoded.pages := + ret.smscb_message.payload.payload_encoded.pages & { f_cbs2ecbe_page(inp.content[i]) }; + } + return ret; +} + +/********************************************************************************* + * ECBE (REST) interface + *********************************************************************************/ + +function f_ecbe_tx_post_cbs(EcbeCbcMessage cbc) +runs on http_CT { + var charstring body := oct2char(enc_EcbeCbcMessage(cbc)); + log("TX POST CBS: ", body); + var HTTPMessage http_resp; + f_http_tx_request(url := "/api/ecbe/v1/message", method := "POST", body := body); +} + +function f_ecbe_rx_resp(template integer exp_sts := (200..299)) +runs on http_CT return HTTPResponse { + var HTTPMessage http_resp := f_http_rx_response(tr_HTTP_Resp(exp_sts), tout := 20.0); + return http_resp.response; +} + +/* run a HTTP POST to add a new CBC message */ +function f_ecbe_post_cbs(EcbeCbcMessage cbc, template integer exp_sts := 201) +runs on http_CT return HTTPResponse { + f_ecbe_tx_post_cbs(cbc); + return f_ecbe_rx_resp(exp_sts) +} + +function f_ecbe_tx_delete_cbs(integer msg_id) +runs on http_CT { + f_http_tx_request("/api/ecbe/v1/message/" & int2str(msg_id), method := "DELETE"); +} + +/* run a HTTP GET on specified URL expecting json in RSRES format as response */ +function f_ecbe_delete_cbs(integer msg_id, template integer exp_sts := 200) +runs on http_CT return HTTPResponse { + f_ecbe_tx_delete_cbs(msg_id); + return f_ecbe_rx_resp(exp_sts); +} + +} diff --git a/cbc/MME_ConnectionHandler.ttcn b/cbc/MME_ConnectionHandler.ttcn new file mode 100644 index 0000000..055aaa3 --- /dev/null +++ b/cbc/MME_ConnectionHandler.ttcn @@ -0,0 +1,103 @@ +/* MME (SBc-AP) Connection Handler of CBC test suite in TTCN-3 + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module MME_ConnectionHandler { + +import from SBC_AP_IEs all; +import from SBC_AP_Constants all; +import from SBC_AP_PDU_Contents all; +import from SBC_AP_PDU_Descriptions all; +import from SBC_AP_Types all; +import from SBC_AP_Templates all; +import from SBC_AP_CodecPort all; +import from SBC_AP_Adapter all; + +import from CBS_Message all; + +type function void_fn() runs on MME_ConnHdlr; + +/* this component represents a single subscriber connection */ +type component MME_ConnHdlr extends SBC_AP_Adapter_CT { + var MME_ConnHdlrPars g_pars; +} + +type record MME_ConnHdlrPars { + integer mme_sbcap_port, + charstring cbc_host, + integer cbc_sbcap_port, + void_fn start_fn, + CBS_Message exp_cbs_msg optional +}; + +function f_MME_ConnHdlr_main(charstring id, MME_ConnHdlrPars pars) runs on MME_ConnHdlr { + g_pars := pars; + SBC_AP_Adapter.f_connect(g_pars.cbc_host, g_pars.cbc_sbcap_port, "", g_pars.mme_sbcap_port); + g_pars.start_fn.apply(); +} + +function f_sbcap_tx_write_replace_warn_resp(CBS_Message msg, integer idx := 0) +runs on MME_ConnHdlr { + var template (value) SBC_AP_PDU tx; + /* TODO: pass Unknown Tracking Area List as parameter above (omit by default) */ + tx := ts_SBCAP_WRITE_WARNING_RESP(int2bit(msg.msg_id, 16), + int2bit(msg.ser_nr, 16)); + f_SBC_AP_send(tx, idx); +} + +function f_sbcap_tx_stop_warn_resp(integer idx := 0, CBS_Message msg) +runs on MME_ConnHdlr { + var template (value) SBC_AP_PDU tx; + tx := ts_SBCAP_STOP_WARNING_RESP(int2bit(msg.msg_id, 16), + int2bit(msg.ser_nr, 16)); + f_SBC_AP_send(tx, idx); +} + +/* handle a SBc-AP Write-Replace Request and respond to it with Response or FAILURE depending on arguments */ +function f_sbcap_handle_write_replace_warn_req(CBS_Message msg, integer idx := 0) +runs on MME_ConnHdlr { + var template (present) SBC_AP_PDU rx_templ; + var SBC_AP_RecvFrom rf; + rx_templ := tr_SBCAP_WRITE_WARNING(int2bit(msg.msg_id, 16), + int2bit(msg.ser_nr, 16), + msg.rep_period, + msg.num_bcast_req); + alt { + [] SBC_AP[idx].receive(tr_SBC_AP_Recv(g_SBC_AP_conn_id[idx], rx_templ)) -> value rf { + log ("received expected req:", rf); + f_sbcap_tx_write_replace_warn_resp(msg, idx); + } + [] SBC_AP[idx].receive { + setverdict(fail, "Received unexpected SBc-AP in index ", idx); + } + } +} + +/* handle a SBc-AP Stop-Warning-Request and respond to it with Response or FAILURE depending on arguments */ +function f_sbcap_handle_stop_warn_req(integer idx := 0, CBS_Message msg) +runs on MME_ConnHdlr { + var template (present) SBC_AP_PDU rx_templ; + var SBC_AP_RecvFrom rf; + + rx_templ := tr_SBCAP_STOP_WARNING(int2bit(msg.msg_id, 16), + int2bit(msg.ser_nr, 16)); + alt { + [] SBC_AP[idx].receive(tr_SBC_AP_Recv(g_SBC_AP_conn_id[idx], rx_templ)) -> value rf { + log ("received expected req:", rf); + f_sbcap_tx_stop_warn_resp(idx, msg); + } + [] SBC_AP[idx].receive { + setverdict(fail, "Received unexpected SBc-AP in index ", idx); + } + } +} + +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28830 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: Ia0300a2ae69bdf604373dbc484537958413c79a2 Gerrit-Change-Number: 28830 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Handle each CBSP and SBc-AP on a separate component

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28830 ) Change subject: cbc: Handle each CBSP and SBc-AP on a separate component ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28830 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: Ia0300a2ae69bdf604373dbc484537958413c79a2 Gerrit-Change-Number: 28830 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 13:04:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: sbcap: Expect IE Send-Write-Replace-Warning-Indication

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28831 ) Change subject: sbcap: Expect IE Send-Write-Replace-Warning-Indication ...................................................................... sbcap: Expect IE Send-Write-Replace-Warning-Indication Since osmo-cbc.git I563e7d1c999f14b8197bb41e85b7bcf6262fe2a0, Write Replace Warning Indication is sent, so expect it. Change-Id: I84e3ae7a532a8a76ac1c26d357da7eaa73f39374 --- M library/sbcap/SBC_AP_Templates.ttcn 1 file changed, 7 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/library/sbcap/SBC_AP_Templates.ttcn b/library/sbcap/SBC_AP_Templates.ttcn index c0c0837..d5f2471 100644 --- a/library/sbcap/SBC_AP_Templates.ttcn +++ b/library/sbcap/SBC_AP_Templates.ttcn @@ -129,7 +129,8 @@ template (present) uint12_t p_rep_per, template (present) uint16_t p_num_bcast, template (present) BIT8 dcs := ?, - template (present) octetstring p_msg_content := ? + template (present) octetstring p_msg_content := ?, + template (present) Send_Write_Replace_Warning_Indication send_ind := ? ) := { initiatingMessage := { procedureCode := id_Write_Replace_Warning, @@ -173,11 +174,13 @@ id := SBC_AP_Constants.id_Warning_Message_Content, criticality := ignore, value_ := { Warning_Message_Content := p_msg_content } - } - /* Warning Message Content */ /* OMC ID */ /* Concurrent Warning Message Indicator */ - /* Send Write Replace Warning Indication */ + }, { + id := SBC_AP_Constants.id_Send_Write_Replace_Warning_Indication, + criticality := ignore, + value_ := { Send_Write_Replace_Warning_Indication := send_ind } + } /* Global eNB ID */ /* Warning Area Coordinates */ }, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28831 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: I84e3ae7a532a8a76ac1c26d357da7eaa73f39374 Gerrit-Change-Number: 28831 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: sbcap: Expect IE Send-Write-Replace-Warning-Indication

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28831 ) Change subject: sbcap: Expect IE Send-Write-Replace-Warning-Indication ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28831 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: I84e3ae7a532a8a76ac1c26d357da7eaa73f39374 Gerrit-Change-Number: 28831 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 13:04:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Request and handle Write Replace Warning Indication

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28822 ) Change subject: sbcap: Request and handle Write Replace Warning Indication ...................................................................... sbcap: Request and handle Write Replace Warning Indication Change-Id: I563e7d1c999f14b8197bb41e85b7bcf6262fe2a0 --- M include/osmocom/cbc/cbc_data.h M include/osmocom/cbc/sbcap_msg.h M include/osmocom/cbc/smscb_message_fsm.h M src/cbc_data.c M src/sbcap_link_fsm.c M src/sbcap_msg.c M src/smscb_peer_fsm.c 7 files changed, 81 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve diff --git a/include/osmocom/cbc/cbc_data.h b/include/osmocom/cbc/cbc_data.h index 890da67..b857dc2 100644 --- a/include/osmocom/cbc/cbc_data.h +++ b/include/osmocom/cbc/cbc_data.h @@ -16,6 +16,7 @@ CBC_CELL_ID_LAI, CBC_CELL_ID_LAC, CBC_CELL_ID_CI, + CBC_CELL_ID_ECGI, }; struct cbc_cell_id { @@ -27,6 +28,7 @@ struct osmo_location_area_id lai; uint16_t lac; uint16_t ci; + struct osmo_eutran_cell_global_id ecgi; } u; /* only in failure list */ struct { diff --git a/include/osmocom/cbc/sbcap_msg.h b/include/osmocom/cbc/sbcap_msg.h index 286642c..22d043b 100644 --- a/include/osmocom/cbc/sbcap_msg.h +++ b/include/osmocom/cbc/sbcap_msg.h @@ -11,3 +11,6 @@ SBcAP_SBC_AP_PDU_t *sbcap_gen_write_replace_warning_req(void *ctx, const struct cbc_message *cbcmsg); SBcAP_SBC_AP_PDU_t *sbcap_gen_stop_warning_req(void *ctx, const struct cbc_message *cbcmsg); SBcAP_SBC_AP_PDU_t *sbcap_gen_error_ind(void *ctx, SBcAP_Cause_t cause, SBcAP_SBC_AP_PDU_t *rx_pdu); + + +void cci_from_sbcap_bcast_cell_id(struct cbc_cell_id *cci, const SBcAP_CellId_Broadcast_List_Item_t *it); diff --git a/include/osmocom/cbc/smscb_message_fsm.h b/include/osmocom/cbc/smscb_message_fsm.h index 9636acc..dec719b 100644 --- a/include/osmocom/cbc/smscb_message_fsm.h +++ b/include/osmocom/cbc/smscb_message_fsm.h @@ -31,6 +31,8 @@ /* SBc-AP peer confirms delete */ SMSCB_E_SBCAP_DELETE_ACK, SMSCB_E_SBCAP_DELETE_NACK, + /* SBc-AP peer sends Write Replace Warning Indication to us */ + SMSCB_E_SBCAP_WRITE_IND, }; enum smscb_fsm_state { diff --git a/src/cbc_data.c b/src/cbc_data.c index 68dc024..013b053 100644 --- a/src/cbc_data.c +++ b/src/cbc_data.c @@ -61,6 +61,10 @@ case CBC_CELL_ID_CI: snprintf(buf, sizeof(buf), "CI %u", cid->u.ci); break; + case CBC_CELL_ID_ECGI: + snprintf(buf, sizeof(buf), "ECGI %s-%05X-%02X", osmo_plmn_name(&cid->u.ecgi.plmn), + cid->u.ecgi.eci >> 8, cid->u.ecgi.eci & 0xff); + break; default: snprintf(buf, sizeof(buf), "<invalid>"); break; diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index 2813611..6a50e91 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -333,6 +333,8 @@ switch (pdu->present) { case SBcAP_SBC_AP_PDU_PR_initiatingMessage: switch (pdu->choice.initiatingMessage.procedureCode) { + case SBcAP_ProcedureId_Write_Replace_Warning_Indication: + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_SBCAP_WRITE_IND, pdu); default: break; } diff --git a/src/sbcap_msg.c b/src/sbcap_msg.c index bd83045..11a08d1 100644 --- a/src/sbcap_msg.c +++ b/src/sbcap_msg.c @@ -225,6 +225,14 @@ ASN_SEQUENCE_ADD(as_pdu, ie); } + /* Send Write-Replace-Warning-Indication + * 3GPP TS 36.413 4.3.4.3.5, 3GPP TS 23.041 9.3.39 + * static const long asn_VAL_14_SBcAP_id_Send_Write_Replace_Warning_Indication = 24; */ + ie = sbcap_alloc_Write_Replace_Warning_Request_IE(24, SBcAP_Criticality_ignore, + SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Send_Write_Replace_Warning_Indication); + ie->value.choice.Send_Write_Replace_Warning_Indication = SBcAP_Send_Write_Replace_Warning_Indication_true; + ASN_SEQUENCE_ADD(as_pdu, ie); + return pdu; } @@ -336,3 +344,15 @@ } return pdu; } +static void cci_from_sbcap_ecgi(struct cbc_cell_id *cci, const SBcAP_EUTRAN_CGI_t *eCGI) +{ + cci->id_discr = CBC_CELL_ID_ECGI; + cci->u.ecgi.eci = (osmo_load32be(&eCGI->cell_ID.buf[0]) >> 4); + osmo_plmn_from_bcd(eCGI->pLMNidentity.buf, &cci->u.ecgi.plmn); +} + +/* Fill a cbc_cell_id from a SBcAP_CellId_Broadcast_List_Item */ +void cci_from_sbcap_bcast_cell_id(struct cbc_cell_id *cci, const SBcAP_CellId_Broadcast_List_Item_t *it) +{ + cci_from_sbcap_ecgi(cci, &it->eCGI); +} diff --git a/src/smscb_peer_fsm.c b/src/smscb_peer_fsm.c index f8bc34d..1d87d69 100644 --- a/src/smscb_peer_fsm.c +++ b/src/smscb_peer_fsm.c @@ -62,6 +62,7 @@ { SMSCB_E_SBCAP_WRITE_NACK, "SBcAP_WRITE_NACK" }, { SMSCB_E_SBCAP_DELETE_ACK, "SBcAP_DELETE_ACK" }, { SMSCB_E_SBCAP_DELETE_NACK, "SBcAP_DELETE_NACK" }, + { SMSCB_E_SBCAP_WRITE_IND, "SBcAP_WRITE_IND" }, { 0, NULL } }; @@ -282,6 +283,37 @@ out->id_discr = cell_id_from_ccid_discr(id_discr); } +/* append SBcAP cells to msg_peer compl list */ +void msg_peer_append_compl_sbcap_bcast_area_list(struct cbc_message_peer *mp, + const SBcAP_Broadcast_Scheduled_Area_List_t *bcast) +{ + SBcAP_CellId_Broadcast_List_t *cell_id_bscat = bcast->cellId_Broadcast_List; + A_SEQUENCE_OF(struct SBcAP_CellId_Broadcast_List_Item) *as_cell_id_bcast; + SBcAP_CellId_Broadcast_List_Item_t *it; + unsigned int i; + + if (!cell_id_bscat) + return; + + as_cell_id_bcast = (void *) &cell_id_bscat->list; + for (i = 0; i < as_cell_id_bcast->count; i++) { + it = (SBcAP_CellId_Broadcast_List_Item_t *)(as_cell_id_bcast->array[i]); + OSMO_ASSERT(it); + struct cbc_cell_id *cci = NULL; // FIXME: lookup + if (!cci) { + cci = talloc_zero(mp, struct cbc_cell_id); + if (!cci) + return; + llist_add_tail(&cci->list, &mp->num_compl_list); + } + cci_from_sbcap_bcast_cell_id(cci, it); + LOGPFSML(mp->fi, LOGL_DEBUG, "Appending CellId %s to Broadcast Completed list\n", + cbc_cell_id2str(cci)); + cci->num_compl.num_compl += 1; + cci->num_compl.num_bcast_info += 1; + } +} + /*********************************************************************** * actual FSM ***********************************************************************/ @@ -532,6 +564,8 @@ struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; struct osmo_cbsp_decoded *cbsp; SBcAP_SBC_AP_PDU_t *sbcap; + A_SEQUENCE_OF(void) *as_pdu; + SBcAP_Write_Replace_Warning_Indication_IEs_t *ie; switch (event) { case SMSCB_E_DELETE: /* send KILL to BSC */ @@ -575,6 +609,18 @@ } osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_DELETE_ACK, 10, T_WAIT_DELETE_ACK); break; + case SMSCB_E_SBCAP_WRITE_IND: + sbcap = (SBcAP_SBC_AP_PDU_t *)data; + OSMO_ASSERT(sbcap->present == SBcAP_SBC_AP_PDU_PR_initiatingMessage); + OSMO_ASSERT(sbcap->choice.initiatingMessage.procedureCode == SBcAP_ProcedureId_Write_Replace_Warning_Indication); + as_pdu = (void *)&sbcap->choice.initiatingMessage.value.choice.Write_Replace_Warning_Indication.protocolIEs.list; + /* static const long asn_VAL_36_SBcAP_id_Broadcast_Scheduled_Area_List = 23; */ + ie = sbcap_as_find_ie(as_pdu, 23); + if (!ie) + return; /* IE is optional */ + OSMO_ASSERT(ie->value.present == SBcAP_Write_Replace_Warning_Indication_IEs__value_PR_Broadcast_Scheduled_Area_List); + msg_peer_append_compl_sbcap_bcast_area_list(mp, &ie->value.choice.Broadcast_Scheduled_Area_List); + break; default: OSMO_ASSERT(0); } @@ -647,7 +693,8 @@ .name = "SMSCB-PEER", .states = smscb_p_fsm_states, .num_states = ARRAY_SIZE(smscb_p_fsm_states), - .allstate_event_mask = S(SMSCB_E_DELETE), + .allstate_event_mask = S(SMSCB_E_DELETE) | + S(SMSCB_E_SBCAP_WRITE_IND), .allstate_action = smscb_p_fsm_allstate, .timer_cb = smscb_p_fsm_timer_cb, .log_subsys = DCBSP, -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I563e7d1c999f14b8197bb41e85b7bcf6262fe2a0 Gerrit-Change-Number: 28822 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(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-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_me...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28823 ) Change subject: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_message_peer ...................................................................... sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_message_peer Change-Id: I37b08aa374c1097d2871bf69a7bb7893f32bccd3 --- M include/osmocom/cbc/cbc_data.h M include/osmocom/cbc/sbcap_msg.h M src/cbc_data.c M src/sbcap_msg.c M src/smscb_peer_fsm.c 5 files changed, 52 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, approved; Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve diff --git a/include/osmocom/cbc/cbc_data.h b/include/osmocom/cbc/cbc_data.h index b857dc2..6d64f04 100644 --- a/include/osmocom/cbc/cbc_data.h +++ b/include/osmocom/cbc/cbc_data.h @@ -17,6 +17,7 @@ CBC_CELL_ID_LAC, CBC_CELL_ID_CI, CBC_CELL_ID_ECGI, + CBC_CELL_ID_TAI, }; struct cbc_cell_id { @@ -29,6 +30,7 @@ uint16_t lac; uint16_t ci; struct osmo_eutran_cell_global_id ecgi; + struct osmo_tracking_area_id tai; } u; /* only in failure list */ struct { diff --git a/include/osmocom/cbc/sbcap_msg.h b/include/osmocom/cbc/sbcap_msg.h index 22d043b..ce76ef3 100644 --- a/include/osmocom/cbc/sbcap_msg.h +++ b/include/osmocom/cbc/sbcap_msg.h @@ -14,3 +14,4 @@ void cci_from_sbcap_bcast_cell_id(struct cbc_cell_id *cci, const SBcAP_CellId_Broadcast_List_Item_t *it); +void cci_from_sbcap_tai(struct cbc_cell_id *cci, const SBcAP_TAI_t *tai); diff --git a/src/cbc_data.c b/src/cbc_data.c index 013b053..3029ffc 100644 --- a/src/cbc_data.c +++ b/src/cbc_data.c @@ -65,6 +65,9 @@ snprintf(buf, sizeof(buf), "ECGI %s-%05X-%02X", osmo_plmn_name(&cid->u.ecgi.plmn), cid->u.ecgi.eci >> 8, cid->u.ecgi.eci & 0xff); break; + case CBC_CELL_ID_TAI: + snprintf(buf, sizeof(buf), "TAI %s-%u", osmo_plmn_name(&cid->u.tai.plmn), cid->u.tai.tac); + break; default: snprintf(buf, sizeof(buf), "<invalid>"); break; diff --git a/src/sbcap_msg.c b/src/sbcap_msg.c index 11a08d1..1c0e768 100644 --- a/src/sbcap_msg.c +++ b/src/sbcap_msg.c @@ -356,3 +356,11 @@ { cci_from_sbcap_ecgi(cci, &it->eCGI); } + +/* Fill a cbc_cell_id from a SBcAP_TAI_t */ +void cci_from_sbcap_tai(struct cbc_cell_id *cci, const SBcAP_TAI_t *tai) +{ + cci->id_discr = CBC_CELL_ID_TAI; + cci->u.tai.tac = osmo_load16be(tai->tAC.buf); + osmo_plmn_from_bcd(tai->pLMNidentity.buf, &cci->u.tai.plmn); +} diff --git a/src/smscb_peer_fsm.c b/src/smscb_peer_fsm.c index 1d87d69..2c1edab 100644 --- a/src/smscb_peer_fsm.c +++ b/src/smscb_peer_fsm.c @@ -314,6 +314,31 @@ } } +/* append SBcAP cells to msg_peer fail list */ +void msg_peer_append_fail_sbcap_tai_list(struct cbc_message_peer *mp, + const SBcAP_List_of_TAIs_t *tais) +{ + A_SEQUENCE_OF(List_of_TAIs__Member) *as_tais = (void *)&tais->list; + List_of_TAIs__Member *it; + unsigned int i; + + for (i = 0; i < as_tais->count; i++) { + it = (List_of_TAIs__Member *)(as_tais->array[i]); + OSMO_ASSERT(it); + struct cbc_cell_id *cci = NULL; // FIXME: lookup + if (!cci) { + cci = talloc_zero(mp, struct cbc_cell_id); + if (!cci) + return; + llist_add_tail(&cci->list, &mp->fail_list); + } + cci_from_sbcap_tai(cci, &it->tai); + cci->fail.cause = SBcAP_Cause_tracking_area_not_valid; + LOGPFSML(mp->fi, LOGL_DEBUG, "Appending CellId %s (cause: %s) to Failed list\n", + cbc_cell_id2str(cci), sbcap_cause_str(cci->fail.cause)); + } +} + /*********************************************************************** * actual FSM ***********************************************************************/ @@ -342,7 +367,9 @@ { struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; struct osmo_cbsp_decoded *dec = NULL; - //SBcAP_SBC_AP_PDU_t *pdu = NULL; + SBcAP_SBC_AP_PDU_t *sbcap = NULL; + A_SEQUENCE_OF(void) *as_pdu; + SBcAP_Write_Replace_Warning_Response_IEs_t *ie; switch (event) { case SMSCB_E_CBSP_WRITE_ACK: @@ -363,13 +390,21 @@ osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_WRITE_NACK, mp); break; case SMSCB_E_SBCAP_WRITE_ACK: - //pdu = data; + sbcap = data; + OSMO_ASSERT(sbcap->present == SBcAP_SBC_AP_PDU_PR_successfulOutcome); + OSMO_ASSERT(sbcap->choice.successfulOutcome.procedureCode == SBcAP_ProcedureId_Write_Replace_Warning); + as_pdu = (void *)&sbcap->choice.successfulOutcome.value.choice.Write_Replace_Warning_Response.protocolIEs.list; + /* static const long asn_VAL_21_SBcAP_id_Unknown_Tracking_Area_List = 22; */ + ie = sbcap_as_find_ie(as_pdu, 22); + if (ie) { /* IE is optional */ + OSMO_ASSERT(ie->value.present == SBcAP_Write_Replace_Warning_Response_IEs__value_PR_List_of_TAIs); + msg_peer_append_fail_sbcap_tai_list(mp, &ie->value.choice.List_of_TAIs); + } osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); /* Signal parent fsm about completion */ osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_SBCAP_WRITE_ACK, mp); break; case SMSCB_E_SBCAP_WRITE_NACK: - //pdu = data; osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); /* Signal parent fsm about completion */ osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_SBCAP_WRITE_NACK, mp); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I37b08aa374c1097d2871bf69a7bb7893f32bccd3 Gerrit-Change-Number: 28823 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(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-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: Move cbc_cell_id2str() and make it public

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28820 ) Change subject: Move cbc_cell_id2str() and make it public ...................................................................... Move cbc_cell_id2str() and make it public It will be used later on to log whenever new cell ids are added to a message_peer. Change-Id: I74ccbbc810a2fa76fb2999a7588b3f67d4d21e03 --- M include/osmocom/cbc/cbc_data.h M src/cbc_data.c M src/cbc_vty.c 3 files changed, 35 insertions(+), 33 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/include/osmocom/cbc/cbc_data.h b/include/osmocom/cbc/cbc_data.h index d3a8319..890da67 100644 --- a/include/osmocom/cbc/cbc_data.h +++ b/include/osmocom/cbc/cbc_data.h @@ -39,6 +39,8 @@ } num_compl; }; +const char *cbc_cell_id2str(const struct cbc_cell_id *cid); + /********************************************************************************* * CBC itself *********************************************************************************/ diff --git a/src/cbc_data.c b/src/cbc_data.c index 2e350e9..68dc024 100644 --- a/src/cbc_data.c +++ b/src/cbc_data.c @@ -35,6 +35,39 @@ #include <osmocom/cbc/rest_it_op.h> #include <osmocom/cbc/debug.h> +const char *cbc_cell_id2str(const struct cbc_cell_id *cid) +{ + static char buf[256]; + + switch (cid->id_discr) { + case CBC_CELL_ID_NONE: + snprintf(buf, sizeof(buf), "NONE"); + break; + case CBC_CELL_ID_BSS: + snprintf(buf, sizeof(buf), "BSS"); + break; + case CBC_CELL_ID_CGI: + snprintf(buf, sizeof(buf), "CGI %s", osmo_cgi_name(&cid->u.cgi)); + break; + case CBC_CELL_ID_LAC_CI: + snprintf(buf, sizeof(buf), "LAC %u CI %u", cid->u.lac_and_ci.lac, cid->u.lac_and_ci.ci); + break; + case CBC_CELL_ID_LAI: + snprintf(buf, sizeof(buf), "LAI %s", osmo_lai_name(&cid->u.lai)); + break; + case CBC_CELL_ID_LAC: + snprintf(buf, sizeof(buf), "LAC %u", cid->u.lac); + break; + case CBC_CELL_ID_CI: + snprintf(buf, sizeof(buf), "CI %u", cid->u.ci); + break; + default: + snprintf(buf, sizeof(buf), "<invalid>"); + break; + } + return buf; +} + struct cbc *cbc_alloc(void *ctx) { struct cbc *cbc; diff --git a/src/cbc_vty.c b/src/cbc_vty.c index 1f19878..631ef96 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -174,39 +174,6 @@ return CMD_SUCCESS; } -static const char *cbc_cell_id2str(const struct cbc_cell_id *cid) -{ - static char buf[256]; - - switch (cid->id_discr) { - case CBC_CELL_ID_NONE: - snprintf(buf, sizeof(buf), "NONE"); - break; - case CBC_CELL_ID_BSS: - snprintf(buf, sizeof(buf), "BSS"); - break; - case CBC_CELL_ID_CGI: - snprintf(buf, sizeof(buf), "CGI %s", osmo_cgi_name(&cid->u.cgi)); - break; - case CBC_CELL_ID_LAC_CI: - snprintf(buf, sizeof(buf), "LAC %u CI %u", cid->u.lac_and_ci.lac, cid->u.lac_and_ci.ci); - break; - case CBC_CELL_ID_LAI: - snprintf(buf, sizeof(buf), "LAI %s", osmo_lai_name(&cid->u.lai)); - break; - case CBC_CELL_ID_LAC: - snprintf(buf, sizeof(buf), "LAC %u", cid->u.lac); - break; - case CBC_CELL_ID_CI: - snprintf(buf, sizeof(buf), "CI %u", cid->u.ci); - break; - default: - snprintf(buf, sizeof(buf), "<invalid>"); - break; - } - return buf; -} - static void dump_one_msg_peer(struct vty *vty, const struct cbc_message_peer *msg_peer, const char *pfx) { struct cbc_cell_id *cid; 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I74ccbbc810a2fa76fb2999a7588b3f67d4d21e03 Gerrit-Change-Number: 28820 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(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-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: Move ASN1C enc/dec logging to its own category

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28821 ) Change subject: Move ASN1C enc/dec logging to its own category ...................................................................... Move ASN1C enc/dec logging to its own category ASN1C encoding/decoding can get really verbose. Furthermore, it should only be enabled under really specific conditions, so it makes sense to have it under its own category. Change-Id: Ia4cbae2395532d9b5b7b9177a7d0f31bf777d751 --- M doc/examples/osmo-cbc/osmo-cbc.cfg M include/osmocom/cbc/debug.h M include/osmocom/sbcap/sbcap_common.h M include/osmocom/sbcap/sbcap_internal.h M src/cbc_main.c M src/sbcap/sbcap_common.c M tests/sbcap/sbcap_test.c 7 files changed, 29 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/doc/examples/osmo-cbc/osmo-cbc.cfg b/doc/examples/osmo-cbc/osmo-cbc.cfg index 847b901..7f5ebdc 100644 --- a/doc/examples/osmo-cbc/osmo-cbc.cfg +++ b/doc/examples/osmo-cbc/osmo-cbc.cfg @@ -1,8 +1,9 @@ log stderr logging level main notice - logging level rest notice logging level cbsp notice logging level sbcap notice + logging level asn1c notice + logging level rest notice cbc unknown-peers reject ecbe diff --git a/include/osmocom/cbc/debug.h b/include/osmocom/cbc/debug.h index 025419e..c0b3864 100644 --- a/include/osmocom/cbc/debug.h +++ b/include/osmocom/cbc/debug.h @@ -4,5 +4,6 @@ DMAIN, DCBSP, DSBcAP, + DASN1C, DREST, }; diff --git a/include/osmocom/sbcap/sbcap_common.h b/include/osmocom/sbcap/sbcap_common.h index 40da3ba..b0fc173 100644 --- a/include/osmocom/sbcap/sbcap_common.h +++ b/include/osmocom/sbcap/sbcap_common.h @@ -118,8 +118,8 @@ #include <osmocom/core/logging.h> -extern int _sbcap_DSBCAP; -#define SBC_AP_DEBUG(x, args ...) DEBUGP(_sbcap_DSBCAP, x, ## args) +extern int _sbcap_DASN1C; +#define SBC_AP_DEBUG(x, args ...) DEBUGP(_sbcap_DASN1C, x, ## args) extern int asn1_xer_print; @@ -140,7 +140,7 @@ const char *sbcap_procedure_code_str(SBcAP_ProcedureCode_t pc); const char *sbcap_cause_str(SBcAP_Cause_t cause); -void sbcap_set_log_area(int log_area); +void sbcap_set_log_area(int log_area_sbcap, int log_area_asn1c); SBcAP_ProcedureCode_t sbcap_pdu_get_procedure_code(const SBcAP_SBC_AP_PDU_t *pdu); SBcAP_Criticality_t sbcap_pdu_get_criticality(const SBcAP_SBC_AP_PDU_t *pdu); diff --git a/include/osmocom/sbcap/sbcap_internal.h b/include/osmocom/sbcap/sbcap_internal.h index 81d058d..036c53b 100644 --- a/include/osmocom/sbcap/sbcap_internal.h +++ b/include/osmocom/sbcap/sbcap_internal.h @@ -2,7 +2,7 @@ #include <osmocom/core/logging.h> -extern int _sbcap_DSBCAP; -#define SBC_AP_ASN_DEBUG(x, args ...) DEBUGP(_sbcap_DSBCAP, x "\n", ## args) +extern int _sbcap_DASN1C; +#define SBC_AP_ASN_DEBUG(x, args ...) DEBUGP(_sbcap_DASN1C, x "\n", ## args) #define ASN_DEBUG SBC_AP_ASN_DEBUG diff --git a/src/cbc_main.c b/src/cbc_main.c index 9373c41..5096dc8 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -44,6 +44,8 @@ #include <osmocom/vty/logging.h> #include <osmocom/vty/misc.h> +#include <osmocom/sbcap/sbcap_common.h> + #include <osmocom/cbc/debug.h> #include <osmocom/cbc/cbc_data.h> #include <osmocom/cbc/cbc_vty.h> @@ -74,6 +76,13 @@ .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DASN1C] = { + .name = "DASN1C", + .description = "SBc-AP ASN1C enc/dec", + .color = "\033[1;34m", + .enabled = 1, + .loglevel = LOGL_NOTICE, + }, [DREST] = { .name = "DREST", .description = "REST interface", @@ -250,6 +259,7 @@ msgb_talloc_ctx_init(tall_cbc_ctx, 0); osmo_init_logging2(tall_cbc_ctx, &log_info); log_enable_multithread(); + sbcap_set_log_area(DSBcAP, DASN1C); osmo_stats_init(tall_cbc_ctx); vty_init(&vty_info); diff --git a/src/sbcap/sbcap_common.c b/src/sbcap/sbcap_common.c index ddc0fed..a364c63 100644 --- a/src/sbcap/sbcap_common.c +++ b/src/sbcap/sbcap_common.c @@ -28,7 +28,9 @@ extern int asn1_xer_print; int _sbcap_DSBCAP = 0; +int _sbcap_DASN1C = 0; #define DSBCAP _sbcap_DSBCAP +#define DASN1C _sbcap_DASN1C static const struct value_string sbcap_procedure_code_vals[] = { { SBcAP_ProcedureId_Write_Replace_Warning, "Write-Replace-Warning" }, @@ -91,7 +93,8 @@ rval = aper_encode_to_buffer(&asn_DEF_SBcAP_SBC_AP_PDU, NULL, pdu, msgb_data(msg), msgb_tailroom(msg)); if (rval.encoded < 0) { - LOGP(DSBCAP, LOGL_ERROR, "Error encoding type: %s\n", + LOGP(DSBCAP, LOGL_ERROR, "%s: Error encoding type: %s\n", + sbcap_pdu_get_name(pdu), rval.failed_type->name); msgb_free(msg); return NULL; @@ -112,6 +115,7 @@ LOGP(DSBCAP, LOGL_ERROR, "Error decoding code=%d\n", rval.code); return NULL; } + LOGP(DSBCAP, LOGL_DEBUG, "Decoded %s\n", sbcap_pdu_get_name(pdu)); return pdu; } @@ -192,9 +196,10 @@ return NULL; } -void sbcap_set_log_area(int log_area) +void sbcap_set_log_area(int log_area_sbcap, int log_area_asn1c) { - _sbcap_DSBCAP = log_area; + _sbcap_DSBCAP = log_area_sbcap; + _sbcap_DASN1C = log_area_asn1c; } SBcAP_Write_Replace_Warning_Request_IEs_t *sbcap_alloc_Write_Replace_Warning_Request_IE( diff --git a/tests/sbcap/sbcap_test.c b/tests/sbcap/sbcap_test.c index 9c8a60f..3298b60 100644 --- a/tests/sbcap/sbcap_test.c +++ b/tests/sbcap/sbcap_test.c @@ -202,8 +202,8 @@ static const struct log_info_cat log_categories[] = { [0] = { - .name = "DSBcAP", - .description = "SBc Application Part (CBC-MME)", + .name = "DMAIN", + .description = "main category", .color = "\033[1;32m", .enabled = 1, .loglevel = LOGL_DEBUG, @@ -220,7 +220,7 @@ void *ctx = talloc_named_const(NULL, 0, "mgcp_test"); void *msgb_ctx = msgb_talloc_ctx_init(ctx, 0); osmo_init_logging2(ctx, &log_info); - sbcap_set_log_area(0); + sbcap_set_log_area(0, 0); log_set_log_level(osmo_stderr_target, LOGL_DEBUG); log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ia4cbae2395532d9b5b7b9177a7d0f31bf777d751 Gerrit-Change-Number: 28821 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Log info about messages received and trasmitted

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28819 ) Change subject: sbcap: Log info about messages received and trasmitted ...................................................................... sbcap: Log info about messages received and trasmitted Change-Id: Ifd1eca79bf4fac63de8066cd6a18004138d51d04 --- M include/osmocom/sbcap/sbcap_common.h M src/sbcap/sbcap_common.c M src/sbcap_link.c M src/sbcap_link_fsm.c 4 files changed, 65 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/sbcap/sbcap_common.h b/include/osmocom/sbcap/sbcap_common.h index 91a95eb..40da3ba 100644 --- a/include/osmocom/sbcap/sbcap_common.h +++ b/include/osmocom/sbcap/sbcap_common.h @@ -137,12 +137,14 @@ struct msgb *sbcap_encode(SBcAP_SBC_AP_PDU_t *pdu); SBcAP_SBC_AP_PDU_t *sbcap_decode(const struct msgb *msg); +const char *sbcap_procedure_code_str(SBcAP_ProcedureCode_t pc); const char *sbcap_cause_str(SBcAP_Cause_t cause); void sbcap_set_log_area(int log_area); SBcAP_ProcedureCode_t sbcap_pdu_get_procedure_code(const SBcAP_SBC_AP_PDU_t *pdu); SBcAP_Criticality_t sbcap_pdu_get_criticality(const SBcAP_SBC_AP_PDU_t *pdu); +const char *sbcap_pdu_get_name(const SBcAP_SBC_AP_PDU_t *pdu); void *sbcap_as_find_ie(void *void_list, SBcAP_ProtocolIE_ID_t ie_id); diff --git a/src/sbcap/sbcap_common.c b/src/sbcap/sbcap_common.c index 0596b53..ddc0fed 100644 --- a/src/sbcap/sbcap_common.c +++ b/src/sbcap/sbcap_common.c @@ -30,6 +30,22 @@ int _sbcap_DSBCAP = 0; #define DSBCAP _sbcap_DSBCAP +static const struct value_string sbcap_procedure_code_vals[] = { + { SBcAP_ProcedureId_Write_Replace_Warning, "Write-Replace-Warning" }, + { SBcAP_ProcedureId_Stop_Warning, "Stop-Warning" }, + { SBcAP_ProcedureId_Error_Indication, "Error-Indication" }, + { SBcAP_ProcedureId_Write_Replace_Warning_Indication, "Write-Replace-Warning-Indication" }, + { SBcAP_ProcedureId_Stop_Warning_Indication, "Stop-Warning-Indication" }, + { SBcAP_ProcedureId_PWS_Restart_Indication, "PWS-Restart-Indication" }, + { SBcAP_ProcedureId_PWS_Failure_Indication, "PWS-Failure-Indication" }, + { 0, NULL } +}; + +const char *sbcap_procedure_code_str(SBcAP_ProcedureCode_t pc) +{ + return get_value_string(sbcap_procedure_code_vals, pc); +} + static const struct value_string sbcap_cause_vals[] = { { SBcAP_Cause_message_accepted, "message accepted" }, { SBcAP_Cause_parameter_not_recognised, "parameter not recognised" }, @@ -141,6 +157,27 @@ } } +const char *sbcap_pdu_get_name(const SBcAP_SBC_AP_PDU_t *pdu) +{ + static char pdu_name[256] = "<unknown>"; + struct osmo_strbuf sb = { .buf = pdu_name, .len = sizeof(pdu_name) }; + SBcAP_ProcedureCode_t pc = sbcap_pdu_get_procedure_code(pdu); + + OSMO_STRBUF_PRINTF(sb, "%s", sbcap_procedure_code_str(pc)); + + switch (pc) { + case SBcAP_ProcedureId_Write_Replace_Warning: + case SBcAP_ProcedureId_Stop_Warning: + OSMO_STRBUF_PRINTF(sb, "%s", + pdu->present == SBcAP_SBC_AP_PDU_PR_initiatingMessage + ? "-Request" : "-Response"); + break; + default: + break; + } + return pdu_name; +} + void *sbcap_as_find_ie(void *void_list, SBcAP_ProtocolIE_ID_t ie_id) { A_SEQUENCE_OF(SBcAP_ProtocolIE_ID_t) *li = (void *)void_list; diff --git a/src/sbcap_link.c b/src/sbcap_link.c index 8a3af59..91fa75c 100644 --- a/src/sbcap_link.c +++ b/src/sbcap_link.c @@ -157,13 +157,13 @@ if (rc == 0) goto out; - LOGPSBCAPC(link, LOGL_DEBUG, "Received SBc-AP %s\n", msgb_hexdump(msg)); + LOGPSBCAPC(link, LOGL_DEBUG, "Rx SBc-AP %s\n", msgb_hexdump(msg)); /* decode + dispatch message */ pdu = sbcap_decode(msg); if (pdu) { - LOGPSBCAPC(link, LOGL_INFO, "Received SBc-AP %d\n", - pdu->present); + LOGPSBCAPC(link, LOGL_INFO, "Rx SBc-AP %s\n", + sbcap_pdu_get_name(pdu)); g_cbc->sbcap.mgr->rx_cb(link, pdu); } else { LOGPSBCAPC(link, LOGL_ERROR, "Unable to decode %s\n", msgb_hexdump(msg)); @@ -274,13 +274,13 @@ if (rc == 0) goto out; - LOGPSBCAPC(link, LOGL_DEBUG, "Received SBc-AP %s\n", msgb_hexdump(msg)); + LOGPSBCAPC(link, LOGL_DEBUG, "Rx SBc-AP %s\n", msgb_hexdump(msg)); /* decode + dispatch message */ pdu = sbcap_decode(msg); if (pdu) { - LOGPSBCAPC(link, LOGL_INFO, "Received SBc-AP %d\n", - pdu->present); + LOGPSBCAPC(link, LOGL_INFO, "Rx SBc-AP %s\n", + sbcap_pdu_get_name(pdu)); cbc->rx_cb(link, pdu); } else { LOGPSBCAPC(link, LOGL_ERROR, "Unable to decode %s\n", msgb_hexdump(msg)); @@ -389,16 +389,19 @@ } if (!link) { - LOGP(DSBcAP, LOGL_NOTICE, "Cannot transmit msg: no connection\n"); + LOGP(DSBcAP, LOGL_NOTICE, "Cannot transmit msg %s: no connection\n", + sbcap_pdu_get_name(pdu)); return; } - LOGPSBCAPC(link, LOGL_INFO, "Transmitting msg\n"); + LOGPSBCAPC(link, LOGL_INFO, "Tx msg %s\n", + sbcap_pdu_get_name(pdu)); OSMO_ASSERT(link->conn); msg = sbcap_encode(pdu); if (!msg) goto ret_free; - LOGPSBCAPC(link, LOGL_DEBUG, "Encoded message: %s\n", msgb_hexdump(msg)); + LOGPSBCAPC(link, LOGL_DEBUG, "Encoded message %s: %s\n", + sbcap_pdu_get_name(pdu), msgb_hexdump(msg)); if (link->is_client) osmo_stream_cli_send(link->cli_conn, msg); else diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index 01e3631..2813611 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -193,7 +193,8 @@ if (!ie) return -1; if (ie->size != 2) { - LOGPSBCAPC(link, LOGL_ERROR, "get_msg_id wrong size %zu\n", ie->size); + LOGPSBCAPC(link, LOGL_ERROR, "get_msg_id(%s) wrong size %zu\n", + sbcap_pdu_get_name(pdu), ie->size); return -1; } return osmo_load16be(ie->buf); @@ -235,8 +236,8 @@ } } - LOGPSBCAPC(link, LOGL_ERROR, "Rx ERROR_IND (cause=%ld, diagnostics=%d [proc_code=%ld, trigger_msg=%ld criticality=%ld])\n", - cause, !!ie_diag, proc_code, trigger_msg, criticality); + LOGPSBCAPC(link, LOGL_ERROR, "Rx %s (cause=%ld, diagnostics=%d [proc_code=%ld, trigger_msg=%ld criticality=%ld])\n", + sbcap_pdu_get_name(pdu), cause, !!ie_diag, proc_code, trigger_msg, criticality); return 0; } @@ -255,15 +256,16 @@ case SBcAP_ProcedureId_Write_Replace_Warning: case SBcAP_ProcedureId_Stop_Warning: LOGPSBCAPC(link, LOGL_ERROR, - "SBcAP initiatingMessage procedure=%ld MME->CBC not expected\n", - pdu->choice.initiatingMessage.procedureCode); + "SBcAP %s MME->CBC not expected\n", + sbcap_pdu_get_name(pdu)); return -EINVAL; case SBcAP_ProcedureId_PWS_Restart_Indication: return osmo_fsm_inst_dispatch(link->fi, SBcAP_LINK_E_RX_RESTART, pdu); case SBcAP_ProcedureId_Error_Indication: return cbc_sbcap_link_rx_error_ind(link, pdu); case SBcAP_ProcedureId_PWS_Failure_Indication: - LOGPSBCAPC(link, LOGL_NOTICE, "Rx PWS Failure Indication not implemented yet\n"); + LOGPSBCAPC(link, LOGL_NOTICE, "Rx %s not implemented yet\n", + sbcap_pdu_get_name(pdu)); return 0; case SBcAP_ProcedureId_Stop_Warning_Indication: case SBcAP_ProcedureId_Write_Replace_Warning_Indication: @@ -276,7 +278,8 @@ cbc_sbcap_link_tx(link, err_ind_pdu); else LOGPSBCAPC(link, LOGL_ERROR, - "Tx SBc-AP Error-Indication: msg gen failed\n"); + "Tx SBc-AP %s: msg gen failed\n", + sbcap_pdu_get_name(err_ind_pdu)); return 0; } break; @@ -311,8 +314,8 @@ /* look-up smscb_message */ smscb = cbc_message_by_id(msg_id); if (!smscb) { - LOGPSBCAPC(link, LOGL_ERROR, "Rx SBc-AP msg for unknown message-id 0x%04x\n", - msg_id); + LOGPSBCAPC(link, LOGL_ERROR, "Rx SBc-AP %s for unknown message-id 0x%04x\n", + sbcap_pdu_get_name(pdu), msg_id); /* TODO: inform peer? */ return 0; } @@ -320,8 +323,8 @@ /* look-up smscb_message_peer */ mp = cbc_message_peer_get(smscb, link->peer); if (!mp) { - LOGPSBCAPC(link, LOGL_ERROR, "Rx SBc-AP msg for message-id 0x%04x without peer %s\n", - msg_id, link->peer->name); + LOGPSBCAPC(link, LOGL_ERROR, "Rx SBc-AP %s for message-id 0x%04x without peer %s\n", + sbcap_pdu_get_name(pdu), msg_id, link->peer->name); /* TODO: inform peer? */ return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ifd1eca79bf4fac63de8066cd6a18004138d51d04 Gerrit-Change-Number: 28819 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_me...

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28823 ) Change subject: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_message_peer ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I37b08aa374c1097d2871bf69a7bb7893f32bccd3 Gerrit-Change-Number: 28823 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(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-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 13:03:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Request and handle Write Replace Warning Indication

by pespin

Attention is currently required from: neels, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28822 ) Change subject: sbcap: Request and handle Write Replace Warning Indication ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I563e7d1c999f14b8197bb41e85b7bcf6262fe2a0 Gerrit-Change-Number: 28822 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(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-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 29 Jul 2022 13:03:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Log info about messages received and trasmitted

by pespin

Attention is currently required from: osmith, neels, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28819 ) Change subject: sbcap: Log info about messages received and trasmitted ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ifd1eca79bf4fac63de8066cd6a18004138d51d04 Gerrit-Change-Number: 28819 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 29 Jul 2022 13:03:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework trxcon_fsm, move into a separate file

by pespin

Attention is currently required from: osmith, laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28809 ) Change subject: trxcon: rework trxcon_fsm, move into a separate file ...................................................................... Patch Set 3: (1 comment) File src/host/trxcon/src/l1ctl.c: https://gerrit.osmocom.org/c/osmocom-bb/+/28809/comment/a809ccac_b7113cdb PS3, Line 467: /* FIXME: we cannot know for sure if the given mode was actually applied. > Oh, good idea. […] See for instance: struct msgb *ms_nacc_create_rlcmac_msg(struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf, uint32_t fn, uint8_t ts) { int rc; struct nacc_ev_create_rlcmac_msg_ctx data_ctx; data_ctx = (struct nacc_ev_create_rlcmac_msg_ctx) { .tbf = tbf, .fn = fn, .ts = ts, .msg = NULL, }; rc = osmo_fsm_inst_dispatch(ms->nacc->fi, NACC_EV_CREATE_RLCMAC_MSG, &data_ctx); if (rc != 0 || !data_ctx.msg) return NULL; return data_ctx.msg; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifaf63ead9dd180181358e771367b2a686ba159ca Gerrit-Change-Number: 28809 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 13:02:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Log info about messages received and trasmitted

by fixeria

Attention is currently required from: osmith, neels, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28819 ) Change subject: sbcap: Log info about messages received and trasmitted ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/sbcap/sbcap_common.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28819/comment/c65af4c9_c54dd84c PS2, Line 166: OSMO_STRBUF_PRINTF(sb, "%s", sbcap_procedure_code_str(pc)); > I agree. […] Done: get_value_string_or_null() -> get_value_string(). -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ifd1eca79bf4fac63de8066cd6a18004138d51d04 Gerrit-Change-Number: 28819 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 13:01:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: Split smscb_peer_fsm into CBSP and SBcAP specific FSMs

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28828 ) Change subject: Split smscb_peer_fsm into CBSP and SBcAP specific FSMs ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0fd00b60cdc6bc6a088be1336d849548ca89c847 Gerrit-Change-Number: 28828 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 13:00:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: Split smscb_peer_fsm into CBSP and SBcAP specific FSMs

by pespin

Attention is currently required from: pespin. pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28828 ) Change subject: Split smscb_peer_fsm into CBSP and SBcAP specific FSMs ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0fd00b60cdc6bc6a088be1336d849548ca89c847 Gerrit-Change-Number: 28828 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: deleteVote

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework trxcon_fsm, move into a separate file

by fixeria

Attention is currently required from: osmith, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28809 ) Change subject: trxcon: rework trxcon_fsm, move into a separate file ...................................................................... Patch Set 3: (1 comment) File src/host/trxcon/src/l1ctl.c: https://gerrit.osmocom.org/c/osmocom-bb/+/28809/comment/a8862a98_21670cd4 PS3, Line 467: /* FIXME: we cannot know for sure if the given mode was actually applied. > I overcome the limitation in osmo-pcu by passing some variable or field inside struct containing the […] Oh, good idea. Thank you, Pau! -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifaf63ead9dd180181358e771367b2a686ba159ca Gerrit-Change-Number: 28809 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 12:59:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: move L1 params from struct trx_instance to trxcon_inst

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28834 ) Change subject: trxcon: move L1 params from struct trx_instance to trxcon_inst ...................................................................... Patch Set 1: (1 comment) File src/host/trxcon/src/sched_prim.c: https://gerrit.osmocom.org/c/osmocom-bb/+/28834/comment/b8bd64de_691ad8f5 PS1, Line 192: trx > change to trxcon? or is this commented out code still useful? I am planning to remove this commented out block soon, so not critical. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifbd9bb17d63ab1d8712d0c8022a62117a48c6384 Gerrit-Change-Number: 28834 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 12:58:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_me...

by pespin

Attention is currently required from: neels. pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28823 ) Change subject: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_message_peer ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I37b08aa374c1097d2871bf69a7bb7893f32bccd3 Gerrit-Change-Number: 28823 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(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-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: deleteVote

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_me...

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28823 ) Change subject: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_message_peer ...................................................................... Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I37b08aa374c1097d2871bf69a7bb7893f32bccd3 Gerrit-Change-Number: 28823 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(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-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 12:58:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework trxcon_fsm, move into a separate file

by pespin

Attention is currently required from: osmith, laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28809 ) Change subject: trxcon: rework trxcon_fsm, move into a separate file ...................................................................... Patch Set 3: (1 comment) File src/host/trxcon/src/l1ctl.c: https://gerrit.osmocom.org/c/osmocom-bb/+/28809/comment/9600f197_741c9f62 PS3, Line 467: /* FIXME: we cannot know for sure if the given mode was actually applied. > No, it cannot be fixed. […] I overcome the limitation in osmo-pcu by passing some variable or field inside struct containing the result in the *data param of osmo_fsm_inst_dispatch. In this case, inside ch_config, or adding a wrapper struct, something like: struct ch_config_fsm_data { enum gsm_phys_chan_config ch_config; bool applied } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifaf63ead9dd180181358e771367b2a686ba159ca Gerrit-Change-Number: 28809 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 12:58:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: tests/ranap_rab_ass: fix potential NULL pointer dereferences

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28837 ) Change subject: tests/ranap_rab_ass: fix potential NULL pointer dereferences ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I16fea7b2a8cb1d693e01c91d7633550e2e599ceb Gerrit-Change-Number: 28837 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 12:55:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: Split smscb_peer_fsm into CBSP and SBcAP specific FSMs

by pespin

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28828 to look at the new patch set (#2). Change subject: Split smscb_peer_fsm into CBSP and SBcAP specific FSMs ...................................................................... Split smscb_peer_fsm into CBSP and SBcAP specific FSMs This further simplifies tracking of events and simplifies and clears code on each of the FSMs. Change-Id: I0fd00b60cdc6bc6a088be1336d849548ca89c847 --- M include/osmocom/cbc/smscb_peer_fsm.h M src/Makefile.am A src/cbsp_smscb_peer_fsm.c A src/sbcap_smscb_peer_fsm.c M src/smscb_peer_fsm.c 5 files changed, 952 insertions(+), 665 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/28/28828/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0fd00b60cdc6bc6a088be1336d849548ca89c847 Gerrit-Change-Number: 28828 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Log info about messages received and trasmitted

by pespin

Attention is currently required from: osmith, neels, pespin. Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28819 to look at the new patch set (#3). Change subject: sbcap: Log info about messages received and trasmitted ...................................................................... sbcap: Log info about messages received and trasmitted Change-Id: Ifd1eca79bf4fac63de8066cd6a18004138d51d04 --- M include/osmocom/sbcap/sbcap_common.h M src/sbcap/sbcap_common.c M src/sbcap_link.c M src/sbcap_link_fsm.c 4 files changed, 65 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/19/28819/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ifd1eca79bf4fac63de8066cd6a18004138d51d04 Gerrit-Change-Number: 28819 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

2024

2023

2022

gerrit-log July 2022