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

Change in libosmo-gprs[master]: llc: rework logging, add LOGLLC macro

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30736 ) Change subject: llc: rework logging, add LOGLLC macro ...................................................................... llc: rework logging, add LOGLLC macro Change-Id: I8ad3267f890a21b6c935b36b256b00bd0a4da8d6 Related: OS#5502 --- M include/osmocom/gprs/llc/llc.h M src/llc/llc_pdu.c M src/llc/llc_xid.c M src/llc/misc.c 4 files changed, 46 insertions(+), 36 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gprs/llc/llc.h b/include/osmocom/gprs/llc/llc.h index 0f0ab83..8ae403a 100644 --- a/include/osmocom/gprs/llc/llc.h +++ b/include/osmocom/gprs/llc/llc.h @@ -184,4 +184,14 @@ const struct osmo_gprs_llc_xid_field *fields, unsigned int num_fields); -void osmo_gprs_llc_set_log_cat(int cat); +enum osmo_gprs_llc_log_cat { + OSMO_GPRS_LLC_LOGC_LLC, + _OSMO_GPRS_LLC_LOGC_MAX, +}; + +void osmo_gprs_llc_set_log_cat(enum osmo_gprs_llc_log_cat logc, int logc_num); + +/* TODO: move to llc_private.h */ +extern int g_llc_log_cat[_OSMO_GPRS_LLC_LOGC_MAX]; + +#define LOGLLC(lvl, fmt, args...) LOGP(g_llc_log_cat[OSMO_GPRS_LLC_LOGC_LLC], lvl, fmt, ## args) diff --git a/src/llc/llc_pdu.c b/src/llc/llc_pdu.c index 6f0a17f..c031098 100644 --- a/src/llc/llc_pdu.c +++ b/src/llc/llc_pdu.c @@ -253,8 +253,7 @@ ctrl[0] |= GPRS_LLC_U_XID; break; default: - LOGP(g_log_cat, LOGL_ERROR, - "Unknown UI func=0x%02x\n", pdu->func); + LOGLLC(LOGL_ERROR, "Unknown UI func=0x%02x\n", pdu->func); return -EINVAL; } break; @@ -268,8 +267,7 @@ /* 5.5a Message Authentication Code (MAC) field */ if (pdu->flags & OSMO_GPRS_LLC_PDU_F_MAC_PRES) { /* TODO: calculate MAC (see 3GPP TS 43.020) */ - LOGP(g_log_cat, LOGL_ERROR, - "Message Authentication Code (MAC) is not implemented\n"); + LOGLLC(LOGL_ERROR, "Message Authentication Code (MAC) is not implemented\n"); return -ENOTSUP; } @@ -295,7 +293,7 @@ #define check_len(len, text) \ do { \ if (data_len < (len)) { \ - LOGP(g_log_cat, LOGL_ERROR, "Failed to parse LLC PDU: %s\n", text); \ + LOGLLC(LOGL_ERROR, "Failed to parse LLC PDU: %s\n", text); \ return -EINVAL; \ } \ } while (0) @@ -316,7 +314,7 @@ /* 6.2.1 Protocol Discriminator bit (PD): shall be 0 */ if (*addr & 0x80) { - LOGP(g_log_cat, LOGL_ERROR, "Protocol Discriminator shall be 0\n"); + LOGLLC(LOGL_ERROR, "Protocol Discriminator shall be 0\n"); return -EINVAL; } @@ -336,7 +334,7 @@ case 0x0c: case 0x0d: case 0x0f: - LOGP(g_log_cat, LOGL_ERROR, "Unknown SAPI=%u\n", pdu->sapi); + LOGLLC(LOGL_ERROR, "Unknown SAPI=%u\n", pdu->sapi); return -EINVAL; } @@ -485,7 +483,7 @@ pdu->data_len = data_len; break; default: - LOGP(g_log_cat, LOGL_ERROR, "Unknown U func=0x%02x\n", ctrl[0] & 0x0f); + LOGLLC(LOGL_ERROR, "Unknown U func=0x%02x\n", ctrl[0] & 0x0f); return -ENOTSUP; } } diff --git a/src/llc/llc_xid.c b/src/llc/llc_xid.c index a787e1a..1aab3a5 100644 --- a/src/llc/llc_xid.c +++ b/src/llc/llc_xid.c @@ -29,8 +29,6 @@ #include <osmocom/gprs/llc/llc.h> -extern int g_log_cat; - const struct value_string osmo_gprs_llc_xid_type_names[] = { { OSMO_GPRS_LLC_XID_T_VERSION, "LLC-Version" }, { OSMO_GPRS_LLC_XID_T_IOV_UI, "IOV-UI" }, @@ -80,8 +78,8 @@ bool osmo_gprs_llc_xid_field_is_valid(const struct osmo_gprs_llc_xid_field *field) { if (field->type >= ARRAY_SIZE(gprs_llc_xid_desc)) { - LOGP(g_log_cat, LOGL_ERROR, - "Unknown XID field type 0x%02x\n", field->type); + LOGLLC(LOGL_ERROR, + "Unknown XID field type 0x%02x\n", field->type); return false; } @@ -93,18 +91,18 @@ return true; if (field->val < gprs_llc_xid_desc[field->type].min) { - LOGP(g_log_cat, LOGL_ERROR, - "XID field %s value=%u < min=%u\n", - osmo_gprs_llc_xid_type_name(field->type), - field->val, gprs_llc_xid_desc[field->type].min); + LOGLLC(LOGL_ERROR, + "XID field %s value=%u < min=%u\n", + osmo_gprs_llc_xid_type_name(field->type), + field->val, gprs_llc_xid_desc[field->type].min); return false; } if (field->val > gprs_llc_xid_desc[field->type].max) { - LOGP(g_log_cat, LOGL_ERROR, - "XID field %s value=%u > max=%u\n", - osmo_gprs_llc_xid_type_name(field->type), - field->val, gprs_llc_xid_desc[field->type].max); + LOGLLC(LOGL_ERROR, + "XID field %s value=%u > max=%u\n", + osmo_gprs_llc_xid_type_name(field->type), + field->val, gprs_llc_xid_desc[field->type].max); return false; } @@ -177,7 +175,7 @@ #define check_len(len, text) \ do { \ if (data_len < (len)) { \ - LOGP(g_log_cat, LOGL_ERROR, "Failed to parse XID: %s\n", text); \ + LOGLLC(LOGL_ERROR, "Failed to parse XID: %s\n", text); \ return -EINVAL; \ } \ } while (0) @@ -187,8 +185,8 @@ uint8_t len; if (num_fields > max_fields) { - LOGP(g_log_cat, LOGL_ERROR, - "Failed to parse XID: too many fields\n"); + LOGLLC(LOGL_ERROR, + "Failed to parse XID: too many fields\n"); return -ENOMEM; } @@ -198,8 +196,8 @@ /* XID field type */ field->type = (*ptr >> 2) & 0x1f; if (field->type >= ARRAY_SIZE(gprs_llc_xid_desc)) { - LOGP(g_log_cat, LOGL_ERROR, - "Failed to parse XID: unknown field type 0x%02x\n", field->type); + LOGLLC(LOGL_ERROR, + "Failed to parse XID: unknown field type 0x%02x\n", field->type); return -EINVAL; } @@ -222,10 +220,10 @@ field->var.val_len = len; } else { if (len != gprs_llc_xid_desc[field->type].len) { - LOGP(g_log_cat, LOGL_NOTICE, - "XID field %s has unusual length=%u (expected %u)\n", - osmo_gprs_llc_xid_type_name(field->type), - len, gprs_llc_xid_desc[field->type].len); + LOGLLC(LOGL_NOTICE, + "XID field %s has unusual length=%u (expected %u)\n", + osmo_gprs_llc_xid_type_name(field->type), + len, gprs_llc_xid_desc[field->type].len); } switch (len) { @@ -242,9 +240,9 @@ field->val = osmo_load32be(ptr); break; default: - LOGP(g_log_cat, LOGL_ERROR, - "Failed to parse XID: unsupported field (%s) length=%u\n", - osmo_gprs_llc_xid_type_name(field->type), len); + LOGLLC(LOGL_ERROR, + "Failed to parse XID: unsupported field (%s) length=%u\n", + osmo_gprs_llc_xid_type_name(field->type), len); return -EINVAL; } diff --git a/src/llc/misc.c b/src/llc/misc.c index 06e2a6c..defe13d 100644 --- a/src/llc/misc.c +++ b/src/llc/misc.c @@ -16,10 +16,14 @@ */ #include <osmocom/core/logging.h> +#include <osmocom/gprs/llc/llc.h> -int g_log_cat = DLGLOBAL; +int g_llc_log_cat[_OSMO_GPRS_LLC_LOGC_MAX] = { + [0 ... _OSMO_GPRS_LLC_LOGC_MAX - 1] = DLGLOBAL +}; -void osmo_gprs_llc_set_log_cat(int cat) +void osmo_gprs_llc_set_log_cat(enum osmo_gprs_llc_log_cat logc, int logc_num) { - g_log_cat = cat; + OSMO_ASSERT(logc < _OSMO_GPRS_LLC_LOGC_MAX); + g_llc_log_cat[logc] = logc_num; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I8ad3267f890a21b6c935b36b256b00bd0a4da8d6 Gerrit-Change-Number: 30736 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in libosmo-gprs[master]: llc: Proper separation of public & private APIs, Introduce llc_prim API

