- gerrit-log - lists.osmocom.org

Change in osmo-cbc[master]: sbcap: Log info about messages received and trasmitted
by fixeria 27 Jul '22

27 Jul '22

Attention is currently required from: 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 1: Code-Review+1 (2 comments) File src/sbcap_link.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28819/comment/a41dd2dc_8b53bba9 PS1, Line 397: Transmitting Given that you're changing "Received" to "Rx", I suggest to use "Tx" here for consistency. https://gerrit.osmocom.org/c/osmo-cbc/+/28819/comment/3727e0f3_78007760 PS1, Line 403: LOGPSBCAPC(link, LOGL_DEBUG, "Encoded message %s: %s\n", Isn't it redundant to print PDU name here? You're already printing it on line 398 ("Transmitting msg %s"). -- 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 18:36:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-cbc[master]: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_me...
by pespin 27 Jul '22

27 Jul '22

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 2: Verified+1 (1 comment) Patchset: PS2: linter warns about asn1c generated code here. -- 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: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 17:51:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-cbc[master]: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_me...
by pespin 27 Jul '22

27 Jul '22

Attention is currently required from: pespin. 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: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: deleteVote

1 0

Change in osmo-cbc[master]: Move ASN1C enc/dec logging to its own category
by pespin 27 Jul '22

27 Jul '22

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28821 to look at the new patch set (#2). 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/21/28821/2 -- 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: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

Change in osmo-cbc[master]: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_me...
by pespin 27 Jul '22

27 Jul '22

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28823 to look at the new patch set (#2). 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/23/28823/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: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-cbc[master]: sbcap: Request and handle Write Replace Warning Indication
by pespin 27 Jul '22

27 Jul '22

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28822 to look at the new patch set (#2). 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/22/28822/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: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-cbc[master]: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_me...
by pespin 27 Jul '22

27 Jul '22

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/23/28823/1 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 f6bbc96..1a7801b 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-cbc[master]: sbcap: Improve handling of WriteReplaceWarnResponse
by pespin 27 Jul '22

27 Jul '22

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/24/28824/1 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-cbc[master]: Move cbc_cell_id2str() and make it public
by pespin 27 Jul '22

27 Jul '22

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/20/28820/1 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; -- 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-cbc[master]: Move ASN1C enc/dec logging to its own category
by pespin 27 Jul '22

27 Jul '22

pespin has uploaded this change for review. ( 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 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 6 files changed, 27 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/21/28821/1 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 ec6bb94..6111ddb 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); -- 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log