March 2024 - gerrit-log - lists.osmocom.org

[M] Change in osmo-hnbgw[master]: use json to decode counters from nftables

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email ) Change subject: use json to decode counters from nftables ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: from the build errors and looking at the patch it seems like it's missing using the LIBJANSSON_LIBS / LIBJANSSON_CFLAGS in the Makefile.am ? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id4e7fa017c31945388a010d8581715d71482116b Gerrit-Change-Number: 36485 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 10:04:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Introduce Asterisk_Tests testsuite

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36490?usp=email ) Change subject: Introduce Asterisk_Tests testsuite ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36490?usp=email 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: I66f776d5df6fb5dc488d9e589b84a6b2385406e8 Gerrit-Change-Number: 36490 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-Comment-Date: Fri, 29 Mar 2024 10:02:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Rework templates to make them more extensible

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36489?usp=email ) Change subject: SIP_Templates: Rework templates to make them more extensible ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36489?usp=email 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: Ifd14213e9c2b8f5061f828a63ef47844828d94ea Gerrit-Change-Number: 36489 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-Comment-Date: Fri, 29 Mar 2024 10:01:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP: generate seq_nr within allowed range

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36488?usp=email ) Change subject: SIP: generate seq_nr within allowed range ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36488?usp=email 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: Iea5f4568af1bd795db57d2b77e82d976edc9e337 Gerrit-Change-Number: 36488 Gerrit-PatchSet: 1 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-Comment-Date: Fri, 29 Mar 2024 10:01:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: generalize hnbgw_tx_ue_register_rej_tmsi() to hnbgw_tx_ue_register_rej()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36474?usp=email ) Change subject: generalize hnbgw_tx_ue_register_rej_tmsi() to hnbgw_tx_ue_register_rej() ...................................................................... generalize hnbgw_tx_ue_register_rej_tmsi() to hnbgw_tx_ue_register_rej() This way the caller can provide the cause value to be used during reject. Requires: osmo-iuh I7db92b51847c282d23d568970dfd2bedecdea486 Change-Id: Ic83674523c0326a7ae51fb176bddfd6641ed3ac4 --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 28 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index b2ff911..32b0904 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -161,13 +161,15 @@ return hnbgw_hnbap_tx(ue->hnb, msg); } -static int hnbgw_tx_ue_register_rej_tmsi(struct hnb_context *hnb, HNBAP_UE_Identity_t *ue_id) +static int hnbgw_tx_ue_register_rej(struct hnb_context *hnb, HNBAP_UE_Identity_t *ue_id, const struct HNBAP_Cause *cause) { HNBAP_UERegisterReject_t reject_out; HNBAP_UERegisterRejectIEs_t reject; struct msgb *msg; int rc; + OSMO_ASSERT(cause); + memset(&reject, 0, sizeof(reject)); reject.uE_Identity.present = ue_id->present; @@ -229,10 +231,9 @@ return -1; } - LOGHNB(hnb, DHNBAP, LOGL_ERROR, "Rejecting UE Register Request: TMSI identity registration is switched off\n"); + LOGHNB(hnb, DHNBAP, LOGL_ERROR, "Rejecting UE Register Request cause=%s\n", hnbap_cause_str(cause)); - reject.cause.present = HNBAP_Cause_PR_radioNetwork; - reject.cause.choice.radioNetwork = HNBAP_CauseRadioNetwork_invalid_UE_identity; + reject.cause = *cause; memset(&reject_out, 0, sizeof(reject_out)); rc = hnbap_encode_ueregisterrejecties(&reject_out, &reject); @@ -527,10 +528,17 @@ break; case HNBAP_UE_Identity_PR_tMSILAI: case HNBAP_UE_Identity_PR_pTMSIRAI: - if (g_hnbgw->config.hnbap_allow_tmsi) + if (g_hnbgw->config.hnbap_allow_tmsi) { rc = hnbgw_tx_ue_register_acc_tmsi(ctx, &ies.uE_Identity); - else - rc = hnbgw_tx_ue_register_rej_tmsi(ctx, &ies.uE_Identity); + } else { + struct HNBAP_Cause cause = { + .present = HNBAP_Cause_PR_radioNetwork, + .choice = { + .radioNetwork = HNBAP_CauseRadioNetwork_invalid_UE_identity, + }, + }; + rc = hnbgw_tx_ue_register_rej(ctx, &ies.uE_Identity, &cause); + } /* all has been handled by TMSI, skip the IMSI code below */ goto free_and_return_rc; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36474?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic83674523c0326a7ae51fb176bddfd6641ed3ac4 Gerrit-Change-Number: 36474 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: Use proper cause values during HNB-REGISTER-REQ processing

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36475?usp=email ) Change subject: HNBAP: Use proper cause values during HNB-REGISTER-REQ processing ...................................................................... HNBAP: Use proper cause values during HNB-REGISTER-REQ processing When we reject the HNB-REGISTER-REQ, let's use an as specific as possible cause value to let the peer know why we rejected registration. Change-Id: Iadddd26b751a9fd80c829068792aa93cd538c43d --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 26 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 32b0904..5cca3cb 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -49,16 +49,19 @@ return 0; } -static int hnbgw_tx_hnb_register_rej(struct hnb_context *ctx) +static int hnbgw_tx_hnb_register_rej(struct hnb_context *ctx, const HNBAP_Cause_t *cause) { HNBAP_HNBRegisterReject_t reject_out; HNBAP_HNBRegisterRejectIEs_t reject; struct msgb *msg; int rc; - reject.presenceMask = 0, - reject.cause.present = HNBAP_Cause_PR_radioNetwork; - reject.cause.choice.radioNetwork = HNBAP_CauseRadioNetwork_unspecified; + OSMO_ASSERT(cause); + + LOGHNB(ctx, DHNBAP, LOGL_ERROR, "Rejecting HNB Register Request cause=%s\n", hnbap_cause_str(cause)); + + reject.presenceMask = 0; + reject.cause = *cause; /* encode the Information Elements */ memset(&reject_out, 0, sizeof(reject_out)); @@ -414,6 +417,7 @@ char identity_str[256]; const char *cell_id_str; struct timespec tp; + HNBAP_Cause_t cause; rc = hnbap_decode_hnbregisterrequesties(&ies, in); if (rc < 0) { @@ -440,7 +444,9 @@ if (!hnbp) { LOGHNB(ctx, DHNBAP, LOGL_NOTICE, "Rejecting unknonwn HNB with identity %s\n", identity_str); hnbap_free_hnbregisterrequesties(&ies); - return hnbgw_tx_hnb_register_rej(ctx); + cause.present = HNBAP_Cause_PR_radioNetwork; + cause.choice.radioNetwork = HNBAP_CauseRadioNetwork_unauthorised_HNB; + return hnbgw_tx_hnb_register_rej(ctx, &cause); } ctx->persistent = hnbp; hnbp->ctx = ctx; @@ -480,7 +486,9 @@ * misconfigurations or someone trying to impersonate an already working HNB: */ LOGHNB(ctx, DHNBAP, LOGL_ERROR, "rejecting HNB-REGISTER-REQ with duplicate cell identity %s\n", cell_id_str); hnbap_free_hnbregisterrequesties(&ies); - return hnbgw_tx_hnb_register_rej(ctx); + cause.present = HNBAP_Cause_PR_radioNetwork; + cause.choice.radioNetwork = HNBAP_CauseRadioNetwork_hNB_parameter_mismatch; + return hnbgw_tx_hnb_register_rej(ctx, &cause); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36475?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iadddd26b751a9fd80c829068792aa93cd538c43d Gerrit-Change-Number: 36475 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: Send HNB-REGISTER-REJ on ASN.1 decoding error

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36476?usp=email ) Change subject: HNBAP: Send HNB-REGISTER-REJ on ASN.1 decoding error ...................................................................... HNBAP: Send HNB-REGISTER-REJ on ASN.1 decoding error Change-Id: Ic4a40966194a57cccc0eb056233f7e7426d6e8f9 --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 5cca3cb..9ffb0ba 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -422,7 +422,9 @@ rc = hnbap_decode_hnbregisterrequesties(&ies, in); if (rc < 0) { LOGHNB(ctx, DHNBAP, LOGL_ERROR, "Failure to decode HNB-REGISTER-REQ: rc=%d\n", rc); - return rc; + cause.present = HNBAP_Cause_PR_protocol; + cause.choice.radioNetwork = HNBAP_CauseProtocol_unspecified; + return hnbgw_tx_hnb_register_rej(ctx, &cause); } asn1_strncpy(identity_str, &ies.hnB_Identity.hNB_Identity_Info, sizeof(identity_str)); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36476?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic4a40966194a57cccc0eb056233f7e7426d6e8f9 Gerrit-Change-Number: 36476 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[M] Change in osmo-hnbgw[master]: HNBAP: Always respond to UE-REGISTER-REQUEST

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36477?usp=email ) Change subject: HNBAP: Always respond to UE-REGISTER-REQUEST ...................................................................... HNBAP: Always respond to UE-REGISTER-REQUEST We always should respond to a UE-REGISTER-REQ. Either it's an ACK or we must send a REJ. There should not be any "quiet" error cases where we don't respond at all: * send general Error Indication at a point where we cannot decode the UE-Identity-IE (which is mandatory in UE-REGISTER-REJECT) * send UE-REGISTER-REJECT with matching cause value whenever we have the decoded UE Identity around Change-Id: I5338a1324545b2c6d31fb45f1e69fee45842e207 --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 73 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 9ffb0ba..631c782 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -49,6 +49,48 @@ return 0; } +static int hnbgw_tx_error_ind(struct hnb_context *ctx, const HNBAP_Cause_t *cause, + HNBAP_ProcedureCode_t proc_code, HNBAP_Criticality_t criticality, + HNBAP_TriggeringMessage_t trig_msg) +{ + HNBAP_ErrorIndication_t err_ind; + HNBAP_ErrorIndicationIEs_t err_ind_ies; + struct msgb *msg; + int rc; + + LOGHNB(ctx, DHNBAP, LOGL_ERROR, "Tx ErrorIndication cause=%s\n", hnbap_cause_str(cause)); + + err_ind_ies.presenceMask = 0; + err_ind_ies.cause = *cause; + + if (proc_code != -1 || trig_msg != -1 || criticality != -1) { + err_ind_ies.presenceMask |= ERRORINDICATIONIES_HNBAP_CRITICALITYDIAGNOSTICS_PRESENT; + if (proc_code != -1) + err_ind_ies.criticalityDiagnostics.procedureCode = &proc_code; + if (trig_msg != -1) + err_ind_ies.criticalityDiagnostics.triggeringMessage = &trig_msg; + if (criticality != -1) + err_ind_ies.criticalityDiagnostics.procedureCriticality = &criticality; + } + + memset(&err_ind, 0, sizeof(err_ind)); + rc = hnbap_encode_errorindicationies(&err_ind, &err_ind_ies); + if (rc < 0) { + LOGHNB(ctx, DHNBAP, LOGL_ERROR, "Failure to encode ERROR-INDICATION to %s: rc=%d\n", + ctx->identity_info, rc); + return rc; + } + + msg = hnbap_generate_initiating_message(HNBAP_ProcedureCode_id_ErrorIndication, + HNBAP_Criticality_ignore, + &asn_DEF_HNBAP_ErrorIndication, + &err_ind); + + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_HNBAP_ErrorIndication, &err_ind); + + return hnbgw_hnbap_tx(ctx, msg); +} + static int hnbgw_tx_hnb_register_rej(struct hnb_context *ctx, const HNBAP_Cause_t *cause) { HNBAP_HNBRegisterReject_t reject_out; @@ -514,14 +556,20 @@ static int hnbgw_rx_ue_register_req(struct hnb_context *ctx, ANY_t *in) { HNBAP_UERegisterRequestIEs_t ies; + HNBAP_Cause_t cause; struct ue_context *ue; struct ue_context *ue_allocated = NULL; char imsi[16]; int rc; rc = hnbap_decode_ueregisterrequesties(&ies, in); - if (rc < 0) - return rc; + if (rc < 0) { + LOGHNB(ctx, DHNBAP, LOGL_ERROR, "Failure to decode UE-REGISTER-REQ: rc=%d\n", rc); + cause.present = HNBAP_Cause_PR_protocol; + cause.choice.radioNetwork = HNBAP_CauseProtocol_unspecified; + return hnbgw_tx_error_ind(ctx, &cause, HNBAP_ProcedureCode_id_UERegister, HNBAP_Criticality_reject, + HNBAP_TriggeringMessage_initiating_message); + } switch (ies.uE_Identity.present) { case HNBAP_UE_Identity_PR_iMSI: @@ -541,12 +589,8 @@ if (g_hnbgw->config.hnbap_allow_tmsi) { rc = hnbgw_tx_ue_register_acc_tmsi(ctx, &ies.uE_Identity); } else { - struct HNBAP_Cause cause = { - .present = HNBAP_Cause_PR_radioNetwork, - .choice = { - .radioNetwork = HNBAP_CauseRadioNetwork_invalid_UE_identity, - }, - }; + cause.present = HNBAP_Cause_PR_radioNetwork; + cause.choice.radioNetwork = HNBAP_CauseRadioNetwork_invalid_UE_identity; rc = hnbgw_tx_ue_register_rej(ctx, &ies.uE_Identity, &cause); } /* all has been handled by TMSI, skip the IMSI code below */ @@ -554,7 +598,9 @@ default: LOGHNB(ctx, DHNBAP, LOGL_NOTICE, "UE-REGISTER-REQ with unsupported UE Id type %d\n", ies.uE_Identity.present); - rc = -ENOTSUP; + cause.present = HNBAP_Cause_PR_radioNetwork; + cause.choice.radioNetwork = HNBAP_CauseRadioNetwork_invalid_UE_identity; + rc = hnbgw_tx_ue_register_rej(ctx, &ies.uE_Identity, &cause); goto free_and_return_rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36477?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I5338a1324545b2c6d31fb45f1e69fee45842e207 Gerrit-Change-Number: 36477 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[M] Change in osmo-hnbgw[master]: HNBAP: Make sure to respond with correct "reject"

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36478?usp=email ) Change subject: HNBAP: Make sure to respond with correct "reject" ...................................................................... HNBAP: Make sure to respond with correct "reject" If we receive a procedure (like UE-REGISTER) in a state where it's not permitted (e.g. HNB not registered), we should send a UE-REGISTER-REJ with proper cause value, rather than not sending any response at all. Change-Id: I300db368a3d1d2fb5967f69f2ed4ac90ecf85e75 --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 62 insertions(+), 46 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 631c782..8615f91 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -571,6 +571,14 @@ HNBAP_TriggeringMessage_initiating_message); } + if (!ctx->hnb_registered) { + /* UE registration requires prior HNB registration; reject with proper cause */ + cause.present = HNBAP_Cause_PR_radioNetwork; + cause.choice.radioNetwork = HNBAP_CauseRadioNetwork_hNB_not_registered; + rc = hnbgw_tx_ue_register_rej(ctx, &ies.uE_Identity, &cause); + goto free_and_return_rc; + } + switch (ies.uE_Identity.present) { case HNBAP_UE_Identity_PR_iMSI: ranap_bcd_decode(imsi, sizeof(imsi), ies.uE_Identity.choice.iMSI.buf, @@ -627,6 +635,7 @@ static int hnbgw_rx_ue_deregister(struct hnb_context *ctx, ANY_t *in) { HNBAP_UEDe_RegisterIEs_t ies; + HNBAP_Cause_t cause; struct ue_context *ue; int rc; uint32_t ctxid; @@ -637,11 +646,19 @@ ctxid = asn1bitstr_to_u24(&ies.context_ID); - LOGHNB(ctx, DHNBAP, LOGL_DEBUG, "UE-DE-REGISTER context=%u cause=%s\n", ctxid, hnbap_cause_str(&ies.cause)); - - ue = ue_context_by_id(ctxid); - if (ue) - ue_context_free(ue); + if (!ctx->hnb_registered) { + LOGHNB(ctx, DHNBAP, LOGL_NOTICE, "UE-DE-REGISTER context=%u cause=%s not permitted; HNB not registered\n", + ctxid, hnbap_cause_str(&ies.cause)); + cause.present = HNBAP_Cause_PR_radioNetwork; + cause.choice.radioNetwork = HNBAP_CauseRadioNetwork_hNB_not_registered; + hnbgw_tx_error_ind(ctx, &cause, HNBAP_ProcedureCode_id_UEDe_Register, + HNBAP_Criticality_ignore, HNBAP_TriggeringMessage_initiating_message); + } else { + LOGHNB(ctx, DHNBAP, LOGL_DEBUG, "UE-DE-REGISTER context=%u cause=%s\n", ctxid, hnbap_cause_str(&ies.cause)); + ue = ue_context_by_id(ctxid); + if (ue) + ue_context_free(ue); + } hnbap_free_uede_registeries(&ies); return 0; @@ -666,47 +683,32 @@ { int rc = 0; - if (!hnb->hnb_registered) { - switch (imsg->procedureCode) { - case HNBAP_ProcedureCode_id_HNBRegister: /* 8.2 */ - rc = hnbgw_rx_hnb_register_req(hnb, &imsg->value); - break; - case HNBAP_ProcedureCode_id_HNBDe_Register: /* 8.3 */ - rc = hnbgw_rx_hnb_deregister(hnb, &imsg->value); - break; - default: - LOGHNB(hnb, DHNBAP, LOGL_NOTICE, "HNBAP Procedure %ld not permitted for de-registered HNB\n", - imsg->procedureCode); - break; - } - } else { - switch (imsg->procedureCode) { - case HNBAP_ProcedureCode_id_HNBRegister: /* 8.2.4: Abnormal Condition, Accept. */ - rc = hnbgw_rx_hnb_register_req(hnb, &imsg->value); - break; - case HNBAP_ProcedureCode_id_HNBDe_Register: /* 8.3 */ - rc = hnbgw_rx_hnb_deregister(hnb, &imsg->value); - break; - case HNBAP_ProcedureCode_id_UERegister: /* 8.4 */ - rc = hnbgw_rx_ue_register_req(hnb, &imsg->value); - break; - case HNBAP_ProcedureCode_id_UEDe_Register: /* 8.5 */ - rc = hnbgw_rx_ue_deregister(hnb, &imsg->value); - break; - case HNBAP_ProcedureCode_id_ErrorIndication: /* 8.6 */ - rc = hnbgw_rx_err_ind(hnb, &imsg->value); - break; - case HNBAP_ProcedureCode_id_TNLUpdate: /* 8.9 */ - case HNBAP_ProcedureCode_id_HNBConfigTransfer: /* 8.10 */ - case HNBAP_ProcedureCode_id_RelocationComplete: /* 8.11 */ - case HNBAP_ProcedureCode_id_U_RNTIQuery: /* 8.12 */ - case HNBAP_ProcedureCode_id_privateMessage: - LOGHNB(hnb, DHNBAP, LOGL_NOTICE, "Unimplemented HNBAP Procedure %ld\n", imsg->procedureCode); - break; - default: - LOGHNB(hnb, DHNBAP, LOGL_NOTICE, "Unknown HNBAP Procedure %ld\n", imsg->procedureCode); - break; - } + switch (imsg->procedureCode) { + case HNBAP_ProcedureCode_id_HNBRegister: /* 8.2 */ + rc = hnbgw_rx_hnb_register_req(hnb, &imsg->value); + break; + case HNBAP_ProcedureCode_id_HNBDe_Register: /* 8.3 */ + rc = hnbgw_rx_hnb_deregister(hnb, &imsg->value); + break; + case HNBAP_ProcedureCode_id_UERegister: /* 8.4 */ + rc = hnbgw_rx_ue_register_req(hnb, &imsg->value); + break; + case HNBAP_ProcedureCode_id_UEDe_Register: /* 8.5 */ + rc = hnbgw_rx_ue_deregister(hnb, &imsg->value); + break; + case HNBAP_ProcedureCode_id_ErrorIndication: /* 8.6 */ + rc = hnbgw_rx_err_ind(hnb, &imsg->value); + break; + case HNBAP_ProcedureCode_id_TNLUpdate: /* 8.9 */ + case HNBAP_ProcedureCode_id_HNBConfigTransfer: /* 8.10 */ + case HNBAP_ProcedureCode_id_RelocationComplete: /* 8.11 */ + case HNBAP_ProcedureCode_id_U_RNTIQuery: /* 8.12 */ + case HNBAP_ProcedureCode_id_privateMessage: + LOGHNB(hnb, DHNBAP, LOGL_NOTICE, "Unimplemented HNBAP Procedure %ld\n", imsg->procedureCode); + break; + default: + LOGHNB(hnb, DHNBAP, LOGL_NOTICE, "Unknown HNBAP Procedure %ld\n", imsg->procedureCode); + break; } return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36478?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I300db368a3d1d2fb5967f69f2ed4ac90ecf85e75 Gerrit-Change-Number: 36478 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: Transmit ErrorIndication in more situations

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36479?usp=email ) Change subject: HNBAP: Transmit ErrorIndication in more situations ...................................................................... HNBAP: Transmit ErrorIndication in more situations Whenever we receive a message and cannot decode the most basic IEs, or receive an unknown/unsupported procedure code, we should respond with an ErrorIndication in order to inform the peer. Change-Id: I7aaa66f83f62ee1b5ba5204248e9f4cc754263ed --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 32 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 8615f91..6d3c8e0 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -434,11 +434,16 @@ static int hnbgw_rx_hnb_deregister(struct hnb_context *ctx, ANY_t *in) { HNBAP_HNBDe_RegisterIEs_t ies; + HNBAP_Cause_t cause; int rc; rc = hnbap_decode_hnbde_registeries(&ies, in); - if (rc < 0) - return rc; + if (rc < 0) { + cause.present = HNBAP_Cause_PR_protocol; + cause.choice.radioNetwork = HNBAP_CauseProtocol_unspecified; + return hnbgw_tx_error_ind(ctx, &cause, HNBAP_ProcedureCode_id_HNBDe_Register, HNBAP_Criticality_ignore, + HNBAP_TriggeringMessage_initiating_message); + } LOGHNB(ctx, DHNBAP, LOGL_DEBUG, "HNB-DE-REGISTER cause=%s\n", hnbap_cause_str(&ies.cause)); @@ -641,8 +646,12 @@ uint32_t ctxid; rc = hnbap_decode_uede_registeries(&ies, in); - if (rc < 0) - return rc; + if (rc < 0) { + cause.present = HNBAP_Cause_PR_protocol; + cause.choice.protocol = HNBAP_CauseProtocol_unspecified; + return hnbgw_tx_error_ind(ctx, &cause, HNBAP_ProcedureCode_id_UEDe_Register, + HNBAP_Criticality_ignore, HNBAP_TriggeringMessage_initiating_message); + } ctxid = asn1bitstr_to_u24(&ies.context_ID); @@ -681,6 +690,10 @@ static int hnbgw_rx_initiating_msg(struct hnb_context *hnb, HNBAP_InitiatingMessage_t *imsg) { + HNBAP_Cause_t cause = { + .present = HNBAP_Cause_PR_protocol, + .choice.protocol = HNBAP_CauseProtocol_unspecified, + }; int rc = 0; switch (imsg->procedureCode) { @@ -705,9 +718,11 @@ case HNBAP_ProcedureCode_id_U_RNTIQuery: /* 8.12 */ case HNBAP_ProcedureCode_id_privateMessage: LOGHNB(hnb, DHNBAP, LOGL_NOTICE, "Unimplemented HNBAP Procedure %ld\n", imsg->procedureCode); + rc = hnbgw_tx_error_ind(hnb, &cause, imsg->procedureCode, -1, HNBAP_TriggeringMessage_initiating_message); break; default: LOGHNB(hnb, DHNBAP, LOGL_NOTICE, "Unknown HNBAP Procedure %ld\n", imsg->procedureCode); + rc = hnbgw_tx_error_ind(hnb, &cause, imsg->procedureCode, -1, HNBAP_TriggeringMessage_initiating_message); break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I7aaa66f83f62ee1b5ba5204248e9f4cc754263ed Gerrit-Change-Number: 36479 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024