Add F1AP positioning measurement abort message enc/dec + test
Reference: 3GPP 38.473 v16.21.0 Mandatory fields: Transaction ID (supported) LMF Measurement ID (supported) RAN Measurement ID (supported) Add F1AP positioning measurement failure indication message enc/dec + test Reference: 3GPP 38.473 v16.21.0 Mandatory fields: Transaction ID (supported) LMF Measurement ID (supported) RAN Measurement ID (supported) Cause (supported)
This commit is contained in:
@@ -1570,4 +1570,26 @@ typedef struct f1ap_positioning_measurement_report_s {
|
||||
// (mandatory)
|
||||
f1ap_pos_measurement_result_list_t *pos_measurement_result_list;
|
||||
} f1ap_positioning_measurement_report_t;
|
||||
|
||||
typedef struct f1ap_positioning_measurement_abort_s {
|
||||
// IE 9.3.1.23 (mandatory)
|
||||
uint8_t transaction_id;
|
||||
// (mandatory)
|
||||
uint16_t lmf_measurement_id;
|
||||
// (mandatory)
|
||||
uint16_t ran_measurement_id;
|
||||
} f1ap_positioning_measurement_abort_t;
|
||||
|
||||
typedef struct f1ap_positioning_measurement_failure_indication_s {
|
||||
// IE 9.3.1.23 (mandatory)
|
||||
uint8_t transaction_id;
|
||||
// (mandatory)
|
||||
uint16_t lmf_measurement_id;
|
||||
// (mandatory)
|
||||
uint16_t ran_measurement_id;
|
||||
// IE 9.3.1.2 (mandatory)
|
||||
f1ap_Cause_t cause;
|
||||
// IE 9.3.1.2 (mandatory)
|
||||
long cause_value;
|
||||
} f1ap_positioning_measurement_failure_indication_t;
|
||||
#endif /* F1AP_MESSAGES_TYPES_H_ */
|
||||
|
||||
@@ -5990,3 +5990,263 @@ void free_positioning_measurement_report(f1ap_positioning_measurement_report_t *
|
||||
free(msg->pos_measurement_result_list->pos_measurement_result_list_item);
|
||||
free(msg->pos_measurement_result_list);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Encode F1 positioning measurement abort to ASN.1
|
||||
*/
|
||||
F1AP_F1AP_PDU_t *encode_positioning_measurement_abort(const f1ap_positioning_measurement_abort_t *msg)
|
||||
{
|
||||
F1AP_F1AP_PDU_t *pdu = calloc_or_fail(1, sizeof(*pdu));
|
||||
|
||||
/* Message Type */
|
||||
pdu->present = F1AP_F1AP_PDU_PR_initiatingMessage;
|
||||
asn1cCalloc(pdu->choice.initiatingMessage, tmp);
|
||||
tmp->procedureCode = F1AP_ProcedureCode_id_PositioningMeasurementAbort;
|
||||
tmp->criticality = F1AP_Criticality_ignore;
|
||||
tmp->value.present = F1AP_InitiatingMessage__value_PR_PositioningMeasurementAbort;
|
||||
F1AP_PositioningMeasurementAbort_t *out = &tmp->value.choice.PositioningMeasurementAbort;
|
||||
|
||||
/* mandatory : TransactionID */
|
||||
asn1cSequenceAdd(out->protocolIEs.list, F1AP_PositioningMeasurementAbortIEs_t, ie1);
|
||||
ie1->id = F1AP_ProtocolIE_ID_id_TransactionID;
|
||||
ie1->criticality = F1AP_Criticality_reject;
|
||||
ie1->value.present = F1AP_PositioningMeasurementAbortIEs__value_PR_TransactionID;
|
||||
ie1->value.choice.TransactionID = msg->transaction_id;
|
||||
|
||||
/* mandatory : LMF_MeasurementID */
|
||||
asn1cSequenceAdd(out->protocolIEs.list, F1AP_PositioningMeasurementAbortIEs_t, ie2);
|
||||
ie2->id = F1AP_ProtocolIE_ID_id_LMF_MeasurementID;
|
||||
ie2->criticality = F1AP_Criticality_reject;
|
||||
ie2->value.present = F1AP_PositioningMeasurementAbortIEs__value_PR_LMF_MeasurementID;
|
||||
ie2->value.choice.LMF_MeasurementID = msg->lmf_measurement_id;
|
||||
|
||||
/* mandatory : RAN_MeasurementID */
|
||||
asn1cSequenceAdd(out->protocolIEs.list, F1AP_PositioningMeasurementAbortIEs_t, ie3);
|
||||
ie3->id = F1AP_ProtocolIE_ID_id_RAN_MeasurementID;
|
||||
ie3->criticality = F1AP_Criticality_reject;
|
||||
ie3->value.present = F1AP_PositioningMeasurementAbortIEs__value_PR_RAN_MeasurementID;
|
||||
ie3->value.choice.RAN_MeasurementID = msg->ran_measurement_id;
|
||||
|
||||
return pdu;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Decode F1 positioning measurement abort
|
||||
*/
|
||||
bool decode_positioning_measurement_abort(const F1AP_F1AP_PDU_t *pdu, f1ap_positioning_measurement_abort_t *out)
|
||||
{
|
||||
DevAssert(out != NULL);
|
||||
memset(out, 0, sizeof(*out));
|
||||
|
||||
F1AP_PositioningMeasurementAbort_t *in = &pdu->choice.initiatingMessage->value.choice.PositioningMeasurementAbort;
|
||||
F1AP_PositioningMeasurementAbortIEs_t *ie;
|
||||
|
||||
F1AP_LIB_FIND_IE(F1AP_PositioningMeasurementAbortIEs_t, ie, &in->protocolIEs.list, F1AP_ProtocolIE_ID_id_TransactionID, true);
|
||||
F1AP_LIB_FIND_IE(F1AP_PositioningMeasurementAbortIEs_t, ie, &in->protocolIEs.list, F1AP_ProtocolIE_ID_id_LMF_MeasurementID, true);
|
||||
F1AP_LIB_FIND_IE(F1AP_PositioningMeasurementAbortIEs_t, ie, &in->protocolIEs.list, F1AP_ProtocolIE_ID_id_RAN_MeasurementID, true);
|
||||
|
||||
for (int i = 0; i < in->protocolIEs.list.count; ++i) {
|
||||
ie = in->protocolIEs.list.array[i];
|
||||
AssertError(ie != NULL, return false, "in->protocolIEs.list.array[i] is NULL");
|
||||
switch (ie->id) {
|
||||
case F1AP_ProtocolIE_ID_id_TransactionID:
|
||||
_F1_EQ_CHECK_INT(ie->value.present, F1AP_PositioningMeasurementAbortIEs__value_PR_TransactionID);
|
||||
out->transaction_id = ie->value.choice.TransactionID;
|
||||
break;
|
||||
case F1AP_ProtocolIE_ID_id_LMF_MeasurementID:
|
||||
_F1_EQ_CHECK_INT(ie->value.present, F1AP_PositioningMeasurementAbortIEs__value_PR_LMF_MeasurementID);
|
||||
out->lmf_measurement_id = ie->value.choice.LMF_MeasurementID;
|
||||
break;
|
||||
case F1AP_ProtocolIE_ID_id_RAN_MeasurementID:
|
||||
_F1_EQ_CHECK_INT(ie->value.present, F1AP_PositioningMeasurementAbortIEs__value_PR_RAN_MeasurementID);
|
||||
out->ran_measurement_id = ie->value.choice.RAN_MeasurementID;
|
||||
break;
|
||||
default:
|
||||
PRINT_ERROR("F1AP_ProtocolIE_ID_id %ld unknown, skipping\n", ie->id);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief F1 positioning measurement abort deep copy
|
||||
*/
|
||||
f1ap_positioning_measurement_abort_t cp_positioning_measurement_abort(const f1ap_positioning_measurement_abort_t *orig)
|
||||
{
|
||||
/* copy all mandatory fields that are not dynamic memory */
|
||||
f1ap_positioning_measurement_abort_t cp = {
|
||||
.transaction_id = orig->transaction_id,
|
||||
.lmf_measurement_id = orig->lmf_measurement_id,
|
||||
.ran_measurement_id = orig->ran_measurement_id,
|
||||
};
|
||||
|
||||
return cp;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief F1 positioning measurement abort equality check
|
||||
*/
|
||||
bool eq_positioning_measurement_abort(const f1ap_positioning_measurement_abort_t *a, const f1ap_positioning_measurement_abort_t *b)
|
||||
{
|
||||
_F1_EQ_CHECK_INT(a->transaction_id, b->transaction_id);
|
||||
_F1_EQ_CHECK_INT(a->lmf_measurement_id, b->lmf_measurement_id);
|
||||
_F1_EQ_CHECK_INT(a->ran_measurement_id, b->ran_measurement_id);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Free Allocated F1 positioning measurement abort
|
||||
*/
|
||||
void free_positioning_measurement_abort(f1ap_positioning_measurement_abort_t *msg)
|
||||
{
|
||||
// nothing to free
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Encode F1 positioning measurement failure indication to ASN.1
|
||||
*/
|
||||
F1AP_F1AP_PDU_t *encode_positioning_measurement_failure_indication(const f1ap_positioning_measurement_failure_indication_t *msg)
|
||||
{
|
||||
F1AP_F1AP_PDU_t *pdu = calloc_or_fail(1, sizeof(*pdu));
|
||||
|
||||
/* Message Type */
|
||||
pdu->present = F1AP_F1AP_PDU_PR_initiatingMessage;
|
||||
asn1cCalloc(pdu->choice.initiatingMessage, tmp);
|
||||
tmp->procedureCode = F1AP_ProcedureCode_id_PositioningMeasurementFailureIndication;
|
||||
tmp->criticality = F1AP_Criticality_ignore;
|
||||
tmp->value.present = F1AP_InitiatingMessage__value_PR_PositioningMeasurementFailureIndication;
|
||||
F1AP_PositioningMeasurementFailureIndication_t *out = &tmp->value.choice.PositioningMeasurementFailureIndication;
|
||||
|
||||
/* mandatory : TransactionID */
|
||||
asn1cSequenceAdd(out->protocolIEs.list, F1AP_PositioningMeasurementFailureIndicationIEs_t, ie1);
|
||||
ie1->id = F1AP_ProtocolIE_ID_id_TransactionID;
|
||||
ie1->criticality = F1AP_Criticality_reject;
|
||||
ie1->value.present = F1AP_PositioningMeasurementFailureIndicationIEs__value_PR_TransactionID;
|
||||
ie1->value.choice.TransactionID = msg->transaction_id;
|
||||
|
||||
/* mandatory : LMF_MeasurementID */
|
||||
asn1cSequenceAdd(out->protocolIEs.list, F1AP_PositioningMeasurementFailureIndicationIEs_t, ie2);
|
||||
ie2->id = F1AP_ProtocolIE_ID_id_LMF_MeasurementID;
|
||||
ie2->criticality = F1AP_Criticality_reject;
|
||||
ie2->value.present = F1AP_PositioningMeasurementFailureIndicationIEs__value_PR_LMF_MeasurementID;
|
||||
ie2->value.choice.LMF_MeasurementID = msg->lmf_measurement_id;
|
||||
|
||||
/* mandatory : RAN_MeasurementID */
|
||||
asn1cSequenceAdd(out->protocolIEs.list, F1AP_PositioningMeasurementFailureIndicationIEs_t, ie3);
|
||||
ie3->id = F1AP_ProtocolIE_ID_id_RAN_MeasurementID;
|
||||
ie3->criticality = F1AP_Criticality_reject;
|
||||
ie3->value.present = F1AP_PositioningMeasurementFailureIndicationIEs__value_PR_RAN_MeasurementID;
|
||||
ie3->value.choice.RAN_MeasurementID = msg->ran_measurement_id;
|
||||
|
||||
/* mandatory : Cause */
|
||||
asn1cSequenceAdd(out->protocolIEs.list, F1AP_PositioningMeasurementFailureIndicationIEs_t, ie4);
|
||||
ie4->id = F1AP_ProtocolIE_ID_id_Cause;
|
||||
ie4->criticality = F1AP_Criticality_ignore;
|
||||
ie4->value.present = F1AP_PositioningMeasurementFailureIndicationIEs__value_PR_Cause;
|
||||
ie4->value.choice.Cause = encode_f1ap_cause(msg->cause, msg->cause_value);
|
||||
|
||||
return pdu;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Decode F1 positioning measurement failure indication
|
||||
*/
|
||||
bool decode_positioning_measurement_failure_indication(const F1AP_F1AP_PDU_t *pdu,
|
||||
f1ap_positioning_measurement_failure_indication_t *out)
|
||||
{
|
||||
DevAssert(out != NULL);
|
||||
memset(out, 0, sizeof(*out));
|
||||
|
||||
F1AP_PositioningMeasurementFailureIndication_t *in =
|
||||
&pdu->choice.initiatingMessage->value.choice.PositioningMeasurementFailureIndication;
|
||||
F1AP_PositioningMeasurementFailureIndicationIEs_t *ie;
|
||||
|
||||
F1AP_LIB_FIND_IE(F1AP_PositioningMeasurementFailureIndicationIEs_t,
|
||||
ie,
|
||||
&in->protocolIEs.list,
|
||||
F1AP_ProtocolIE_ID_id_TransactionID,
|
||||
true);
|
||||
F1AP_LIB_FIND_IE(F1AP_PositioningMeasurementFailureIndicationIEs_t,
|
||||
ie,
|
||||
&in->protocolIEs.list,
|
||||
F1AP_ProtocolIE_ID_id_LMF_MeasurementID,
|
||||
true);
|
||||
F1AP_LIB_FIND_IE(F1AP_PositioningMeasurementFailureIndicationIEs_t,
|
||||
ie,
|
||||
&in->protocolIEs.list,
|
||||
F1AP_ProtocolIE_ID_id_RAN_MeasurementID,
|
||||
true);
|
||||
F1AP_LIB_FIND_IE(F1AP_PositioningMeasurementFailureIndicationIEs_t, ie, &in->protocolIEs.list, F1AP_ProtocolIE_ID_id_Cause, true);
|
||||
|
||||
for (int i = 0; i < in->protocolIEs.list.count; ++i) {
|
||||
ie = in->protocolIEs.list.array[i];
|
||||
AssertError(ie != NULL, return false, "in->protocolIEs.list.array[i] is NULL");
|
||||
switch (ie->id) {
|
||||
case F1AP_ProtocolIE_ID_id_TransactionID:
|
||||
_F1_EQ_CHECK_INT(ie->value.present, F1AP_PositioningMeasurementFailureIndicationIEs__value_PR_TransactionID);
|
||||
out->transaction_id = ie->value.choice.TransactionID;
|
||||
break;
|
||||
case F1AP_ProtocolIE_ID_id_LMF_MeasurementID:
|
||||
_F1_EQ_CHECK_INT(ie->value.present, F1AP_PositioningMeasurementFailureIndicationIEs__value_PR_LMF_MeasurementID);
|
||||
out->lmf_measurement_id = ie->value.choice.LMF_MeasurementID;
|
||||
break;
|
||||
case F1AP_ProtocolIE_ID_id_RAN_MeasurementID:
|
||||
_F1_EQ_CHECK_INT(ie->value.present, F1AP_PositioningMeasurementFailureIndicationIEs__value_PR_RAN_MeasurementID);
|
||||
out->ran_measurement_id = ie->value.choice.RAN_MeasurementID;
|
||||
break;
|
||||
case F1AP_ProtocolIE_ID_id_Cause:
|
||||
_F1_EQ_CHECK_INT(ie->value.present, F1AP_PositioningMeasurementFailureIndicationIEs__value_PR_Cause);
|
||||
_F1_CHECK_EXP(decode_f1ap_cause(ie->value.choice.Cause, &out->cause, &out->cause_value));
|
||||
break;
|
||||
default:
|
||||
PRINT_ERROR("F1AP_ProtocolIE_ID_id %ld unknown, skipping\n", ie->id);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief F1 positioning measurement failure indication deep copy
|
||||
*/
|
||||
f1ap_positioning_measurement_failure_indication_t cp_positioning_measurement_failure_indication(
|
||||
const f1ap_positioning_measurement_failure_indication_t *orig)
|
||||
{
|
||||
/* copy all mandatory fields that are not dynamic memory */
|
||||
f1ap_positioning_measurement_failure_indication_t cp = {
|
||||
.transaction_id = orig->transaction_id,
|
||||
.lmf_measurement_id = orig->lmf_measurement_id,
|
||||
.ran_measurement_id = orig->ran_measurement_id,
|
||||
.cause = orig->cause,
|
||||
.cause_value = orig->cause_value,
|
||||
};
|
||||
|
||||
return cp;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief F1 positioning measurement failure indication equality check
|
||||
*/
|
||||
bool eq_positioning_measurement_failure_indication(const f1ap_positioning_measurement_failure_indication_t *a,
|
||||
const f1ap_positioning_measurement_failure_indication_t *b)
|
||||
{
|
||||
_F1_EQ_CHECK_INT(a->transaction_id, b->transaction_id);
|
||||
_F1_EQ_CHECK_INT(a->lmf_measurement_id, b->lmf_measurement_id);
|
||||
_F1_EQ_CHECK_INT(a->ran_measurement_id, b->ran_measurement_id);
|
||||
_F1_EQ_CHECK_INT(a->cause, b->cause);
|
||||
_F1_EQ_CHECK_LONG(a->cause_value, b->cause_value);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Free Allocated F1 positioning measurement failure indication
|
||||
*/
|
||||
void free_positioning_measurement_failure_indication(f1ap_positioning_measurement_failure_indication_t *msg)
|
||||
{
|
||||
// nothing to free
|
||||
}
|
||||
|
||||
@@ -136,4 +136,22 @@ f1ap_positioning_measurement_report_t cp_positioning_measurement_report(const f1
|
||||
bool eq_positioning_measurement_report(const f1ap_positioning_measurement_report_t *a,
|
||||
const f1ap_positioning_measurement_report_t *b);
|
||||
void free_positioning_measurement_report(f1ap_positioning_measurement_report_t *msg);
|
||||
|
||||
// positioning measurement abort
|
||||
struct F1AP_F1AP_PDU *encode_positioning_measurement_abort(const f1ap_positioning_measurement_abort_t *msg);
|
||||
bool decode_positioning_measurement_abort(const struct F1AP_F1AP_PDU *pdu, f1ap_positioning_measurement_abort_t *out);
|
||||
f1ap_positioning_measurement_abort_t cp_positioning_measurement_abort(const f1ap_positioning_measurement_abort_t *orig);
|
||||
bool eq_positioning_measurement_abort(const f1ap_positioning_measurement_abort_t *a, const f1ap_positioning_measurement_abort_t *b);
|
||||
void free_positioning_measurement_abort(f1ap_positioning_measurement_abort_t *msg);
|
||||
|
||||
// positioning measurement failure indication
|
||||
struct F1AP_F1AP_PDU *encode_positioning_measurement_failure_indication(
|
||||
const f1ap_positioning_measurement_failure_indication_t *msg);
|
||||
bool decode_positioning_measurement_failure_indication(const struct F1AP_F1AP_PDU *pdu,
|
||||
f1ap_positioning_measurement_failure_indication_t *out);
|
||||
f1ap_positioning_measurement_failure_indication_t cp_positioning_measurement_failure_indication(
|
||||
const f1ap_positioning_measurement_failure_indication_t *orig);
|
||||
bool eq_positioning_measurement_failure_indication(const f1ap_positioning_measurement_failure_indication_t *a,
|
||||
const f1ap_positioning_measurement_failure_indication_t *b);
|
||||
void free_positioning_measurement_failure_indication(f1ap_positioning_measurement_failure_indication_t *msg);
|
||||
#endif /* F1AP_POSITIONING_H_ */
|
||||
|
||||
@@ -2268,6 +2268,66 @@ static void test_f1ap_positioning_measurement_report()
|
||||
printf("%s() successful\n", __func__);
|
||||
}
|
||||
|
||||
static void test_f1ap_positioning_measurement_abort()
|
||||
{
|
||||
f1ap_positioning_measurement_abort_t orig = {
|
||||
.transaction_id = 12,
|
||||
.lmf_measurement_id = 1999,
|
||||
.ran_measurement_id = 2225,
|
||||
};
|
||||
F1AP_F1AP_PDU_t *f1enc = encode_positioning_measurement_abort(&orig);
|
||||
F1AP_F1AP_PDU_t *f1dec = f1ap_encode_decode(f1enc);
|
||||
f1ap_msg_free(f1enc);
|
||||
|
||||
f1ap_positioning_measurement_abort_t decoded = {0};
|
||||
bool ret = decode_positioning_measurement_abort(f1dec, &decoded);
|
||||
AssertFatal(ret, "decode_positioning_measurement_abort(): could not decode message\n");
|
||||
f1ap_msg_free(f1dec);
|
||||
|
||||
ret = eq_positioning_measurement_abort(&orig, &decoded);
|
||||
AssertFatal(ret, "eq_positioning_measurement_abort(): decoded message doesn't match\n");
|
||||
free_positioning_measurement_abort(&decoded);
|
||||
|
||||
f1ap_positioning_measurement_abort_t cp = cp_positioning_measurement_abort(&orig);
|
||||
ret = eq_positioning_measurement_abort(&orig, &cp);
|
||||
AssertFatal(ret, "eq_positioning_measurement_abort(): copied message doesn't match\n");
|
||||
free_positioning_measurement_abort(&orig);
|
||||
free_positioning_measurement_abort(&cp);
|
||||
|
||||
printf("%s() successful\n", __func__);
|
||||
}
|
||||
|
||||
static void test_f1ap_positioning_measurement_failure_indication()
|
||||
{
|
||||
f1ap_positioning_measurement_failure_indication_t orig = {
|
||||
.transaction_id = 12,
|
||||
.lmf_measurement_id = 1999,
|
||||
.ran_measurement_id = 2225,
|
||||
.cause = F1AP_CAUSE_MISC,
|
||||
.cause_value = 3,
|
||||
};
|
||||
F1AP_F1AP_PDU_t *f1enc = encode_positioning_measurement_failure_indication(&orig);
|
||||
F1AP_F1AP_PDU_t *f1dec = f1ap_encode_decode(f1enc);
|
||||
f1ap_msg_free(f1enc);
|
||||
|
||||
f1ap_positioning_measurement_failure_indication_t decoded = {0};
|
||||
bool ret = decode_positioning_measurement_failure_indication(f1dec, &decoded);
|
||||
AssertFatal(ret, "decode_positioning_measurement_failure_indication(): could not decode message\n");
|
||||
f1ap_msg_free(f1dec);
|
||||
|
||||
ret = eq_positioning_measurement_failure_indication(&orig, &decoded);
|
||||
AssertFatal(ret, "eq_positioning_measurement_failure_indication(): decoded message doesn't match\n");
|
||||
free_positioning_measurement_failure_indication(&decoded);
|
||||
|
||||
f1ap_positioning_measurement_failure_indication_t cp = cp_positioning_measurement_failure_indication(&orig);
|
||||
ret = eq_positioning_measurement_failure_indication(&orig, &cp);
|
||||
AssertFatal(ret, "eq_positioning_measurement_failure_indication(): copied message doesn't match\n");
|
||||
free_positioning_measurement_failure_indication(&orig);
|
||||
free_positioning_measurement_failure_indication(&cp);
|
||||
|
||||
printf("%s() successful\n", __func__);
|
||||
}
|
||||
|
||||
int main()
|
||||
{
|
||||
test_initial_ul_rrc_message_transfer();
|
||||
@@ -2309,5 +2369,7 @@ int main()
|
||||
test_f1ap_positioning_measurement_response();
|
||||
test_f1ap_positioning_measurement_failure();
|
||||
test_f1ap_positioning_measurement_report();
|
||||
test_f1ap_positioning_measurement_abort();
|
||||
test_f1ap_positioning_measurement_failure_indication();
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user