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

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

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 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 year, 9 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

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 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

1 year, 9 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

1 year, 9 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

1 year, 9 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

1 year, 9 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

1 year, 9 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

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: ranap_rab_ass_req_encode(): return msgb

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28815 ) Change subject: ranap_rab_ass_req_encode(): return msgb ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: It would even probably make more sense to allocate the msgb at the caller and pass it to the encode function, in case the caller wants to prepend something (like RUA) before it. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I85e715326e1d8f4f301f82f78da109f1a7a92f30 Gerrit-Change-Number: 28815 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 14:07:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: fix test_ranap_rab_ass_resp_decode_encode

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28814 ) Change subject: fix test_ranap_rab_ass_resp_decode_encode ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ifb98a52e56db1227a834c0d7b7a260314d9f547e Gerrit-Change-Number: 28814 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 14:05:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: mgw_fsm: move MGCP timeout to mgw_fsm_T_defs

by pespin

Attention is currently required from: neels, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28813 ) Change subject: mgw_fsm: move MGCP timeout to mgw_fsm_T_defs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2aa67121c20dc3da5fd937a02b6747468622f317 Gerrit-Change-Number: 28813 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 14:04:44 +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]: hnbgw: test PS RAB GTP mapping

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818 ) Change subject: hnbgw: test PS RAB GTP mapping ...................................................................... hnbgw: test PS RAB GTP mapping Related: SYS#5895 Change-Id: I93c4689ddc016eb4eb25f8cbdd0142936c6f972b --- M hnbgw/HNBGW_Tests.ttcn M hnbgw/gen_links.sh M hnbgw/osmo-hnbgw.cfg M hnbgw/regen_makefile.sh M library/ranap/RANAP_Templates.ttcn 5 files changed, 302 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/28818/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 81d9f1a..36ae2ce 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -57,6 +57,11 @@ import from MGCP_CodecPort all; import from SDP_Types all; +import from PFCP_Types all; +import from PFCP_Emulation all; +import from PFCP_Templates all; +import from PFCP_CodecPort all; + modulepar { /* IP address at which the HNodeB can be reached */ charstring mp_hnodeb_ip := "127.0.0.1"; @@ -91,6 +96,9 @@ sio := '83'O, rctx := 2 }; + + /* IP address at which we listen for PFCP to emulate a UPF */ + charstring mp_pfcp_ip_local := "127.0.0.1"; } function MSC_UnitdataCallback(RANAP_PDU ranap) runs on RAN_Emulation_CT return template RANAP_PDU { @@ -168,7 +176,8 @@ boolean ps_domain, MgcpParameters mgcp_pars optional, HnbConfig hnb optional, - boolean separate_sccp_cr + boolean separate_sccp_cr, + charstring pfcp_local_addr } /* We extend: @@ -176,7 +185,7 @@ * RAN_ConnHdlr (for the Iu side, emulating the MSC) * MGCP_ConnHdlr (for the MGCP side, emulating the MGW) */ -type component ConnHdlr extends RAN_ConnHdlr, MGCP_ConnHdlr, RUA_ConnHdlr { +type component ConnHdlr extends RAN_ConnHdlr, MGCP_ConnHdlr, RUA_ConnHdlr, PFCP_ConnHdlr { var integer g_sccp_conn_id; var TestHdlrParams g_pars; timer g_Tguard; @@ -267,6 +276,23 @@ vc_MGCP.start(MGCP_Emulation.main(ops, pars, id)); } +function f_init_pfcp(charstring id) runs on ConnHdlr { + id := id & "-PFCP"; + + var PFCP_Emulation_Cfg pfcp_cfg := { + pfcp_bind_ip := mp_pfcp_ip_local, + pfcp_bind_port := PFCP_PORT, + pfcp_remote_ip := "127.0.0.2", + pfcp_remote_port := PFCP_PORT, + role := UPF + }; + + vc_PFCP := PFCP_Emulation_CT.create(id) alive; + connect(self:PFCP, vc_PFCP:CLIENT); + connect(self:PFCP_PROC, vc_PFCP:CLIENT_PROC); + vc_PFCP.start(PFCP_Emulation.main(pfcp_cfg)); +} + function f_init_hnodeb(charstring id, integer hnb_idx, RuaOps rua_ops) runs on test_CT { id := id & "-Iuh" & int2str(hnb_idx); @@ -417,6 +443,9 @@ function f_init_handler(TestHdlrParams pars, float t_guard := 20.0) runs on ConnHdlr { /* make parameters available via component variable */ g_pars := pars; + + f_init_pfcp(testcasename()); + /* start guard timer and activate it as default */ g_Tguard.start(t_guard); activate(as_Tguard_ConnHdlr()); @@ -643,7 +672,8 @@ imsi := f_gen_imsi(imsi_suffix), ps_domain := ps_domain, hnb := omit, /* filled in later */ - separate_sccp_cr := separate_sccp_cr + separate_sccp_cr := separate_sccp_cr, + pfcp_local_addr := mp_pfcp_ip_local } /* Create an Iuh connection; send InitialUE; expect it to appear on new SCCP conenction */ @@ -1139,8 +1169,164 @@ vc_conn.done; } +type record FTeid { + HostName addr, + OCT4 teid +} + +type record FTeids { + FTeid local, + FTeid remote +} +/* 'local' and 'remote' refer to the GTP information from the UPF's point of view: + * HNB UPF CN + * access.remote <---> access.local | core.local <---> core.remote + */ +type record GtpParameters { + FTeids core, + FTeids access +} + +/* HNB UPF CN + * access.remote <---> access.local | core.local <---> core.remote + * 127.0.0.4 127.0.0.3 127.0.0.2 127.0.0.1 + * 0x44004400 0x30303030 0x22002200 0x10101010 + */ +template GtpParameters t_GtpParameters := { + core := { + local := { + addr := "127.0.0.2", + teid := '22002200'O + }, + remote := { + addr := "127.0.0.1", + teid := '10101010'O + } + }, + access := { + local := { + addr := "127.0.0.3", + teid := '30303030'O + }, + remote := { + addr := "127.0.0.4", + teid := '44004400'O + } + } +} + +friend function f_tc_ps_rab_assignment(charstring id, TestHdlrParams pars) runs on ConnHdlr { + var RANAP_PDU tx; + var RANAP_PDU rx; + timer T := 5.0; + + f_init_handler(pars); + + f_pfcp_register(); + + var PDU_PFCP m; + var Node_ID upf_node_id := valueof(ts_PFCP_Node_ID_fqdn("\07osmocom\03org")); + + PFCP.receive(tr_PFCP_Assoc_Setup_Req()) -> value m; + PFCP.send(ts_PFCP_Assoc_Setup_Resp(m.sequence_number, upf_node_id, + ts_PFCP_Cause(REQUEST_ACCEPTED), 1234)); + + tx := f_build_initial_ue(g_pars); + f_iuh2iu_connect(tx); + + var GtpParameters gtp_pars := valueof(t_GtpParameters); + var template RAB_SetupOrModifyList rab_sml; + + /* Send RAB Assignment Request */ + rab_sml := ts_RAB_SML_ps(t_RAB_id(23), f_ts_RAB_TLA(gtp_pars.core.remote.addr), gtp_pars.core.remote.teid); + tx := valueof(ts_RANAP_RabAssReq(rab_sml)); + BSSAP.send(tx); + + /* Expect PFCP Session Establishment Request. */ + PFCP.receive(tr_PFCP_Session_Est_Req()) -> value m; + var F_SEID hnbgw_f_seid := m.message_body.pfcp_session_establishment_request.CP_F_SEID; + var PFCP_Session_Establishment_Request serq := m.message_body.pfcp_session_establishment_request; + + /* Acting as UPF, invent a new PFCP SEID to send to HNBGW. Respond to the Session Establishment. + * The PFCP response must have the same sequence_number as the request. */ + var F_SEID up_f_seid := valueof(ts_PFCP_F_SEID_ipv4("127.0.0.1", '1111111111111111'O)); + var template PDU_PFCP r := ts_PFCP_Session_Est_Resp(m.sequence_number, upf_node_id, hnbgw_f_seid.seid); + r.message_body.pfcp_session_establishment_response := { + offending_ie := omit, + UP_F_SEID := up_f_seid, + created_PDR_list := { + { + elementIdentifier := 8, + lengthIndicator := 0, + grouped_ie := { + pdr_id := serq.create_PDR_list[0].grouped_ie.pdr_id, + local_F_TEID := ts_PFCP_F_TEID_ipv4(gtp_pars.core.local.teid, + gtp_pars.core.local.addr) + } + }, + { + elementIdentifier := 8, + lengthIndicator := 0, + grouped_ie := { + pdr_id := serq.create_PDR_list[1].grouped_ie.pdr_id, + local_F_TEID := ts_PFCP_F_TEID_ipv4(gtp_pars.access.local.teid, + gtp_pars.access.local.addr) + } + } + }, + load_control_information := omit, + overload_control_information := omit, + node_list := omit, + failed_rule_id := omit, + created_traffic_endpoint_list := omit + }; + PFCP.send(r); + + /* Expect on Iuh: RAB Assignment Request with IP/port from PFCP Session Est Resp */ + rab_sml := ts_RAB_SML_ps(t_RAB_id(23), f_ts_RAB_TLA(gtp_pars.access.local.addr), + gtp_pars.access.local.teid); + rx := valueof(ts_RANAP_RabAssReq(rab_sml)); + RUA.receive(rx); + + /* Send back RAB Assignment Response via Iuh */ + var template RAB_SetupOrModifiedList rab_smdl; + rab_smdl := ts_RAB_SMdL_ps(t_RAB_id(23), f_ts_RAB_TLA(gtp_pars.access.remote.addr), + gtp_pars.access.remote.teid); + tx := valueof(ts_RANAP_RabAssResp(rab_smdl)); + RUA.send(tx); + T.start; + + PFCP.receive(tr_PFCP_Session_Mod_Req(up_f_seid.seid)) -> value m; + r := ts_PFCP_Session_Mod_Resp(m.sequence_number, hnbgw_f_seid.seid); + PFCP.send(r); + + rab_smdl := ts_RAB_SMdL_ps(t_RAB_id(23), f_ts_RAB_TLA(gtp_pars.core.local.addr), gtp_pars.core.local.teid); + BSSAP.receive(tr_RANAP_RabAssResp(rab_smdl)); + + f_sleep(2.0); + tx := valueof(ts_RANAP_IuReleaseCommand(ts_RanapCause_om_intervention)); + f_iu2iuh(tx); + + tx := valueof(ts_RANAP_IuReleaseComplete()); + f_iuh2iu(tx); + + PFCP.receive(tr_PFCP_Session_Del_Req(up_f_seid.seid)) -> value m; + PFCP.send(ts_PFCP_Session_Del_Resp(m.sequence_number, hnbgw_f_seid.seid)); + + f_sleep(2.0); +} + +testcase TC_ps_rab_assignment() runs on test_CT { + var ConnHdlr vc_conn; + f_init(); + f_start_hnbs(); + f_sleep(1.0); + + vc_conn := f_start_handler_with_pars(refers(f_tc_ps_rab_assignment), t_pars(7, ps_domain := true)); + vc_conn.done; +} control { execute(TC_hnb_register()); @@ -1156,6 +1342,7 @@ execute(TC_rab_assign_mgcp_to()); execute(TC_ranap_cs_mo_disconnect()); execute(TC_ranap_ps_mo_disconnect()); + execute(TC_ps_rab_assignment()); } } diff --git a/hnbgw/gen_links.sh b/hnbgw/gen_links.sh index aabc8c0..4be3b53 100755 --- a/hnbgw/gen_links.sh +++ b/hnbgw/gen_links.sh @@ -22,6 +22,7 @@ gen_links $DIR $FILES # Required by MGCP and IPA +# Required by PFCP/UDP DIR=$BASEDIR/titan.TestPorts.IPL4asp/src FILES="IPL4asp_Functions.ttcn IPL4asp_PT.cc IPL4asp_PT.hh IPL4asp_PortType.ttcn IPL4asp_Types.ttcn IPL4asp_discovery.cc IPL4asp_protocol_L234.hh" gen_links $DIR $FILES @@ -76,6 +77,10 @@ FILES="TELNETasp_PT.cc TELNETasp_PT.hh TELNETasp_PortType.ttcn" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.PFCP_v15.1.0/src +FILES="PFCP_Types.ttcn" +gen_links $DIR $FILES + DIR=../library/hnbap FILES="HNBAP_CommonDataTypes.asn HNBAP_Constants.asn HNBAP_Containers.asn HNBAP_IEs.asn HNBAP_PDU_Contents.asn HNBAP_PDU_Descriptions.asn " FILES+="HNBAP_EncDec.cc HNBAP_Types.ttcn HNBAP_Templates.ttcn " @@ -95,6 +100,7 @@ FILES="Iuh_Types.ttcn Iuh_CodecPort.ttcn Iuh_CodecPort_CtrlFunctDef.cc Iuh_CodecPort_CtrlFunct.ttcn Iuh_Emulation.ttcn DNS_Helpers.ttcn " FILES+="MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc " FILES+="RAN_Adapter.ttcnpp RAN_Emulation.ttcnpp BSSAP_CodecPort.ttcn SCCP_Templates.ttcn " +FILES+="PFCP_CodecPort.ttcn PFCP_CodecPort_CtrlFunct.ttcn PFCP_CodecPort_CtrlFunctDef.cc PFCP_Emulation.ttcn PFCP_Templates.ttcn " FILES+="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn " FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcn " diff --git a/hnbgw/osmo-hnbgw.cfg b/hnbgw/osmo-hnbgw.cfg index f11f613..e4dfed2 100644 --- a/hnbgw/osmo-hnbgw.cfg +++ b/hnbgw/osmo-hnbgw.cfg @@ -33,3 +33,8 @@ remote-addr msc iups remote-addr sgsn + pfcp + remote-addr 127.0.0.1 + local-addr 127.0.0.2 + local-port 8805 + timer pfcp x26 5 diff --git a/hnbgw/regen_makefile.sh b/hnbgw/regen_makefile.sh index 47f7ee8..13db985 100755 --- a/hnbgw/regen_makefile.sh +++ b/hnbgw/regen_makefile.sh @@ -27,6 +27,7 @@ RANAP_EncDec.cc MGCP_CodecPort_CtrlFunctDef.cc UD_PT.cc + PFCP_CodecPort_CtrlFunctDef.cc " export CPPFLAGS_TTCN3=" diff --git a/library/ranap/RANAP_Templates.ttcn b/library/ranap/RANAP_Templates.ttcn index 11947d9..7fac3a4 100644 --- a/library/ranap/RANAP_Templates.ttcn +++ b/library/ranap/RANAP_Templates.ttcn @@ -1291,6 +1291,86 @@ } } } +template (value) TransportLayerInformation ts_TLI_ps(template (value) TransportLayerAddress tla, + template (value) GTP_TEI gtp_tei) := { + transportLayerAddress := tla, + iuTransportAssociation := { + gTP_TEI := gtp_tei + }, + iE_Extensions := omit +} +template TransportLayerInformation tr_TLI_ps(template TransportLayerAddress tla, + template (value) GTP_TEI gtp_tei) := { + transportLayerAddress := tla, + iuTransportAssociation := { + gTP_TEI := gtp_tei + }, + iE_Extensions := * +} + +template (value) RAB_SetupOrModifyList ts_RAB_SML_ps(template (value) RAB_ID rab_id, + template (value) TransportLayerAddress tla, + template (value) GTP_TEI gtp_tei) := { { + { + id := id_RAB_SetupOrModifyItem, + firstCriticality := reject, + firstValue := { + rAB_SetupOrModifyItemFirst := { + rAB_ID := rab_id, + nAS_SynchronisationIndicator := omit, + rAB_Parameters := ts_RabParams, + userPlaneInformation := ts_UserPlaneInfo, + transportLayerInformation := ts_TLI_ps(tla, gtp_tei), + service_Handover := omit, + iE_Extensions := omit + } + }, + secondCriticality := ignore, + secondValue := { + rAB_SetupOrModifyItemSecond := { + pDP_TypeInformation := omit, + dataVolumeReportingIndication := omit, + dl_GTP_PDU_SequenceNumber := omit, + ul_GTP_PDU_SequenceNumber := omit, + dl_N_PDU_SequenceNumber := omit, + ul_N_PDU_SequenceNumber := omit, + iE_Extensions := omit + } + } + } +} } +template RAB_SetupOrModifyList tr_RAB_SML_ps(template (present) RAB_ID rab_id, + template TransportLayerAddress tla, + template (value) GTP_TEI gtp_tei) := { { + { + id := id_RAB_SetupOrModifyItem, + firstCriticality := reject, + firstValue := { + rAB_SetupOrModifyItemFirst := { + rAB_ID := rab_id, + nAS_SynchronisationIndicator := *, + rAB_Parameters := ts_RabParams, + userPlaneInformation := ts_UserPlaneInfo, + transportLayerInformation := tr_TLI_ps(tla, gtp_tei), + service_Handover := *, + iE_Extensions := * + } + }, + secondCriticality := ignore, + secondValue := { + rAB_SetupOrModifyItemSecond := { + pDP_TypeInformation := omit, + dataVolumeReportingIndication := omit, + dl_GTP_PDU_SequenceNumber := omit, + ul_GTP_PDU_SequenceNumber := omit, + dl_N_PDU_SequenceNumber := omit, + ul_N_PDU_SequenceNumber := omit, + iE_Extensions := omit + } + } + } +} } + template (value) RAB_SetupOrModifiedList ts_RAB_SMdL(template (value) RAB_ID rab_id, template (value) TransportLayerAddress tla, template (value) BindingID binding_id) := { { @@ -1311,6 +1391,26 @@ } } } +template (value) RAB_SetupOrModifiedList ts_RAB_SMdL_ps(template (value) RAB_ID rab_id, + template (value) TransportLayerAddress tla, + template (value) GTP_TEI gtp_tei) := { { + { + id := id_RAB_SetupOrModifiedItem, + criticality := ignore, + value_ := { + rAB_SetupOrModifiedItem := { + rAB_ID := rab_id, + transportLayerAddress := tla, + iuTransportAssociation := { + gTP_TEI := gtp_tei + }, + dl_dataVolumes := omit, + iE_Extensions := omit + } + } + } +} } + template RAB_SetupOrModifiedList tr_RAB_SMdL(template (present) RAB_ID rab_id, template TransportLayerAddress tla, template BindingID binding_id) := { { -- 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-MessageType: newchange

1 year, 9 months

