jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/onomondo-ipa/+/43034?usp=email )
Change subject: V1.2: Rename searchCriteria of IpaEuiccDataRequest to
searchCriteriaNotification
......................................................................
V1.2: Rename searchCriteria of IpaEuiccDataRequest to searchCriteriaNotification
Reference: SGP.32 Section 2.11.1.2
Related: SYS#8101
Change-Id: I245c2c1c1c5cdd2be387d515d1bf51d0bf82ef41
---
M asn1/SGP32Definitions.asn
M src/ipa/libasn/IpaEuiccDataRequest.c
M src/ipa/libasn/IpaEuiccDataRequest.h
M src/ipa/libipa/es10b_retr_notif_from_lst.c
M src/ipa/libipa/es10b_retr_notif_from_lst.h
M src/ipa/libipa/proc_euicc_data_req.c
6 files changed, 42 insertions(+), 42 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/34/43034/1
diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn
index 8529f46..69175e1 100644
--- a/asn1/SGP32Definitions.asn
+++ b/asn1/SGP32Definitions.asn
@@ -115,7 +115,7 @@
IpaEuiccDataRequest ::= [82] SEQUENCE { -- Tag BF52
tagList [APPLICATION 28] OCTET STRING, -- Tag '5C'
euiccCiPKIdentifierToBeUsed OCTET STRING OPTIONAL, -- CI Public Key
Identifier (possibly truncated) supported on the eUICC for signature creation
- searchCriteria [1] CHOICE {
+ searchCriteriaNotification [1] CHOICE {
seqNumber [0] INTEGER,
profileManagementOperation [1] NotificationEvent,
euiccPackageResults [2] NULL
diff --git a/src/ipa/libasn/IpaEuiccDataRequest.c
b/src/ipa/libasn/IpaEuiccDataRequest.c
index e382a58..a790d61 100644
--- a/src/ipa/libasn/IpaEuiccDataRequest.c
+++ b/src/ipa/libasn/IpaEuiccDataRequest.c
@@ -7,16 +7,16 @@
#include "IpaEuiccDataRequest.h"
-static asn_oer_constraints_t asn_OER_type_searchCriteria_constr_4 CC_NOTUSED =
{
+static asn_oer_constraints_t asn_OER_type_searchCriteriaNotification_constr_4
CC_NOTUSED = {
{ 0, 0 },
-1};
-static asn_per_constraints_t asn_PER_type_searchCriteria_constr_4 CC_NOTUSED =
{
+static asn_per_constraints_t asn_PER_type_searchCriteriaNotification_constr_4
CC_NOTUSED = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 2, 2, 0, 2 } /* (0..2,...)
*/,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_TYPE_member_t asn_MBR_searchCriteria_4[] = {
- { ATF_NOFLAGS, 0, offsetof(struct IpaEuiccDataRequest__searchCriteria,
choice.seqNumber),
+static asn_TYPE_member_t asn_MBR_searchCriteriaNotification_4[] = {
+ { ATF_NOFLAGS, 0, offsetof(struct
IpaEuiccDataRequest__searchCriteriaNotification, choice.seqNumber),
(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
@@ -25,7 +25,7 @@
0, 0, /* No default value */
"seqNumber"
},
- { ATF_NOFLAGS, 0, offsetof(struct IpaEuiccDataRequest__searchCriteria,
choice.profileManagementOperation),
+ { ATF_NOFLAGS, 0, offsetof(struct
IpaEuiccDataRequest__searchCriteriaNotification,
choice.profileManagementOperation),
(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-1, /* IMPLICIT tag at current level */
&asn_DEF_NotificationEvent,
@@ -34,7 +34,7 @@
0, 0, /* No default value */
"profileManagementOperation"
},
- { ATF_NOFLAGS, 0, offsetof(struct IpaEuiccDataRequest__searchCriteria,
choice.euiccPackageResults),
+ { ATF_NOFLAGS, 0, offsetof(struct
IpaEuiccDataRequest__searchCriteriaNotification, choice.euiccPackageResults),
(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
-1, /* IMPLICIT tag at current level */
&asn_DEF_NULL,
@@ -44,34 +44,34 @@
"euiccPackageResults"
},
};
-static const asn_TYPE_tag2member_t asn_MAP_searchCriteria_tag2el_4[] = {
+static const asn_TYPE_tag2member_t
asn_MAP_searchCriteriaNotification_tag2el_4[] = {
{ (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* seqNumber */
{ (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /*
profileManagementOperation */
{ (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* euiccPackageResults */
};
-static asn_CHOICE_specifics_t asn_SPC_searchCriteria_specs_4 = {
- sizeof(struct IpaEuiccDataRequest__searchCriteria),
- offsetof(struct IpaEuiccDataRequest__searchCriteria, _asn_ctx),
- offsetof(struct IpaEuiccDataRequest__searchCriteria, present),
- sizeof(((struct IpaEuiccDataRequest__searchCriteria *)0)->present),
- asn_MAP_searchCriteria_tag2el_4,
+static asn_CHOICE_specifics_t asn_SPC_searchCriteriaNotification_specs_4 = {
+ sizeof(struct IpaEuiccDataRequest__searchCriteriaNotification),
+ offsetof(struct IpaEuiccDataRequest__searchCriteriaNotification,
_asn_ctx),
+ offsetof(struct IpaEuiccDataRequest__searchCriteriaNotification,
present),
+ sizeof(((struct IpaEuiccDataRequest__searchCriteriaNotification
*)0)->present),
+ asn_MAP_searchCriteriaNotification_tag2el_4,
3, /* Count of tags in the map */
0, 0,
3 /* Extensions start */
};
static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_searchCriteria_4 = {
- "searchCriteria",
- "searchCriteria",
+asn_TYPE_descriptor_t asn_DEF_searchCriteriaNotification_4 = {
+ "searchCriteriaNotification",
+ "searchCriteriaNotification",
&asn_OP_CHOICE,
0, /* No effective tags (pointer) */
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- { &asn_OER_type_searchCriteria_constr_4,
&asn_PER_type_searchCriteria_constr_4, CHOICE_constraint },
- asn_MBR_searchCriteria_4,
+ { &asn_OER_type_searchCriteriaNotification_constr_4,
&asn_PER_type_searchCriteriaNotification_constr_4, CHOICE_constraint },
+ asn_MBR_searchCriteriaNotification_4,
3, /* Elements count */
- &asn_SPC_searchCriteria_specs_4 /* Additional specs */
+ &asn_SPC_searchCriteriaNotification_specs_4 /* Additional specs */
};
asn_TYPE_member_t asn_MBR_IpaEuiccDataRequest_1[] = {
@@ -93,14 +93,14 @@
0, 0, /* No default value */
"euiccCiPKIdentifierToBeUsed"
},
- { ATF_POINTER, 1, offsetof(struct IpaEuiccDataRequest, searchCriteria),
+ { ATF_POINTER, 1, offsetof(struct IpaEuiccDataRequest,
searchCriteriaNotification),
(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+1, /* EXPLICIT tag at current level */
- &asn_DEF_searchCriteria_4,
+ &asn_DEF_searchCriteriaNotification_4,
0,
{ 0, 0, 0 },
0, 0, /* No default value */
- "searchCriteria"
+ "searchCriteriaNotification"
},
};
static const int asn_MAP_IpaEuiccDataRequest_oms_1[] = { 1, 2 };
@@ -111,7 +111,7 @@
static const asn_TYPE_tag2member_t asn_MAP_IpaEuiccDataRequest_tag2el_1[] = {
{ (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 1, 0, 0 }, /*
euiccCiPKIdentifierToBeUsed */
{ (ASN_TAG_CLASS_APPLICATION | (28 << 2)), 0, 0, 0 }, /* tagList */
- { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 2, 0, 0 } /* searchCriteria */
+ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 2, 0, 0 } /*
searchCriteriaNotification */
};
asn_SEQUENCE_specifics_t asn_SPC_IpaEuiccDataRequest_specs_1 = {
sizeof(struct IpaEuiccDataRequest),
diff --git a/src/ipa/libasn/IpaEuiccDataRequest.h
b/src/ipa/libasn/IpaEuiccDataRequest.h
index b2deef4..d40dfaf 100644
--- a/src/ipa/libasn/IpaEuiccDataRequest.h
+++ b/src/ipa/libasn/IpaEuiccDataRequest.h
@@ -24,22 +24,22 @@
#endif
/* Dependencies */
-typedef enum IpaEuiccDataRequest__searchCriteria_PR {
- IpaEuiccDataRequest__searchCriteria_PR_NOTHING, /* No components
present */
- IpaEuiccDataRequest__searchCriteria_PR_seqNumber,
- IpaEuiccDataRequest__searchCriteria_PR_profileManagementOperation,
- IpaEuiccDataRequest__searchCriteria_PR_euiccPackageResults
+typedef enum IpaEuiccDataRequest__searchCriteriaNotification_PR {
+ IpaEuiccDataRequest__searchCriteriaNotification_PR_NOTHING, /* No
components present */
+ IpaEuiccDataRequest__searchCriteriaNotification_PR_seqNumber,
+
IpaEuiccDataRequest__searchCriteriaNotification_PR_profileManagementOperation,
+ IpaEuiccDataRequest__searchCriteriaNotification_PR_euiccPackageResults
/* Extensions may appear below */
-} IpaEuiccDataRequest__searchCriteria_PR;
+} IpaEuiccDataRequest__searchCriteriaNotification_PR;
/* IpaEuiccDataRequest */
typedef struct IpaEuiccDataRequest {
OCTET_STRING_t tagList;
OCTET_STRING_t *euiccCiPKIdentifierToBeUsed /* OPTIONAL */;
- struct IpaEuiccDataRequest__searchCriteria {
- IpaEuiccDataRequest__searchCriteria_PR present;
- union IpaEuiccDataRequest__searchCriteria_u {
+ struct IpaEuiccDataRequest__searchCriteriaNotification {
+ IpaEuiccDataRequest__searchCriteriaNotification_PR present;
+ union IpaEuiccDataRequest__searchCriteriaNotification_u {
long seqNumber;
NotificationEvent_t profileManagementOperation;
NULL_t euiccPackageResults;
@@ -51,7 +51,7 @@
/* Context for parsing across buffer boundaries */
asn_struct_ctx_t _asn_ctx;
- } *searchCriteria;
+ } *searchCriteriaNotification;
/*
* This type is extensible,
* possible extensions are below.
diff --git a/src/ipa/libipa/es10b_retr_notif_from_lst.c
b/src/ipa/libipa/es10b_retr_notif_from_lst.c
index e8b444e..170f59a 100644
--- a/src/ipa/libipa/es10b_retr_notif_from_lst.c
+++ b/src/ipa/libipa/es10b_retr_notif_from_lst.c
@@ -159,17 +159,17 @@
if (req->dr_search_criteria) {
/* Convert from foreigen searchCriteria (see comment in header
file) */
switch (req->dr_search_criteria->present) {
- case IpaEuiccDataRequest__searchCriteria_PR_seqNumber:
+ case
IpaEuiccDataRequest__searchCriteriaNotification_PR_seqNumber:
search_criteria.present =
RetrieveNotificationsListRequest__searchCriteria_PR_seqNumber;
search_criteria.choice.seqNumber =
req->dr_search_criteria->choice.seqNumber;
break;
- case
IpaEuiccDataRequest__searchCriteria_PR_profileManagementOperation:
+ case
IpaEuiccDataRequest__searchCriteriaNotification_PR_profileManagementOperation:
search_criteria.present =
RetrieveNotificationsListRequest__searchCriteria_PR_profileManagementOperation;
search_criteria.choice.profileManagementOperation =
req->dr_search_criteria->choice.profileManagementOperation;
break;
- case IpaEuiccDataRequest__searchCriteria_PR_euiccPackageResults:
+ case
IpaEuiccDataRequest__searchCriteriaNotification_PR_euiccPackageResults:
IPA_LOGP_ES10X("RetrieveNotificationsList", LERROR,
"unsupported euiccPackageResults
searchCriteria in IpaEuiccDataRequest!\n");
search_criteria.present =
RetrieveNotificationsListRequest__searchCriteria_PR_NOTHING;
@@ -219,17 +219,17 @@
if (req->dr_search_criteria) {
/* Convert from foreigen searchCriteria (see comment in header
file) */
switch (req->dr_search_criteria->present) {
- case IpaEuiccDataRequest__searchCriteria_PR_seqNumber:
+ case
IpaEuiccDataRequest__searchCriteriaNotification_PR_seqNumber:
search_criteria.present =
SGP32_RetrieveNotificationsListRequest__searchCriteria_PR_seqNumber;
search_criteria.choice.seqNumber =
req->dr_search_criteria->choice.seqNumber;
break;
- case
IpaEuiccDataRequest__searchCriteria_PR_profileManagementOperation:
+ case
IpaEuiccDataRequest__searchCriteriaNotification_PR_profileManagementOperation:
search_criteria.present =
SGP32_RetrieveNotificationsListRequest__searchCriteria_PR_profileManagementOperation;
search_criteria.choice.profileManagementOperation =
req->dr_search_criteria->choice.profileManagementOperation;
break;
- case IpaEuiccDataRequest__searchCriteria_PR_euiccPackageResults:
+ case
IpaEuiccDataRequest__searchCriteriaNotification_PR_euiccPackageResults:
search_criteria.present =
SGP32_RetrieveNotificationsListRequest__searchCriteria_PR_euiccPackageResults;
search_criteria.choice.euiccPackageResults =
diff --git a/src/ipa/libipa/es10b_retr_notif_from_lst.h
b/src/ipa/libipa/es10b_retr_notif_from_lst.h
index 84f3706..2773356 100644
--- a/src/ipa/libipa/es10b_retr_notif_from_lst.h
+++ b/src/ipa/libipa/es10b_retr_notif_from_lst.h
@@ -19,7 +19,7 @@
/* When the caller has access to a search searchCriteria that
originates from an IpaEuiccDataRequest, the
* pointer to it may be passed here. The function will then
atomatically convert the searchCriteria into
* the native RetrieveNotificationsListRequest format. */
- const struct IpaEuiccDataRequest__searchCriteria *dr_search_criteria;
+ const struct IpaEuiccDataRequest__searchCriteriaNotification
*dr_search_criteria;
};
struct ipa_es10b_retr_notif_from_lst_res {
diff --git a/src/ipa/libipa/proc_euicc_data_req.c
b/src/ipa/libipa/proc_euicc_data_req.c
index 2e2ebc1..ebfbf1d 100644
--- a/src/ipa/libipa/proc_euicc_data_req.c
+++ b/src/ipa/libipa/proc_euicc_data_req.c
@@ -197,7 +197,7 @@
if (ipa_tag_in_taglist(0xBF2B, tag_list)) {
IPA_LOGP(SIPA, LINFO, "eIM asks for List of Notifications
and/or eUICC Package Results\n");
- retr_notif_from_lst_req.dr_search_criteria =
pars->ipa_euicc_data_request->searchCriteria;
+ retr_notif_from_lst_req.dr_search_criteria =
pars->ipa_euicc_data_request->searchCriteriaNotification;
retr_notif_from_lst_res = ipa_es10b_retr_notif_from_lst(ctx,
&retr_notif_from_lst_req);
if (retr_notif_from_lst_res &&
retr_notif_from_lst_res->sgp32_res)
ipa_euicc_data_response.choice.ipaEuiccData.notificationsList =
retr_notif_from_lst_res->sgp32_res;
--
To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43034?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: onomondo-ipa
Gerrit-Branch: master
Gerrit-Change-Id: I245c2c1c1c5cdd2be387d515d1bf51d0bf82ef41
Gerrit-Change-Number: 43034
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <[email protected]>