by pespin

Attention is currently required from: fixeria, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30489 ) Change subject: llc: Proper separation of public & private APIs, Introduce llc_prim API ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I588eb576b2703262f4ab9566ec362920d8390cfd Gerrit-Change-Number: 30489 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 12:47:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmo-gprs[master]: llc: rework logging, add LOGLLC macro

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30736 ) Change subject: llc: rework logging, add LOGLLC macro ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I8ad3267f890a21b6c935b36b256b00bd0a4da8d6 Gerrit-Change-Number: 30736 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 12:46:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmo-gprs[master]: llc: split up enum osmo_gprs_llc_prim_type

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30735 ) Change subject: llc: split up enum osmo_gprs_llc_prim_type ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic5b7a2fb8d028a6e2031fb805189be4e92d80b9f Gerrit-Change-Number: 30735 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 12:46:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmo-gprs[master]: llc: add enum osmo_gprs_llc_{location,prim_sap}

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30734 ) Change subject: llc: add enum osmo_gprs_llc_{location,prim_sap} ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: What's really the point of having this separate? I see no point. I'm just +2 it and merging everything so we can all continue, it's all a nonsense. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I5606c0b41196f25adbc00cfdce9927daaed9a901 Gerrit-Change-Number: 30734 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 12:45:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmo-gprs[master]: llc: add libosmogsm dependency

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30733 ) Change subject: llc: add libosmogsm dependency ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: It is not needed /cannot be added in debian, it's libosmocore-dev, see https://gerrit.osmocom.org/c/libosmo-gprs/+/30489/comment/ef965efa_e8c01597/ -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Iee45fb87905ea29df02a48003396bde27e6c550c Gerrit-Change-Number: 30733 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 12:44:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmo-gprs[master]: llc: libosmo-gprs-llc.pc.in: add 'Requires.private: talloc'

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30732 ) Change subject: llc: libosmo-gprs-llc.pc.in: add 'Requires.private: talloc' ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: Because it uses libtalloc in the implementation. Ideally all projects should have it but it's in general not necessary because libosmocore already "Requires:" it publicly. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ie8ba61b124585e55accdaf2713b72e3ace78772f Gerrit-Change-Number: 30732 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 12:43:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmo-gprs[master]: llc: fix typo: OSMO_GPRS_LLC_SAPI_SNDCP{12->11}

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30731 ) Change subject: llc: fix typo: OSMO_GPRS_LLC_SAPI_SNDCP{12->11} ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icee190d0e20044d3808a8b1beb237a987a795d8e Gerrit-Change-Number: 30731 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 12:42:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-bsc[master]: WIP Ericsson GPRS support

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30749 ) Change subject: WIP Ericsson GPRS support ...................................................................... Patch Set 1: (3 comments) File src/osmo-bsc/pcu_sock.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2170): https://gerrit.osmocom.org/c/osmo-bsc/+/30749/comment/419eddef_3097a654 PS1, Line 128: if (trx->mo.nm_state.operational != NM_OPSTATE_ENABLED || that open brace { should be on the previous line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2170): https://gerrit.osmocom.org/c/osmo-bsc/+/30749/comment/72eb7067_371cbcf9 PS1, Line 137: trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2170): https://gerrit.osmocom.org/c/osmo-bsc/+/30749/comment/5d342e34_a8ee8208 PS1, Line 663: { SYSINFO_TYPE_1, SYSINFO_TYPE_2, SYSINFO_TYPE_3, SYSINFO_TYPE_13 }; that open brace { should be on the previous line -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If96b3f1e26a7206fcd2658b6faf6afe556cfbb14 Gerrit-Change-Number: 30749 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 21 Dec 2022 11:58:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-bsc[master]: HACK: enable PDCH after OML is done

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30748 ) Change subject: HACK: enable PDCH after OML is done ...................................................................... HACK: enable PDCH after OML is done Change-Id: If5251b102c8aa45dfc8cc4ee4e0223d7dc438938 --- M src/osmo-bsc/abis_om2000.c M src/osmo-bsc/timeslot_fsm.c 2 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/48/30748/1 diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index cf69ded..5223814 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -2255,6 +2255,8 @@ struct gsm_bts_trx_ts *ts; /* notify TS is ready */ + /* TODO: for some reason this event is needed now. It seems to be + * problematic to send it at a later point. */ ts = &otfp->trx->ts[otfp->cur_ts_nr]; osmo_fsm_inst_dispatch(ts->fi, TS_EV_OML_READY, NULL); @@ -2285,6 +2287,7 @@ struct nm_statechg_signal_data nsd; struct nm_statechg_signal_data nsd_bb_transc; struct gsm_bts_trx *trx = otfp->trx; + unsigned int i; memset(&nsd, 0, sizeof(nsd)); @@ -2316,6 +2319,13 @@ if (fi->proc.parent) osmo_fsm_inst_dispatch(fi->proc.parent, otfp->done_event, NULL); + + /* TODO: This event has already been sent (see above), however, for + * PDCHs the early OML ready notification does not work proberly. This + * is the reason why we send the event again for all TS. The TS that + * are already active will ignore the event. */ + for(i = 0; i < ARRAY_SIZE(trx->ts); i++) + osmo_fsm_inst_dispatch(trx->ts[i].fi, TS_EV_OML_READY, NULL); } static void om2k_trx_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 72db0fa..0bd3234 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -353,6 +353,16 @@ ts->last_errmsg ? : "-"); return; } + + /* It may be that the TRX mo nm state is still set to administrative. In this case it won't be possible + * to activate the PDCH, so we go back to the NOT INITIALIZED state in order to be able to try again + * later. */ + if (ts->trx->mo.nm_state.administrative == NM_STATE_LOCKED) { + LOG_TS(ts, LOGL_DEBUG, "cannot send RSL command to activate PDCH, the related TRX MO is still in NM STATE LOCKED!"); + osmo_fsm_inst_state_chg(fi, TS_ST_NOT_INITIALIZED, 0, 0); + return; + } + osmo_fsm_inst_state_chg(fi, TS_ST_WAIT_PDCH_ACT, CHAN_ACT_DEACT_TIMEOUT, T_CHAN_ACT_DEACT); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If5251b102c8aa45dfc8cc4ee4e0223d7dc438938 Gerrit-Change-Number: 30748 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2022