1
0
0 0

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

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817 ) Change subject: add library/PFCP_*, deps/PFCP ...................................................................... add library/PFCP_*, deps/PFCP Will soon be used by new subdir 'upf' (test osmo-upf), and by 'hnbgw' (test GTP mapping via UPF). Related: SYS#5599 Change-Id: I0723b931b3f755ea291bffa2f27c34ba446c2f2f --- M deps/Makefile M library/General_Types.ttcn M library/Osmocom_VTY_Functions.ttcn A library/PFCP_CodecPort.ttcn A library/PFCP_CodecPort_CtrlFunct.ttcn A library/PFCP_CodecPort_CtrlFunctDef.cc A library/PFCP_Emulation.ttcn A library/PFCP_Templates.ttcn 8 files changed, 911 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/28817/1 diff --git a/deps/Makefile b/deps/Makefile index 2a906eb..f284f69 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -47,6 +47,7 @@ titan.ProtocolModules.NS_v7.3.0 \ titan.ProtocolModules.SGsAP_13.2.0 \ titan.ProtocolModules.SNDCP_v7.0.0 \ + titan.ProtocolModules.PFCP_v15.1.0 \ titan.TestPorts.Common_Components.Socket-API \ titan.TestPorts.Common_Components.Abstract_Socket \ titan.TestPorts.HTTPmsg \ @@ -111,6 +112,7 @@ titan.ProtocolModules.SUA_commit= R.5.A-5-gcf1137a titan.ProtocolModules.TCP_commit= R.3.A-5-g39e5f45 titan.ProtocolModules.UDP_commit= R.4.A-5-geea8aa3 +titan.ProtocolModules.PFCP_v15.1.0_commit= d550ad9ddb6f9c823c9a555254cd76cf0e738d18 titan.TestPorts.AF_PACKET_commit= 0.1-5-g89ebea6 titan.TestPorts.Common_Components.Socket-API_commit= R.6.A-6-gf4380d0 titan.TestPorts.Common_Components.Abstract_Socket_commit= R.9.B-4-gbd41994 diff --git a/library/General_Types.ttcn b/library/General_Types.ttcn index 9a8489f..c818313 100644 --- a/library/General_Types.ttcn +++ b/library/General_Types.ttcn @@ -286,6 +286,7 @@ type integer LIN2_BO_LAST (0..65535) with { variant "FIELDLENGTH(16), COMP(nosign), BYTEORDER(last)" }; type integer LIN3_BO_LAST (0..16777215) with { variant "FIELDLENGTH(24), COMP(nosign), BYTEORDER(last)" }; type integer LIN4_BO_LAST (0..4294967295) with { variant "FIELDLENGTH(32), COMP(nosign), BYTEORDER(last)" }; + type integer LIN8_BO_LAST (0..18446744073709551616) with { variant "FIELDLENGTH(64), COMP(nosign), BYTEORDER(last)" }; //integer with fixed bit number type integer INT1b (0..1) with { variant "FIELDLENGTH(1)" }; diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn index e4a9182..be32d2c 100644 --- a/library/Osmocom_VTY_Functions.ttcn +++ b/library/Osmocom_VTY_Functions.ttcn @@ -244,7 +244,7 @@ return count; } -private type record of charstring StrList; +type record of charstring StrList; /* Perform a 'show talloc-context' to get a count of the given object_strs that are still allocated. * Retry 'attempts' times until the actual talloc object count matches 'expect_count'. diff --git a/library/PFCP_CodecPort.ttcn b/library/PFCP_CodecPort.ttcn new file mode 100644 index 0000000..8d4078d --- /dev/null +++ b/library/PFCP_CodecPort.ttcn @@ -0,0 +1,56 @@ +/* dual-faced port sitting on top of IPL4_asp UDP to encode/decode PFCP + * + * (C) 2022 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 PFCP_CodecPort { + +import from IPL4asp_PortType all; +import from IPL4asp_Types all; +import from PFCP_Types all; + +/* identifies a remote peer (sender or receiver) */ +type record PFCP_Peer { + ConnectionId conn_id, + HostName remote_name, + PortNumber remote_port +} + +type record PFCP_Unitdata { + PFCP_Peer peer, + PDU_PFCP pdu +} + +/* Translation port on top of IPL4asp; ASP_Event passed through transparently */ +type port PFCP_PT message { + out PFCP_Unitdata; + in PFCP_Unitdata, + ASP_ConnId_ReadyToRelease, + ASP_Event; +} with { extension "user IPL4asp_PT + out(PFCP_Unitdata -> ASP_SendTo: function(f_enc_pfcp_unitdata)) + in(ASP_RecvFrom -> PFCP_Unitdata: function(f_dec_pfcp_unitdata); + ASP_ConnId_ReadyToRelease -> ASP_ConnId_ReadyToRelease: simple; + ASP_Event -> ASP_Event: simple)" } + +private function f_enc_pfcp_unitdata(in PFCP_Unitdata in_ud, out ASP_SendTo out_ud) { + out_ud.connId := in_ud.peer.conn_id; + out_ud.remName := in_ud.peer.remote_name; + out_ud.remPort := in_ud.peer.remote_port; + out_ud.proto := { udp := {} }; + out_ud.msg := enc_PDU_PFCP(in_ud.pdu); +} with { extension "prototype(fast)" }; + +private function f_dec_pfcp_unitdata(in ASP_RecvFrom in_ud, out PFCP_Unitdata out_ud) { + out_ud.peer.conn_id := in_ud.connId; + out_ud.peer.remote_name := in_ud.remName; + out_ud.peer.remote_port := in_ud.remPort; + out_ud.pdu := dec_PDU_PFCP(in_ud.msg); +} with { extension "prototype(fast)" }; + +} diff --git a/library/PFCP_CodecPort_CtrlFunct.ttcn b/library/PFCP_CodecPort_CtrlFunct.ttcn new file mode 100644 index 0000000..33d5aec --- /dev/null +++ b/library/PFCP_CodecPort_CtrlFunct.ttcn @@ -0,0 +1,43 @@ +module PFCP_CodecPort_CtrlFunct { + +import from PFCP_CodecPort all; +import from IPL4asp_Types all; + +external function f_IPL4_listen( + inout PFCP_PT portRef, + in HostName locName, + in PortNumber locPort, + in ProtoTuple proto, + in OptionList options := {} +) return Result; + +external function f_IPL4_connect( + inout PFCP_PT portRef, + in HostName remName, + in PortNumber remPort, + in HostName locName, + in PortNumber locPort, + in ConnectionId connId, + in ProtoTuple proto, + in OptionList options := {} +) return Result; + +external function f_IPL4_close( + inout PFCP_PT portRef, + in ConnectionId id, + in ProtoTuple proto := { unspecified := {} } +) return Result; + +external function f_IPL4_setUserData( + inout PFCP_PT portRef, + in ConnectionId id, + in UserData userData +) return Result; + +external function f_IPL4_getUserData( + inout PFCP_PT portRef, + in ConnectionId id, + out UserData userData +) return Result; + +} diff --git a/library/PFCP_CodecPort_CtrlFunctDef.cc b/library/PFCP_CodecPort_CtrlFunctDef.cc new file mode 100644 index 0000000..31e014d --- /dev/null +++ b/library/PFCP_CodecPort_CtrlFunctDef.cc @@ -0,0 +1,55 @@ +#include "IPL4asp_PortType.hh" +#include "IPL4asp_PT.hh" +#include "PFCP_CodecPort.hh" + +namespace PFCP__CodecPort__CtrlFunct { + + IPL4asp__Types::Result f__IPL4__listen( + PFCP__CodecPort::PFCP__PT& portRef, + const IPL4asp__Types::HostName& locName, + const IPL4asp__Types::PortNumber& locPort, + const IPL4asp__Types::ProtoTuple& proto, + const IPL4asp__Types::OptionList& options) + { + return f__IPL4__PROVIDER__listen(portRef, locName, locPort, proto, options); + } + + IPL4asp__Types::Result f__IPL4__connect( + PFCP__CodecPort::PFCP__PT& portRef, + const IPL4asp__Types::HostName& remName, + const IPL4asp__Types::PortNumber& remPort, + const IPL4asp__Types::HostName& locName, + const IPL4asp__Types::PortNumber& locPort, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::ProtoTuple& proto, + const IPL4asp__Types::OptionList& options) + { + return f__IPL4__PROVIDER__connect(portRef, remName, remPort, + locName, locPort, connId, proto, options); + } + + IPL4asp__Types::Result f__IPL4__close( + PFCP__CodecPort::PFCP__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::ProtoTuple& proto) + { + return f__IPL4__PROVIDER__close(portRef, connId, proto); + } + + IPL4asp__Types::Result f__IPL4__setUserData( + PFCP__CodecPort::PFCP__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::UserData& userData) + { + return f__IPL4__PROVIDER__setUserData(portRef, connId, userData); + } + + IPL4asp__Types::Result f__IPL4__getUserData( + PFCP__CodecPort::PFCP__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + IPL4asp__Types::UserData& userData) + { + return f__IPL4__PROVIDER__getUserData(portRef, connId, userData); + } + +} diff --git a/library/PFCP_Emulation.ttcn b/library/PFCP_Emulation.ttcn new file mode 100644 index 0000000..05a07b1 --- /dev/null +++ b/library/PFCP_Emulation.ttcn @@ -0,0 +1,202 @@ +/* PFCP Emulation in TTCN-3 + * + * (C) 2022 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 PFCP_Emulation { + +import from IPL4asp_Types all; +import from General_Types all; +import from Osmocom_Types all; +import from PFCP_Types all; +import from PFCP_CodecPort all; +import from PFCP_CodecPort_CtrlFunct all; + +/*********************************************************************** + * Main Emulation Component + ***********************************************************************/ + +const integer PFCP_PORT := 8805; + +type enumerated PFCP_Role { + CPF, + UPF +}; + +type record PFCP_Emulation_Cfg { + HostName pfcp_bind_ip, + PortNumber pfcp_bind_port, + HostName pfcp_remote_ip, + PortNumber pfcp_remote_port, + PFCP_Role role +}; + +type component PFCP_Emulation_CT { + /* Communication with underlying PFCP CodecPort */ + port PFCP_PT PFCP; + + /* Communication with Clients */ + port PFCPEM_PT CLIENT; + port PFCPEM_PROC_PT CLIENT_PROC; + + /* Configuration by the user */ + var PFCP_Emulation_Cfg g_pfcp_cfg; + + /* State */ + var integer g_pfcp_conn_id; + var integer g_recovery_timestamp; + + var PFCPEM_conns g_conns; + + var integer g_next_sequence_nr_state; +}; + +private function f_PFCPEM_next_sequence_nr() runs on PFCP_Emulation_CT return integer { + g_next_sequence_nr_state := g_next_sequence_nr_state + 1; + if (g_next_sequence_nr_state > 16777215) { + g_next_sequence_nr_state := 1; + } + return g_next_sequence_nr_state; +} + +type record PFCPEM_conn { + PFCP_ConnHdlr vc_conn, + OCT8 seid optional, + LIN3_BO_LAST pfcp_msg_sequence_number optional +}; + +type record of PFCPEM_conn PFCPEM_conns; + +private function f_PFCPEM_conn_by_seid_or_seqnr(OCT8 seid, LIN3_BO_LAST seqnr) runs on PFCP_Emulation_CT return PFCP_ConnHdlr { + log("looking for seid ", seid, " seqnr ", seqnr, " in conns ", g_conns); + for (var integer i := 0; i < lengthof(g_conns); i := i + 1) { + if (isbound(g_conns[i].pfcp_msg_sequence_number) + and seqnr == g_conns[i].pfcp_msg_sequence_number) { + return g_conns[i].vc_conn; + } + if (isbound(g_conns[i].seid) + and seid == g_conns[i].seid) { + return g_conns[i].vc_conn; + } + } + return null; +}; + +private function f_PFCPEM_add_conn(PFCP_ConnHdlr vc_conn) runs on PFCP_Emulation_CT { + for (var integer i := 0; i < lengthof(g_conns); i := i + 1) { + if (g_conns[i].vc_conn == vc_conn) { + return; + } + } + /* Not in the list yet, add. */ + var PFCPEM_conn conn := { vc_conn := vc_conn }; + g_conns := g_conns & { conn }; +} + +private function f_init(PFCP_Emulation_Cfg cfg) runs on PFCP_Emulation_CT { + var Result res; + + map(self:PFCP, system:PFCP); + res := PFCP_CodecPort_CtrlFunct.f_IPL4_listen(PFCP, cfg.pfcp_bind_ip, cfg.pfcp_bind_port, {udp:={}}); + g_pfcp_conn_id := res.connId; + + g_recovery_timestamp := f_rnd_int(4294967296); + g_pfcp_cfg := cfg; + + g_conns := {}; + + g_next_sequence_nr_state := (1 + f_rnd_int(1000)) * 10000; +} + +function main(PFCP_Emulation_Cfg cfg) runs on PFCP_Emulation_CT { + var PFCP_ConnHdlr vc_conn; + var PFCP_Unitdata ud; + var PDU_PFCP pdu; + + f_init(cfg); + + while (true) { + alt { + [] PFCP.receive(PFCP_Unitdata:?) -> value ud { + log("PFCP_Emulation main() PFCP.receive: ", ud); + vc_conn := null; + if (ud.pdu.s_flag == '1'B) { + /* There is a SEID */ + vc_conn := f_PFCPEM_conn_by_seid_or_seqnr(ud.pdu.seid, ud.pdu.sequence_number); + } + if (vc_conn != null) { + log("found destination ", vc_conn); + CLIENT.send(ud.pdu) to vc_conn; + } else { + log("sending to all conns: ", g_conns); + for (var integer i := 0; i < lengthof(g_conns); i := i + 1) { + CLIENT.send(ud.pdu) to g_conns[i].vc_conn; + } + } + } + + [] CLIENT.receive(PDU_PFCP:?) -> value pdu sender vc_conn { + log("PFCP_Emulation main() CLIENT.receive from ", vc_conn, ": ", pdu); + if (pdu.sequence_number == 0) { + pdu.sequence_number := f_PFCPEM_next_sequence_nr(); + } + ud := { + peer := { + conn_id := g_pfcp_conn_id, + remote_name := g_pfcp_cfg.pfcp_remote_ip, + remote_port := g_pfcp_cfg.pfcp_remote_port + }, + pdu := pdu + }; + + f_PFCPEM_add_conn(vc_conn); + + PFCP.send(ud); + } + + [] CLIENT_PROC.getcall(PFCPEM_register:{}) -> sender vc_conn { + log("PFCP_Emulation main() CLIENT_PROC.getcall(PFCPEM_register)"); + f_PFCPEM_add_conn(vc_conn); + CLIENT_PROC.reply(PFCPEM_register:{}) to vc_conn; + } + } + } +} + + +/*********************************************************************** + * Interaction between Main and Client Components + ***********************************************************************/ +type port PFCPEM_PT message { + inout PDU_PFCP; +} with { extension "internal" }; + +signature PFCPEM_register(); + +type port PFCPEM_PROC_PT procedure { + inout PFCPEM_register; +} with { extension "internal" }; + +/*********************************************************************** + * Client Compoennt + ***********************************************************************/ + +type component PFCP_ConnHdlr { + port PFCPEM_PT PFCP; + port PFCPEM_PROC_PT PFCP_PROC; + var PFCP_Emulation_CT vc_PFCP; +}; + +function f_pfcp_register() runs on PFCP_ConnHdlr { + PFCP_PROC.call(PFCPEM_register:{}) { + [] PFCP_PROC.getreply(PFCPEM_register:{}); + } +} + +} diff --git a/library/PFCP_Templates.ttcn b/library/PFCP_Templates.ttcn new file mode 100644 index 0000000..8c2e443 --- /dev/null +++ b/library/PFCP_Templates.ttcn @@ -0,0 +1,551 @@ +/* PFCP Templates in TTCN-3 + * (C) 2022 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 PFCP_Templates { + +import from General_Types all; +import from Native_Functions all; +import from Osmocom_Types all; +import from PFCP_Types all; + +type enumerated e_PFCP_Cause { + RESERVED (0), + REQUEST_ACCEPTED (1), + MORE_USAGE_REPORT_TO_SEND (2), + REQUEST_REJECTED (64), + SESSION_CTX_NOT_FOUND (65), + MANDATORY_IE_MISSING (66), + CONDITIONAL_IE_MISSING (67), + INVALID_LENGTH (68), + MANDATORY_IE_INCORRECT (69), + INVALID_FORW_POLICY (70), + INVALID_F_TEID_ALLOC_OPTION (71), + NO_ESTABLISHED_PFCP_ASSOC (72), + RULE_CREATION_MOD_FAILURE (73), + PFCP_ENTITY_IN_CONGESTION (74), + NO_RESOURCES_AVAILABLE (75), + SERVICE_NOT_SUPPORTED (76), + SYSTEM_FAILURE (77), + REDIRECTION_REQUESTED (78), + ALL_DYNAMIC_ADDRESSES_ARE_OCCUPIED (79) +}; + +template Cause ts_PFCP_Cause(e_PFCP_Cause cause) := { + elementIdentifier := 19, + lengthIndicator := 0, + causeValue := int2oct(enum2int(cause), 1) +}; + +template Cause tr_PFCP_Cause(e_PFCP_Cause cause) := { + elementIdentifier := 19, + lengthIndicator := ?, + causeValue := int2oct(enum2int(cause), 1) +}; + +const INT4b PFCP_Node_ID_IPv4 := 0; +const INT4b PFCP_Node_ID_IPv6 := 1; +const INT4b PFCP_Node_ID_FQDN := 2; + +template Node_ID ts_PFCP_Node_ID(INT4b id_type, octetstring id_value) := { + elementIdentifier := 60, + lengthIndicator := 0, + node_id_type := id_type, + spare := '0000'B, + node_id_value := id_value +}; + +template Node_ID tr_PFCP_Node_ID(template INT4b id_type := ?, template octetstring id_value := ?) := { + elementIdentifier := 60, + lengthIndicator := ?, + node_id_type := id_type, + spare := ?, + node_id_value := id_value +}; + +/* t_PFCP_Node_ID_IPv4(f_inet_addr("127.0.0.1")) */ +template Node_ID ts_PFCP_Node_ID_ipv4(OCT4 ip_value) := ts_PFCP_Node_ID(PFCP_Node_ID_IPv4, ip_value); +template Node_ID ts_PFCP_Node_ID_fqdn(charstring fqdn) := ts_PFCP_Node_ID(PFCP_Node_ID_FQDN, char2oct(fqdn)); + +template Recovery_Time_Stamp ts_PFCP_Recovery_Timestamp(LIN4_BO_LAST time_value) := { + elementIdentifier := 96, + lengthIndicator := 0, + time_value := time_value +}; + +template Recovery_Time_Stamp tr_PFCP_Recovery_Timestamp(template LIN4_BO_LAST time_value := ?) := { + elementIdentifier := 96, + lengthIndicator := ?, + time_value := time_value +}; + +template PDU_PFCP ts_PDU_PFCP_ := { + s_flag := '0'B, + mp := '0'B, + spare := '000'B, + version := 1, + message_type := 0, + lengthIndicator := 0, + seid := omit, + sequence_number := 0, + spare2 := '0000'B, + mp_or_spare := '0000'B, + message_body := - +}; + +template PDU_PFCP tr_PDU_PFCP_ := { + s_flag := ?, + mp := ?, + spare := ?, + version := 1, + message_type := ?, + lengthIndicator := ?, + seid := *, + sequence_number := ?, + spare2 := ?, + mp_or_spare := ?, + message_body := ? +}; + +template PDU_PFCP ts_PDU_PFCP(LIN3_BO_LAST sequence_number := 0, template OCT8 seid := omit) +modifies ts_PDU_PFCP_ := { + seid := seid, + sequence_number := sequence_number +}; + +template PDU_PFCP tr_PDU_PFCP(template OCT8 seid := *) +modifies tr_PDU_PFCP_ := { + seid := seid +}; + +template PDU_PFCP ts_PFCP_Assoc_Setup_Req(template (value) Node_ID node_id, LIN4_BO_LAST recovery_timestamp) +modifies ts_PDU_PFCP_ := { + message_body := { + pfcp_association_setup_request := { + node_id := node_id, + time_stamp := ts_PFCP_Recovery_Timestamp(recovery_timestamp), + up_function_features := omit, + cp_function_features := omit, + UP_IP_resource_list := omit + } + } +}; + +function tr_PFCP_Assoc_Setup_Req(template Node_ID node_id := ?) return template PDU_PFCP { + var template PDU_PFCP t := tr_PDU_PFCP(); + t.message_body := { + pfcp_association_setup_request := { + node_id := node_id, + time_stamp := ?, + up_function_features := *, + cp_function_features := *, + UP_IP_resource_list := * + } + }; + return t; +}; + +template PDU_PFCP ts_PFCP_Assoc_Setup_Resp(LIN3_BO_LAST sequence_number, + template (value) Node_ID node_id, + template (value) Cause cause, + LIN4_BO_LAST recovery_timestamp) +modifies ts_PDU_PFCP_ := { + sequence_number := sequence_number, + message_body := { + pfcp_association_setup_response := { + node_id := node_id, + cause := cause, + time_stamp := ts_PFCP_Recovery_Timestamp(recovery_timestamp), + up_function_features := omit, + cp_function_features := omit, + UP_IP_resource_list := omit + } + } +}; + +function tr_PFCP_Assoc_Setup_Resp(template Node_ID node_id := ?, template Cause cause := ?) return template PDU_PFCP { + var template PDU_PFCP t := tr_PDU_PFCP(); + t.message_body := { + pfcp_association_setup_response := { + node_id := node_id, + cause := cause, + time_stamp := ?, + up_function_features := *, + cp_function_features := *, + UP_IP_resource_list := * + } + }; + return t; +}; + +function ts_PFCP_Assoc_Release_Req(template (value) Node_ID node_id) return template PDU_PFCP { + var template PDU_PFCP t := ts_PDU_PFCP(); + + t.message_body := { + pfcp_association_release_request := { + node_id := node_id + } + }; + return t; +}; + +function tr_PFCP_Assoc_Release_Resp(template Node_ID node_id := ?, template Cause cause := ?) return template PDU_PFCP { + var template PDU_PFCP t := tr_PDU_PFCP(); + t.message_body := { + pfcp_association_release_response := { + node_id := node_id, + cause := cause + } + }; + return t; +}; + +template F_SEID ts_PFCP_F_SEID_ipv4(charstring addr_v4, OCT8 seid) := { + elementIdentifier := 57, + lengthIndicator := 0, + v6 := '0'B, + v4 := '1'B, + spare := '000000'B, + seid := seid, + ipv4_address := f_inet_addr(addr_v4), + ipv6_address := omit +} + +type enumerated e_PFCP_Src_Iface { + ACCESS (0), + CORE (1), + SGI_LAN_N6_LAN (2), + CP_FUNCTION (3), + x_5G_VN_INTERNAL (4) +}; + +template Source_Interface ts_PFCP_Src_Iface(e_PFCP_Src_Iface iface) := { + elementIdentifier := 20, + lengthIndicator := 0, + interfacevalue := enum2int(iface), + spare := '0000'B +} + +template UE_IP_Address ts_PFCP_UE_IP_Address_v4(charstring addr_v4, boolean is_destination := true) := { + elementIdentifier := 93, + lengthIndicator := 0, + v6 := '0'B, + v4 := '1'B, + sd := bool2bit(is_destination), + spare := '00000'B, + ipv4_address := f_inet_addr(addr_v4), + ipv6_address := omit +} + +template F_TEID ts_PFCP_F_TEID_ipv4(OCT4 teid, charstring addr_v4) := { + elementIdentifier := 21, + lengthIndicator := 0, + v4 := '1'B, + v6 := '0'B, + ch := '0'B, + chid := '0'B, + spare := '0000'B, + teid := teid, + ipv4_address := f_inet_addr(addr_v4), + ipv6_address := omit, + choose_id := omit +} + +template F_TEID ts_PFCP_F_TEID_choose_v4(template (omit) OCT1 choose_id := omit) := { + elementIdentifier := 21, + lengthIndicator := 0, + v4 := '1'B, + v6 := '0'B, + ch := '1'B, + chid := '0'B, + spare := '0000'B, + teid := omit, + ipv4_address := omit, + ipv6_address := omit, + choose_id := choose_id +} + +template PDI_IE ts_PFCP_PDI( + e_PFCP_Src_Iface src_iface, + template F_TEID local_F_TEID := omit, + template UE_IP_Address ue_addr_v4 := omit) := { + elementIdentifier := 2, + lengthIndicator := 0, + grouped_ie := { + source_interface := ts_PFCP_Src_Iface(src_iface), + local_F_TEID := local_F_TEID, + pdn_instance := omit, + ue_ip_address := ue_addr_v4, + traffic_endpoint_id := omit, + sdf_filter_list := omit, + application_id := omit, + ethernet_packet_filter_list := omit, + qfi_list := omit + } +} + +template Apply_Action ts_PFCP_Apply_Action(BIT1 forw := '0'B, BIT1 drop := '0'B, BIT1 buff := '0'B) := { + elementIdentifier := 44, + lengthIndicator := 0, + drop := drop, + forw := forw, + buff := buff, + nocp := '0'B, + dupl := '0'B, + spare := '000'B +} + +function ts_PFCP_Apply_Action_FORW() return Apply_Action { + return valueof(ts_PFCP_Apply_Action(forw := '1'B)); +} +template Apply_Action ts_PFCP_Apply_Action_DROP := ts_PFCP_Apply_Action(drop := '1'B); +template Apply_Action ts_PFCP_Apply_Action_BUFF := ts_PFCP_Apply_Action(buff := '1'B); + +type enumerated e_PFCP_Dest_Iface { + ACCESS (0), + CORE (1), + SGI_LAN_N6_LAN (2), + CP_FUNCTION (3), + LI_FUNCTION (4), + x_5G_VN_INTERNAL (5) +}; + +template Destination_Interface ts_PFCP_Destination_Interface(e_PFCP_Dest_Iface di) := { + elementIdentifier := 42, + lengthIndicator := 0, + interface_value := enum2int(di), + spare := '0000'B +} + +template Outer_Header_Creation ts_PFCP_Outer_Header_Creation_GTP_ipv4(OCT4 remote_teid, charstring remote_addr_v4) := { + elementIdentifier := 84, + lengthIndicator := 0, + ohc_description_oct5 := '00000001'B, + ohc_description_oct6 := '00000000'B, + teid := remote_teid, + ipv4 := f_inet_addr(remote_addr_v4), + ipv6 := omit, + udp_port := omit +} + +type enumerated e_PFCP_Outer_Header_Removal { + GTP_U_UDP_IPV4 (0), + GTP_U_UDP_IPV6 (1), + UDP_IPV4 (2), + UDP_IPV6 (3), + IPV4 (4), + IPV6 (5), + GTP_U_UDP_IP (6), + VLAN_S_TAG (7), + S_TAG_AND_C_TAG (8) +}; + +template Outer_Header_Removal ts_PFCP_Outer_Header_Removal(e_PFCP_Outer_Header_Removal ohr) := { + elementIdentifier := 95, + lengthIndicator := 0, + ohc_description := enum2int(ohr) +} + +template Forwarding_Parameters ts_PFCP_Forwarding_Parameters( + e_PFCP_Dest_Iface dest_iface, + template Outer_Header_Creation outer_header_creation := omit + ) := { + elementIdentifier := 4, + lengthIndicator := 0, + grouped_ie := { + destination_interface := ts_PFCP_Destination_Interface(dest_iface), + pdn_Instance := omit, + redirect_information := omit, + outer_header_creation := outer_header_creation, + transport_level_marking := omit, + forwarding_policy := omit, + header_enrichment := omit, + traffic_endpoint_ID := omit + } +} + +template FAR_ID ts_PFCP_FAR_ID(LIN4_BO_LAST far_id) := { + elementIdentifier := 108, + lengthIndicator := 0, + id_value := far_id +} + +template Create_FAR ts_PFCP_Create_FAR(LIN4_BO_LAST far_id, Apply_Action aa, Forwarding_Parameters fp) := { + elementIdentifier := 3, + lengthIndicator := 0, + grouped_ie := { + far_id := ts_PFCP_FAR_ID(far_id), + apply_action := aa, + forwarding_parameters := fp, + duplicating_parameters := omit, + bar_id := omit + } +} + +template PDR_ID ts_PFCP_PDR_ID(OCT2 pdr_id) := { + elementIdentifier := 56, + lengthIndicator := 0, + rule_id := pdr_id +} + +template Precedence ts_PFCP_Precedence(LIN4_BO_LAST val) := { + elementIdentifier := 29, + lengthIndicator := 0, + precedence_value := val +} + +template Create_PDR ts_PFCP_Create_PDR(integer pdr_id, template PDI_IE pdi, template Outer_Header_Removal outer_header_removal := omit, LIN4_BO_LAST far_id) := { + elementIdentifier := 1, + lengthIndicator := 0, + grouped_ie := { + pdr_id := ts_PFCP_PDR_ID(int2oct(pdr_id, 2)), + precedence := ts_PFCP_Precedence(0), + pdi := pdi, + outer_header_removal := outer_header_removal, + FAR_ID_list := { ts_PFCP_FAR_ID(far_id) }, + uRR_ID_list := omit, + qER_ID_list := omit, + activate_predefined_rules := omit + } +} + +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 { + var template PDU_PFCP t := ts_PDU_PFCP(); + t.message_body := { + pfcp_session_establishment_request := { + node_id := ts_PFCP_Node_ID_ipv4(f_inet_addr(node_id)), + CP_F_SEID := ts_PFCP_F_SEID_ipv4(node_id, cp_seid), + create_PDR_list := create_pdr, + create_FAR_list := create_far, + create_URR_list := omit, + create_QER_list := omit, + create_BAR := omit, + create_traffic_endpoint_list := omit, + pdn_type := omit, + node_list := omit, + up_inactivity_timer := omit + } + }; + return t; +} + +function tr_PFCP_Session_Est_Req() return template PDU_PFCP { + var template PDU_PFCP t := tr_PDU_PFCP(?); + t.message_body := { + pfcp_session_establishment_request := { + node_id := ? + } + }; + return t; +} + +function ts_PFCP_Session_Est_Resp(LIN3_BO_LAST seq_nr, template Node_ID node_id, OCT8 seid) return template PDU_PFCP { + var template PDU_PFCP t := ts_PDU_PFCP(seq_nr, seid); + t.sequence_number := seq_nr; + t.message_body := { + pfcp_session_establishment_response := { + node_id := node_id, + cause := ts_PFCP_Cause(REQUEST_ACCEPTED) + } + }; + return t; +} + +function tr_PFCP_Session_Est_Resp(template OCT8 hdr_seid := ?) return template PDU_PFCP { + var template PDU_PFCP t := tr_PDU_PFCP(hdr_seid); + t.message_body := { + pfcp_session_establishment_response := { + node_id := ?, + cause := tr_PFCP_Cause(REQUEST_ACCEPTED), + offending_ie := *, + UP_F_SEID := ?, + created_PDR_list := ?, + load_control_information := *, + overload_control_information := *, + node_list := *, + failed_rule_id := *, + created_traffic_endpoint_list := * + } + }; + return t; +} + +function tr_PFCP_Session_Mod_Req(template OCT8 seid := ?) return template PDU_PFCP { + var template PDU_PFCP t := tr_PDU_PFCP(seid); + t.message_body := { + pfcp_session_modification_request := ? + }; + return t; +} + +function ts_PFCP_Session_Mod_Resp(LIN3_BO_LAST seq_nr, OCT8 seid) return template PDU_PFCP { + var template PDU_PFCP t := ts_PDU_PFCP(seq_nr, seid); + t.message_body := { + pfcp_session_modification_response := { + cause := ts_PFCP_Cause(REQUEST_ACCEPTED), + offending_IE := omit, + created_PDR := omit, + load_control_information := omit, + overload_control_information := omit, + usage_report := omit, + failed_rule_id := omit, + additional_usage_reports_information := omit, + created_updated_traffic_endpoint := omit + } + }; + return t; +} + +function ts_PFCP_Session_Del_Req(LIN3_BO_LAST seq_nr, OCT8 seid) return template PDU_PFCP { + var template PDU_PFCP t := ts_PDU_PFCP(seq_nr, seid); + t.message_body := { + pfcp_session_deletion_request := { } + }; + return t; +} + +function tr_PFCP_Session_Del_Req(template OCT8 seid := ?) return template PDU_PFCP { + var template PDU_PFCP t := tr_PDU_PFCP(seid); + t.message_body := { + pfcp_session_deletion_request := ? + }; + return t; +} + +function ts_PFCP_Session_Del_Resp(LIN3_BO_LAST seq_nr, OCT8 seid, e_PFCP_Cause cause := REQUEST_ACCEPTED) + return template PDU_PFCP { + var template PDU_PFCP t := ts_PDU_PFCP(seq_nr, seid); + t.message_body := { + pfcp_session_deletion_response := { + cause := ts_PFCP_Cause(cause), + offending_IE := omit, + load_control_information := omit, + overload_control_information := omit, + usage_report := omit + } + }; + return t; +} + +function tr_PFCP_Session_Del_Resp(template OCT8 seid := ?, + template Cause cause := tr_PFCP_Cause(REQUEST_ACCEPTED)) return template PDU_PFCP { + var template PDU_PFCP t := tr_PDU_PFCP(seid); + t.message_body := { + pfcp_session_deletion_response := { + cause := cause, + offending_IE := *, + load_control_information := *, + overload_control_information := *, + usage_report := * + } + }; + return t; +} + +} -- 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-MessageType: newchange

1 year, 9 months

