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

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

by pespin

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

2 years, 11 months

1
0
0 0

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

by pespin

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

2 years, 11 months

1
0
0 0

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

by pespin

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

2 years, 11 months

1
0
0 0

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

by pespin

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

2 years, 11 months

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/19/28819/1 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..ec6bb94 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_or_null(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..387993f 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, "Transmitting 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-hnbgw[master]: add ps_rab_ass FSM to map GTP via UPF

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 ) Change subject: add ps_rab_ass FSM to map GTP via UPF ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: (btw this patch depends on https://gerrit.osmocom.org/c/libosmo-pfcp/+/28754 ) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic9bc30f322c4c6c6e82462d1da50cb15b336c63a Gerrit-Change-Number: 28816 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 16:08:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-bsc[master]: tests/ctrl: Avoid creating logfile

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28811 ) Change subject: tests/ctrl: Avoid creating logfile ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iaeee14a01badb8439bc8893ba8be06b13e4318f3 Gerrit-Change-Number: 28811 Gerrit-PatchSet: 2 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 15:51:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: test PS RAB GTP mapping

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818 ) Change subject: hnbgw: test PS RAB GTP mapping ...................................................................... Patch Set 1: (3 comments) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818/comment/48b801cb_b3f0… PS1, Line 285: pfcp_remote_ip := "127.0.0.2", this probably needs to be moved to a mp_pfcp_ip_remote https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818/comment/42c25ed1_0d5f… PS1, Line 1261: elementIdentifier := 8, sounds like you may want to add a template for this https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818/comment/49ad5678_d4f9… PS1, Line 1308: f_sleep(2.0); is this sleep needed? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818 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: I93c4689ddc016eb4eb25f8cbdd0142936c6f972b Gerrit-Change-Number: 28818 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 14:52:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: add library/PFCP_*, deps/PFCP

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817 ) Change subject: add library/PFCP_*, deps/PFCP ...................................................................... Patch Set 1: (5 comments) File library/Osmocom_VTY_Functions.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817/comment/3b9498ad_d441… PS1, Line 247: type record of charstring StrList; You may be probably reusing this for something no VTY related? then maybe move it to another module actually aimed at providing types? File library/PFCP_CodecPort_CtrlFunct.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817/comment/98d16bbb_a6a2… PS1, Line 7: inout PFCP_PT portRef, did you copy this? indentation looks weird. File library/PFCP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817/comment/1368050c_8d56… PS1, Line 18: type enumerated e_PFCP_Cause { You could move some of these into PFCP_Types.ttcn https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817/comment/79d5a3d0_ec6f… PS1, Line 418: function ts_PFCP_Session_Est_Req(charstring node_id, OCT8 cp_seid, Create_PDR_list create_pdr, Create_FAR_list create_far) return template PDU_PFCP { Please improve the scope of template types. ts_* -> "template (value)" tr_* -> "template (present)" https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817/comment/5a13e485_f106… PS1, Line 460: function tr_PFCP_Session_Est_Resp(template OCT8 hdr_seid := ?) return template PDU_PFCP { template (present) OCT8 hdr_seid -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817 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: I0723b931b3f755ea291bffa2f27c34ba446c2f2f Gerrit-Change-Number: 28817 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 14:48:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-hnbgw[master]: add ps_rab_ass FSM to map GTP via UPF

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 ) Change subject: add ps_rab_ass FSM to map GTP via UPF ...................................................................... Patch Set 1: (20 comments) File include/osmocom/hnbgw/context_map.h: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/78c4e6a7_c816e36b PS1, Line 56: * and each Response gets one ps_rab_ass FSM. Each such message can contain any number and any combination of you mean each req+response pair has a ps_rab_ass? or one for each? File include/osmocom/hnbgw/hnbgw.h: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/3164de7d_a9d87d48 PS1, Line 193: static inline bool hnb_gw_is_gtp_mapping_enabled(const struct hnb_gw *gw) can you document this function? what does gtp_mapping mean exactly? File include/osmocom/hnbgw/ps_rab_fsm.h: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/46e3ee4d_7f5355d8 PS1, Line 8: struct addr_teid { Maybe add a one line documenttion. Is this for GTP? gtp_addr_teid? https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/072a90fe_91559445 PS1, Line 14: /* Two of this make up a GTP mapping, one for the Access (HNB) side, one for the Core (CN) side. what does "this" mean here? https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/5545552b_6c00f4cb PS1, Line 24: struct half_gtp_map { gtp_map_leg? to use some term more "usual". https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/6918eb71_7d6d4276 PS1, Line 36: /* Whether the RANAP message this RAB's remote address was obtained from encoded the address in x213_nsap */ "from encoded the address" looks wrongly written? https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/599123b2_f33523c9 PS1, Line 41: struct osmo_fsm_inst *fi; document the type of fsm? because I see 2 more "fi" below. https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/62222c6a_ed79e330 PS1, Line 54: /* Backpointer to the ps_rab_ass_fsm for the RAB Assignment Request from Core that created this RAB. */ (I wonder why do we need 2 different FSMs here, looks like the same followup procedure to me, req + resp). https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/44ff19a5_495ee9d2 PS1, Line 79: bool ps_rab_is_established(struct ps_rab *rab); constify param File src/osmo-hnbgw/hnbgw.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/3f1ebd77_b41cb27a PS1, Line 230: LOGP(DHNBAP, LOGL_INFO, "deallocating UE context: id 0x%x, imsi %s, tmsi 0x%x\n", this can probably go on a different commit. https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/f793fa67_08fc6623 PS1, Line 354: LOGP(DMAIN, LOGL_INFO, "Deallocating hnb_context\n"); this can probably go on a different commit. File src/osmo-hnbgw/hnbgw_cn.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/21909278_7fd593a4 PS1, Line 373: if (!map->is_ps) { not super important, but probably makes it easier to read if you do "if (map->is_ps)" now, and move the existing code to the "else" condition. https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/97e22bf5_e60ace6f PS1, Line 396: rc = ranap_ran_rx_co_decode(map, message, msgb_l2(oph->msg), msgb_l2len(oph->msg)); You are actually duplicating these 2 lines now. They can be moved outside the if/else condition. The "if (rc == 0)" and ranap_ran_rx_co_free(message); can also be in the single path. File src/osmo-hnbgw/hnbgw_pfcp.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/997a3c13_30542dc8 PS1, Line 77: if (!hnb_gw_is_gtp_mapping_enabled(hnb_gw)) { I'd move this to the main function, to avoid calling hnbgw_pfcp_init(). I think for readers will be easier to understand the whole thing is disabled by this when looking at the main file. File src/osmo-hnbgw/hnbgw_rua.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/53c609a4_c6c59aec PS1, Line 284: if (!map->is_ps) { same, probably easier to read with "if (map->is_ps)" File src/osmo-hnbgw/hnbgw_vty.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/644d88f9_101a9297 PS1, Line 474: if (g_hnb_gw->config.pfcp.local_addr) I think we usually print first local addresses, then remote addresses. File src/osmo-hnbgw/ps_rab_ass_fsm.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/02a7a95c_0e96ce3e PS1, Line 490: /* See whether all RABs are done establishing, and replace RTP info in the RAB Assignment Response message, so that we s/RTP/GTP/ https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/5e0bc258_c7d0befb PS1, Line 625: void hnbgw_gtpmap_release(struct hnbgw_context_map *map) I'm reading "gsmtap" all the time ;) File src/osmo-hnbgw/ps_rab_fsm.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/82146a8a_df878e97 PS1, Line 786: .name = "PS_RAB_ST_WAIT_PFCP_DEL_RESP", WAIT_PFCP_DEL_RESP https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/f152c4db_1bf98735 PS1, Line 797: .name = "PS_RAB_ST_WAIT_USE_COUNT", WAIT_USE_COUNT -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic9bc30f322c4c6c6e82462d1da50cb15b336c63a Gerrit-Change-Number: 28816 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 14:42:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022