1
0
0 0

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

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 ) Change subject: add ps_rab_ass FSM to map GTP via UPF ...................................................................... add ps_rab_ass FSM to map GTP via UPF Related: SYS#5895 Change-Id: Ic9bc30f322c4c6c6e82462d1da50cb15b336c63a --- M configure.ac M contrib/jenkins.sh M include/osmocom/hnbgw/Makefile.am M include/osmocom/hnbgw/context_map.h M include/osmocom/hnbgw/hnbgw.h A include/osmocom/hnbgw/hnbgw_pfcp.h A include/osmocom/hnbgw/ps_rab_ass_fsm.h A include/osmocom/hnbgw/ps_rab_fsm.h M include/osmocom/hnbgw/tdefs.h M include/osmocom/hnbgw/vty.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/context_map.c M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_cn.c A src/osmo-hnbgw/hnbgw_pfcp.c M src/osmo-hnbgw/hnbgw_rua.c M src/osmo-hnbgw/hnbgw_vty.c A src/osmo-hnbgw/ps_rab_ass_fsm.c A src/osmo-hnbgw/ps_rab_fsm.c M src/osmo-hnbgw/tdefs.c 20 files changed, 1,947 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/16/28816/1 diff --git a/configure.ac b/configure.ac index 2405cb0..0f2a7c4 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,8 @@ PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOHNBAP, libosmo-hnbap >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.10.0) +PKG_CHECK_MODULES(LIBOSMOGTLV, libosmo-gtlv >= 0.1.0) +PKG_CHECK_MODULES(LIBOSMOPFCP, libosmo-pfcp >= 0.1.0) dnl checks for header files AC_HEADER_STDC diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index b43eac6..98291b4 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -33,6 +33,7 @@ osmo-build-dep.sh libosmo-abis osmo-build-dep.sh libosmo-netif osmo-build-dep.sh libosmo-sccp +osmo-build-dep.sh libosmo-pfcp osmo-build-dep.sh libasn1c osmo-build-dep.sh osmo-iuh osmo-build-dep.sh osmo-mgw diff --git a/include/osmocom/hnbgw/Makefile.am b/include/osmocom/hnbgw/Makefile.am index 2a75df8..b6824b3 100644 --- a/include/osmocom/hnbgw/Makefile.am +++ b/include/osmocom/hnbgw/Makefile.am @@ -2,4 +2,8 @@ vty.h \ context_map.h hnbgw.h hnbgw_cn.h \ hnbgw_hnbap.h hnbgw_rua.h hnbgw_ranap.h \ - ranap_rab_ass.h mgw_fsm.h tdefs.h + ranap_rab_ass.h mgw_fsm.h tdefs.h \ + hnbgw_pfcp.h \ + ps_rab_ass_fsm.h \ + ps_rab_fsm.h \ + $(NULL) diff --git a/include/osmocom/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h index d6fc2e7..afaeaf2 100644 --- a/include/osmocom/hnbgw/context_map.h +++ b/include/osmocom/hnbgw/context_map.h @@ -6,6 +6,13 @@ struct msgb; +#define LOG_MAP(HNB_CTX_MAP, SUBSYS, LEVEL, FMT, ARGS...) \ + LOGHNB((HNB_CTX_MAP) ? (HNB_CTX_MAP)->hnb_ctx : NULL, \ + SUBSYS, LEVEL, "RUA-%u %s: " FMT, \ + (HNB_CTX_MAP) ? (HNB_CTX_MAP)->rua_ctx_id : 0, \ + (HNB_CTX_MAP) ? ((HNB_CTX_MAP)->is_ps ? "PS" : "CS") : "NULL", \ + ##ARGS) \ + enum hnbgw_context_map_state { MAP_S_NULL, MAP_S_ACTIVE, /* currently active map */ @@ -44,6 +51,17 @@ /* FSM instance for the MGW */ struct osmo_fsm_inst *mgw_fi; + + /* FSMs handling RANAP RAB assignments for PS. list of struct ps_rab_ass. For PS RAB Assignment, each Request + * and each Response gets one ps_rab_ass FSM. Each such message can contain any number and any combination of + * RAB IDs. The state of each RAB is kept separately in the list hnbgw_context_map.ps_rabs, and as soon as all + * RABs appearing in a PS RAB Assignment message have completed their PFCP setup, we can replace the GTP info + * for the RAB IDs and forward the RAB Assignment Request to HNB / the RAB Assignment Response to CN. */ + struct llist_head ps_rab_ass; + + /* All PS RABs and their GTP tunnel mappings. list of struct ps_rab. Each ps_rab FSM handles the PFCP + * communication for one particular RAB ID. */ + struct llist_head ps_rabs; }; diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index 76c5b84..8976604 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -19,8 +19,8 @@ DMGW, }; -#define LOGHNB(x, ss, lvl, fmt, args ...) \ - LOGP(ss, lvl, "%s " fmt, hnb_context_name(x), ## args) +#define LOGHNB(HNB_CTX, ss, lvl, fmt, args ...) \ + LOGP(ss, lvl, "%s " fmt, hnb_context_name(HNB_CTX), ## args) enum hnb_ctrl_node { CTRL_NODE_HNB = _LAST_CTRL_NODE, @@ -136,6 +136,12 @@ bool log_prefix_hnb_id; unsigned int max_sccp_cr_payload_len; struct mgcp_client_conf *mgcp_client; + struct { + char *local_addr; + uint16_t local_port; + char *remote_addr; + uint16_t remote_port; + } pfcp; } config; /*! SCTP listen socket for incoming connections */ struct osmo_stream_srv_link *iuh; @@ -155,6 +161,11 @@ struct osmo_sccp_addr iups_remote_addr; } sccp; struct mgcp_client *mgcp_client; + + struct { + struct osmo_pfcp_endpoint *ep; + struct osmo_pfcp_cp_peer *cp_peer; + } pfcp; }; extern void *talloc_asn1_ctx; @@ -178,3 +189,8 @@ int hnbgw_vty_go_parent(struct vty *vty); bool hnbgw_requires_empty_sccp_cr(struct hnb_gw *gw, unsigned int ranap_msg_len); + +static inline bool hnb_gw_is_gtp_mapping_enabled(const struct hnb_gw *gw) +{ + return gw->config.pfcp.remote_addr != NULL; +} diff --git a/include/osmocom/hnbgw/hnbgw_pfcp.h b/include/osmocom/hnbgw/hnbgw_pfcp.h new file mode 100644 index 0000000..f3f5bb4 --- /dev/null +++ b/include/osmocom/hnbgw/hnbgw_pfcp.h @@ -0,0 +1,5 @@ +#pragma once + +struct hnb_gw; + +int hnbgw_pfcp_init(struct hnb_gw *hnb_gw); diff --git a/include/osmocom/hnbgw/ps_rab_ass_fsm.h b/include/osmocom/hnbgw/ps_rab_ass_fsm.h new file mode 100644 index 0000000..775d73a --- /dev/null +++ b/include/osmocom/hnbgw/ps_rab_ass_fsm.h @@ -0,0 +1,14 @@ +#pragma once + +#include <osmocom/ranap/ranap_ies_defs.h> + +enum ps_rab_ass_fsm_event { + PS_RAB_ASS_EV_LOCAL_F_TEIDS_RX, + PS_RAB_ASS_EV_RAB_ASS_RESP, + PS_RAB_ASS_EV_RAB_ESTABLISHED, + PS_RAB_ASS_EV_RAB_FAIL, +}; + +int hnbgw_gtpmap_rx_rab_ass_req(struct hnbgw_context_map *map, struct osmo_prim_hdr *oph, ranap_message *message); +int hnbgw_gtpmap_rx_rab_ass_resp(struct hnbgw_context_map *map, struct osmo_prim_hdr *oph, ranap_message *message); +void hnbgw_gtpmap_release(struct hnbgw_context_map *map); diff --git a/include/osmocom/hnbgw/ps_rab_fsm.h b/include/osmocom/hnbgw/ps_rab_fsm.h new file mode 100644 index 0000000..f16a5a5 --- /dev/null +++ b/include/osmocom/hnbgw/ps_rab_fsm.h @@ -0,0 +1,91 @@ +#pragma once + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/socket.h> +#include <osmocom/core/use_count.h> +#include <osmocom/pfcp/pfcp_msg.h> + +struct addr_teid { + bool present; + struct osmo_sockaddr addr; + uint32_t teid; +}; + +/* Two of this make up a GTP mapping, one for the Access (HNB) side, one for the Core (CN) side. + * + * half_gtp_map | half_gtp_map + * Access HNBGW+UPF Core + * remote local | local remote + * -->PDR-FAR-->| + * |<--FAR-PDR<-- + * + * See ps_rab.core, ps_rab.access. + */ +struct half_gtp_map { + /* GTP endpoint, obtained from incoming RAB Assignment Request/Response. + * This is the remote side as seen from the UPF's point of view. + * For example, ps_rab.core.remote is the CN GTP that the RAB Assignment Request told us. + * ps_rab.access.remote is the HNB GTP that RAB Assignment Response told us. */ + struct addr_teid remote; + /* UPF GTP endpoint, obtained from PFCP Session Establishment Response. */ + struct addr_teid local; + /* PFCP Packet Detection Rule id that detects GTP-U packets coming from Core/Access */ + uint16_t pdr_id; + /* PFCP Forward Action Rule id that forwards GTP-U packets to Access/Core */ + uint32_t far_id; + /* Whether the RANAP message this RAB's remote address was obtained from encoded the address in x213_nsap */ + bool use_x213_nsap; +}; + +struct ps_rab { + struct osmo_fsm_inst *fi; + + /* backpointer */ + struct hnb_gw *hnb_gw; + + /* List entry and backpointer. + * If map == NULL, do not call llist_del(&entry): the hnbgw_context_map may deallocate before the PFCP release + * is complete, in which case it sets map = NULL. */ + struct llist_head entry; + struct hnbgw_context_map *map; + + /* RAB-ID used in RANAP RAB AssignmentRequest and Response messages */ + uint8_t rab_id; + /* Backpointer to the ps_rab_ass_fsm for the RAB Assignment Request from Core that created this RAB. */ + struct osmo_fsm_inst *req_fi; + /* Backpointer to the ps_rab_ass_fsm for the RAB Assignment Response from Access that confirmed this RAB. */ + struct osmo_fsm_inst *resp_fi; + + /* PFCP session controlling the GTP mapping for this RAB */ + uint64_t cp_seid; + struct osmo_pfcp_ie_f_seid up_f_seid; + bool release_requested; + + /* 'local' and 'remote' refer to the GTP information from the UPF's point of view: + * HNB UPF CN + * access.remote <---> access.local | core.local <---> core.remote + */ + struct half_gtp_map core; + struct half_gtp_map access; + + struct osmo_use_count use_count; +}; + +struct ps_rab *ps_rab_start(struct hnbgw_context_map *map, uint8_t rab_id, + const struct addr_teid *core_f_teid, bool use_x213_nsap, + struct osmo_fsm_inst *req_fi); + +struct ps_rab *ps_rab_get(struct hnbgw_context_map *map, uint8_t rab_id); +bool ps_rab_is_established(struct ps_rab *rab); +void ps_rab_release(struct ps_rab *rab); + +struct ps_rab_rx_args { + struct addr_teid f_teid; + bool use_x213_nsap; + struct osmo_fsm_inst *notify_fi; +}; +int ps_rab_rx_access_remote_f_teid(struct hnbgw_context_map *map, uint8_t rab_id, + const struct ps_rab_rx_args *args); + +struct ps_rab *ps_rab_find_by_seid(struct hnb_gw *hnb_gw, uint64_t seid, bool is_cp_seid); +void ps_rab_pfcp_set_msg_ctx(struct ps_rab *rab, struct osmo_pfcp_msg *m); diff --git a/include/osmocom/hnbgw/tdefs.h b/include/osmocom/hnbgw/tdefs.h index 4f98a36..8ae1c97 100644 --- a/include/osmocom/hnbgw/tdefs.h +++ b/include/osmocom/hnbgw/tdefs.h @@ -3,4 +3,5 @@ #include <osmocom/core/tdef.h> extern struct osmo_tdef mgw_fsm_T_defs[]; +extern struct osmo_tdef ps_T_defs[]; extern struct osmo_tdef_group hnbgw_tdef_group[]; diff --git a/include/osmocom/hnbgw/vty.h b/include/osmocom/hnbgw/vty.h index 93b3c45..e97a1ad 100644 --- a/include/osmocom/hnbgw/vty.h +++ b/include/osmocom/hnbgw/vty.h @@ -8,5 +8,6 @@ IUCS_NODE, IUPS_NODE, MGCP_NODE, + PFCP_NODE, }; diff --git a/src/osmo-hnbgw/Makefile.am b/src/osmo-hnbgw/Makefile.am index 64d5ccd..4d2403d 100644 --- a/src/osmo-hnbgw/Makefile.am +++ b/src/osmo-hnbgw/Makefile.am @@ -20,6 +20,8 @@ $(LIBOSMORANAP_CFLAGS) \ $(LIBOSMOHNBAP_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ + $(LIBOSMOGTLV_CFLAGS) \ + $(LIBOSMOPFCP_CFLAGS) \ $(NULL) AM_LDFLAGS = \ @@ -35,11 +37,14 @@ hnbgw_hnbap.c \ hnbgw_rua.c \ hnbgw_ranap.c \ + hnbgw_pfcp.c \ hnbgw_vty.c \ context_map.c \ hnbgw_cn.c \ ranap_rab_ass.c \ mgw_fsm.c \ + ps_rab_ass_fsm.c \ + ps_rab_fsm.c \ tdefs.c \ $(NULL) @@ -58,4 +63,6 @@ $(LIBOSMOMGCPCLIENT_LIBS) \ $(LIBSCTP_LIBS) \ $(LIBOSMOMGCPCLIENT_LIBS) \ + $(LIBOSMOGTLV_LIBS) \ + $(LIBOSMOPFCP_LIBS) \ $(NULL) diff --git a/src/osmo-hnbgw/context_map.c b/src/osmo-hnbgw/context_map.c index 5a7b48b..6bd4f6c 100644 --- a/src/osmo-hnbgw/context_map.c +++ b/src/osmo-hnbgw/context_map.c @@ -28,6 +28,7 @@ #include <osmocom/hnbgw/hnbgw_rua.h> #include <osmocom/hnbgw/context_map.h> #include <osmocom/hnbgw/mgw_fsm.h> +#include <osmocom/hnbgw/ps_rab_ass_fsm.h> const struct value_string hnbgw_context_map_state_names[] = { {MAP_S_NULL , "not-initialized"}, @@ -102,6 +103,8 @@ map->rua_ctx_id = rua_ctx_id; map->is_ps = is_ps; map->scu_conn_id = new_scu_conn_id; + INIT_LLIST_HEAD(&map->ps_rab_ass); + INIT_LLIST_HEAD(&map->ps_rabs); /* put it into both lists */ llist_add_tail(&map->hnb_list, &hnb->map_list); @@ -147,6 +150,8 @@ void context_map_deactivate(struct hnbgw_context_map *map) { + LOG_MAP(map, DMAIN, LOGL_NOTICE, "Deactivating\n"); + /* set the state to reserved. We still show up in the list and * avoid re-allocation of the context-id until we are cleaned up * by the context_map garbage collector timer */ @@ -160,6 +165,8 @@ mgw_fsm_release(map); OSMO_ASSERT(map->mgw_fi == NULL); } + + hnbgw_gtpmap_release(map); } static struct osmo_timer_list context_map_tmr; @@ -181,6 +188,7 @@ case MAP_S_RESERVED2: /* second time we see this reserved * entry: remove it */ + LOG_MAP(map, DMAIN, LOGL_NOTICE, "Deallocating\n"); map->state = MAP_S_NULL; llist_del(&map->cn_list); llist_del(&map->hnb_list); diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index 04ca34c..89c1e37 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -61,10 +61,13 @@ #include <osmocom/sigtran/protocol/m3ua.h> #include <osmocom/sigtran/sccp_sap.h> +#include <osmocom/pfcp/pfcp_proto.h> + #include <osmocom/hnbgw/hnbgw.h> #include <osmocom/hnbgw/hnbgw_hnbap.h> #include <osmocom/hnbgw/hnbgw_rua.h> #include <osmocom/hnbgw/hnbgw_cn.h> +#include <osmocom/hnbgw/hnbgw_pfcp.h> #include <osmocom/hnbgw/context_map.h> static const char * const osmo_hnbgw_copyright = @@ -101,6 +104,8 @@ gw->config.mgcp_client = talloc_zero(tall_hnb_ctx, struct mgcp_client_conf); mgcp_client_conf_init(gw->config.mgcp_client); + gw->config.pfcp.remote_port = OSMO_PFCP_PORT; + return gw; } @@ -222,6 +227,8 @@ void ue_context_free(struct ue_context *ue) { + LOGP(DHNBAP, LOGL_INFO, "deallocating UE context: id 0x%x, imsi %s, tmsi 0x%x\n", + ue->context_id, ue->imsi ? : "-", ue->tmsi); llist_del(&ue->list); talloc_free(ue); } @@ -344,6 +351,7 @@ osmo_stream_srv_destroy(ctx->conn); + LOGP(DMAIN, LOGL_INFO, "Deallocating hnb_context\n"); talloc_free(ctx); } @@ -713,6 +721,9 @@ return -EINVAL; } + /* If UPF is configured, set up PFCP socket and send Association Setup Request to UPF */ + hnbgw_pfcp_init(g_hnb_gw); + if (hnbgw_cmdline_config.daemonize) { rc = osmo_daemonize(); if (rc < 0) { diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 7c1dc9d..75b1c94 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -29,12 +29,15 @@ #include <osmocom/sigtran/sccp_sap.h> #include <osmocom/sigtran/sccp_helpers.h> +#include <osmocom/pfcp/pfcp_cp_peer.h> + #include <osmocom/hnbgw/hnbgw.h> #include <osmocom/hnbgw/hnbgw_rua.h> #include <osmocom/ranap/ranap_ies_defs.h> #include <osmocom/ranap/ranap_msg_factory.h> #include <osmocom/hnbgw/context_map.h> #include <osmocom/hnbgw/mgw_fsm.h> +#include <osmocom/hnbgw/ps_rab_ass_fsm.h> #include <osmocom/ranap/RANAP_ProcedureCode.h> #include <osmocom/ranap/ranap_common.h> #include <osmocom/ranap/ranap_common_ran.h> @@ -353,6 +356,7 @@ struct hnbgw_context_map *map; ranap_message *message; int rc; + struct hnb_gw *hnb_gw = cnlink->gw; /* Usually connection-oriented data is always passed transparently towards the specific HNB, via a RUA * connection identified by conn_id. An exception is made for RANAP RAB AssignmentRequest and @@ -365,8 +369,9 @@ return 0; } - /* Intercept RAB Assignment Request, Setup MGW FSM */ + /* Intercept RAB Assignment Request, to map RTP and GTP between access and core */ if (!map->is_ps) { + /* Circuit-Switched. Set up mapping of RTP ports via MGW */ message = talloc_zero(map, ranap_message); rc = ranap_ran_rx_co_decode(map, message, msgb_l2(oph->msg), msgb_l2len(oph->msg)); @@ -385,6 +390,37 @@ } talloc_free(message); + } else { + /* Packet-Switched. Set up mapping of GTP ports via UPF */ + message = talloc_zero(map, ranap_message); + rc = ranap_ran_rx_co_decode(map, message, msgb_l2(oph->msg), msgb_l2len(oph->msg)); + + if (rc == 0) { + switch (message->procedureCode) { + + case RANAP_ProcedureCode_id_RAB_Assignment: + /* If a UPF is configured, handle the RAB Assignment via ps_rab_ass_fsm, and replace the + * GTP F-TEIDs in the RAB Assignment message before passing it on to RUA. */ + if (hnb_gw_is_gtp_mapping_enabled(hnb_gw)) { + LOGP(DMAIN, LOGL_DEBUG, + "RAB Assignment: setting up GTP tunnel mapping via UPF %s\n", + osmo_sockaddr_to_str_c(OTC_SELECT, &hnb_gw->pfcp.cp_peer->remote_addr)); + return hnbgw_gtpmap_rx_rab_ass_req(map, oph, message); + } + /* If no UPF is configured, directly forward the message as-is (no GTP mapping). */ + LOGP(DMAIN, LOGL_DEBUG, "RAB Assignment: no UPF configured, forwarding as-is\n"); + break; + + case RANAP_ProcedureCode_id_Iu_Release: + /* Any IU Release will terminate the MGW FSM, the message itsself is not passed to the + * FSM code. It is just forwarded normally by the rua_tx_dt() call below. */ + hnbgw_gtpmap_release(map); + break; + } + ranap_ran_rx_co_free(message); + } + + talloc_free(message); } return rua_tx_dt(map->hnb_ctx, map->is_ps, map->rua_ctx_id, diff --git a/src/osmo-hnbgw/hnbgw_pfcp.c b/src/osmo-hnbgw/hnbgw_pfcp.c new file mode 100644 index 0000000..a3fe0df --- /dev/null +++ b/src/osmo-hnbgw/hnbgw_pfcp.c @@ -0,0 +1,148 @@ +/* PFCP link to UPF for osmo-hnbgw */ +/* (C) 2022 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * + * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de> + * + * 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/sockaddr_str.h> +#include <osmocom/pfcp/pfcp_endpoint.h> +#include <osmocom/pfcp/pfcp_cp_peer.h> + +#include <osmocom/hnbgw/hnbgw.h> +#include <osmocom/hnbgw/context_map.h> +#include <osmocom/hnbgw/ps_rab_fsm.h> + +static void pfcp_set_msg_ctx(struct osmo_pfcp_endpoint *ep, struct osmo_pfcp_msg *m, struct osmo_pfcp_msg *req) +{ + struct hnb_gw *hnb_gw = osmo_pfcp_endpoint_get_priv(ep); + + if (!m->ctx.peer_fi) + osmo_pfcp_cp_peer_set_msg_ctx(hnb_gw->pfcp.cp_peer, m); + + /* If this is a response to an earlier request, just take the msg context from the request message. + * In osmo-hnbgw, a session_fi always points at a ps_rab FSM. */ + if (!m->ctx.session_fi && req && req->ctx.session_fi) + ps_rab_pfcp_set_msg_ctx(req->ctx.session_fi->priv, m); + + /* Otherwise iterate all PS RABs in all hnb contexts matching on the SEID. This rarely happens at all: for tx, + * ps_rab_new_pfcp_msg_tx() already sets the msg ctx, and for rx, we only expect to receive PFCP Responses, + * which are handled above. The only time this will happen is when the UPF shuts down and sends a Deletion. */ + if (!m->ctx.session_fi && m->h.seid_present && m->h.seid != 0) { + struct ps_rab *rab = ps_rab_find_by_seid(hnb_gw, m->h.seid, m->rx); + if (rab) + ps_rab_pfcp_set_msg_ctx(rab, m); + } +} + +static void pfcp_rx_msg(struct osmo_pfcp_endpoint *ep, struct osmo_pfcp_msg *m, struct osmo_pfcp_msg *req) +{ + switch (m->h.message_type) { + + /* We only expect responses to requests. Those are handled by osmo_pfcp_msg.ctx.resp_cb. */ + + /* TODO: handle graceful shutdown from UPF (Session Modification? Deletion?) */ + + default: + LOGP(DLPFCP, LOGL_ERROR, "rx unexpected PFCP message: %s\n", + osmo_pfcp_message_type_str(m->h.message_type)); + return; + } +} + +int hnbgw_pfcp_init(struct hnb_gw *hnb_gw) +{ + struct osmo_pfcp_endpoint_cfg cfg; + struct osmo_pfcp_endpoint *ep; + struct osmo_sockaddr_str local_addr_str; + struct osmo_sockaddr_str upf_addr_str; + struct osmo_sockaddr upf_addr; + + LOGP(DLPFCP, LOGL_DEBUG, "%p cfg: pfcp remote-addr %s\n", hnb_gw, hnb_gw->config.pfcp.remote_addr); + + if (!hnb_gw_is_gtp_mapping_enabled(hnb_gw)) { + LOGP(DLPFCP, LOGL_NOTICE, "No UPF configured, NOT setting up PFCP, NOT mapping GTP via UPF\n"); + return 0; + } + if (!hnb_gw->config.pfcp.local_addr) { + LOGP(DLPFCP, LOGL_ERROR, "Configuration error: missing local PFCP address, required for Node Id\n"); + return -1; + } + + cfg = (struct osmo_pfcp_endpoint_cfg){ + .set_msg_ctx_cb = pfcp_set_msg_ctx, + .rx_msg_cb = pfcp_rx_msg, + .priv = hnb_gw, + }; + + /* Set up PFCP endpoint's local node id from local IP address. Parse address string into local_addr_str... */ + if (osmo_sockaddr_str_from_str(&local_addr_str, hnb_gw->config.pfcp.local_addr, hnb_gw->config.pfcp.local_port)) { + LOGP(DLPFCP, LOGL_ERROR, "Error in PFCP local IP: %s\n", + osmo_quote_str_c(OTC_SELECT, hnb_gw->config.pfcp.local_addr, -1)); + return -1; + } + /* ...and convert to osmo_sockaddr, write to ep->cfg */ + if (osmo_sockaddr_str_to_sockaddr(&local_addr_str, &cfg.local_addr.u.sas)) { + LOGP(DLPFCP, LOGL_ERROR, "Error in PFCP local IP: %s\n", + osmo_quote_str_c(OTC_SELECT, hnb_gw->config.pfcp.local_addr, -1)); + return -1; + } + /* also store the local addr as local Node ID */ + if (osmo_pfcp_ie_node_id_from_osmo_sockaddr(&cfg.local_node_id, &cfg.local_addr)) { + LOGP(DLPFCP, LOGL_ERROR, "Error in PFCP local IP: %s\n", + osmo_quote_str_c(OTC_SELECT, hnb_gw->config.pfcp.local_addr, -1)); + return -1; + } + + hnb_gw->pfcp.ep = ep = osmo_pfcp_endpoint_create(hnb_gw, &cfg); + if (!ep) { + LOGP(DLPFCP, LOGL_ERROR, "Failed to allocate PFCP endpoint\n"); + return -1; + } + + /* Set up remote PFCP address to reach UPF at. First parse the string into upf_addr_str. */ + if (osmo_sockaddr_str_from_str(&upf_addr_str, hnb_gw->config.pfcp.remote_addr, hnb_gw->config.pfcp.remote_port)) { + LOGP(DLPFCP, LOGL_ERROR, "Error in PFCP remote IP: %s\n", + osmo_quote_str_c(OTC_SELECT, hnb_gw->config.pfcp.remote_addr, -1)); + return -1; + } + /* then convert upf_addr_str to osmo_sockaddr */ + if (osmo_sockaddr_str_to_sockaddr(&upf_addr_str, &upf_addr.u.sas)) { + LOGP(DLPFCP, LOGL_ERROR, "Error in PFCP remote IP: %s\n", + osmo_quote_str_c(OTC_SELECT, hnb_gw->config.pfcp.remote_addr, -1)); + return -1; + } + + /* Start the socket */ + if (osmo_pfcp_endpoint_bind(ep)) { + LOGP(DLPFCP, LOGL_ERROR, "Cannot bind PFCP endpoint\n"); + return -1; + } + + /* Associate with UPF */ + hnb_gw->pfcp.cp_peer = osmo_pfcp_cp_peer_alloc(hnb_gw, ep, &upf_addr); + if (!hnb_gw->pfcp.cp_peer) { + LOGP(DLPFCP, LOGL_ERROR, "Cannot allocate PFCP CP Peer FSM\n"); + return -1; + } + if (osmo_pfcp_cp_peer_associate(hnb_gw->pfcp.cp_peer)) { + LOGP(DLPFCP, LOGL_ERROR, "Cannot start PFCP CP Peer FSM\n"); + return -1; + } + + return 0; +} diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c index 56d2724..404c11d 100644 --- a/src/osmo-hnbgw/hnbgw_rua.c +++ b/src/osmo-hnbgw/hnbgw_rua.c @@ -39,6 +39,7 @@ #include <osmocom/hnbgw/context_map.h> #include <osmocom/hnbap/HNBAP_CN-DomainIndicator.h> #include <osmocom/hnbgw/mgw_fsm.h> +#include <osmocom/hnbgw/ps_rab_ass_fsm.h> #include <osmocom/ranap/RANAP_ProcedureCode.h> #include <osmocom/ranap/ranap_common.h> #include <osmocom/ranap/ranap_common_cn.h> @@ -273,15 +274,20 @@ /* If there is data, see if it is a RAB Assignment message where we need to change the user plane information, * for RTP mapping via MGW (soon also GTP mapping via UPF). */ - if (data && len && map && !map->is_ps && !release_context_map) { + if (data && len && map && !release_context_map) { message = talloc_zero(map, ranap_message); rc = ranap_cn_rx_co_decode(map, message, msgb_l2(prim->oph.msg), msgb_l2len(prim->oph.msg)); if (rc == 0) { switch (message->procedureCode) { case RANAP_ProcedureCode_id_RAB_Assignment: - /* mgw_fsm_handle_rab_ass_resp() takes ownership of prim->oph and (ranap) message */ - return mgw_fsm_handle_rab_ass_resp(map, &prim->oph, message); + if (!map->is_ps) { + /* mgw_fsm_handle_rab_ass_resp() takes ownership of prim->oph and (ranap) message */ + return mgw_fsm_handle_rab_ass_resp(map, &prim->oph, message); + } else { + /* ps_rab_ass_fsm takes ownership of prim->oph and RANAP message */ + return hnbgw_gtpmap_rx_rab_ass_resp(map, &prim->oph, message); + } } ranap_cn_rx_co_free(message); } diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index c263ab3..05a30d9 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -362,6 +362,47 @@ return CMD_SUCCESS; } +static struct cmd_node pfcp_node = { + PFCP_NODE, + "%s(config-hnbgw-pfcp)# ", + 1, +}; + +DEFUN(cfg_hnbgw_pfcp, cfg_hnbgw_pfcp_cmd, + "pfcp", "Configure PFCP for GTP tunnel mapping") +{ + vty->node = PFCP_NODE; + return CMD_SUCCESS; +} + +DEFUN(cfg_pfcp_remote_addr, cfg_pfcp_remote_addr_cmd, + "remote-addr IP_ADDR", + "Remote UPF's listen IP address; where to send PFCP requests\n" + "IP address\n") +{ + osmo_talloc_replace_string(g_hnb_gw, &g_hnb_gw->config.pfcp.remote_addr, argv[0]); + LOGP(DLPFCP, LOGL_NOTICE, "%p cfg: pfcp remote-addr %s\n", g_hnb_gw, g_hnb_gw->config.pfcp.remote_addr); + return CMD_SUCCESS; +} + +DEFUN(cfg_pfcp_local_addr, cfg_pfcp_local_addr_cmd, + "local-addr IP_ADDR", + "Local address for PFCP\n" + "IP address\n") +{ + osmo_talloc_replace_string(g_hnb_gw, &g_hnb_gw->config.pfcp.local_addr, argv[0]); + return CMD_SUCCESS; +} + +DEFUN(cfg_pfcp_local_port, cfg_pfcp_local_port_cmd, + "local-port <1-65535>", + "Local port for PFCP\n" + "IP port\n") +{ + g_hnb_gw->config.pfcp.local_port = atoi(argv[0]); + return CMD_SUCCESS; +} + static int config_write_hnbgw(struct vty *vty) { vty_out(vty, "hnbgw%s", VTY_NEWLINE); @@ -425,6 +466,17 @@ return CMD_SUCCESS; } +static int config_write_hnbgw_pfcp(struct vty *vty) +{ + vty_out(vty, " pfcp%s", VTY_NEWLINE); + if (g_hnb_gw->config.pfcp.remote_addr) + vty_out(vty, " remote-addr %s%s", g_hnb_gw->config.pfcp.remote_addr, VTY_NEWLINE); + if (g_hnb_gw->config.pfcp.local_addr) + vty_out(vty, " local-addr %s%s", g_hnb_gw->config.pfcp.local_addr, VTY_NEWLINE); + + return CMD_SUCCESS; +} + void hnbgw_vty_init(struct hnb_gw *gw, void *tall_ctx) { g_hnb_gw = gw; @@ -463,6 +515,12 @@ install_element(HNBGW_NODE, &cfg_hnbgw_mgcp_cmd); install_node(&mgcp_node, config_write_hnbgw_mgcp); + install_node(&pfcp_node, config_write_hnbgw_pfcp); + install_element(HNBGW_NODE, &cfg_hnbgw_pfcp_cmd); + install_element(PFCP_NODE, &cfg_pfcp_remote_addr_cmd); + install_element(PFCP_NODE, &cfg_pfcp_local_addr_cmd); + install_element(PFCP_NODE, &cfg_pfcp_local_port_cmd); + mgcp_client_vty_init(tall_hnb_ctx, MGCP_NODE, g_hnb_gw->config.mgcp_client); osmo_tdef_vty_groups_init(HNBGW_NODE, hnbgw_tdef_group); } diff --git a/src/osmo-hnbgw/ps_rab_ass_fsm.c b/src/osmo-hnbgw/ps_rab_ass_fsm.c new file mode 100644 index 0000000..c1b8880 --- /dev/null +++ b/src/osmo-hnbgw/ps_rab_ass_fsm.c @@ -0,0 +1,686 @@ +/* Handle RANAP PS RAB Assignment */ +/* (C) 2022 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * + * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de> + * + * 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 <errno.h> + +#include <asn1c/asn1helpers.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/prim.h> + +#include <osmocom/core/fsm.h> +#include <osmocom/core/byteswap.h> +#include <arpa/inet.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/sockaddr_str.h> +#include <osmocom/core/tdef.h> + +#include <osmocom/ranap/ranap_common.h> +#include <osmocom/ranap/ranap_common_cn.h> +#include <osmocom/ranap/ranap_common_ran.h> +#include <osmocom/ranap/ranap_msg_factory.h> + +#include <osmocom/ranap/ranap_ies_defs.h> +#include <osmocom/ranap/iu_helpers.h> + +#include <osmocom/pfcp/pfcp_msg.h> +#include <osmocom/pfcp/pfcp_endpoint.h> +#include <osmocom/pfcp/pfcp_cp_peer.h> + +#include <osmocom/hnbgw/hnbgw.h> +#include <osmocom/hnbgw/context_map.h> +#include <osmocom/hnbgw/ranap_rab_ass.h> +#include <osmocom/hnbgw/ps_rab_fsm.h> + +#include <osmocom/hnbgw/hnbgw_rua.h> + +#include <osmocom/hnbgw/tdefs.h> + +#define PORT_GTP1_U 2152 + +#define LOG_PS_RAB_ASS(RAB_ASS, LOGL, FMT, ARGS...) \ + LOGPFSML((RAB_ASS) ? (RAB_ASS)->fi : NULL, LOGL, FMT, ##ARGS) + +enum ps_rab_ass_fsm_event { + PS_RAB_ASS_EV_LOCAL_F_TEIDS_RX, + PS_RAB_ASS_EV_RAB_ASS_RESP, + PS_RAB_ASS_EV_RAB_ESTABLISHED, + PS_RAB_ASS_EV_RAB_FAIL, +}; + +static const struct value_string ps_rab_ass_fsm_event_names[] = { + OSMO_VALUE_STRING(PS_RAB_ASS_EV_LOCAL_F_TEIDS_RX), + OSMO_VALUE_STRING(PS_RAB_ASS_EV_RAB_ASS_RESP), + OSMO_VALUE_STRING(PS_RAB_ASS_EV_RAB_ESTABLISHED), + OSMO_VALUE_STRING(PS_RAB_ASS_EV_RAB_FAIL), + {} +}; + +enum ps_rab_ass_state { + PS_RAB_ASS_ST_RX_RAB_ASS_MSG, + PS_RAB_ASS_ST_WAIT_LOCAL_F_TEIDS, + PS_RAB_ASS_ST_RX_RAB_ASS_RESP, + PS_RAB_ASS_ST_WAIT_RABS_ESTABLISHED, +}; + +/* Represents one RANAP PS RAB Assignment Request and Response dialog. + * There may be any number of PS RAB Assignment Requests, each with any number of RABs being established. We need to + * manage these asynchronously and flexibly: + * - RABs may be assigned in a group and released one by one, or vice versa; + * - we can only forward a RAB Assignment Request / Response when all RABs appearing in it have been set up by the UPF. + * + * This structure manages the RAB Assignment procedures, and the currently set up RABs: + * + * - hnbgw_context_map + * - .ps_rab_ass: list of PS RAB Assignment procedures + * - ps_rab_ass_fsm: one RANAP PS RAB Assignment procedure + * - ... + * - .ps_rabs: list of individual PS RABs + * - ps_rab_fsm: one GTP mapping with PFCP session to the UPF, for a single RAB + * - ... + * + * This ps_rab_ass_fsm lives from a received RAB Assignment Request up to the sent RAB Assignment Response; it + * deallocates when all the RABs have been set up. + * + * The ps_rab_ass_fsm sets up ps_rab_fsm instances, which live longer: up until a RAB or conn release is performed. + */ +struct ps_rab_ass { + struct llist_head entry; + + struct osmo_fsm_inst *fi; + + /* backpointer */ + struct hnbgw_context_map *map; + + ranap_message *ranap_rab_ass_req_message; + + ranap_message *ranap_rab_ass_resp_message; + struct osmo_prim_hdr *ranap_rab_ass_resp_oph; + + /* A RAB Assignment may contain more than one RAB. Each RAB sets up a distinct ps_rab_fsm (aka PFCP session) and + * reports back about local F-TEIDs assigned by the UPF. This gives the nr of RAB events we expect from + * ps_rab_fsms, without iterating the RAB Assignment message every time (minor optimisation). */ + int rabs_count; + int rabs_done_count; +}; + +struct osmo_tdef_state_timeout ps_rab_ass_fsm_timeouts[32] = { + /* PS_RAB_ASS_ST_WAIT_LOCAL_F_TEIDS is terminated by PFCP timeouts via ps_rab_fsm */ + /* PS_RAB_ASS_ST_WAIT_RABS_ESTABLISHED is terminated by PFCP timeouts via ps_rab_fsm */ +}; + +#define ps_rab_ass_fsm_state_chg(state) \ + osmo_tdef_fsm_inst_state_chg(fi, state, ps_rab_ass_fsm_timeouts, ps_T_defs, -1) + +static struct osmo_fsm ps_rab_ass_fsm; + +static struct ps_rab_ass *ps_rab_ass_alloc(struct hnbgw_context_map *map) +{ + struct ps_rab_ass *rab_ass; + struct osmo_fsm_inst *fi; + + fi = osmo_fsm_inst_alloc(&ps_rab_ass_fsm, map, map, LOGL_DEBUG, NULL); + OSMO_ASSERT(fi); + osmo_fsm_inst_update_id_f_sanitize(fi, '-', "%s-RUA-%u", hnb_context_name(map->hnb_ctx), map->rua_ctx_id); + + rab_ass = talloc(fi, struct ps_rab_ass); + OSMO_ASSERT(rab_ass); + *rab_ass = (struct ps_rab_ass){ + .fi = fi, + .map = map, + }; + fi->priv = rab_ass; + + llist_add_tail(&rab_ass->entry, &map->ps_rab_ass); + return rab_ass; +} + +static void ps_rab_ass_failure(struct ps_rab_ass *rab_ass) +{ + LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "PS RAB Assignment failed\n"); + + /* TODO: send unsuccessful RAB Assignment Response to Core? */ + /* TODO: remove RAB from Access? */ + + osmo_fsm_inst_term(rab_ass->fi, OSMO_FSM_TERM_REGULAR, NULL); +} + +/* Add a single RAB from a RANAP PS RAB Assignment Request's list of RABs */ +static int ps_rab_setup_core_remote(struct ps_rab_ass *rab_ass, RANAP_ProtocolIE_FieldPair_t *protocol_ie_field_pair) +{ + struct hnbgw_context_map *map = rab_ass->map; + uint8_t rab_id; + struct addr_teid f_teid = {}; + bool use_x213_nsap; + struct ps_rab *rab; + + RANAP_RAB_SetupOrModifyItemFirst_t first; + RANAP_TransportLayerAddress_t *transp_layer_addr; + RANAP_TransportLayerInformation_t *tli; + int rc; + + if (protocol_ie_field_pair->id != RANAP_ProtocolIE_ID_id_RAB_SetupOrModifyItem) + return -1; + + /* Extract information about the GTP Core side */ + rc = ranap_decode_rab_setupormodifyitemfirst(&first, + &protocol_ie_field_pair->firstValue); + if (rc < 0) + goto error_exit; + + rab_id = first.rAB_ID.buf[0]; + + /* Decode GTP endpoint IP-Address */ + tli = first.transportLayerInformation; + transp_layer_addr = &tli->transportLayerAddress; + rc = ranap_transp_layer_addr_decode2(&f_teid.addr, &use_x213_nsap, transp_layer_addr); + if (rc < 0) + goto error_exit; + osmo_sockaddr_set_port(&f_teid.addr.u.sa, PORT_GTP1_U); + + /* Decode the GTP remote TEID */ + if (tli->iuTransportAssociation.present != RANAP_IuTransportAssociation_PR_gTP_TEI) { + rc = -1; + goto error_exit; + } + f_teid.teid = osmo_load32be(tli->iuTransportAssociation.choice.gTP_TEI.buf); + f_teid.present = true; + + rab_ass->rabs_count++; + rab = ps_rab_start(map, rab_id, &f_teid, use_x213_nsap, rab_ass->fi); + if (!rab) { + rc = -1; + goto error_exit; + } + rc = 0; + +error_exit: + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifyItemFirst, &first); + return rc; +} + +int hnbgw_gtpmap_rx_rab_ass_req(struct hnbgw_context_map *map, struct osmo_prim_hdr *oph, ranap_message *message) +{ + RANAP_RAB_AssignmentRequestIEs_t *ies = &message->msg.raB_AssignmentRequestIEs; + int i; + + struct hnb_gw *hnb_gw = map->hnb_ctx->gw; + struct ps_rab_ass *rab_ass; + struct osmo_fsm_inst *fi; + + rab_ass = ps_rab_ass_alloc(map); + rab_ass->ranap_rab_ass_req_message = message; + /* Now rab_ass owns message and will clean it up */ + + if (!osmo_pfcp_cp_peer_is_associated(hnb_gw->pfcp.cp_peer)) { + LOG_MAP(map, DLPFCP, LOGL_ERROR, "PFCP is not associated, cannot set up GTP mapping\n"); + goto no_rab; + } + + /* Make sure we indeed deal with a setup-or-modify list */ + if (!(ies->presenceMask & RAB_ASSIGNMENTREQUESTIES_RANAP_RAB_SETUPORMODIFYLIST_PRESENT)) { + LOG_MAP(map, DLPFCP, LOGL_ERROR, "RANAP PS RAB AssignmentRequest lacks setup-or-modify list\n"); + goto no_rab; + } + + /* Multiple RABs may be set up, assemble in list rab_ass->ps_rabs. */ + for (i = 0; i < ies->raB_SetupOrModifyList.list.count; i++) { + RANAP_ProtocolIE_ContainerPair_t *protocol_ie_container_pair; + RANAP_ProtocolIE_FieldPair_t *protocol_ie_field_pair; + + protocol_ie_container_pair = ies->raB_SetupOrModifyList.list.array[i]; + protocol_ie_field_pair = protocol_ie_container_pair->list.array[0]; + if (!protocol_ie_field_pair) + goto no_rab; + if (protocol_ie_field_pair->id != RANAP_ProtocolIE_ID_id_RAB_SetupOrModifyItem) + goto no_rab; + + if (ps_rab_setup_core_remote(rab_ass, protocol_ie_field_pair)) + goto no_rab; + } + + /* Got all RABs' state and their Core side GTP info in map->ps_rabs. For each, a ps_rab_fsm has been started and + * each will call back with PS_RAB_ASS_EV_LOCAL_F_TEIDS_RX or PS_RAB_ASS_EV_RAB_FAIL. */ + fi = rab_ass->fi; + return ps_rab_ass_fsm_state_chg(PS_RAB_ASS_ST_WAIT_LOCAL_F_TEIDS); + +no_rab: + ps_rab_ass_failure(rab_ass); + return -1; +} + +static void ps_rab_ass_req_check_local_f_teids(struct ps_rab_ass *rab_ass); + +static void ps_rab_ass_fsm_wait_local_f_teids(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct ps_rab_ass *rab_ass = fi->priv; + + switch (event) { + case PS_RAB_ASS_EV_LOCAL_F_TEIDS_RX: + rab_ass->rabs_done_count++; + if (rab_ass->rabs_done_count < rab_ass->rabs_count) { + /* some RABs are still pending, postpone going through the message until all are done. */ + return; + } + ps_rab_ass_req_check_local_f_teids(rab_ass); + return; + + case PS_RAB_ASS_EV_RAB_FAIL: + ps_rab_ass_failure(rab_ass); + return; + + default: + OSMO_ASSERT(false); + } +} + +/* See whether all information is in so that we can forward the modified RAB Assignment Request to RUA. */ +static void ps_rab_ass_req_check_local_f_teids(struct ps_rab_ass *rab_ass) +{ + struct ps_rab *rab; + RANAP_RAB_AssignmentRequestIEs_t *ies = &rab_ass->ranap_rab_ass_req_message->msg.raB_AssignmentRequestIEs; + int i; + struct msgb *msg; + + /* Go through all RABs in the RAB Assignment Request message and replace with the F-TEID that the UPF assigned, + * verifying that we indeed have local F-TEIDs for all RABs contained in this message. */ + for (i = 0; i < ies->raB_SetupOrModifyList.list.count; i++) { + RANAP_ProtocolIE_ContainerPair_t *protocol_ie_container_pair; + RANAP_ProtocolIE_FieldPair_t *protocol_ie_field_pair; + RANAP_RAB_SetupOrModifyItemFirst_t first; + uint8_t rab_id; + int rc; + + protocol_ie_container_pair = ies->raB_SetupOrModifyList.list.array[i]; + protocol_ie_field_pair = protocol_ie_container_pair->list.array[0]; + if (!protocol_ie_field_pair) + continue; + if (protocol_ie_field_pair->id != RANAP_ProtocolIE_ID_id_RAB_SetupOrModifyItem) + continue; + + /* Get to the information about the GTP Core side */ + rc = ranap_decode_rab_setupormodifyitemfirst(&first, + &protocol_ie_field_pair->firstValue); + if (rc < 0) + goto continue_cleanloop; + + rab_id = first.rAB_ID.buf[0]; + + /* Find struct ps_rab for this rab_id */ + rab = ps_rab_get(rab_ass->map, rab_id); + if (!rab || !rab->access.local.present) { + /* Not ready to send on the RAB Assignment Request to RUA, a local F-TEID is missing. */ + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifyItemFirst, &first); + return; + } + + /* Replace GTP endpoint */ + ASN_STRUCT_FREE(asn_DEF_RANAP_TransportLayerInformation, first.transportLayerInformation); + first.transportLayerInformation = ranap_new_transp_info_gtp(&rab->access.local.addr, + rab->access.local.teid, + rab->core.use_x213_nsap); + + /* Reencode to update transport-layer-information */ + rc = ANY_fromType_aper(&protocol_ie_field_pair->firstValue, &asn_DEF_RANAP_RAB_SetupOrModifyItemFirst, + &first); + if (rc < 0) + LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Re-encoding RANAP PS RAB Assignment Request failed\n"); +continue_cleanloop: + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifyItemFirst, &first); + } + + /* Send the modified RAB Assignment Request to the hNodeB, wait for the RAB Assignment Response */ + msg = ranap_rab_ass_req_encode(ies); + if (!msg) { + LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Re-encoding RANAP PS RAB Assignment Request failed\n"); + ps_rab_ass_failure(rab_ass); + return; + } + rua_tx_dt(rab_ass->map->hnb_ctx, rab_ass->map->is_ps, rab_ass->map->rua_ctx_id, msg->data, msg->len); + /* The request message has been forwarded. The response will be handled by a new FSM instance. + * We are done. */ + osmo_fsm_inst_term(rab_ass->fi, OSMO_FSM_TERM_REGULAR, NULL); +} + +/* Add a single RAB from a RANAP/RUA RAB Assignment Response's list of RABs */ +static int ps_rab_setup_access_remote(struct ps_rab_ass *rab_ass, + RANAP_RAB_SetupOrModifiedItem_t *rab_item) +{ + struct hnbgw_context_map *map = rab_ass->map; + uint8_t rab_id; + int rc; + struct ps_rab_rx_args args = {}; + + rab_id = rab_item->rAB_ID.buf[0]; + + rc = ranap_transp_layer_addr_decode2(&args.f_teid.addr, &args.use_x213_nsap, rab_item->transportLayerAddress); + if (rc < 0) + return rc; + + /* Decode the GTP remote TEID */ + if (!rab_item->iuTransportAssociation + || rab_item->iuTransportAssociation->present != RANAP_IuTransportAssociation_PR_gTP_TEI) + return -1; + args.f_teid.teid = osmo_load32be(rab_item->iuTransportAssociation->choice.gTP_TEI.buf); + args.f_teid.present = true; + + args.notify_fi = rab_ass->fi; + + return ps_rab_rx_access_remote_f_teid(map, rab_id, &args); +} + +int hnbgw_gtpmap_rx_rab_ass_resp(struct hnbgw_context_map *map, struct osmo_prim_hdr *oph, ranap_message *message) +{ + /* hNodeB responds with its own F-TEIDs. Need to tell the UPF about those to complete the GTP mapping. + * 1. here, extract the F-TEIDs (one per RAB), + * trigger each ps_rab_fsm to do a PFCP Session Modification. + * 2. after all ps_rab_fsms responded with success, insert our Core side local F-TEIDs and send on the RAB + * Assignment Response to IuPS. (We already know the local F-TEIDs assigned by the UPF and could send on the + * RAB Assignment Response immediately, but rather wait for the PFCP mod req to succeed first.) + * + * To wait for all the RABs in this response message to complete, create a *separate* rab_ass_fsm instance from + * the one created for the earlier RAB Assignment Request message. The reason is that technically we cannot + * assume that the request and the response have exactly matching RAB IDs contained in them. + * + * In the vast majority of practical cases, there will be only one RAB Assignment Request message pending, but + * for interop, by treating each RAB on its own and by treating request and response message separately from + * each other, we are able to handle mismatching RAB IDs in request and response messages. + */ + + int rc; + int i; + struct ps_rab_ass *rab_ass; + struct osmo_fsm_inst *fi; + RANAP_RAB_AssignmentResponseIEs_t *ies; + struct hnb_gw *hnb_gw = map->hnb_ctx->gw; + + /* Make sure we indeed deal with a setup-or-modify list */ + ies = &message->msg.raB_AssignmentResponseIEs; + if (!(ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_SETUPORMODIFIEDLIST_PRESENT)) { + LOG_MAP(map, DRUA, LOGL_ERROR, "RANAP PS RAB AssignmentResponse lacks setup-or-modify list\n"); + return -1; + } + + rab_ass = ps_rab_ass_alloc(map); + rab_ass->ranap_rab_ass_resp_message = message; + rab_ass->ranap_rab_ass_resp_oph = oph; + /* Now rab_ass owns message and will clean it up */ + + if (!osmo_pfcp_cp_peer_is_associated(hnb_gw->pfcp.cp_peer)) { + LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "PFCP is not associated, cannot set up GTP mapping\n"); + ps_rab_ass_failure(rab_ass); + return -1; + } + + LOG_PS_RAB_ASS(rab_ass, LOGL_NOTICE, "PS RAB-AssignmentResponse received, updating RABs\n"); + + /* Multiple RABs may be set up, bump matching FSMs in list rab_ass->ps_rabs. */ + for (i = 0; i < ies->raB_SetupOrModifiedList.raB_SetupOrModifiedList_ies.list.count; i++) { + RANAP_IE_t *list_ie; + RANAP_RAB_SetupOrModifiedItemIEs_t item_ies; + + list_ie = ies->raB_SetupOrModifiedList.raB_SetupOrModifiedList_ies.list.array[i]; + if (!list_ie) + continue; + + rc = ranap_decode_rab_setupormodifieditemies_fromlist(&item_ies, + &list_ie->value); + if (rc < 0) { + LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Failed to decode PS RAB-AssignmentResponse" + " SetupOrModifiedItemIEs with list index %d\n", i); + goto continue_cleanloop; + } + + if (ps_rab_setup_access_remote(rab_ass, &item_ies.raB_SetupOrModifiedItem)) + LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Failed to apply PS RAB-AssignmentResponse" + " SetupOrModifiedItemIEs with list index %d\n", i); + rab_ass->rabs_count++; + +continue_cleanloop: + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifiedItem, &item_ies); + } + + /* Got all RABs' state and updated their Access side GTP info in map->ps_rabs. For each RAB ID, the matching + * ps_rab_fsm has been instructed to tell the UPF about the Access Remote GTP F-TEID. Each will call back with + * PS_RAB_ASS_EV_RAB_ESTABLISHED or PS_RAB_ASS_EV_RAB_FAIL. */ + fi = rab_ass->fi; + return ps_rab_ass_fsm_state_chg(PS_RAB_ASS_ST_WAIT_RABS_ESTABLISHED); +} + +static void ps_rab_ass_resp_send_if_ready(struct ps_rab_ass *rab_ass); + +static void ps_rab_ass_fsm_wait_rabs_established(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct ps_rab_ass *rab_ass = fi->priv; + + switch (event) { + case PS_RAB_ASS_EV_RAB_ESTABLISHED: + rab_ass->rabs_done_count++; + if (rab_ass->rabs_done_count < rab_ass->rabs_count) { + /* some RABs are still pending, postpone going through the message until all are done. */ + return; + } + /* All RABs have succeeded, ready to forward */ + ps_rab_ass_resp_send_if_ready(rab_ass); + return; + + case PS_RAB_ASS_EV_RAB_FAIL: + ps_rab_ass_failure(rab_ass); + return; + default: + OSMO_ASSERT(false); + } +} + +/* See whether all RABs are done establishing, and replace RTP info in the RAB Assignment Response message, so that we + * can forward the modified RAB Assignment Request to M3UA. */ +static void ps_rab_ass_resp_send_if_ready(struct ps_rab_ass *rab_ass) +{ + int i; + int rc; + struct hnbgw_cnlink *cn = rab_ass->map->cn_link; + RANAP_RAB_AssignmentResponseIEs_t *ies = &rab_ass->ranap_rab_ass_resp_message->msg.raB_AssignmentResponseIEs; + + /* Go through all RABs in the RAB Assignment Response message and replace with the F-TEID that the UPF assigned, + * verifying that instructing the UPF has succeeded. */ + for (i = 0; i < ies->raB_SetupOrModifiedList.raB_SetupOrModifiedList_ies.list.count; i++) { + RANAP_IE_t *list_ie; + RANAP_RAB_SetupOrModifiedItemIEs_t item_ies; + RANAP_RAB_SetupOrModifiedItem_t *rab_item; + int rc; + uint8_t rab_id; + uint32_t teid_be; + struct ps_rab *rab; + + list_ie = ies->raB_SetupOrModifiedList.raB_SetupOrModifiedList_ies.list.array[i]; + if (!list_ie) + continue; + + rc = ranap_decode_rab_setupormodifieditemies_fromlist(&item_ies, + &list_ie->value); + if (rc < 0) { + LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Failed to decode PS RAB-AssignmentResponse" + " SetupOrModifiedItemIEs with list index %d\n", i); + goto continue_cleanloop; + } + + rab_item = &item_ies.raB_SetupOrModifiedItem; + rab_id = rab_item->rAB_ID.buf[0]; + + /* Find struct ps_rab for this rab_id */ + rab = ps_rab_get(rab_ass->map, rab_id); + if (!ps_rab_is_established(rab)) { + /* Not ready to send on the RAB Assignment Response to M3UA, still waiting for it to be + * established */ + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifiedItem, &item_ies); + return; + } + + /* Replace GTP endpoint */ + if (ranap_new_transp_layer_addr(rab_item->transportLayerAddress, &rab->core.local.addr, + rab->access.use_x213_nsap) < 0) { + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifiedItem, &item_ies); + LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Re-encoding RANAP PS RAB-AssignmentResponse failed\n"); + ps_rab_ass_failure(rab_ass); + return; + } + + LOG_PS_RAB_ASS(rab_ass, LOGL_DEBUG, "Re-encoding RANAP PS RAB-AssignmentResponse: RAB %u:" + " RUA sent F-TEID %s-0x%x; replacing with %s-0x%x\n", + rab_id, + osmo_sockaddr_to_str_c(OTC_SELECT, &rab->access.remote.addr), rab->access.remote.teid, + osmo_sockaddr_to_str_c(OTC_SELECT, &rab->core.local.addr), rab->core.local.teid); + + teid_be = htonl(rab->core.local.teid); + rab_item->iuTransportAssociation->present = RANAP_IuTransportAssociation_PR_gTP_TEI; + OCTET_STRING_fromBuf(&rab_item->iuTransportAssociation->choice.gTP_TEI, + (const char *)&teid_be, sizeof(teid_be)); + + /* Reencode this list item in the RANAP message */ + rc = ANY_fromType_aper(&list_ie->value, &asn_DEF_RANAP_RAB_SetupOrModifiedItem, rab_item); + if (rc < 0) { + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifiedItem, &item_ies); + LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Re-encoding RANAP PS RAB-AssignmentResponse failed\n"); + ps_rab_ass_failure(rab_ass); + return; + } + +continue_cleanloop: + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifiedItem, &item_ies); + } + + /* Replaced all the GTP info, re-encode the message. Since we are replacing data 1:1, taking care to use the + * same IP address encoding, the resulting message size must be identical to the original message size. */ + rc = ranap_rab_ass_resp_encode(msgb_l2(rab_ass->ranap_rab_ass_resp_oph->msg), + msgb_l2len(rab_ass->ranap_rab_ass_resp_oph->msg), ies); + if (rc < 0) { + LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Re-encoding RANAP PS RAB-AssignmentResponse failed\n"); + ps_rab_ass_failure(rab_ass); + return; + } + + LOG_PS_RAB_ASS(rab_ass, LOGL_NOTICE, "Sending RANAP PS RAB-AssignmentResponse with mapped GTP info\n"); + rc = osmo_sccp_user_sap_down(cn->sccp_user, rab_ass->ranap_rab_ass_resp_oph); + rab_ass->ranap_rab_ass_resp_oph = NULL; + if (rc < 0) { + LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Sending RANAP PS RAB-AssignmentResponse failed\n"); + ps_rab_ass_failure(rab_ass); + } + + /* The request message has been forwarded. We are done. */ + osmo_fsm_inst_term(rab_ass->fi, OSMO_FSM_TERM_REGULAR, NULL); +} + +static void ps_rab_ass_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) +{ + struct ps_rab_ass *rab_ass = fi->priv; + struct osmo_scu_prim *scu_prim; + struct msgb *scu_msg; + struct ps_rab *rab; + + if (rab_ass->ranap_rab_ass_req_message) { + ranap_ran_rx_co_free(rab_ass->ranap_rab_ass_req_message); + talloc_free(rab_ass->ranap_rab_ass_req_message); + rab_ass->ranap_rab_ass_req_message = NULL; + } + + if (rab_ass->ranap_rab_ass_resp_message) { + ranap_cn_rx_co_free(rab_ass->ranap_rab_ass_resp_message); + talloc_free(rab_ass->ranap_rab_ass_resp_message); + rab_ass->ranap_rab_ass_resp_message = NULL; + } + + if (rab_ass->ranap_rab_ass_resp_oph) { + scu_prim = (struct osmo_scu_prim *)rab_ass->ranap_rab_ass_resp_oph; + scu_msg = scu_prim->oph.msg; + msgb_free(scu_msg); + rab_ass->ranap_rab_ass_resp_oph = NULL; + } + + llist_for_each_entry(rab, &rab_ass->map->ps_rabs, entry) { + if (rab->req_fi == fi) + rab->req_fi = NULL; + if (rab->resp_fi == fi) + rab->resp_fi = NULL; + } + + llist_del(&rab_ass->entry); +} + +void hnbgw_gtpmap_release(struct hnbgw_context_map *map) +{ + struct ps_rab_ass *rab_ass, *next; + struct ps_rab *rab, *next2; + llist_for_each_entry_safe(rab, next2, &map->ps_rabs, entry) { + ps_rab_release(rab); + } + llist_for_each_entry_safe(rab_ass, next, &map->ps_rab_ass, entry) { + osmo_fsm_inst_term(rab_ass->fi, OSMO_FSM_TERM_REGULAR, NULL); + } +} + +#define S(x) (1 << (x)) + +static const struct osmo_fsm_state ps_rab_ass_fsm_states[] = { + [PS_RAB_ASS_ST_RX_RAB_ASS_MSG] = { + .name = "RX_RAB_ASS_MSG", + .out_state_mask = 0 + | S(PS_RAB_ASS_ST_WAIT_LOCAL_F_TEIDS) + | S(PS_RAB_ASS_ST_WAIT_RABS_ESTABLISHED) + , + }, + [PS_RAB_ASS_ST_WAIT_LOCAL_F_TEIDS] = { + .name = "WAIT_LOCAL_F_TEIDS", + .action = ps_rab_ass_fsm_wait_local_f_teids, + .in_event_mask = 0 + | S(PS_RAB_ASS_EV_LOCAL_F_TEIDS_RX) + | S(PS_RAB_ASS_EV_RAB_FAIL) + , + }, + [PS_RAB_ASS_ST_WAIT_RABS_ESTABLISHED] = { + .name = "WAIT_RABS_ESTABLISHED", + .action = ps_rab_ass_fsm_wait_rabs_established, + .in_event_mask = 0 + | S(PS_RAB_ASS_EV_RAB_ESTABLISHED) + | S(PS_RAB_ASS_EV_RAB_FAIL) + , + }, +}; + +int ps_rab_ass_fsm_timer_cb(struct osmo_fsm_inst *fi) +{ + struct ps_rab_ass *rab_ass = fi->priv; + LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Timeout of " OSMO_T_FMT "\n", OSMO_T_FMT_ARGS(fi->T)); + /* terminate */ + return 1; +} + +static struct osmo_fsm ps_rab_ass_fsm = { + .name = "ps_rab_ass", + .states = ps_rab_ass_fsm_states, + .num_states = ARRAY_SIZE(ps_rab_ass_fsm_states), + .log_subsys = DRANAP, + .event_names = ps_rab_ass_fsm_event_names, + .cleanup = ps_rab_ass_fsm_cleanup, + .timer_cb = ps_rab_ass_fsm_timer_cb, +}; + +static __attribute__((constructor)) void ps_rab_ass_fsm_register(void) +{ + OSMO_ASSERT(osmo_fsm_register(&ps_rab_ass_fsm) == 0); +} diff --git a/src/osmo-hnbgw/ps_rab_fsm.c b/src/osmo-hnbgw/ps_rab_fsm.c new file mode 100644 index 0000000..9f0be5f --- /dev/null +++ b/src/osmo-hnbgw/ps_rab_fsm.c @@ -0,0 +1,819 @@ +/* Handle PFCP communication with the UPF for a single RAB. */ +/* (C) 2022 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * + * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de> + * + * 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 <errno.h> + +#include <osmocom/core/tdef.h> + +#include <osmocom/pfcp/pfcp_endpoint.h> +#include <osmocom/pfcp/pfcp_cp_peer.h> + +#include <osmocom/hnbgw/hnbgw.h> +#include <osmocom/hnbgw/context_map.h> +#include <osmocom/hnbgw/tdefs.h> +#include <osmocom/hnbgw/ps_rab_fsm.h> +#include <osmocom/hnbgw/ps_rab_ass_fsm.h> + +#define LOG_PS_RAB(RAB, LOGL, FMT, ARGS...) \ + LOGPFSML((RAB) ? (RAB)->fi : NULL, LOGL, FMT, ##ARGS) + +enum ps_rab_state { + PS_RAB_ST_RX_CORE_REMOTE_F_TEID, + PS_RAB_ST_WAIT_PFCP_EST_RESP, + PS_RAB_ST_WAIT_ACCESS_REMOTE_F_TEID, + PS_RAB_ST_WAIT_PFCP_MOD_RESP, + PS_RAB_ST_ESTABLISHED, + PS_RAB_ST_WAIT_PFCP_DEL_RESP, + PS_RAB_ST_WAIT_USE_COUNT, +}; + +enum ps_rab_event { + PS_RAB_EV_PFCP_EST_RESP, + PS_RAB_EV_RX_ACCESS_REMOTE_F_TEID, + PS_RAB_EV_PFCP_MOD_RESP, + PS_RAB_EV_PFCP_DEL_RESP, + PS_RAB_EV_USE_COUNT_ZERO, +}; + +static const struct value_string ps_rab_fsm_event_names[] = { + OSMO_VALUE_STRING(PS_RAB_EV_PFCP_EST_RESP), + OSMO_VALUE_STRING(PS_RAB_EV_RX_ACCESS_REMOTE_F_TEID), + OSMO_VALUE_STRING(PS_RAB_EV_PFCP_MOD_RESP), + OSMO_VALUE_STRING(PS_RAB_EV_PFCP_DEL_RESP), + OSMO_VALUE_STRING(PS_RAB_EV_USE_COUNT_ZERO), + {} +}; + +struct osmo_tdef_state_timeout ps_rab_fsm_timeouts[32] = { + /* PS_RAB_ST_WAIT_PFCP_EST_RESP is terminated by PFCP timeouts via resp_cb() */ + /* PS_RAB_ST_WAIT_ACCESS_REMOTE_F_TEID is terminated by ps_rab_ass_fsm */ + /* PS_RAB_ST_WAIT_PFCP_MOD_RESP is terminated by PFCP timeouts via resp_cb() */ + /* PS_RAB_ST_WAIT_PFCP_DEL_RESP is terminated by PFCP timeouts via resp_cb() */ +}; + +enum pdr_far_id { + ID_CORE_TO_ACCESS = 1, + ID_ACCESS_TO_CORE = 2, +}; + + +#define ps_rab_fsm_state_chg(state) \ + osmo_tdef_fsm_inst_state_chg(fi, state, ps_rab_fsm_timeouts, ps_T_defs, -1) + +#define PS_RAB_USE_ACTIVE "active" + +static struct osmo_fsm ps_rab_fsm; + +static int ps_rab_fsm_use_cb(struct osmo_use_count_entry *e, int32_t old_use_count, const char *file, int line); + +static struct ps_rab *ps_rab_alloc(struct hnbgw_context_map *map, uint8_t rab_id) +{ + struct osmo_fsm_inst *fi; + struct ps_rab *rab; + + /* Allocate with the global hnb_gw, so that we can gracefully handle PFCP release even if a hnb_ctx gets + * deallocated. */ + fi = osmo_fsm_inst_alloc(&ps_rab_fsm, map->hnb_ctx->gw, NULL, LOGL_DEBUG, NULL); + OSMO_ASSERT(fi); + osmo_fsm_inst_update_id_f_sanitize(fi, '-', "%s-RUA-%u-RAB-%u", hnb_context_name(map->hnb_ctx), map->rua_ctx_id, + rab_id); + + rab = talloc(fi, struct ps_rab); + OSMO_ASSERT(rab); + *rab = (struct ps_rab){ + .fi = fi, + .hnb_gw = map->hnb_ctx->gw, + .map = map, + .rab_id = rab_id, + .use_count = { + .talloc_object = rab, + .use_cb = ps_rab_fsm_use_cb, + }, + }; + fi->priv = rab; + + osmo_use_count_get_put(&rab->use_count, PS_RAB_USE_ACTIVE, 1); + + llist_add_tail(&rab->entry, &map->ps_rabs); + return rab; +} + +/* Iterate all ps_rab instances of all context maps and return the one matching the given SEID. + * If is_cp_seid == true, match seid with rab->cp_seid (e.g. for received PFCP messages). + * Otherwise match seid with rab->up_f_seid.seid (e.g. for sent PFCP messages). */ +struct ps_rab *ps_rab_find_by_seid(struct hnb_gw *hnb_gw, uint64_t seid, bool is_cp_seid) +{ + struct hnb_context *hnb; + llist_for_each_entry(hnb, &hnb_gw->hnb_list, list) { + struct hnbgw_context_map *map; + llist_for_each_entry(map, &hnb->map_list, hnb_list) { + struct ps_rab *rab; + llist_for_each_entry(rab, &map->ps_rabs, entry) { + uint64_t rab_seid = is_cp_seid ? rab->cp_seid : rab->up_f_seid.seid; + if (rab_seid == seid) + return rab; + } + } + } + return NULL; +} + +void ps_rab_pfcp_set_msg_ctx(struct ps_rab *rab, struct osmo_pfcp_msg *m) +{ + if (m->ctx.session_fi) + return; + m->ctx.session_fi = rab->fi; + m->ctx.session_use_count = &rab->use_count; + m->ctx.session_use_token = "PFCP_MSG"; + osmo_use_count_get_put(m->ctx.session_use_count, m->ctx.session_use_token, 1); +} + +static struct osmo_pfcp_msg *ps_rab_new_pfcp_msg_req(struct ps_rab *rab, enum osmo_pfcp_message_type msg_type) +{ + struct hnb_gw *hnb_gw = rab->hnb_gw; + struct osmo_pfcp_msg *m = osmo_pfcp_cp_peer_new_req(hnb_gw->pfcp.cp_peer, msg_type); + + m->h.seid_present = true; + m->h.seid = rab->up_f_seid.seid; + ps_rab_pfcp_set_msg_ctx(rab, m); + return m; +} + +struct ps_rab *ps_rab_get(struct hnbgw_context_map *map, uint8_t rab_id) +{ + struct ps_rab *rab; + llist_for_each_entry(rab, &map->ps_rabs, entry) { + if (rab->rab_id != rab_id) + continue; + return rab; + } + return NULL; +} + +bool ps_rab_is_established(struct ps_rab *rab) +{ + return rab && rab->fi->state == PS_RAB_ST_ESTABLISHED; +} + +void ps_rab_failure(struct ps_rab *rab) +{ + if (rab->req_fi) + osmo_fsm_inst_dispatch(rab->req_fi, PS_RAB_ASS_EV_RAB_FAIL, rab); + if (rab->resp_fi) + osmo_fsm_inst_dispatch(rab->resp_fi, PS_RAB_ASS_EV_RAB_FAIL, rab); + ps_rab_release(rab); +} + +struct ps_rab *ps_rab_start(struct hnbgw_context_map *map, uint8_t rab_id, + const struct addr_teid *core_f_teid, bool use_x213_nsap, + struct osmo_fsm_inst *req_fi) +{ + struct osmo_fsm_inst *fi; + struct ps_rab *rab; + + rab = ps_rab_alloc(map, rab_id); + fi = rab->fi; + rab->req_fi = req_fi; + rab->core.remote = *core_f_teid; + rab->core.use_x213_nsap = use_x213_nsap; + + /* Got the RAB's Core side GTP info. Route the GTP for via the local UPF. + * Establish a PFCP session with the UPF: tell it about the Core side GTP endpoint and request local F-TEIDs. */ + if (ps_rab_fsm_state_chg(PS_RAB_ST_WAIT_PFCP_EST_RESP)) { + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); + return NULL; + } + + return rab; +} + +/* Add two PDR and two FAR to the PFCP Session Establishment Request message, according to the information found in rab. + */ +static int rab_to_pfcp_session_est_req(struct osmo_pfcp_msg_session_est_req *ser, struct ps_rab *rab) +{ + if (ser->create_pdr_count + 2 > ARRAY_SIZE(ser->create_pdr) + || ser->create_far_count + 2 > ARRAY_SIZE(ser->create_far)) { + LOG_PS_RAB(rab, LOGL_ERROR, "insufficient space for Create PDR / Create FAR IEs\n"); + return -1; + } + + /* Core to Access: + * - UPF should return an F-TEID for the PDR, to be forwarded back to Core later in + * RANAP RAB Assignment Response. + * - we don't know the Access side GTP address yet, so set FAR to DROP. + */ + ser->create_pdr[ser->create_pdr_count] = (struct osmo_pfcp_ie_create_pdr){ + .pdr_id = ID_CORE_TO_ACCESS, + .precedence = 255, + .pdi = { + .source_iface = OSMO_PFCP_SOURCE_IFACE_CORE, + .local_f_teid_present = true, + .local_f_teid = { + .choose_flag = true, + .choose = { + .ipv4_addr = true, + }, + }, + }, + .outer_header_removal_present = true, + .outer_header_removal = { + .desc = OSMO_PFCP_OUTER_HEADER_REMOVAL_GTP_U_UDP_IPV4, + }, + .far_id_present = true, + .far_id = ID_CORE_TO_ACCESS, + }; + ser->create_pdr_count++; + + ser->create_far[ser->create_far_count] = (struct osmo_pfcp_ie_create_far){ + .far_id = ID_CORE_TO_ACCESS, + }; + osmo_pfcp_bits_set(ser->create_far[ser->create_far_count].apply_action.bits, + OSMO_PFCP_APPLY_ACTION_DROP, true); + ser->create_far_count++; + + /* Access to Core: + * - UPF should return an F-TEID for the PDR, to be forwarded to Access in the modified + * RANAP RAB Assignment Request. + * - we already know the Core's GTP endpoint F-TEID, so fully set up this FAR. + */ + ser->create_pdr[ser->create_pdr_count] = (struct osmo_pfcp_ie_create_pdr){ + .pdr_id = ID_ACCESS_TO_CORE, + .precedence = 255, + .pdi = { + .source_iface = OSMO_PFCP_SOURCE_IFACE_ACCESS, + .local_f_teid_present = true, + .local_f_teid = { + .choose_flag = true, + .choose = { + .ipv4_addr = true, + }, + }, + }, + .outer_header_removal_present = true, + .outer_header_removal = { + .desc = OSMO_PFCP_OUTER_HEADER_REMOVAL_GTP_U_UDP_IPV4, + }, + .far_id_present = true, + .far_id = ID_ACCESS_TO_CORE, + }; + ser->create_pdr_count++; + + ser->create_far[ser->create_far_count] = (struct osmo_pfcp_ie_create_far){ + .far_id = ID_ACCESS_TO_CORE, + .forw_params_present = true, + .forw_params = { + .destination_iface = OSMO_PFCP_DEST_IFACE_CORE, + .outer_header_creation_present = true, + .outer_header_creation = { + .teid_present = true, + .teid = rab->core.remote.teid, + .ip_addr.v4_present = true, + .ip_addr.v4 = rab->core.remote.addr, + }, + }, + }; + osmo_pfcp_bits_set(ser->create_far[ser->create_far_count].forw_params.outer_header_creation.desc_bits, + OSMO_PFCP_OUTER_HEADER_CREATION_GTP_U_UDP_IPV4, true); + osmo_pfcp_bits_set(ser->create_far[ser->create_far_count].apply_action.bits, + OSMO_PFCP_APPLY_ACTION_FORW, true); + ser->create_far_count++; + + return 0; +} + +static int on_pfcp_est_resp(struct osmo_pfcp_msg *req, struct osmo_pfcp_msg *rx_resp, const char *errmsg); + +static void ps_rab_fsm_wait_pfcp_est_resp_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct ps_rab *rab = fi->priv; + struct hnb_gw *hnb_gw = rab->hnb_gw; + struct osmo_pfcp_msg *m; + struct osmo_pfcp_ie_f_seid cp_f_seid; + struct osmo_pfcp_msg_session_est_req *ser; + + /* So far we have the rab->core.remote information. Send that to the UPF. + * Also request all local GTP endpoints from UPF (rab->{core,access}.local) */ + m = ps_rab_new_pfcp_msg_req(rab, OSMO_PFCP_MSGT_SESSION_EST_REQ); + + /* Send UP-SEID as zero, the UPF has yet to assign a SEID for itself remotely */ + m->h.seid = 0; + + /* Make a new CP-SEID, our local reference for the PFCP session. */ + rab->cp_seid = osmo_pfcp_next_seid(&hnb_gw->pfcp.cp_peer->next_seid_state); + cp_f_seid = (struct osmo_pfcp_ie_f_seid){ + .seid = rab->cp_seid, + }; + osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, &osmo_pfcp_endpoint_get_cfg(hnb_gw->pfcp.ep)->local_addr); + + m->ies.session_est_req = (struct osmo_pfcp_msg_session_est_req){ + .node_id = m->ies.session_est_req.node_id, + .cp_f_seid_present = true, + .cp_f_seid = cp_f_seid, + }; + ser = &m->ies.session_est_req; + + /* Create PDR+FAR pairs */ + if (rab_to_pfcp_session_est_req(ser, rab)) { + LOG_PS_RAB(rab, LOGL_ERROR, "Failed to compose PFCP message\n"); + osmo_pfcp_msg_free(m); + ps_rab_failure(rab); + return; + } + + /* Send PFCP Session Establishment Request to UPF, wait for response. */ + m->ctx.resp_cb = on_pfcp_est_resp; + if (osmo_pfcp_endpoint_tx(hnb_gw->pfcp.ep, m)) { + LOG_PS_RAB(rab, LOGL_ERROR, "Failed to send PFCP message\n"); + ps_rab_failure(rab); + } +} + +static int on_pfcp_est_resp(struct osmo_pfcp_msg *req, struct osmo_pfcp_msg *rx_resp, const char *errmsg) +{ + struct ps_rab *rab = req->ctx.session_fi->priv; + + /* Send as FSM event to ensure this step is currently allowed */ + osmo_fsm_inst_dispatch(rab->fi, PS_RAB_EV_PFCP_EST_RESP, rx_resp); + + /* By returning 0 here, the rx_resp message is not dispatched "again" to pfcp_ep->rx_msg(). We've handled it + * here already. */ + return 0; +} + +static void ps_rab_rx_pfcp_est_resp(struct osmo_fsm_inst *fi, struct osmo_pfcp_msg *rx); + +static void ps_rab_fsm_wait_pfcp_est_resp(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch (event) { + case PS_RAB_EV_PFCP_EST_RESP: + ps_rab_rx_pfcp_est_resp(fi, data); + break; + + default: + OSMO_ASSERT(false); + } +} + +/* Look for dst->local.pdr_id in ser->created_pdr[], and copy the GTP endpoint info to dst->local.addr_teid, if found. */ +static int get_local_f_teid_from_created_pdr(struct half_gtp_map *dst, struct osmo_pfcp_msg_session_est_resp *ser, + uint8_t pdr_id) +{ + int i; + for (i = 0; i < ser->created_pdr_count; i++) { + struct osmo_pfcp_ie_created_pdr *cpdr = &ser->created_pdr[i]; + if (cpdr->pdr_id != pdr_id) + continue; + if (!cpdr->local_f_teid_present) + continue; + if (cpdr->local_f_teid.choose_flag) + continue; + if (!cpdr->local_f_teid.fixed.ip_addr.v4_present) + continue; + dst->local.addr = cpdr->local_f_teid.fixed.ip_addr.v4; + dst->local.teid = cpdr->local_f_teid.fixed.teid; + dst->local.present = true; + return 0; + } + return -1; +} + +static void ps_rab_rx_pfcp_est_resp(struct osmo_fsm_inst *fi, struct osmo_pfcp_msg *rx) +{ + struct ps_rab *rab = fi->priv; + enum osmo_pfcp_cause *cause; + struct osmo_pfcp_msg_session_est_resp *ser; + + if (!rx) { + /* This happens when no response has arrived after all PFCP timeouts and retransmissions. */ + LOG_PS_RAB(rab, LOGL_ERROR, "No response to PFCP Session Establishment Request\n"); + goto pfcp_session_est_failed; + } + + ser = &rx->ies.session_est_resp; + + cause = osmo_pfcp_msg_cause(rx); + if (!cause || *cause != OSMO_PFCP_CAUSE_REQUEST_ACCEPTED) { + LOG_PS_RAB(rab, LOGL_ERROR, "PFCP Session Establishment Response was not successful: %s\n", + cause ? osmo_pfcp_cause_str(*cause) : "NULL"); + goto pfcp_session_est_failed; + } + + /* Get the UPF's SEID for future messages for this PFCP session */ + if (!ser->up_f_seid_present) { + LOG_PS_RAB(rab, LOGL_ERROR, "PFCP Session Establishment Response lacks a UP F-SEID\n"); + goto pfcp_session_est_failed; + } + rab->up_f_seid = ser->up_f_seid; + + if (rab->release_requested) { + /* The UE conn or the entire HNB has released while we were waiting for a PFCP response. Now that there + * is a remote SEID, we can finally delete the session that we asked for earlier. */ + ps_rab_fsm_state_chg(PS_RAB_ST_WAIT_PFCP_DEL_RESP); + return; + } + + /* Get the UPF's local F-TEIDs for both Core and Access */ + if (get_local_f_teid_from_created_pdr(&rab->core, ser, ID_CORE_TO_ACCESS) + || get_local_f_teid_from_created_pdr(&rab->access, ser, ID_ACCESS_TO_CORE)) { + LOG_PS_RAB(rab, LOGL_ERROR, "Missing F-TEID in PFCP Session Establishment Response\n"); + ps_rab_failure(rab); + return; + } + + if (rab->req_fi) + osmo_fsm_inst_dispatch(rab->req_fi, PS_RAB_ASS_EV_LOCAL_F_TEIDS_RX, rab); + + /* The RAB Assignment Response will yield the hNodeB's F-TEID, i.e. the F-TEID we are supposed to send to Access + * in outgoing GTP packets. */ + ps_rab_fsm_state_chg(PS_RAB_ST_WAIT_ACCESS_REMOTE_F_TEID); + return; + +pfcp_session_est_failed: + if (rab->release_requested) { + /* the RAB was released and we were waiting for some PFCP responsewhile waiting for a response, and now + * we know that no session has been created. No PFCP left, deallocate. */ + ps_rab_fsm_state_chg(PS_RAB_ST_WAIT_USE_COUNT); + return; + } + ps_rab_failure(rab); +} + +int ps_rab_rx_access_remote_f_teid(struct hnbgw_context_map *map, uint8_t rab_id, + const struct ps_rab_rx_args *args) +{ + int rc; + struct ps_rab *rab = ps_rab_get(map, rab_id); + if (!rab) { + LOG_MAP(map, DLPFCP, LOGL_ERROR, "There is no RAB with id %u\n", rab_id); + return -ENOENT; + } + /* Dispatch as event to make sure this is currently allowed */ + rc = osmo_fsm_inst_dispatch(rab->fi, PS_RAB_EV_RX_ACCESS_REMOTE_F_TEID, (void*)args); + if (rc) + return rc; + return 0; +} + +static void ps_rab_fsm_wait_access_remote_f_teid(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct ps_rab *rab = fi->priv; + const struct ps_rab_rx_args *args; + switch (event) { + case PS_RAB_EV_RX_ACCESS_REMOTE_F_TEID: + args = data; + rab->resp_fi = args->notify_fi; + rab->access.use_x213_nsap = args->use_x213_nsap; + rab->access.remote = args->f_teid; + ps_rab_fsm_state_chg(PS_RAB_ST_WAIT_PFCP_MOD_RESP); + return; + default: + OSMO_ASSERT(false); + } +} + +/* Add an Update FAR to the PFCP Session Modification Request message, updating a remote F-TEID. */ +static int rab_to_pfcp_session_mod_req_upd_far(struct osmo_pfcp_msg_session_mod_req *smr, + uint32_t far_id, const struct addr_teid *remote_f_teid) +{ + if (smr->upd_far_count + 1 > ARRAY_SIZE(smr->upd_far)) + return -1; + + smr->upd_far[smr->upd_far_count] = (struct osmo_pfcp_ie_upd_far){ + .far_id = far_id, + .apply_action_present = true, + /* apply_action.bits set below */ + .upd_forw_params_present = true, + .upd_forw_params = { + .outer_header_creation_present = true, + .outer_header_creation = { + /* desc_bits set below */ + .teid_present = true, + .teid = remote_f_teid->teid, + .ip_addr.v4_present = true, + .ip_addr.v4 = remote_f_teid->addr, + }, + }, + }; + osmo_pfcp_bits_set(smr->upd_far[smr->upd_far_count].apply_action.bits, + OSMO_PFCP_APPLY_ACTION_FORW, true); + osmo_pfcp_bits_set(smr->upd_far[smr->upd_far_count].upd_forw_params.outer_header_creation.desc_bits, + OSMO_PFCP_OUTER_HEADER_CREATION_GTP_U_UDP_IPV4, true); + smr->upd_far_count++; + + return 0; +} + +static int on_pfcp_mod_resp(struct osmo_pfcp_msg *req, struct osmo_pfcp_msg *rx_resp, const char *errmsg); + +static void ps_rab_fsm_wait_pfcp_mod_resp_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + /* We have been given the Access side's remote F-TEID, now in rab->access.remote, and we need to tell the UPF + * about it. */ + struct ps_rab *rab = fi->priv; + struct hnb_gw *hnb_gw = rab->hnb_gw; + struct osmo_pfcp_msg *m; + + if (!(rab->up_f_seid.ip_addr.v4_present /* || rab->up_f_seid.ip_addr.v6_present */)) { + LOG_PS_RAB(rab, LOGL_ERROR, "no valid PFCP session\n"); + ps_rab_failure(rab); + return; + } + + m = ps_rab_new_pfcp_msg_req(rab, OSMO_PFCP_MSGT_SESSION_MOD_REQ); + + if (rab_to_pfcp_session_mod_req_upd_far(&m->ies.session_mod_req, ID_ACCESS_TO_CORE, &rab->access.remote)) { + LOG_PS_RAB(rab, LOGL_ERROR, "error composing Update FAR IE in PFCP msg\n"); + ps_rab_failure(rab); + return; + } + + m->ctx.resp_cb = on_pfcp_mod_resp; + if (osmo_pfcp_endpoint_tx(hnb_gw->pfcp.ep, m)) { + LOG_PS_RAB(rab, LOGL_ERROR, "Failed to send PFCP message\n"); + ps_rab_failure(rab); + } +} + +static int on_pfcp_mod_resp(struct osmo_pfcp_msg *req, struct osmo_pfcp_msg *rx_resp, const char *errmsg) +{ + struct ps_rab *rab = req->ctx.session_fi->priv; + + /* Send as FSM event to ensure this step is currently allowed */ + osmo_fsm_inst_dispatch(rab->fi, PS_RAB_EV_PFCP_MOD_RESP, rx_resp); + + /* By returning 0 here, the rx_resp message is not dispatched "again" to pfcp_ep->rx_msg(). We've handled it + * here already. */ + return 0; +} + +static void ps_rab_rx_pfcp_mod_resp(struct osmo_fsm_inst *fi, struct osmo_pfcp_msg *rx); + +static void ps_rab_fsm_wait_pfcp_mod_resp(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch (event) { + case PS_RAB_EV_PFCP_MOD_RESP: + ps_rab_rx_pfcp_mod_resp(fi, data); + return; + default: + OSMO_ASSERT(false); + } +} + +static void ps_rab_rx_pfcp_mod_resp(struct osmo_fsm_inst *fi, struct osmo_pfcp_msg *rx) +{ + struct ps_rab *rab = fi->priv; + enum osmo_pfcp_cause *cause; + + if (!rx) { + LOG_PS_RAB(rab, LOGL_ERROR, "No response to PFCP Session Modification Request\n"); + ps_rab_failure(rab); + return; + } + + cause = osmo_pfcp_msg_cause(rx); + if (!cause || *cause != OSMO_PFCP_CAUSE_REQUEST_ACCEPTED) { + LOG_PS_RAB(rab, LOGL_ERROR, "PFCP Session Modification Response was not successful: %s\n", + cause ? osmo_pfcp_cause_str(*cause) : "NULL"); + ps_rab_failure(rab); + return; + } + + /* This RAB is now complete. Everything went as expected, now we can forward the RAB Assignment Response to the + * CN. */ + ps_rab_fsm_state_chg(PS_RAB_ST_ESTABLISHED); +} + +static void ps_rab_fsm_established_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct ps_rab *rab = fi->priv; + if (rab->resp_fi) + osmo_fsm_inst_dispatch(rab->resp_fi, PS_RAB_ASS_EV_RAB_ESTABLISHED, rab); +} + +static int on_pfcp_del_resp(struct osmo_pfcp_msg *req, struct osmo_pfcp_msg *rx_resp, const char *errmsg); + +static void ps_rab_fsm_wait_pfcp_del_resp_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + /* If a PFCP session has been established, send a Session Deletion Request and wait for the response. + * If no session is established, just terminate. */ + struct ps_rab *rab = fi->priv; + struct hnb_gw *hnb_gw = rab->hnb_gw; + struct osmo_pfcp_msg *m; + + if (!(rab->up_f_seid.ip_addr.v4_present /* || rab->up_f_seid.ip_addr.v6_present */)) { + /* There is no valid PFCP session, so no need to send a Session Deletion Request */ + ps_rab_fsm_state_chg(PS_RAB_ST_WAIT_USE_COUNT); + return; + } + + m = ps_rab_new_pfcp_msg_req(rab, OSMO_PFCP_MSGT_SESSION_DEL_REQ); + m->ctx.resp_cb = on_pfcp_del_resp; + if (osmo_pfcp_endpoint_tx(hnb_gw->pfcp.ep, m)) { + LOG_PS_RAB(rab, LOGL_ERROR, "Failed to send PFCP message\n"); + ps_rab_failure(rab); + } +} + +static int on_pfcp_del_resp(struct osmo_pfcp_msg *req, struct osmo_pfcp_msg *rx_resp, const char *errmsg) +{ + struct ps_rab *rab = req->ctx.session_fi->priv; + if (errmsg) + LOG_PS_RAB(rab, LOGL_ERROR, "PFCP Session Deletion Response: %s\n", errmsg); + osmo_fsm_inst_dispatch(rab->fi, PS_RAB_EV_PFCP_DEL_RESP, rx_resp); + + /* By returning 0 here, the rx_resp message is not dispatched "again" to pfcp_ep->rx_msg(). We've handled it + * here already. */ + return 0; +} + +static void ps_rab_fsm_wait_pfcp_del_resp(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch (event) { + case PS_RAB_EV_PFCP_DEL_RESP: + /* All done, terminate. Even if the Session Deletion failed, there's nothing we can do about it. */ + ps_rab_fsm_state_chg(PS_RAB_ST_WAIT_USE_COUNT); + return; + default: + OSMO_ASSERT(false); + } +} + +static int ps_rab_fsm_use_cb(struct osmo_use_count_entry *e, int32_t old_use_count, const char *file, int line) +{ + struct ps_rab *rab = e->use_count->talloc_object; + if (!osmo_use_count_total(&rab->use_count)) + osmo_fsm_inst_dispatch(rab->fi, PS_RAB_EV_USE_COUNT_ZERO, NULL); + return 0; +} + +static void ps_rab_fsm_wait_use_count_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct ps_rab *rab = fi->priv; + osmo_use_count_get_put(&rab->use_count, PS_RAB_USE_ACTIVE, -1); +} + +static void ps_rab_fsm_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch (event) { + + case PS_RAB_EV_USE_COUNT_ZERO: + if (fi->state == PS_RAB_ST_WAIT_USE_COUNT) + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); + /* else, ignore. */ + return; + + default: + OSMO_ASSERT(false); + } +} + +static void ps_rab_forget_map(struct ps_rab *rab) +{ + if (rab->map) + llist_del(&rab->entry); + rab->map = NULL; +} + +static void ps_rab_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) +{ + struct ps_rab *rab = fi->priv; + ps_rab_forget_map(rab); +} + +void ps_rab_release(struct ps_rab *rab) +{ + struct osmo_fsm_inst *fi = rab->fi; + ps_rab_forget_map(rab); + switch (fi->state) { + case PS_RAB_ST_RX_CORE_REMOTE_F_TEID: + /* No session requested yet. Nothing to be deleted. */ + LOG_PS_RAB(rab, LOGL_NOTICE, "RAB release before PFCP Session Establishment Request, terminating\n"); + ps_rab_fsm_state_chg(PS_RAB_ST_WAIT_USE_COUNT); + return; + case PS_RAB_ST_WAIT_PFCP_EST_RESP: + /* Session was requested via PFCP, but we only know the SEID to send in a deletion when the PFCP Session + * Establishment Response arrives. */ + rab->release_requested = true; + LOG_PS_RAB(rab, LOGL_ERROR, "RAB release while waiting for PFCP Session Establishment Response\n"); + return; + default: + /* Session has been established (and we know the SEID). Initiate deletion. */ + LOG_PS_RAB(rab, LOGL_INFO, "RAB release, deleting PFCP session\n"); + ps_rab_fsm_state_chg(PS_RAB_ST_WAIT_PFCP_DEL_RESP); + return; + case PS_RAB_ST_WAIT_PFCP_DEL_RESP: + /* Already requested a PFCP Session Deletion. Nothing else to do, wait for the Deletion Response (or + * timeout). */ + LOG_PS_RAB(rab, LOGL_INFO, "RAB release while waiting for PFCP Session Deletion Response\n"); + return; + case PS_RAB_ST_WAIT_USE_COUNT: + /* Already released, just wait for the last users (queued PFCP messages) to expire. */ + LOG_PS_RAB(rab, LOGL_INFO, "RAB release, already waiting for deallocation\n"); + return; + } +} + +#define S(x) (1 << (x)) + +static const struct osmo_fsm_state ps_rab_fsm_states[] = { + [PS_RAB_ST_RX_CORE_REMOTE_F_TEID] = { + .name = "RX_CORE_REMOTE_F_TEID", + .out_state_mask = 0 + | S(PS_RAB_ST_WAIT_PFCP_EST_RESP) + | S(PS_RAB_ST_WAIT_USE_COUNT) + , + }, + [PS_RAB_ST_WAIT_PFCP_EST_RESP] = { + .name = "WAIT_PFCP_EST_RESP", + .onenter = ps_rab_fsm_wait_pfcp_est_resp_onenter, + .action = ps_rab_fsm_wait_pfcp_est_resp, + .in_event_mask = 0 + | S(PS_RAB_EV_PFCP_EST_RESP) + , + .out_state_mask = 0 + | S(PS_RAB_ST_WAIT_ACCESS_REMOTE_F_TEID) + | S(PS_RAB_ST_WAIT_USE_COUNT) + , + }, + [PS_RAB_ST_WAIT_ACCESS_REMOTE_F_TEID] = { + .name = "WAIT_ACCESS_REMOTE_F_TEID", + .action = ps_rab_fsm_wait_access_remote_f_teid, + .in_event_mask = 0 + | S(PS_RAB_EV_RX_ACCESS_REMOTE_F_TEID) + , + .out_state_mask = 0 + | S(PS_RAB_ST_WAIT_PFCP_MOD_RESP) + | S(PS_RAB_ST_WAIT_PFCP_DEL_RESP) + | S(PS_RAB_ST_WAIT_USE_COUNT) + , + }, + [PS_RAB_ST_WAIT_PFCP_MOD_RESP] = { + .name = "WAIT_PFCP_MOD_RESP", + .onenter = ps_rab_fsm_wait_pfcp_mod_resp_onenter, + .action = ps_rab_fsm_wait_pfcp_mod_resp, + .in_event_mask = 0 + | S(PS_RAB_EV_PFCP_MOD_RESP) + , + .out_state_mask = 0 + | S(PS_RAB_ST_ESTABLISHED) + | S(PS_RAB_ST_WAIT_PFCP_DEL_RESP) + | S(PS_RAB_ST_WAIT_USE_COUNT) + , + }, + [PS_RAB_ST_ESTABLISHED] = { + .name = "ESTABLISHED", + .onenter = ps_rab_fsm_established_onenter, + .out_state_mask = 0 + | S(PS_RAB_ST_WAIT_PFCP_DEL_RESP) + | S(PS_RAB_ST_WAIT_USE_COUNT) + , + }, + [PS_RAB_ST_WAIT_PFCP_DEL_RESP] = { + .name = "PS_RAB_ST_WAIT_PFCP_DEL_RESP", + .onenter = ps_rab_fsm_wait_pfcp_del_resp_onenter, + .action = ps_rab_fsm_wait_pfcp_del_resp, + .in_event_mask = 0 + | S(PS_RAB_EV_PFCP_DEL_RESP) + , + .out_state_mask = 0 + | S(PS_RAB_ST_WAIT_USE_COUNT) + , + }, + [PS_RAB_ST_WAIT_USE_COUNT] = { + .name = "PS_RAB_ST_WAIT_USE_COUNT", + .onenter = ps_rab_fsm_wait_use_count_onenter, + .in_event_mask = 0 + | S(PS_RAB_EV_USE_COUNT_ZERO) + , + }, +}; + +static struct osmo_fsm ps_rab_fsm = { + .name = "ps_rab", + .states = ps_rab_fsm_states, + .num_states = ARRAY_SIZE(ps_rab_fsm_states), + .log_subsys = DLPFCP, + .event_names = ps_rab_fsm_event_names, + .cleanup = ps_rab_fsm_cleanup, + .allstate_event_mask = S(PS_RAB_EV_USE_COUNT_ZERO), + .allstate_action = ps_rab_fsm_allstate_action, +}; + +static __attribute__((constructor)) void ps_rab_fsm_register(void) +{ + OSMO_ASSERT(osmo_fsm_register(&ps_rab_fsm) == 0); +} diff --git a/src/osmo-hnbgw/tdefs.c b/src/osmo-hnbgw/tdefs.c index 13e04c5..5113dd3 100644 --- a/src/osmo-hnbgw/tdefs.c +++ b/src/osmo-hnbgw/tdefs.c @@ -15,6 +15,7 @@ */ #include <osmocom/hnbgw/tdefs.h> +#include <osmocom/pfcp/pfcp_endpoint.h> struct osmo_tdef mgw_fsm_T_defs[] = { {.T = -1001, .default_val = 5, .desc = "Timeout for HNB side call-leg (to-HNB) creation" }, @@ -25,7 +26,14 @@ { } }; +struct osmo_tdef ps_T_defs[] = { + {.T = -1002, .default_val = 10, .desc = "Timeout for the HNB to respond to PS RAB Assignment Request" }, + { } +}; + struct osmo_tdef_group hnbgw_tdef_group[] = { {.name = "mgw", .tdefs = mgw_fsm_T_defs, .desc = "MGW (Media Gateway) interface" }, + {.name = "ps", .tdefs = ps_T_defs, .desc = "timers for Packet Switched domain" }, + {.name = "pfcp", .tdefs = osmo_pfcp_tdefs, .desc = "PFCP timers" }, { } }; -- 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-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: mgw_fsm: move MGCP timeout to mgw_fsm_T_defs

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28813 ) Change subject: mgw_fsm: move MGCP timeout to mgw_fsm_T_defs ...................................................................... mgw_fsm: move MGCP timeout to mgw_fsm_T_defs For the tdefs used by libosmo-mgcp-client, passed via osmo_mgcpc_ep_alloc(), do not use the separate mgw_tdefs. Instead, move X2427 to mgw_fsm_T_defs. This makes X2427 VTY configurable. Related: SYS#5895 Change-Id: I2aa67121c20dc3da5fd937a02b6747468622f317 --- M src/osmo-hnbgw/mgw_fsm.c M src/osmo-hnbgw/tdefs.c 2 files changed, 3 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/13/28813/1 diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c index 1dc9884..a343e80 100644 --- a/src/osmo-hnbgw/mgw_fsm.c +++ b/src/osmo-hnbgw/mgw_fsm.c @@ -122,12 +122,7 @@ uint16_t msc_rtp_port; }; -static const struct osmo_tdef mgw_tdefs[] = { - {.T = -2427, .default_val = 5, .desc = "timeout for MGCP response from MGW" }, - { } -}; - -static const struct osmo_tdef_state_timeout mgw_fsm_timeouts[32] = { +struct osmo_tdef_state_timeout mgw_fsm_timeouts[32] = { [MGW_ST_CRCX_HNB] = {.T = -1001 }, [MGW_ST_ASSIGN] = {.T = -1002 }, [MGW_ST_MDCX_HNB] = {.T = -1003 }, @@ -179,7 +174,7 @@ epname = mgcp_client_rtpbridge_wildcard(map->hnb_ctx->gw->mgcp_client); mgw_fsm_priv->mgcpc_ep = - osmo_mgcpc_ep_alloc(fi, MGW_EV_MGCP_TERM, map->hnb_ctx->gw->mgcp_client, mgw_tdefs, fi->id, "%s", epname); + osmo_mgcpc_ep_alloc(fi, MGW_EV_MGCP_TERM, map->hnb_ctx->gw->mgcp_client, mgw_fsm_T_defs, fi->id, "%s", epname); mgw_fsm_priv->mgcpc_ep_ci_hnb = osmo_mgcpc_ep_ci_add(mgw_fsm_priv->mgcpc_ep, "to-HNB"); osmo_mgcpc_ep_ci_request(mgw_fsm_priv->mgcpc_ep_ci_hnb, MGCP_VERB_CRCX, &mgw_info, fi, MGW_EV_MGCP_OK, diff --git a/src/osmo-hnbgw/tdefs.c b/src/osmo-hnbgw/tdefs.c index d8198f2..13e04c5 100644 --- a/src/osmo-hnbgw/tdefs.c +++ b/src/osmo-hnbgw/tdefs.c @@ -21,6 +21,7 @@ {.T = -1002, .default_val = 10, .desc = "Timeout for the HNB to respond to RAB Assignment Request" }, {.T = -1003, .default_val = 5, .desc = "Timeout for HNB side call-leg (to-HNB) completion" }, {.T = -1004, .default_val = 5, .desc = "Timeout for MSC side call-leg (to-MSC) completion" }, + {.T = -2427, .default_val = 5, .desc = "timeout for MGCP response from MGW" }, { } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2aa67121c20dc3da5fd937a02b6747468622f317 Gerrit-Change-Number: 28813 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: fix test_ranap_rab_ass_resp_decode_encode

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28814 ) Change subject: fix test_ranap_rab_ass_resp_decode_encode ...................................................................... fix test_ranap_rab_ass_resp_decode_encode There is an extra zero octet at the end of the test data, which does not get encoded back. The test currently does not detect this, but will in upcoming patch I85e715326e1d8f4f301f82f78da109f1a7a92f30. Related: SYS#5895 Change-Id: Ifb98a52e56db1227a834c0d7b7a260314d9f547e --- M tests/ranap_rab_ass/ranap_rab_ass_test.c M tests/ranap_rab_ass/ranap_rab_ass_test.ok 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/14/28814/1 diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.c b/tests/ranap_rab_ass/ranap_rab_ass_test.c index 9a98cf8..482b0fc 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.c +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.c @@ -53,7 +53,7 @@ 0xc0, 0x35, 0x00, 0x01, 0x0a, 0x09, 0x01, 0xa2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x1f, 0x76, - 0x00, 0x00, 0x40, 0x01, 0x00, 0x00 + 0x00, 0x00, 0x40, 0x01, 0x00 }; uint8_t encoded[sizeof(testvec)]; diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.ok b/tests/ranap_rab_ass/ranap_rab_ass_test.ok index aca4ff3..80def36 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.ok +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.ok @@ -1,6 +1,6 @@ ranap_rab_ass_req_encode rc=93 -INPUT: 0000005900000100364052000001003500487822cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f76000040010000 -RESULT: 0000005900000100364052000001003500487822cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f76000040010000 +INPUT: 0000005900000100364052000001003500487822cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f760000400100 +RESULT: 0000005900000100364052000001003500487822cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f760000400100 ranap_rab_ass_resp_encode rc=46 INPUT: 6000002a000001003440230000010033401c603a7c3500010a0901a40000000000000000000000000040040a0000 RESULT: 6000002a000001003440230000010033401c603a7c3500010a0901a40000000000000000000000000040040a0000 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ifb98a52e56db1227a834c0d7b7a260314d9f547e Gerrit-Change-Number: 28814 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: ranap_rab_ass_req_encode(): return msgb

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28815 ) Change subject: ranap_rab_ass_req_encode(): return msgb ...................................................................... ranap_rab_ass_req_encode(): return msgb ranap_rab_ass_req_encode() forms a msgb, then copies the data to a buffer provided by the caller. Instead, just return the msgb. This removes one unnecessary memcpy() and simplifies some code. In ranap_rab_ass_test.c, actually ensure the correct size of the returned data. See also the fix of expected test data in patch Ifb98a52e56db1227a834c0d7b7a260314d9f547e Related: SYS#5895 Change-Id: I85e715326e1d8f4f301f82f78da109f1a7a92f30 --- M include/osmocom/hnbgw/ranap_rab_ass.h M src/osmo-hnbgw/mgw_fsm.c M src/osmo-hnbgw/ranap_rab_ass.c M tests/ranap_rab_ass/Makefile.am M tests/ranap_rab_ass/ranap_rab_ass_test.c M tests/ranap_rab_ass/ranap_rab_ass_test.ok 6 files changed, 25 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/15/28815/1 diff --git a/include/osmocom/hnbgw/ranap_rab_ass.h b/include/osmocom/hnbgw/ranap_rab_ass.h index 13fd2df..ae288af 100644 --- a/include/osmocom/hnbgw/ranap_rab_ass.h +++ b/include/osmocom/hnbgw/ranap_rab_ass.h @@ -1,7 +1,6 @@ #pragma once -int ranap_rab_ass_req_encode(uint8_t *data, unsigned int len, - RANAP_RAB_AssignmentRequestIEs_t *rab_assignment_request_ies); +struct msgb *ranap_rab_ass_req_encode(RANAP_RAB_AssignmentRequestIEs_t *rab_assignment_request_ies); int ranap_rab_ass_resp_encode(uint8_t *data, unsigned int len, RANAP_RAB_AssignmentResponseIEs_t *rab_assignment_response_ies); diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c index a343e80..8e42f58 100644 --- a/src/osmo-hnbgw/mgw_fsm.c +++ b/src/osmo-hnbgw/mgw_fsm.c @@ -235,20 +235,19 @@ { struct mgw_fsm_priv *mgw_fsm_priv = fi->priv; struct hnbgw_context_map *map = mgw_fsm_priv->map; - uint8_t encoded[IUH_MSGB_SIZE]; RANAP_RAB_AssignmentRequestIEs_t *ies; - int rc; + struct msgb *msg; ies = &mgw_fsm_priv->ranap_rab_ass_req_message->msg.raB_AssignmentRequestIEs; - rc = ranap_rab_ass_req_encode(encoded, sizeof(encoded), ies); - if (rc < 0) { + msg = ranap_rab_ass_req_encode(ies); + if (!msg) { LOGPFSML(fi, LOGL_ERROR, "failed to re-encode RAB-AssignmentRequest message\n"); osmo_fsm_inst_state_chg(fi, MGW_ST_FAILURE, 0, 0); return; } LOGPFSML(fi, LOGL_DEBUG, "forwarding modified RAB-AssignmentRequest to HNB\n"); - rua_tx_dt(map->hnb_ctx, map->is_ps, map->rua_ctx_id, encoded, rc); + rua_tx_dt(map->hnb_ctx, map->is_ps, map->rua_ctx_id, msg->data, msg->len); } static void mgw_fsm_assign(struct osmo_fsm_inst *fi, uint32_t event, void *data) diff --git a/src/osmo-hnbgw/ranap_rab_ass.c b/src/osmo-hnbgw/ranap_rab_ass.c index 5930451..78805b8 100644 --- a/src/osmo-hnbgw/ranap_rab_ass.c +++ b/src/osmo-hnbgw/ranap_rab_ass.c @@ -37,20 +37,18 @@ * \ptmap[in] len length of user provided memory to store resulting ASN.1 encoded message. * \ptmap[in] ies user provided memory with RANAP_RAB_AssignmentRequestIEs. * \returns resulting message length on success; negative on error. */ -int ranap_rab_ass_req_encode(uint8_t *data, unsigned int len, - RANAP_RAB_AssignmentRequestIEs_t *rab_assignment_request_ies) +struct msgb *ranap_rab_ass_req_encode(RANAP_RAB_AssignmentRequestIEs_t *rab_assignment_request_ies) { int rc; struct msgb *msg; RANAP_RAB_AssignmentRequest_t _rab_assignment_request; RANAP_RAB_AssignmentRequest_t *rab_assignment_request = &_rab_assignment_request; - memset(data, 0, len); memset(rab_assignment_request, 0, sizeof(*rab_assignment_request)); rc = ranap_encode_rab_assignmentrequesties(rab_assignment_request, rab_assignment_request_ies); if (rc < 0) - return -EINVAL; + return NULL; /* generate an Initiating Mesasage */ msg = ranap_generate_initiating_message(RANAP_ProcedureCode_id_RAB_Assignment, @@ -60,15 +58,7 @@ /* 'msg' has been generated, we cann now release the input 'out' */ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_AssignmentRequest, rab_assignment_request); - if (!msg) - return -EINVAL; - if (msg->len > len) - return -EINVAL; - - memcpy(data, msg->data, msg->len); - rc = msg->len; - msgb_free(msg); - return rc; + return msg; } /*! Encode RABAP RAB AssignmentRequest from RANAP_RAB_AssignmentResponseIEs. diff --git a/tests/ranap_rab_ass/Makefile.am b/tests/ranap_rab_ass/Makefile.am index 8d1df7a..70ca6f6 100644 --- a/tests/ranap_rab_ass/Makefile.am +++ b/tests/ranap_rab_ass/Makefile.am @@ -35,3 +35,7 @@ $(COVERAGE_LDFLAGS) \ $(top_builddir)/src/osmo-hnbgw/ranap_rab_ass.o \ $(NULL) + +.PHONY: update_exp +update_exp: + $(builddir)/ranap_rab_ass_test >$(srcdir)/ranap_rab_ass_test.ok diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.c b/tests/ranap_rab_ass/ranap_rab_ass_test.c index 482b0fc..043b16b 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.c +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.c @@ -55,19 +55,21 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x1f, 0x76, 0x00, 0x00, 0x40, 0x01, 0x00 }; - uint8_t encoded[sizeof(testvec)]; + struct msgb *encoded; rc = ranap_ran_rx_co_decode(talloc_asn1_ctx, &message, testvec, sizeof(testvec)); OSMO_ASSERT(rc == 0); - rc = ranap_rab_ass_req_encode(encoded, sizeof(encoded), &message.msg.raB_AssignmentRequestIEs); - printf("ranap_rab_ass_req_encode rc=%d\n", rc); + encoded = ranap_rab_ass_req_encode(&message.msg.raB_AssignmentRequestIEs); + printf("ranap_rab_ass_req_encode %s\n", encoded ? "ok" : "ERROR"); printf("INPUT: %s\n", osmo_hexdump_nospc(testvec, sizeof(testvec))); - printf("RESULT: %s\n", osmo_hexdump_nospc(encoded, sizeof(encoded))); - OSMO_ASSERT(memcmp(testvec, encoded, sizeof(testvec)) == 0); + printf("RESULT: %s\n", osmo_hexdump_nospc(encoded->data, encoded->len)); + OSMO_ASSERT(encoded->len == sizeof(testvec)); + OSMO_ASSERT(memcmp(testvec, encoded->data, sizeof(testvec)) == 0); ranap_ran_rx_co_free(&message); + msgb_free(encoded); } void test_ranap_rab_ass_resp_decode_encode(void) @@ -158,6 +160,7 @@ struct osmo_sockaddr addr; struct osmo_sockaddr_str addr_str; ranap_message message; + struct msgb *encoded; uint8_t rab_id; uint8_t testvec_in[] = { 0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x01, 0x00, @@ -210,11 +213,12 @@ osmo_sockaddr_str_from_sockaddr(&addr_str, &addr.u.sas); printf("after: addr=%s, port=%u, rab_id=%u\n", addr_str.ip, addr_str.port, rab_id); - rc = ranap_rab_ass_req_encode(testvec_in, sizeof(testvec_in), &message.msg.raB_AssignmentRequestIEs); - OSMO_ASSERT(rc == sizeof(testvec_in)); - OSMO_ASSERT(memcmp(testvec_in, testvec_expected_out, sizeof(testvec_in)) == 0); + encoded = ranap_rab_ass_req_encode(&message.msg.raB_AssignmentRequestIEs); + OSMO_ASSERT(encoded->len == sizeof(testvec_expected_out)); + OSMO_ASSERT(memcmp(encoded->data, testvec_expected_out, encoded->len) == 0); ranap_ran_rx_co_free(&message); + msgb_free(encoded); } void test_ranap_rab_ass_resp_ies_replace_inet_addr(void) diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.ok b/tests/ranap_rab_ass/ranap_rab_ass_test.ok index 80def36..47fb97f 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.ok +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.ok @@ -1,4 +1,4 @@ -ranap_rab_ass_req_encode rc=93 +ranap_rab_ass_req_encode ok INPUT: 0000005900000100364052000001003500487822cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f760000400100 RESULT: 0000005900000100364052000001003500487822cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f760000400100 ranap_rab_ass_resp_encode rc=46 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I85e715326e1d8f4f301f82f78da109f1a7a92f30 Gerrit-Change-Number: 28815 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in libosmo-pfcp[master]: pfcp_endpoint: fix final PFCP retrans resp_cb

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28812 ) Change subject: pfcp_endpoint: fix final PFCP retrans resp_cb ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Iaca396891921f7057015ce6e1e4528b955757809 Gerrit-Change-Number: 28812 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 13:33:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in libosmo-pfcp[master]: pfcp_endpoint: fix final PFCP retrans resp_cb

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28812 ) Change subject: pfcp_endpoint: fix final PFCP retrans resp_cb ...................................................................... pfcp_endpoint: fix final PFCP retrans resp_cb After the final retransmission of a sent request, still keep the message in the queue for its expiry period, so that a later response is matched to the request. The osmo_pfcp_msg.resp_cb() depends on the sent message to remain in the queue until it times out. That was not the case in an earlier stage of libosmo-pfcp development. I noticed this during ttcn3 testing, where osmo-hnbgw continuously resends PFCP Association Setup Requests, and fails to associate if ttcn3 happens to respond to the final retransmission of a request. Related: SYS#5599 Change-Id: Iaca396891921f7057015ce6e1e4528b955757809 --- M src/libosmo-pfcp/pfcp_endpoint.c 1 file changed, 10 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/12/28812/1 diff --git a/src/libosmo-pfcp/pfcp_endpoint.c b/src/libosmo-pfcp/pfcp_endpoint.c index 3002591..454f102 100644 --- a/src/libosmo-pfcp/pfcp_endpoint.c +++ b/src/libosmo-pfcp/pfcp_endpoint.c @@ -181,18 +181,19 @@ struct osmo_pfcp_msg *m = qe->m; int rc; - /* re-transmit */ - if (qe->n1_remaining) - qe->n1_remaining--; - OSMO_LOG_PFCP_MSG(m, LOGL_INFO, "re-sending (%u attempts remaining)\n", qe->n1_remaining); - - rc = osmo_pfcp_endpoint_tx_data_no_logging(endpoint, m); - /* If encoding failed, it cannot ever succeed. Drop the queue entry. */ - if (rc) - return false; /* if no more attempts remaining, drop from queue */ if (!qe->n1_remaining) return false; + + /* re-transmit */ + qe->n1_remaining--; + OSMO_LOG_PFCP_MSG(m, LOGL_INFO, "re-sending (%u attempts remaining after this)\n", qe->n1_remaining); + + rc = osmo_pfcp_endpoint_tx_data_no_logging(endpoint, m); + /* If encoding failed, it cannot ever succeed. Drop the queue entry. (Error logging already taken care of in + * osmo_pfcp_endpoint_tx_data_no_logging().) */ + if (rc) + return false; /* re-schedule timer, keep in queue */ osmo_timer_schedule(&qe->t1, t1_ms/1000, (t1_ms % 1000) * 1000); return true; -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Iaca396891921f7057015ce6e1e4528b955757809 Gerrit-Change-Number: 28812 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

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

by pespin

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-bsc/+/28811 to look at the new patch set (#2). Change subject: tests/ctrl: Avoid creating logfile ...................................................................... tests/ctrl: Avoid creating logfile It's of no use for the test. Furthemore, it was being created outside the build direcory, being left there. Change-Id: Iaeee14a01badb8439bc8893ba8be06b13e4318f3 --- M tests/ctrl/osmo-bsc-neigh-test.cfg 1 file changed, 0 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/11/28811/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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28811 ) Change subject: tests/ctrl: Avoid creating logfile outside build directory ...................................................................... tests/ctrl: Avoid creating logfile outside build directory Otherwise it is left there after the test. Change-Id: Iaeee14a01badb8439bc8893ba8be06b13e4318f3 --- M tests/ctrl/osmo-bsc-neigh-test.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/11/28811/1 diff --git a/tests/ctrl/osmo-bsc-neigh-test.cfg b/tests/ctrl/osmo-bsc-neigh-test.cfg index 8c04db6..e39c903 100644 --- a/tests/ctrl/osmo-bsc-neigh-test.cfg +++ b/tests/ctrl/osmo-bsc-neigh-test.cfg @@ -1,7 +1,7 @@ ! osmo-bsc default configuration ! (assumes STP to run on 127.0.0.1 and uses default point codes) ! -log file /tmp/osmo-bsc-neigh.log +log file osmo-bsc-neigh.log logging filter all 1 logging color 1 logging print category 1 -- 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in docker-playground[master]: ttcn3-cbc: Set mode server in osmo-cbc.cfg

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28775 ) Change subject: ttcn3-cbc: Set mode server in osmo-cbc.cfg ...................................................................... ttcn3-cbc: Set mode server in osmo-cbc.cfg TCP/SCTP client support was added recently in osmo-cbc. Since then, the connection mode (client|server|disabled) needs to be specified in the config. Let's update osmo-cbc.git to provide the correct info in here. Requires: osmo-cbc.git Change-Id I3ec54b615b41b56f7a9c64298e3fcaac37f4b60e Change-Id: I2e3a806a8371011cdb4c3b1f194e132d3896374e --- M ttcn3-cbc-test/osmo-cbc.cfg 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ttcn3-cbc-test/osmo-cbc.cfg b/ttcn3-cbc-test/osmo-cbc.cfg index 0e131c0..c2c1b7b 100644 --- a/ttcn3-cbc-test/osmo-cbc.cfg +++ b/ttcn3-cbc-test/osmo-cbc.cfg @@ -32,8 +32,10 @@ local-ip 172.18.27.20 local-port 29168 peer cbsp ttcn3-bsc + mode server remote-port 9999 remote-ip 172.18.27.100 peer sbcap ttcn3-mme + mode server remote-port 9998 remote-ip 172.18.27.100 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2e3a806a8371011cdb4c3b1f194e132d3896374e Gerrit-Change-Number: 28775 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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: Fix typo in comment

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28806 ) Change subject: sbcap: Fix typo in comment ...................................................................... sbcap: Fix typo in comment Change-Id: I6d519cb80a90e2a7e80e4608c713996f94043f21 --- M src/sbcap_link_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index c632a4a..01e3631 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -240,7 +240,7 @@ return 0; } -/* message was received from remote SBcAP peer (BSC) */ +/* 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) { struct cbc_message *smscb; 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/+/28806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6d519cb80a90e2a7e80e4608c713996f94043f21 Gerrit-Change-Number: 28806 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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: Tx Error ind if Rx ProcedureCode is unknown

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28804 ) Change subject: sbcap: Tx Error ind if Rx ProcedureCode is unknown ...................................................................... sbcap: Tx Error ind if Rx ProcedureCode is unknown Change-Id: I3ee760b98d87f179917acbc369f56d72d0db571d --- M src/sbcap_link_fsm.c 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index 3135f1f..4f89c3c 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -28,6 +28,7 @@ #include <osmocom/cbc/cbc_message.h> #include <osmocom/cbc/sbcap_link.h> #include <osmocom/cbc/sbcap_link_fsm.h> +#include <osmocom/cbc/sbcap_msg.h> #include <osmocom/cbc/debug.h> #include <osmocom/cbc/cbc_peer.h> #include <osmocom/cbc/smscb_message_fsm.h> @@ -258,6 +259,7 @@ { struct cbc_message *smscb; struct cbc_message_peer *mp; + SBcAP_SBC_AP_PDU_t *err_ind_pdu; int msg_id; /* messages without reference to a specific SMSCB message */ @@ -282,7 +284,13 @@ break; /* Handle msg id below */ default: LOGPSBCAPC(link, LOGL_ERROR, "SBcAP initiatingMessage procedure=%ld not implemented?\n", - pdu->choice.initiatingMessage.procedureCode); + pdu->choice.initiatingMessage.procedureCode); + err_ind_pdu = sbcap_gen_error_ind(link, SBcAP_Cause_valid_message_not_identified, pdu); + if (err_ind_pdu) + cbc_sbcap_link_tx(link, err_ind_pdu); + else + LOGPSBCAPC(link, LOGL_ERROR, + "Tx SBc-AP Error-Indication: msg gen failed\n"); return 0; } break; 4 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/+/28804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I3ee760b98d87f179917acbc369f56d72d0db571d Gerrit-Change-Number: 28804 Gerrit-PatchSet: 5 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]: Move sbcap_as_find_ie() to libsbcap

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28805 ) Change subject: Move sbcap_as_find_ie() to libsbcap ...................................................................... Move sbcap_as_find_ie() to libsbcap This function is generic and can be (will be) used in more places. Change-Id: Ib0c7fa12a8f6faa4271e4132ca5a5c656e717400 --- M include/osmocom/sbcap/sbcap_common.h M src/sbcap/sbcap_common.c M src/sbcap_link_fsm.c 3 files changed, 16 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/sbcap/sbcap_common.h b/include/osmocom/sbcap/sbcap_common.h index 303cf6d..91a95eb 100644 --- a/include/osmocom/sbcap/sbcap_common.h +++ b/include/osmocom/sbcap/sbcap_common.h @@ -144,6 +144,8 @@ 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); +void *sbcap_as_find_ie(void *void_list, SBcAP_ProtocolIE_ID_t ie_id); + SBcAP_Write_Replace_Warning_Request_IEs_t *sbcap_alloc_Write_Replace_Warning_Request_IE( long id, SBcAP_Criticality_t criticality, SBcAP_Write_Replace_Warning_Request_IEs__value_PR present); diff --git a/src/sbcap/sbcap_common.c b/src/sbcap/sbcap_common.c index 86ca0b2..0596b53 100644 --- a/src/sbcap/sbcap_common.c +++ b/src/sbcap/sbcap_common.c @@ -141,6 +141,20 @@ } } +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; + int i; + for (i = 0; i < li->count; i++) { + /* "SBcAP_ProtocolIE_ID_t id" is first element in all *_IEs struct */ + SBcAP_ProtocolIE_ID_t *cur_ie_id = li->array[i]; + if (*cur_ie_id == ie_id) { + return cur_ie_id; + } + } + return NULL; +} + void sbcap_set_log_area(int log_area) { _sbcap_DSBCAP = log_area; diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index 4f89c3c..c632a4a 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -129,20 +129,6 @@ .cleanup = sbcap_link_fsm_cleanup, }; -static 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; - int i; - for (i = 0; i < li->count; i++) { - /* "SBcAP_ProtocolIE_ID_t id" is first element in all *_IEs struct */ - SBcAP_ProtocolIE_ID_t *cur_ie_id = li->array[i]; - if (*cur_ie_id == ie_id) { - return cur_ie_id; - } - } - return NULL; -} - static SBcAP_Message_Identifier_t *get_msg_id_ie(struct cbc_sbcap_link *link, const SBcAP_SBC_AP_PDU_t *pdu) { 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/+/28805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ib0c7fa12a8f6faa4271e4132ca5a5c656e717400 Gerrit-Change-Number: 28805 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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 logging of rx Error Indication

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28802 ) Change subject: sbcap: Improve logging of rx Error Indication ...................................................................... sbcap: Improve logging of rx Error Indication Change-Id: I63871a57f219a98f8191e6ee4787fc33edb21528 --- M src/sbcap_link_fsm.c 1 file changed, 43 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index d4d10f2..39dd281 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -212,6 +212,47 @@ return osmo_load16be(ie->buf); } +/* Rx Error Indication from peer */ +static int cbc_sbcap_link_rx_error_ind(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu) +{ + A_SEQUENCE_OF(void) *as_pdu = NULL; + SBcAP_ErrorIndicationIEs_t *ie; + SBcAP_Criticality_Diagnostics_t *ie_diag = NULL; + long cause = -1; + long proc_code = -1; + long trigger_msg = -1; + long criticality = -1; + int i; + + as_pdu = (void *)&pdu->choice.initiatingMessage.value.choice.Error_Indication.protocolIEs.list; + OSMO_ASSERT(as_pdu); + + for (i = 0; i < as_pdu->count; i++) { + ie = (SBcAP_ErrorIndicationIEs_t *)(as_pdu->array[i]); + OSMO_ASSERT(ie); + switch (ie->id) { + case SBcAP_ErrorIndicationIEs__value_PR_Cause: + cause = ie->value.choice.Cause; + break; + case SBcAP_ErrorIndicationIEs__value_PR_Criticality_Diagnostics: + ie_diag = &ie->value.choice.Criticality_Diagnostics; + if (ie_diag->procedureCode) + proc_code = *ie_diag->procedureCode; + if (ie_diag->triggeringMessage) + trigger_msg = *ie_diag->triggeringMessage; + if (ie_diag->procedureCriticality) + criticality = *ie_diag->procedureCriticality; + break; + default: + continue; + } + } + + 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); + return 0; +} + /* message was received from remote SBcAP peer (BSC) */ int cbc_sbcap_link_rx_cb(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu) { @@ -231,10 +272,11 @@ 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_Stop_Warning_Indication: case SBcAP_ProcedureId_Write_Replace_Warning_Indication: break; /* Handle msg id below */ - case SBcAP_ProcedureId_Error_Indication: case SBcAP_ProcedureId_PWS_Failure_Indication: default: LOGPSBCAPC(link, LOGL_ERROR, "SBcAP initiatingMessage procedure=%ld not implemented?\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I63871a57f219a98f8191e6ee4787fc33edb21528 Gerrit-Change-Number: 28802 Gerrit-PatchSet: 6 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 logging on non-implemented PWS Restart/Failure Ind

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28803 ) Change subject: sbcap: Improve logging on non-implemented PWS Restart/Failure Ind ...................................................................... sbcap: Improve logging on non-implemented PWS Restart/Failure Ind Change-Id: I0085ac40a7676d9c3626a9da38d02d3b1b2cf6b4 --- M src/sbcap_link_fsm.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index 39dd281..3135f1f 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -80,7 +80,7 @@ //pdu = data; /* TODO: delete any CBS state we have for this peer */ /* TODO: re-send messages we have matching the scope of the peer */ - LOGPSBCAPC(link, LOGL_NOTICE, "RESTART but re-sending not implemented yet\n"); + LOGPSBCAPC(link, LOGL_NOTICE, "Rx PWS Restart Indication not implemented yet\n"); break; default: OSMO_ASSERT(0); @@ -274,10 +274,12 @@ 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"); + return 0; case SBcAP_ProcedureId_Stop_Warning_Indication: case SBcAP_ProcedureId_Write_Replace_Warning_Indication: break; /* Handle msg id below */ - case SBcAP_ProcedureId_PWS_Failure_Indication: default: LOGPSBCAPC(link, LOGL_ERROR, "SBcAP initiatingMessage procedure=%ld not implemented?\n", pdu->choice.initiatingMessage.procedureCode); 4 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/+/28803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0085ac40a7676d9c3626a9da38d02d3b1b2cf6b4 Gerrit-Change-Number: 28803 Gerrit-PatchSet: 5 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 logging of rx Error Indication

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28802 ) Change subject: sbcap: Improve logging of rx Error Indication ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I63871a57f219a98f8191e6ee4787fc33edb21528 Gerrit-Change-Number: 28802 Gerrit-PatchSet: 6 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 27 Jul 2022 11:47:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-upf[master]: apply refactoring of osmo_pfcp_msg_alloc API

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28753 ) Change subject: apply refactoring of osmo_pfcp_msg_alloc API ...................................................................... apply refactoring of osmo_pfcp_msg_alloc API libosmo-pfcp I0d71134e42932cc72992eba73a15e82bc7cd11bd clarifies the osmo_pfcp_msg_alloc functions, apply the necessary changes here. Related: SYS#5599 Depends: I0d71134e42932cc72992eba73a15e82bc7cd11bd (libosmo-pfcp) Change-Id: I73e6da3b80f05e9408c81f41ac05d6578b8e31cf --- M src/osmo-pfcp-tool/pfcp_tool_vty.c M src/osmo-upf/up_endpoint.c M src/osmo-upf/up_peer.c 3 files changed, 24 insertions(+), 30 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-pfcp-tool/pfcp_tool_vty.c b/src/osmo-pfcp-tool/pfcp_tool_vty.c index 2943c76..8593217 100644 --- a/src/osmo-pfcp-tool/pfcp_tool_vty.c +++ b/src/osmo-pfcp-tool/pfcp_tool_vty.c @@ -193,8 +193,7 @@ return CMD_WARNING; } - m = osmo_pfcp_msg_alloc_tx(OTC_SELECT, &peer->remote_addr, &g_pfcp_tool->ep->cfg.local_node_id, NULL, - OSMO_PFCP_MSGT_ASSOC_SETUP_REQ); + m = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, OSMO_PFCP_MSGT_ASSOC_SETUP_REQ); m->ies.assoc_setup_req.recovery_time_stamp = g_pfcp_tool->ep->recovery_time_stamp; m->ies.assoc_setup_req.cp_function_features_present = true; @@ -222,7 +221,9 @@ return CMD_WARNING; } - m = osmo_pfcp_msg_alloc_tx(OTC_SELECT, &peer->remote_addr, &g_pfcp_tool->ep->cfg.local_node_id, NULL, 0); + /* Allocate using API function to have the usual talloc destructor set up, then copy the last request or + * response over it. */ + m = osmo_pfcp_msg_alloc_rx(OTC_SELECT, &peer->remote_addr); if (strcmp(argv[0], "req") == 0) *m = peer->last_req; else @@ -392,8 +393,7 @@ }; osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, &g_pfcp_tool->ep->cfg.local_addr); - m = osmo_pfcp_msg_alloc_tx(OTC_SELECT, &peer->remote_addr, &g_pfcp_tool->ep->cfg.local_node_id, NULL, - OSMO_PFCP_MSGT_SESSION_EST_REQ); + m = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, OSMO_PFCP_MSGT_SESSION_EST_REQ); m->h.seid_present = true; /* the UPF has yet to assign a SEID for itself, no matter what SEID we (the CPF) use for this session */ m->h.seid = 0; @@ -567,8 +567,7 @@ }; osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, &g_pfcp_tool->ep->cfg.local_addr); - m = osmo_pfcp_msg_alloc_tx(OTC_SELECT, &peer->remote_addr, &g_pfcp_tool->ep->cfg.local_node_id, NULL, - OSMO_PFCP_MSGT_SESSION_EST_REQ); + m = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, OSMO_PFCP_MSGT_SESSION_EST_REQ); m->h.seid_present = true; m->h.seid = 0; /* GTP tunmap: remove header from both directions, and add header in both directions */ @@ -688,8 +687,7 @@ }; osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, &g_pfcp_tool->ep->cfg.local_addr); - m = osmo_pfcp_msg_alloc_tx(OTC_SELECT, &peer->remote_addr, &g_pfcp_tool->ep->cfg.local_node_id, NULL, - OSMO_PFCP_MSGT_SESSION_MOD_REQ); + m = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, OSMO_PFCP_MSGT_SESSION_MOD_REQ); m->h.seid_present = true; m->h.seid = session->up_f_seid.seid; m->ies.session_mod_req = (struct osmo_pfcp_msg_session_mod_req){ @@ -732,8 +730,7 @@ return CMD_WARNING; } - m = osmo_pfcp_msg_alloc_tx(OTC_SELECT, &peer->remote_addr, &g_pfcp_tool->ep->cfg.local_node_id, NULL, - OSMO_PFCP_MSGT_SESSION_DEL_REQ); + m = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, OSMO_PFCP_MSGT_SESSION_DEL_REQ); m->h.seid_present = true; m->h.seid = session->up_f_seid.seid; diff --git a/src/osmo-upf/up_endpoint.c b/src/osmo-upf/up_endpoint.c index b33e112..ef3702a 100644 --- a/src/osmo-upf/up_endpoint.c +++ b/src/osmo-upf/up_endpoint.c @@ -62,13 +62,12 @@ } static void up_ep_rx_not_impl_req(struct up_endpoint *up_ep, const struct osmo_pfcp_msg *m, - enum osmo_pfcp_message_type resp_msgt, - const struct osmo_pfcp_ie_node_id *node_id, enum osmo_pfcp_cause cause) + enum osmo_pfcp_message_type resp_msgt, enum osmo_pfcp_cause cause) { struct osmo_pfcp_msg *tx; enum osmo_pfcp_cause *tx_cause; OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "message type not implemented\n"); - tx = osmo_pfcp_msg_alloc_tx(OTC_SELECT, NULL, &up_ep->pfcp_ep->cfg.local_node_id, m, resp_msgt); + tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, resp_msgt); tx_cause = osmo_pfcp_msg_cause(tx); if (tx_cause) *tx_cause = cause; @@ -77,7 +76,7 @@ static void up_ep_rx_pfd_mgmt_req(struct up_endpoint *up_ep, const struct osmo_pfcp_msg *m) { - up_ep_rx_not_impl_req(up_ep, m, OSMO_PFCP_MSGT_PFD_MGMT_RESP, NULL, OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED); + up_ep_rx_not_impl_req(up_ep, m, OSMO_PFCP_MSGT_PFD_MGMT_RESP, OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED); } static void up_ep_rx_assoc_setup_req(struct up_endpoint *up_ep, const struct osmo_pfcp_msg *m) @@ -95,8 +94,7 @@ if (!m->ctx.peer_fi) { struct osmo_pfcp_msg *tx; OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Peer is not associated, cannot update association\n"); - tx = osmo_pfcp_msg_alloc_tx(OTC_SELECT, NULL, &up_ep->pfcp_ep->cfg.local_node_id, m, OSMO_PFCP_MSGT_ASSOC_UPDATE_RESP); - /* FIXME set node_id, cause */ + tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, OSMO_PFCP_MSGT_ASSOC_UPDATE_RESP); osmo_pfcp_endpoint_tx(up_ep->pfcp_ep, tx); return; } @@ -108,8 +106,7 @@ if (!m->ctx.peer_fi) { struct osmo_pfcp_msg *tx; OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Peer is not associated. Sending ACK response anyway\n"); - tx = osmo_pfcp_msg_alloc_tx(OTC_SELECT, NULL, &up_ep->pfcp_ep->cfg.local_node_id, m, OSMO_PFCP_MSGT_ASSOC_RELEASE_RESP); - /* FIXME set node_id, cause */ + tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, OSMO_PFCP_MSGT_ASSOC_RELEASE_RESP); osmo_pfcp_endpoint_tx(up_ep->pfcp_ep, tx); return; } @@ -118,14 +115,13 @@ static void up_ep_rx_node_report_req(struct up_endpoint *up_ep, const struct osmo_pfcp_msg *m) { - up_ep_rx_not_impl_req(up_ep, m, OSMO_PFCP_MSGT_NODE_REPORT_RESP, NULL /* FIXME? */, - OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED); + up_ep_rx_not_impl_req(up_ep, m, OSMO_PFCP_MSGT_NODE_REPORT_RESP, OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED); } static void up_ep_rx_session_set_del_req(struct up_endpoint *up_ep, const struct osmo_pfcp_msg *m) { up_ep_rx_not_impl_req(up_ep, m, OSMO_PFCP_MSGT_SESSION_SET_DEL_RESP, - &up_ep->pfcp_ep->cfg.local_node_id, OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED); + OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED); } static void up_ep_rx_session_est_req(struct up_endpoint *up_ep, const struct osmo_pfcp_msg *m) @@ -133,7 +129,7 @@ if (!m->ctx.peer_fi) { struct osmo_pfcp_msg *tx; OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Peer is not associated, cannot establish session\n"); - tx = osmo_pfcp_msg_alloc_tx(OTC_SELECT, NULL, &up_ep->pfcp_ep->cfg.local_node_id, m, OSMO_PFCP_MSGT_SESSION_EST_RESP); + tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, OSMO_PFCP_MSGT_SESSION_EST_RESP); tx->ies.session_est_resp.cause = OSMO_PFCP_CAUSE_NO_ESTABLISHED_PFCP_ASSOC; osmo_pfcp_endpoint_tx(up_ep->pfcp_ep, tx); return; @@ -146,8 +142,7 @@ if (!m->ctx.session_fi) { /* Session not found. */ struct osmo_pfcp_msg *tx; - tx = osmo_pfcp_msg_alloc_tx(OTC_SELECT, NULL, &up_ep->pfcp_ep->cfg.local_node_id, m, - OSMO_PFCP_MSGT_SESSION_MOD_RESP); + tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, OSMO_PFCP_MSGT_SESSION_MOD_RESP); if (!m->ctx.peer_fi) { /* Not even the peer is associated. */ OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Peer is not associated, cannot modify session\n"); @@ -169,7 +164,7 @@ if (!m->ctx.session_fi) { /* Session not found. */ struct osmo_pfcp_msg *tx; - tx = osmo_pfcp_msg_alloc_tx(OTC_SELECT, NULL, &up_ep->pfcp_ep->cfg.local_node_id, m, OSMO_PFCP_MSGT_SESSION_DEL_RESP); + tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, OSMO_PFCP_MSGT_SESSION_DEL_RESP); if (!m->ctx.peer_fi) { /* Not even the peer is associated. */ OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Peer is not associated, cannot delete session\n"); @@ -188,7 +183,7 @@ static void up_ep_rx_session_rep_req(struct up_endpoint *up_ep, const struct osmo_pfcp_msg *m) { - up_ep_rx_not_impl_req(up_ep, m, OSMO_PFCP_MSGT_SESSION_REP_RESP, NULL, OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED); + up_ep_rx_not_impl_req(up_ep, m, OSMO_PFCP_MSGT_SESSION_REP_RESP, OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED); } static void up_endpoint_rx_cb(struct osmo_pfcp_endpoint *ep, struct osmo_pfcp_msg *m, struct osmo_pfcp_msg *req) diff --git a/src/osmo-upf/up_peer.c b/src/osmo-upf/up_peer.c index d0d7dbd..633e458 100644 --- a/src/osmo-upf/up_peer.c +++ b/src/osmo-upf/up_peer.c @@ -194,9 +194,11 @@ struct osmo_pfcp_msg *up_peer_init_tx(struct up_peer *peer, struct osmo_pfcp_msg *in_reply_to, enum osmo_pfcp_message_type message_type) { - struct osmo_pfcp_msg *tx = osmo_pfcp_msg_alloc_tx(OTC_SELECT, &peer->remote_addr, - &peer->up_endpoint->pfcp_ep->cfg.local_node_id, - in_reply_to, message_type); + struct osmo_pfcp_msg *tx; + if (in_reply_to) + tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, in_reply_to, message_type); + else + tx = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, message_type); up_peer_set_msg_ctx(peer, tx); return tx; } -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I73e6da3b80f05e9408c81f41ac05d6578b8e31cf Gerrit-Change-Number: 28753 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmo-upf[master]: apply refactoring of osmo_pfcp_msg_alloc API

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28753 ) Change subject: apply refactoring of osmo_pfcp_msg_alloc API ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I73e6da3b80f05e9408c81f41ac05d6578b8e31cf Gerrit-Change-Number: 28753 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 11:42:30 +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 logging on non-implemented PWS Restart/Failure Ind

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28803 to look at the new patch set (#5). Change subject: sbcap: Improve logging on non-implemented PWS Restart/Failure Ind ...................................................................... sbcap: Improve logging on non-implemented PWS Restart/Failure Ind Change-Id: I0085ac40a7676d9c3626a9da38d02d3b1b2cf6b4 --- M src/sbcap_link_fsm.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/03/28803/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0085ac40a7676d9c3626a9da38d02d3b1b2cf6b4 Gerrit-Change-Number: 28803 Gerrit-PatchSet: 5 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Improve logging of rx Error Indication

by pespin

Attention is currently required from: laforge. Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28802 to look at the new patch set (#6). Change subject: sbcap: Improve logging of rx Error Indication ...................................................................... sbcap: Improve logging of rx Error Indication Change-Id: I63871a57f219a98f8191e6ee4787fc33edb21528 --- M src/sbcap_link_fsm.c 1 file changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/02/28802/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I63871a57f219a98f8191e6ee4787fc33edb21528 Gerrit-Change-Number: 28802 Gerrit-PatchSet: 6 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: Move sbcap_as_find_ie() to libsbcap

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28805 to look at the new patch set (#3). Change subject: Move sbcap_as_find_ie() to libsbcap ...................................................................... Move sbcap_as_find_ie() to libsbcap This function is generic and can be (will be) used in more places. Change-Id: Ib0c7fa12a8f6faa4271e4132ca5a5c656e717400 --- M include/osmocom/sbcap/sbcap_common.h M src/sbcap/sbcap_common.c M src/sbcap_link_fsm.c 3 files changed, 16 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/05/28805/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ib0c7fa12a8f6faa4271e4132ca5a5c656e717400 Gerrit-Change-Number: 28805 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: 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 osmo-cbc[master]: sbcap: Fix typo in comment

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28806 to look at the new patch set (#2). Change subject: sbcap: Fix typo in comment ...................................................................... sbcap: Fix typo in comment Change-Id: I6d519cb80a90e2a7e80e4608c713996f94043f21 --- M src/sbcap_link_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/06/28806/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6d519cb80a90e2a7e80e4608c713996f94043f21 Gerrit-Change-Number: 28806 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: 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 osmo-cbc[master]: sbcap: Tx Error ind if Rx ProcedureCode is unknown

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28804 to look at the new patch set (#5). Change subject: sbcap: Tx Error ind if Rx ProcedureCode is unknown ...................................................................... sbcap: Tx Error ind if Rx ProcedureCode is unknown Change-Id: I3ee760b98d87f179917acbc369f56d72d0db571d --- M src/sbcap_link_fsm.c 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/04/28804/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I3ee760b98d87f179917acbc369f56d72d0db571d Gerrit-Change-Number: 28804 Gerrit-PatchSet: 5 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Improve handling of rx Error Indication

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28802 ) Change subject: sbcap: Improve handling of rx Error Indication ...................................................................... Patch Set 5: (1 comment) Patchset: PS5: > I would suggest (next time) to put a one-line description on what that improvement is. […] Indeed. Right now I only logging, but I also implemented all the parsing of the message iterating it, so now using it for whatever in the future should also be easier. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I63871a57f219a98f8191e6ee4787fc33edb21528 Gerrit-Change-Number: 28802 Gerrit-PatchSet: 5 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 27 Jul 2022 11:41:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in libosmo-pfcp[master]: clarify osmo_pfcp_msg alloc API

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28750 ) Change subject: clarify osmo_pfcp_msg alloc API ...................................................................... clarify osmo_pfcp_msg alloc API Looking at the osmo_pfcp_msg_alloc API with a bit of distance now, I found that: - it is confusing to have a single function for req and resp. A resp may pass remote_addr as NULL, and a req may pass in_reply_to as NULL. Make this much more obvious with separate req/resp functions. - the osmo_pfcp_endpoint_tx() implicitly puts the local Node ID into sent PFCP messages, so the local_node_id arg for msg alloc is redundant. Drop that. Refactor without backwards compat, because we have not yet officially released this API. This requires a fixup patch to osmo-upf.git (and affects unmerged patches to osmo-hnbgw.git). Related: SYS#5599 Related: I73e6da3b80f05e9408c81f41ac05d6578b8e31cf (osmo-upf) Change-Id: I0d71134e42932cc72992eba73a15e82bc7cd11bd --- M include/osmocom/pfcp/pfcp_cp_peer.h M include/osmocom/pfcp/pfcp_msg.h M src/libosmo-pfcp/pfcp_cp_peer.c M src/libosmo-pfcp/pfcp_endpoint.c M src/libosmo-pfcp/pfcp_msg.c 5 files changed, 48 insertions(+), 27 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/pfcp/pfcp_cp_peer.h b/include/osmocom/pfcp/pfcp_cp_peer.h index 8c6e448..e555a5f 100644 --- a/include/osmocom/pfcp/pfcp_cp_peer.h +++ b/include/osmocom/pfcp/pfcp_cp_peer.h @@ -58,6 +58,9 @@ const struct osmo_sockaddr *remote_addr); int osmo_pfcp_cp_peer_associate(struct osmo_pfcp_cp_peer *cp_peer); bool osmo_pfcp_cp_peer_is_associated(const struct osmo_pfcp_cp_peer *cp_peer); -struct osmo_pfcp_msg *osmo_pfcp_cp_peer_new_msg_tx(struct osmo_pfcp_cp_peer *cp_peer, - enum osmo_pfcp_message_type msg_type); +struct osmo_pfcp_msg *osmo_pfcp_cp_peer_new_req(struct osmo_pfcp_cp_peer *cp_peer, + enum osmo_pfcp_message_type msg_type); +struct osmo_pfcp_msg *osmo_pfcp_cp_peer_new_resp(struct osmo_pfcp_cp_peer *cp_peer, + const struct osmo_pfcp_msg *in_reply_to, + enum osmo_pfcp_message_type msg_type); void osmo_pfcp_cp_peer_set_msg_ctx(struct osmo_pfcp_cp_peer *cp_peer, struct osmo_pfcp_msg *m); diff --git a/include/osmocom/pfcp/pfcp_msg.h b/include/osmocom/pfcp/pfcp_msg.h index 2833408..4affa54 100644 --- a/include/osmocom/pfcp/pfcp_msg.h +++ b/include/osmocom/pfcp/pfcp_msg.h @@ -169,10 +169,10 @@ int osmo_pfcp_msg_decode_tlv(struct osmo_pfcp_msg *m, struct osmo_gtlv_load *tlv); struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_rx(void *ctx, const struct osmo_sockaddr *remote_addr); -struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_tx(void *ctx, const struct osmo_sockaddr *remote_addr, - const struct osmo_pfcp_ie_node_id *local_node_id, - const struct osmo_pfcp_msg *in_reply_to, - enum osmo_pfcp_message_type msg_type); +struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_tx_req(void *ctx, const struct osmo_sockaddr *remote_addr, + enum osmo_pfcp_message_type msg_type); +struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_tx_resp(void *ctx, const struct osmo_pfcp_msg *in_reply_to, + enum osmo_pfcp_message_type msg_type); void osmo_pfcp_msg_invalidate_ctx(struct osmo_pfcp_msg *m, struct osmo_fsm_inst *deleted_fi); diff --git a/src/libosmo-pfcp/pfcp_cp_peer.c b/src/libosmo-pfcp/pfcp_cp_peer.c index c47b440..e1dd9ac 100644 --- a/src/libosmo-pfcp/pfcp_cp_peer.c +++ b/src/libosmo-pfcp/pfcp_cp_peer.c @@ -160,7 +160,7 @@ struct osmo_pfcp_cp_peer *cp_peer = fi->priv; struct osmo_pfcp_msg *m; - m = osmo_pfcp_cp_peer_new_msg_tx(cp_peer, OSMO_PFCP_MSGT_ASSOC_SETUP_REQ); + m = osmo_pfcp_cp_peer_new_req(cp_peer, OSMO_PFCP_MSGT_ASSOC_SETUP_REQ); m->ies.assoc_setup_req.recovery_time_stamp = cp_peer->ep->recovery_time_stamp; m->ies.assoc_setup_req.cp_function_features_present = true; @@ -391,14 +391,25 @@ osmo_use_count_get_put(m->ctx.peer_use_count, m->ctx.peer_use_token, 1); } -struct osmo_pfcp_msg *osmo_pfcp_cp_peer_new_msg_tx(struct osmo_pfcp_cp_peer *cp_peer, - enum osmo_pfcp_message_type msg_type) +/* Allocate a new PFCP request message to be sent to cp_peer->remote_addr. */ +struct osmo_pfcp_msg *osmo_pfcp_cp_peer_new_req(struct osmo_pfcp_cp_peer *cp_peer, + enum osmo_pfcp_message_type msg_type) { struct osmo_pfcp_msg *m; - m = osmo_pfcp_msg_alloc_tx(cp_peer->ep, &cp_peer->remote_addr, &cp_peer->ep->cfg.local_node_id, NULL, - msg_type); - if (!m) - return m; + m = osmo_pfcp_msg_alloc_tx_req(cp_peer->ep, &cp_peer->remote_addr, msg_type); + OSMO_ASSERT(m); + osmo_pfcp_cp_peer_set_msg_ctx(cp_peer, m); + return m; +} + +/* Allocate a new PFCP response message to be sent to cp_peer->remote_addr. */ +struct osmo_pfcp_msg *osmo_pfcp_cp_peer_new_resp(struct osmo_pfcp_cp_peer *cp_peer, + const struct osmo_pfcp_msg *in_reply_to, + enum osmo_pfcp_message_type msg_type) +{ + struct osmo_pfcp_msg *m; + m = osmo_pfcp_msg_alloc_tx_resp(cp_peer->ep, in_reply_to, msg_type); + OSMO_ASSERT(m); osmo_pfcp_cp_peer_set_msg_ctx(cp_peer, m); return m; } diff --git a/src/libosmo-pfcp/pfcp_endpoint.c b/src/libosmo-pfcp/pfcp_endpoint.c index f446858..6162086 100644 --- a/src/libosmo-pfcp/pfcp_endpoint.c +++ b/src/libosmo-pfcp/pfcp_endpoint.c @@ -242,8 +242,7 @@ int osmo_pfcp_endpoint_tx_heartbeat_req(struct osmo_pfcp_endpoint *ep, const struct osmo_sockaddr *remote_addr) { - struct osmo_pfcp_msg *tx = osmo_pfcp_msg_alloc_tx(OTC_SELECT, remote_addr, NULL, NULL, - OSMO_PFCP_MSGT_HEARTBEAT_REQ); + struct osmo_pfcp_msg *tx = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, remote_addr, OSMO_PFCP_MSGT_HEARTBEAT_REQ); tx->ies.heartbeat_req.recovery_time_stamp = ep->recovery_time_stamp; tx->h.sequence_nr = osmo_pfcp_next_seq_nr(&ep->seq_nr_state); return osmo_pfcp_endpoint_tx_data(ep, tx); @@ -326,7 +325,7 @@ if (m->h.message_type == OSMO_PFCP_MSGT_HEARTBEAT_REQ) { /* Directly answer with a Heartbeat Response. */ - struct osmo_pfcp_msg *resp = osmo_pfcp_msg_alloc_tx(OTC_SELECT, NULL, NULL, m, OSMO_PFCP_MSGT_HEARTBEAT_RESP); + struct osmo_pfcp_msg *resp = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, OSMO_PFCP_MSGT_HEARTBEAT_RESP); resp->ies.heartbeat_resp.recovery_time_stamp = ep->recovery_time_stamp; osmo_pfcp_endpoint_tx_data(ep, resp); /* Still also dispatch the Rx event to the peer. */ diff --git a/src/libosmo-pfcp/pfcp_msg.c b/src/libosmo-pfcp/pfcp_msg.c index 9d65efc..5f55575 100644 --- a/src/libosmo-pfcp/pfcp_msg.c +++ b/src/libosmo-pfcp/pfcp_msg.c @@ -418,31 +418,39 @@ return rx; } -struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_tx(void *ctx, const struct osmo_sockaddr *remote_addr, - const struct osmo_pfcp_ie_node_id *node_id, - const struct osmo_pfcp_msg *in_reply_to, - enum osmo_pfcp_message_type msg_type) +static struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_tx(void *ctx, const struct osmo_sockaddr *remote_addr, + const struct osmo_pfcp_msg *in_reply_to, + enum osmo_pfcp_message_type msg_type) { struct osmo_pfcp_msg *tx; if (!remote_addr && in_reply_to) remote_addr = &in_reply_to->remote_addr; OSMO_ASSERT(remote_addr); tx = _osmo_pfcp_msg_alloc(ctx, remote_addr); + OSMO_ASSERT(tx); tx->is_response = osmo_pfcp_msgtype_is_response(msg_type); tx->h.message_type = msg_type; if (in_reply_to) tx->h.sequence_nr = in_reply_to->h.sequence_nr; osmo_pfcp_msg_set_memb_ofs(tx); - - /* Write the local node id data to the correct tx->ies.* member. */ - if (node_id) { - struct osmo_pfcp_ie_node_id *tx_node_id = osmo_pfcp_msg_node_id(tx); - if (tx_node_id) - *tx_node_id = *node_id; - } return tx; } +/* Allocate a new PFCP Request message to be transmitted to a peer. */ +struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_tx_req(void *ctx, const struct osmo_sockaddr *remote_addr, + enum osmo_pfcp_message_type msg_type) +{ + return osmo_pfcp_msg_alloc_tx(ctx, remote_addr, NULL, msg_type); +} + +/* Allocate a new PFCP Response message to be transmitted to a peer, as a response to a received PFCP message. + * Pass the received PFCP Request in in_reply_to; take the remote address and sequence nr from in_reply_to. */ +struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_tx_resp(void *ctx, const struct osmo_pfcp_msg *in_reply_to, + enum osmo_pfcp_message_type msg_type) +{ + return osmo_pfcp_msg_alloc_tx(ctx, NULL, in_reply_to, msg_type); +} + static int osmo_pfcp_msg_destructor(struct osmo_pfcp_msg *m) { OSMO_LOG_PFCP_MSG(m, LOGL_DEBUG, "discarding\n"); -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I0d71134e42932cc72992eba73a15e82bc7cd11bd Gerrit-Change-Number: 28750 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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 osmocom-bb[master]: trxcon: make trx_if_cmd_setfh() accept const *ma

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28808 ) Change subject: trxcon: make trx_if_cmd_setfh() accept const *ma ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id80b59260a24ccf8458c15ae8e191524a86a839c Gerrit-Change-Number: 28808 Gerrit-PatchSet: 1 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: Wed, 27 Jul 2022 11:14:10 +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: make l1sched_start_ciphering() accept const *key

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28807 ) Change subject: trxcon: make l1sched_start_ciphering() accept const *key ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: IT would be more like pass, it already accepted const pointer before :P -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28807 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I042903d779b6fbae68951a94788a458bf5226046 Gerrit-Change-Number: 28807 Gerrit-PatchSet: 1 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: Wed, 27 Jul 2022 11:13:20 +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: assert *ts is not NULL in l1sched_set_lchans

by fixeria

fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmocom-bb/+/28810 ) Change subject: trxcon: assert *ts is not NULL in l1sched_set_lchans ...................................................................... trxcon: assert *ts is not NULL in l1sched_set_lchans We cannot use ts->sched as logging context because ts is NULL. Change-Id: I53b40b31f20fc9aefdfcac1406c465d226e5fde0 Related: CID#275337 --- M src/host/trxcon/src/sched_trx.c 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/10/28810/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28810 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I53b40b31f20fc9aefdfcac1406c465d226e5fde0 Gerrit-Change-Number: 28810 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: assert *ts is not NULL in l1sched_set_lchans

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28810 ) Change subject: trxcon: assert *ts is not NULL in l1sched_set_lchans ...................................................................... trxcon: assert *ts is not NULL in l1sched_set_lchans Change-Id: I53b40b31f20fc9aefdfcac1406c465d226e5fde0 Related: CID#275337 --- M src/host/trxcon/src/sched_trx.c 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/10/28810/1 diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index 556fe6a..030cbc9 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -418,10 +418,7 @@ int rc = 0; /* Prevent NULL-pointer deference */ - if (ts == NULL) { - LOGP_SCHEDC(ts->sched, LOGL_ERROR, "Timeslot isn't configured\n"); - return -EINVAL; - } + OSMO_ASSERT(ts != NULL); /* Iterate over all allocated lchans */ llist_for_each_entry(lchan, &ts->lchans, list) { -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28810 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I53b40b31f20fc9aefdfcac1406c465d226e5fde0 Gerrit-Change-Number: 28810 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Build failure of network:osmocom:nightly/osmo-sgsn in Raspbian_10/armv7l

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o… Package network:osmocom:nightly/osmo-sgsn failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 223s] tl-paper: setting paper size for xdvi to a4: /var/lib/texmf/xdvi/XDvi-paper [ 223s] tl-paper: setting paper size for pdftex to a4: /var/lib/texmf/tex/generic/config/pdftexconfig.tex [ 226s] [452/484] installing gnupg-2.2.12-1+rpi1+deb10u1 [ 227s] [453/484] installing libpangomm-1.4-1v5-2.42.0-2 [ 227s] [454/484] installing librsvg2-2-2.44.10-2.1+rpi1 [ 227s] [455/484] installing libgvc6-2.40.1-6+deb10u1 [ 228s] [456/484] installing systemd-241-7~deb10u8+rpi1 [ 230s] Created symlink /etc/systemd/system/getty.target.wants/getty(a)tty1.service -> /lib/systemd/system/getty@.service. [ 230s] Created symlink /etc/systemd/system/multi-user.target.wants/remote-fs.target -> /lib/systemd/system/remote-fs.target. [ 230s] Created symlink /etc/systemd/system/dbus-org.freedesktop.timesync1.service -> /lib/systemd/system/systemd-timesyncd.service. [ 230s] Created symlink /etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service -> /lib/systemd/system/systemd-timesyncd.service. [ 230s] Initializing machine ID from random generator. [ 231s] [457/484] installing texlive-fonts-recommended-2018.20190227-2 [ 236s] [458/484] installing librsvg2-common-2.44.10-2.1+rpi1 [ 236s] [459/484] installing texlive-plain-generic-2018.20190227-2 [ 237s] dpkg-deb (subprocess): decompressing archive member: lzma error: compressed data is corrupt [ 237s] dpkg-deb: error: <decompress> subprocess returned error exit status 2 [ 237s] dpkg: error processing archive .init_b_cache/texlive-plain-generic.deb (--install): [ 237s] cannot copy extracted data for './usr/share/doc/texlive-doc/generic/chronosys/docchronosys_en.pdf' to '/usr/share/doc/texlive-doc/generic/chronosys/docchronosys_en.pdf.dpkg-new': unexpected end of file or stream [ 237s] Errors were encountered while processing: [ 237s] .init_b_cache/texlive-plain-generic.deb [ 237s] exit ... [ 237s] ### VM INTERACTION START ### [ 238s] [ 206.564717] sysrq: SysRq : Power Off [ 238s] [ 206.607057] reboot: Power down [ 238s] ### VM INTERACTION END ### [ 238s] [ 238s] armbuild01 failed "build osmo-sgsn_1.9.0.202207270052.dsc" at Wed Jul 27 06:24:23 UTC 2022. [ 238s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

1 year, 9 months

1
0
0 0

Build failure of network:osmocom:nightly/osmo-hnbgw in Raspbian_11/armv7l

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o… Package network:osmocom:nightly/osmo-hnbgw failed to build in Raspbian_11/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-hnbgw Last lines of build log: [ 342s] update-alternatives: using /usr/share/docutils/scripts/python3/rst2odt to provide /usr/bin/rst2odt (rst2odt) in auto mode [ 342s] update-alternatives: using /usr/share/docutils/scripts/python3/rst2odt_prepstyles to provide /usr/bin/rst2odt_prepstyles (rst2odt_prepstyles) in auto mode [ 342s] update-alternatives: using /usr/share/docutils/scripts/python3/rst2pseudoxml to provide /usr/bin/rst2pseudoxml (rst2pseudoxml) in auto mode [ 342s] update-alternatives: using /usr/share/docutils/scripts/python3/rst2s5 to provide /usr/bin/rst2s5 (rst2s5) in auto mode [ 342s] update-alternatives: using /usr/share/docutils/scripts/python3/rst2xetex to provide /usr/bin/rst2xetex (rst2xetex) in auto mode [ 342s] update-alternatives: using /usr/share/docutils/scripts/python3/rst2xml to provide /usr/bin/rst2xml (rst2xml) in auto mode [ 342s] update-alternatives: using /usr/share/docutils/scripts/python3/rstpep2html to provide /usr/bin/rstpep2html (rstpep2html) in auto mode [ 343s] [458/491] installing python3-reportlab-3.5.59-2 [ 346s] [459/491] installing g++-4:10.2.1-1+rpi1 [ 346s] update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode [ 346s] [460/491] installing libosmo-netif-dev-1.2.0.4.dcae.202207270052 [ 346s] [461/491] installing mount-2.36.1-8+deb11u1 [ 347s] [462/491] installing texlive-latex-extra-2020.20210202-3 [ 360s] [463/491] installing debhelper-13.3.4 [ 360s] [464/491] installing bash-5.1-2+deb11u1 [ 361s] dpkg-deb (subprocess): decompressing archive '.init_b_cache/bash.deb' (size=1295464) member 'data.tar': lzma error: compressed data is corrupt [ 361s] dpkg-deb: error: <decompress> subprocess returned error exit status 2 [ 361s] dpkg: error processing archive .init_b_cache/bash.deb (--install): [ 361s] cannot copy extracted data for './bin/bash' to '/bin/bash.dpkg-new': unexpected end of file or stream [ 361s] Errors were encountered while processing: [ 361s] .init_b_cache/bash.deb [ 361s] exit ... [ 361s] ### VM INTERACTION START ### [ 364s] [ 336.630022] sysrq: SysRq : Power Off [ 364s] [ 336.631715] reboot: Power down [ 364s] ### VM INTERACTION END ### [ 364s] [ 364s] armbuild01 failed "build osmo-hnbgw_1.3.0.1.7eb8.202207270052.dsc" at Wed Jul 27 06:11:14 UTC 2022. [ 364s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

1 year, 9 months

1
0
0 0

Build failure of network:osmocom:nightly/osmo-pcu in Raspbian_11/armv7l

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o… Package network:osmocom:nightly/osmo-pcu failed to build in Raspbian_11/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 512s] ## ----------- ## [ 512s] ## confdefs.h. ## [ 512s] ## ----------- ## [ 512s] [ 512s] /* confdefs.h */ [ 512s] #define PACKAGE_NAME "osmo-pcu" [ 512s] #define PACKAGE_TARNAME "osmo-pcu" [ 512s] #define PACKAGE_VERSION "1.1.0.3-0eaa3" [ 512s] #define PACKAGE_STRING "osmo-pcu 1.1.0.3-0eaa3" [ 512s] #define PACKAGE_BUGREPORT "osmocom-net-gprs(a)lists.osmocom.org" [ 512s] #define PACKAGE_URL "" [ 512s] #define PACKAGE "osmo-pcu" [ 512s] #define VERSION "1.1.0.3-0eaa3" [ 512s] [ 512s] configure: exit 77 [ 512s] dh_auto_configure: error: ./configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --libexecdir=\${prefix}/lib/arm-linux-gnueabihf --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 77 [ 512s] make[1]: *** [debian/rules:27: override_dh_auto_configure] Error 25 [ 512s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 512s] make: *** [debian/rules:12: build] Error 2 [ 512s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 512s] ### VM INTERACTION START ### [ 513s] Failed to write wtmp record, ignoring: Read-only file system [ 513s] Failed to write utmp record: Read-only file system [ 513s] Powering off. [ 513s] [ 483.687461] reboot: Power down [ 513s] ### VM INTERACTION END ### [ 513s] [ 513s] armbuild01 failed "build osmo-pcu_1.1.0.3.0eaa3.202207270052.dsc" at Wed Jul 27 04:23:55 UTC 2022. [ 513s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: make trx_if_cmd_setfh() accept const *ma

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28808 ) Change subject: trxcon: make trx_if_cmd_setfh() accept const *ma ...................................................................... trxcon: make trx_if_cmd_setfh() accept const *ma Change-Id: Id80b59260a24ccf8458c15ae8e191524a86a839c --- M src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h M src/host/trxcon/src/trx_if.c 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/08/28808/1 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 0e9c849..18d71cc 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h @@ -68,8 +68,8 @@ int trx_if_cmd_setslot(struct trx_instance *trx, uint8_t tn, enum gsm_phys_chan_config pchan); -int trx_if_cmd_setfh(struct trx_instance *trx, uint8_t hsn, - uint8_t maio, uint16_t *ma, size_t ma_len); +int trx_if_cmd_setfh(struct trx_instance *trx, uint8_t hsn, uint8_t maio, + const uint16_t *ma, size_t ma_len); int trx_if_cmd_measure(struct trx_instance *trx, uint16_t band_arfcn_start, uint16_t band_arfcn_stop); diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index 339173f..a9a6c96 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -428,8 +428,8 @@ * channel list is expected to be sorted in ascending order. */ -int trx_if_cmd_setfh(struct trx_instance *trx, uint8_t hsn, - uint8_t maio, uint16_t *ma, size_t ma_len) +int trx_if_cmd_setfh(struct trx_instance *trx, uint8_t hsn, uint8_t maio, + const uint16_t *ma, size_t ma_len) { /* Reserve some room for CMD SETFH <HSN> <MAIO> */ char ma_buf[TRXC_BUF_SIZE - 24]; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id80b59260a24ccf8458c15ae8e191524a86a839c Gerrit-Change-Number: 28808 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

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 uploaded this change for review. ( 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 Change-Id: Ifaf63ead9dd180181358e771367b2a686ba159ca Related: OS#5599 --- 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/logging.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, 670 insertions(+), 384 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/09/28809/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h index e15d5a2..3ad5406 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h @@ -9,6 +9,7 @@ /* Event handlers */ int l1ctl_rx_cb(struct l1ctl_client *l1c, struct msgb *msg); +int l1ctl_tx_fbsb_fail(struct l1ctl_client *l1c, uint16_t band_arfcn); 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_ccch_mode_conf(struct l1ctl_client *l1c, uint8_t mode); diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index da47f8b..df5ad64 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -4,19 +4,106 @@ 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_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_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_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 +118,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..12f45e2 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,6 +166,28 @@ return conf; } +int l1ctl_tx_fbsb_fail(struct l1ctl_client *l1c, uint16_t band_arfcn) +{ + 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 -ENOMEM; + + dl = put_dl_info_hdr(msg, NULL); + + /* 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, uint8_t result, const struct l1ctl_info_dl *dl_info, uint8_t bsic) { @@ -184,12 +206,6 @@ /* 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); @@ -299,44 +315,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 +330,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 +351,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 +364,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 +402,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, @@ -488,8 +442,7 @@ 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; + int rc; req = (struct l1ctl_ccch_mode_req *) msg->l1h; if (msgb_l1len(msg) < sizeof(*req)) { @@ -503,24 +456,15 @@ LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, "Received CCCH mode request (%u)\n", 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; - } - /* 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, &ch_config); + if (rc == 0) { + /* FIXME: we cannot know for sure if the given mode was actually applied. + * All we know is whether the event was dispatched. Blindly confirm. */ + l1ctl_tx_ccch_mode_conf(l1c, req->ccch_mode); + } exit: msgb_free(msg); @@ -529,40 +473,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 +512,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 +555,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 +563,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 +612,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 +628,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 +666,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; @@ -794,9 +681,7 @@ { struct trxcon_inst *trxcon = l1c->priv; struct l1ctl_tch_mode_req *req; - struct l1sched_lchan_state *lchan; - struct l1sched_ts *ts; - unsigned int tn; + int rc; req = (struct l1ctl_tch_mode_req *) msg->l1h; @@ -804,30 +689,14 @@ "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; - } - } - /* TODO: do we need to care about audio_mode? */ + rc = osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_SET_TCH_MODE_REQ, &req->tch_mode); + if (rc != 0) { + 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 +707,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/logging.c b/src/host/trxcon/src/logging.c index 5c16ac5..e25af8b 100644 --- a/src/host/trxcon/src/logging.c +++ b/src/host/trxcon/src/logging.c @@ -28,7 +28,7 @@ .name = "DAPP", .description = "Application", .color = "\033[1;35m", - .enabled = 1, .loglevel = LOGL_NOTICE, + .enabled = 1, .loglevel = LOGL_DEBUG, }, [DL1C] = { .name = "DL1C", diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index a9a6c96..c960645 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, 0); // XXX 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..570a5a7 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" \ @@ -168,9 +166,10 @@ 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); + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_FBSB_SEARCH_RES, NULL); + rc = l1ctl_tx_fbsb_conf(trxcon->l1c, 0, &dl_hdr, sched->bsic); // XXX break; } /* fall through */ @@ -255,75 +254,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 +307,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); @@ -560,6 +488,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 +501,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..9f56b41 --- /dev/null +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -0,0 +1,419 @@ +/* + * 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 <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_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) +{ + switch (event) { + case TRXCON_EV_FBSB_SEARCH_RES: + osmo_fsm_inst_state_chg(fi, TRXCON_ST_BCCH_CCCH, 0, 0); + break; + default: + OSMO_ASSERT(0); + } +} + +static void trxcon_st_bcch_ccch_action(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + struct trxcon_inst *trxcon = fi->priv; + struct l1sched_ts *ts; + int rc; + + switch (event) { + case TRXCON_EV_TX_ACCESS_BURST_REQ: + { + const struct trxcon_param_tx_access_burst_req *req = data; + enum l1sched_ts_prim_type prim_type; + 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"); + return; + } + break; + } + case TRXCON_EV_SET_CCCH_MODE_REQ: + { + const enum gsm_phys_chan_config *chan_config = data; + + /* 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"); + 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); + 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; + } + 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_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: + { + const uint8_t *tch_mode = 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 = *tch_mode; + } + } + 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: // XXX + case TRXCON_EV_RX_DATA_IND: // XXX + 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_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_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_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_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: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: make l1sched_start_ciphering() accept const *key

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28807 ) Change subject: trxcon: make l1sched_start_ciphering() accept const *key ...................................................................... trxcon: make l1sched_start_ciphering() accept const *key Change-Id: I042903d779b6fbae68951a94788a458bf5226046 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_trx.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/07/28807/1 diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index d2cc2eb..2c48eae 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -397,7 +397,7 @@ int l1sched_configure_ts(struct l1sched_state *sched, int tn, enum gsm_phys_chan_config config); int l1sched_start_ciphering(struct l1sched_ts *ts, uint8_t algo, - uint8_t *key, uint8_t key_len); + const uint8_t *key, uint8_t key_len); /* Logical channel management functions */ enum gsm_phys_chan_config l1sched_chan_nr2pchan_config(uint8_t chan_nr); diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index 556fe6a..10a4c5f 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -368,7 +368,7 @@ } int l1sched_start_ciphering(struct l1sched_ts *ts, uint8_t algo, - uint8_t *key, uint8_t key_len) + const uint8_t *key, uint8_t key_len) { struct l1sched_lchan_state *lchan; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28807 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I042903d779b6fbae68951a94788a458bf5226046 Gerrit-Change-Number: 28807 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

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

by fixeria

Attention is currently required from: neels. fixeria 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: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/28784/comment/6b7c1ab1_bf7373c6 PS3, Line 9: act on a struct sdp_audio_codecs But they all return a struct sdp_audio_codec (singular), so I guess it's fine? -- 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-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Jul 2022 20:56:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: in sdp logging: add payload type number like 'AMR#111'

by fixeria

Attention is currently required from: neels, pespin, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28782 ) Change subject: in sdp logging: add payload type number like 'AMR#111' ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: > Good idea! Maybe it makes sense to print something like "AMR-PT=111" so that one knows that the numb […] Ack, I like this approach more than 'AMR#111'. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icbb4e89ce2947bf787c3ee14e3e115d406e43de2 Gerrit-Change-Number: 28782 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Jul 2022 20:53:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

2024

2023

2022

gerrit-log July 2022