jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/onomondo-ipa/+/43025?usp=email )
Change subject: V1.2: Update from "EnableUsingDD" to "ImmediateEnable" function
......................................................................
V1.2: Update from "EnableUsingDD" to "ImmediateEnable" function
Work on 5.9.15 -> Renamed things and added ASN.1 fields, but no
processing of these fields yet.
Reference: SGP.32 Section 5.9.15
Related: SYS#8101
Change-Id: Id750b2f5ca6c08a013aa30f876aa37e6291a30d5
---
M asn1/SGP32Definitions.asn
M src/ipa/libasn/CMakeLists.txt
D src/ipa/libasn/EnableUsingDDRequest.c
D src/ipa/libasn/EnableUsingDDResponse.c
D src/ipa/libasn/EnableUsingDDResponse.h
A src/ipa/libasn/ImmediateEnableRequest.c
R src/ipa/libasn/ImmediateEnableRequest.h
A src/ipa/libasn/ImmediateEnableResponse.c
A src/ipa/libasn/ImmediateEnableResponse.h
M src/ipa/libipa/CMakeLists.txt
R src/ipa/libipa/es10b_immediate_enable.c
R src/ipa/libipa/es10b_immediate_enable.h
M src/ipa/libipa/es10b_load_bnd_prfle_pkg.c
M src/ipa/libipa/proc_prfle_inst.c
14 files changed, 218 insertions(+), 198 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/25/43025/1
diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn
index bc4fdad..9b5da2f 100644
--- a/asn1/SGP32Definitions.asn
+++ b/asn1/SGP32Definitions.asn
@@ -458,15 +458,17 @@
-- Section 5.9.15
-- ASN1START
-EnableUsingDDRequest ::= [90] SEQUENCE { -- Tag 'BF5A'
+ImmediateEnableRequest ::= [90] SEQUENCE { -- Tag 'BF5A'
+ refreshFlag BOOLEAN -- indicating whether REFRESH is required
}
-- ASN1STOP
-- ASN1START
-EnableUsingDDResponse ::= [90] SEQUENCE { -- Tag 'BF5A'
- enableUsingDDResult [0] INTEGER {
+ImmediateEnableResponse ::= [90] SEQUENCE { -- Tag 'BF5A'
+ immediateEnableResult [0] INTEGER {
ok(0),
immediateEnableNotAvailable(1),
noSessionContext(4),
+ catBusy(5),
undefinedError(127)
}
}
diff --git a/src/ipa/libasn/CMakeLists.txt b/src/ipa/libasn/CMakeLists.txt
index 8efadc9..90d7b42 100644
--- a/src/ipa/libasn/CMakeLists.txt
+++ b/src/ipa/libasn/CMakeLists.txt
@@ -289,10 +289,6 @@
EnableProfileResponse.h
EnableProfileResult.c
EnableProfileResult.h
-EnableUsingDDRequest.c
-EnableUsingDDRequest.h
-EnableUsingDDResponse.c
-EnableUsingDDResponse.h
ErrorReason.c
ErrorReason.h
ErrorResult.c
@@ -437,6 +433,10 @@
Iccid.h
IconType.c
IconType.h
+ImmediateEnableRequest.c
+ImmediateEnableRequest.h
+ImmediateEnableResponse.c
+ImmediateEnableResponse.h
InhibitAnyPolicy.c
InhibitAnyPolicy.h
InitialiseSecureChannelRequest.c
diff --git a/src/ipa/libasn/EnableUsingDDRequest.c
b/src/ipa/libasn/EnableUsingDDRequest.c
deleted file mode 100644
index c37fbfe..0000000
--- a/src/ipa/libasn/EnableUsingDDRequest.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
- * From ASN.1 module "SGP32Definitions"
- * found in "../../../asn1/SGP32Definitions.asn"
- * `asn1c -fcompound-names -no-gen-example`
- */
-
-#include "EnableUsingDDRequest.h"
-
-static const ber_tlv_tag_t asn_DEF_EnableUsingDDRequest_tags_1[] = {
- (ASN_TAG_CLASS_CONTEXT | (90 << 2)),
- (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static asn_SEQUENCE_specifics_t asn_SPC_EnableUsingDDRequest_specs_1 = {
- sizeof(struct EnableUsingDDRequest),
- offsetof(struct EnableUsingDDRequest, _asn_ctx),
- 0, /* No top level tags */
- 0, /* No tags in the map */
- 0, 0, 0, /* Optional elements (not needed) */
- -1, /* First extension addition */
-};
-asn_TYPE_descriptor_t asn_DEF_EnableUsingDDRequest = {
- "EnableUsingDDRequest",
- "EnableUsingDDRequest",
- &asn_OP_SEQUENCE,
- asn_DEF_EnableUsingDDRequest_tags_1,
- sizeof(asn_DEF_EnableUsingDDRequest_tags_1)
- /sizeof(asn_DEF_EnableUsingDDRequest_tags_1[0]) - 1, /* 1 */
- asn_DEF_EnableUsingDDRequest_tags_1, /* Same as above */
- sizeof(asn_DEF_EnableUsingDDRequest_tags_1)
- /sizeof(asn_DEF_EnableUsingDDRequest_tags_1[0]), /* 2 */
- { 0, 0, SEQUENCE_constraint },
- 0, 0, /* No members */
- &asn_SPC_EnableUsingDDRequest_specs_1 /* Additional specs */
-};
-
diff --git a/src/ipa/libasn/EnableUsingDDResponse.c
b/src/ipa/libasn/EnableUsingDDResponse.c
deleted file mode 100644
index af30721..0000000
--- a/src/ipa/libasn/EnableUsingDDResponse.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
- * From ASN.1 module "SGP32Definitions"
- * found in "../../../asn1/SGP32Definitions.asn"
- * `asn1c -fcompound-names -no-gen-example`
- */
-
-#include "EnableUsingDDResponse.h"
-
-static asn_TYPE_member_t asn_MBR_EnableUsingDDResponse_1[] = {
- { ATF_NOFLAGS, 0, offsetof(struct EnableUsingDDResponse,
enableUsingDDResult),
- (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
- -1, /* IMPLICIT tag at current level */
- &asn_DEF_NativeInteger,
- 0,
- { 0, 0, 0 },
- 0, 0, /* No default value */
- "enableUsingDDResult"
- },
-};
-static const ber_tlv_tag_t asn_DEF_EnableUsingDDResponse_tags_1[] = {
- (ASN_TAG_CLASS_CONTEXT | (90 << 2)),
- (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_EnableUsingDDResponse_tag2el_1[] = {
- { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* enableUsingDDResult */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_EnableUsingDDResponse_specs_1 = {
- sizeof(struct EnableUsingDDResponse),
- offsetof(struct EnableUsingDDResponse, _asn_ctx),
- asn_MAP_EnableUsingDDResponse_tag2el_1,
- 1, /* Count of tags in the map */
- 0, 0, 0, /* Optional elements (not needed) */
- 1, /* First extension addition */
-};
-asn_TYPE_descriptor_t asn_DEF_EnableUsingDDResponse = {
- "EnableUsingDDResponse",
- "EnableUsingDDResponse",
- &asn_OP_SEQUENCE,
- asn_DEF_EnableUsingDDResponse_tags_1,
- sizeof(asn_DEF_EnableUsingDDResponse_tags_1)
- /sizeof(asn_DEF_EnableUsingDDResponse_tags_1[0]) - 1, /* 1 */
- asn_DEF_EnableUsingDDResponse_tags_1, /* Same as above */
- sizeof(asn_DEF_EnableUsingDDResponse_tags_1)
- /sizeof(asn_DEF_EnableUsingDDResponse_tags_1[0]), /* 2 */
- { 0, 0, SEQUENCE_constraint },
- asn_MBR_EnableUsingDDResponse_1,
- 1, /* Elements count */
- &asn_SPC_EnableUsingDDResponse_specs_1 /* Additional specs */
-};
-
diff --git a/src/ipa/libasn/EnableUsingDDResponse.h
b/src/ipa/libasn/EnableUsingDDResponse.h
deleted file mode 100644
index faa2c26..0000000
--- a/src/ipa/libasn/EnableUsingDDResponse.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
- * From ASN.1 module "SGP32Definitions"
- * found in "../../../asn1/SGP32Definitions.asn"
- * `asn1c -fcompound-names -no-gen-example`
- */
-
-#ifndef _EnableUsingDDResponse_H_
-#define _EnableUsingDDResponse_H_
-
-
-#include <asn_application.h>
-
-/* Including external dependencies */
-#include <NativeInteger.h>
-#include <constr_SEQUENCE.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Dependencies */
-typedef enum EnableUsingDDResponse__enableUsingDDResult {
- EnableUsingDDResponse__enableUsingDDResult_ok = 0,
- EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable
= 1,
- EnableUsingDDResponse__enableUsingDDResult_noSessionContext = 4,
- EnableUsingDDResponse__enableUsingDDResult_undefinedError = 127
-} e_EnableUsingDDResponse__enableUsingDDResult;
-
-/* EnableUsingDDResponse */
-typedef struct EnableUsingDDResponse {
- long enableUsingDDResult;
- /*
- * This type is extensible,
- * possible extensions are below.
- */
-
- /* Context for parsing across buffer boundaries */
- asn_struct_ctx_t _asn_ctx;
-} EnableUsingDDResponse_t;
-
-/* Implementation */
-extern asn_TYPE_descriptor_t asn_DEF_EnableUsingDDResponse;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _EnableUsingDDResponse_H_ */
-#include <asn_internal.h>
diff --git a/src/ipa/libasn/ImmediateEnableRequest.c
b/src/ipa/libasn/ImmediateEnableRequest.c
new file mode 100644
index 0000000..e08fe51
--- /dev/null
+++ b/src/ipa/libasn/ImmediateEnableRequest.c
@@ -0,0 +1,51 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#include "ImmediateEnableRequest.h"
+
+static asn_TYPE_member_t asn_MBR_ImmediateEnableRequest_1[] = {
+ { ATF_NOFLAGS, 0, offsetof(struct ImmediateEnableRequest, refreshFlag),
+ (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_BOOLEAN,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "refreshFlag"
+ },
+};
+static const ber_tlv_tag_t asn_DEF_ImmediateEnableRequest_tags_1[] = {
+ (ASN_TAG_CLASS_CONTEXT | (90 << 2)),
+ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_ImmediateEnableRequest_tag2el_1[] =
{
+ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* refreshFlag */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_ImmediateEnableRequest_specs_1 = {
+ sizeof(struct ImmediateEnableRequest),
+ offsetof(struct ImmediateEnableRequest, _asn_ctx),
+ asn_MAP_ImmediateEnableRequest_tag2el_1,
+ 1, /* Count of tags in the map */
+ 0, 0, 0, /* Optional elements (not needed) */
+ 1, /* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_ImmediateEnableRequest = {
+ "ImmediateEnableRequest",
+ "ImmediateEnableRequest",
+ &asn_OP_SEQUENCE,
+ asn_DEF_ImmediateEnableRequest_tags_1,
+ sizeof(asn_DEF_ImmediateEnableRequest_tags_1)
+ /sizeof(asn_DEF_ImmediateEnableRequest_tags_1[0]) - 1, /* 1 */
+ asn_DEF_ImmediateEnableRequest_tags_1, /* Same as above */
+ sizeof(asn_DEF_ImmediateEnableRequest_tags_1)
+ /sizeof(asn_DEF_ImmediateEnableRequest_tags_1[0]), /* 2 */
+ { 0, 0, SEQUENCE_constraint },
+ asn_MBR_ImmediateEnableRequest_1,
+ 1, /* Elements count */
+ &asn_SPC_ImmediateEnableRequest_specs_1 /* Additional specs */
+};
+
diff --git a/src/ipa/libasn/EnableUsingDDRequest.h
b/src/ipa/libasn/ImmediateEnableRequest.h
similarity index 64%
rename from src/ipa/libasn/EnableUsingDDRequest.h
rename to src/ipa/libasn/ImmediateEnableRequest.h
index ab1573b..0def067 100644
--- a/src/ipa/libasn/EnableUsingDDRequest.h
+++ b/src/ipa/libasn/ImmediateEnableRequest.h
@@ -5,21 +5,23 @@
* `asn1c -fcompound-names -no-gen-example`
*/
-#ifndef _EnableUsingDDRequest_H_
-#define _EnableUsingDDRequest_H_
+#ifndef _ImmediateEnableRequest_H_
+#define _ImmediateEnableRequest_H_
#include <asn_application.h>
/* Including external dependencies */
+#include <BOOLEAN.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
extern "C" {
#endif
-/* EnableUsingDDRequest */
-typedef struct EnableUsingDDRequest {
+/* ImmediateEnableRequest */
+typedef struct ImmediateEnableRequest {
+ BOOLEAN_t refreshFlag;
/*
* This type is extensible,
* possible extensions are below.
@@ -27,14 +29,14 @@
/* Context for parsing across buffer boundaries */
asn_struct_ctx_t _asn_ctx;
-} EnableUsingDDRequest_t;
+} ImmediateEnableRequest_t;
/* Implementation */
-extern asn_TYPE_descriptor_t asn_DEF_EnableUsingDDRequest;
+extern asn_TYPE_descriptor_t asn_DEF_ImmediateEnableRequest;
#ifdef __cplusplus
}
#endif
-#endif /* _EnableUsingDDRequest_H_ */
+#endif /* _ImmediateEnableRequest_H_ */
#include <asn_internal.h>
diff --git a/src/ipa/libasn/ImmediateEnableResponse.c
b/src/ipa/libasn/ImmediateEnableResponse.c
new file mode 100644
index 0000000..e6197b1
--- /dev/null
+++ b/src/ipa/libasn/ImmediateEnableResponse.c
@@ -0,0 +1,51 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#include "ImmediateEnableResponse.h"
+
+static asn_TYPE_member_t asn_MBR_ImmediateEnableResponse_1[] = {
+ { ATF_NOFLAGS, 0, offsetof(struct ImmediateEnableResponse,
immediateEnableResult),
+ (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_NativeInteger,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "immediateEnableResult"
+ },
+};
+static const ber_tlv_tag_t asn_DEF_ImmediateEnableResponse_tags_1[] = {
+ (ASN_TAG_CLASS_CONTEXT | (90 << 2)),
+ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_ImmediateEnableResponse_tag2el_1[]
= {
+ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* immediateEnableResult */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_ImmediateEnableResponse_specs_1 = {
+ sizeof(struct ImmediateEnableResponse),
+ offsetof(struct ImmediateEnableResponse, _asn_ctx),
+ asn_MAP_ImmediateEnableResponse_tag2el_1,
+ 1, /* Count of tags in the map */
+ 0, 0, 0, /* Optional elements (not needed) */
+ 1, /* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_ImmediateEnableResponse = {
+ "ImmediateEnableResponse",
+ "ImmediateEnableResponse",
+ &asn_OP_SEQUENCE,
+ asn_DEF_ImmediateEnableResponse_tags_1,
+ sizeof(asn_DEF_ImmediateEnableResponse_tags_1)
+ /sizeof(asn_DEF_ImmediateEnableResponse_tags_1[0]) - 1, /* 1 */
+ asn_DEF_ImmediateEnableResponse_tags_1, /* Same as above */
+ sizeof(asn_DEF_ImmediateEnableResponse_tags_1)
+ /sizeof(asn_DEF_ImmediateEnableResponse_tags_1[0]), /* 2 */
+ { 0, 0, SEQUENCE_constraint },
+ asn_MBR_ImmediateEnableResponse_1,
+ 1, /* Elements count */
+ &asn_SPC_ImmediateEnableResponse_specs_1 /* Additional specs */
+};
+
diff --git a/src/ipa/libasn/ImmediateEnableResponse.h
b/src/ipa/libasn/ImmediateEnableResponse.h
new file mode 100644
index 0000000..f4c4445
--- /dev/null
+++ b/src/ipa/libasn/ImmediateEnableResponse.h
@@ -0,0 +1,51 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#ifndef _ImmediateEnableResponse_H_
+#define _ImmediateEnableResponse_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <NativeInteger.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum ImmediateEnableResponse__immediateEnableResult {
+ ImmediateEnableResponse__immediateEnableResult_ok = 0,
+
ImmediateEnableResponse__immediateEnableResult_immediateEnableNotAvailable
= 1,
+ ImmediateEnableResponse__immediateEnableResult_noSessionContext = 4,
+ ImmediateEnableResponse__immediateEnableResult_catBusy = 5,
+ ImmediateEnableResponse__immediateEnableResult_undefinedError = 127
+} e_ImmediateEnableResponse__immediateEnableResult;
+
+/* ImmediateEnableResponse */
+typedef struct ImmediateEnableResponse {
+ long immediateEnableResult;
+ /*
+ * This type is extensible,
+ * possible extensions are below.
+ */
+
+ /* Context for parsing across buffer boundaries */
+ asn_struct_ctx_t _asn_ctx;
+} ImmediateEnableResponse_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_ImmediateEnableResponse;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _ImmediateEnableResponse_H_ */
+#include <asn_internal.h>
diff --git a/src/ipa/libipa/CMakeLists.txt b/src/ipa/libipa/CMakeLists.txt
index 49a2c14..e6bed87 100644
--- a/src/ipa/libipa/CMakeLists.txt
+++ b/src/ipa/libipa/CMakeLists.txt
@@ -23,7 +23,7 @@
es10c_delete_prfle.c
es10c_disable_prfle.c
es10c_enable_prfle.c
- es10b_enable_using_dd.c
+ es10b_immediate_enable.c
es10c_get_eid.c
es10c_get_prfle_info.c
es10x.c
diff --git a/src/ipa/libipa/es10b_enable_using_dd.c
b/src/ipa/libipa/es10b_immediate_enable.c
similarity index 61%
rename from src/ipa/libipa/es10b_enable_using_dd.c
rename to src/ipa/libipa/es10b_immediate_enable.c
index 87e731d..1d0b942 100644
--- a/src/ipa/libipa/es10b_enable_using_dd.c
+++ b/src/ipa/libipa/es10b_immediate_enable.c
@@ -5,7 +5,7 @@
*
* Author: Philipp Maier <[email protected]> / sysmocom - s.f.m.c. GmbH
*
- * See also: GSMA SGP.23, 5.9.15: Function (ES10b): EnableUsingDD
+ * See also: GSMA SGP.23, 5.9.15: Function (ES10b): ImmediateEnable
*/
#include <stdio.h>
@@ -16,67 +16,67 @@
#include <onomondo/ipa/utils.h>
#include <onomondo/ipa/scard.h>
#include <onomondo/ipa/log.h>
-#include <EnableUsingDDRequest.h>
-#include <EnableUsingDDResponse.h>
+#include <ImmediateEnableRequest.h>
+#include <ImmediateEnableResponse.h>
#include "context.h"
#include "length.h"
#include "utils.h"
#include "euicc.h"
#include "es10x.h"
-#include "es10b_enable_using_dd.h"
+#include "es10b_immediate_enable.h"
#include "es10c_enable_prfle.h"
static const struct num_str_map error_code_strings[] = {
- { EnableUsingDDResponse__enableUsingDDResult_ok, "ok" },
- {
EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable,
"immediateEnableNotAvailable" },
- { EnableUsingDDResponse__enableUsingDDResult_noSessionContext,
"noSessionContext" },
- { EnableUsingDDResponse__enableUsingDDResult_undefinedError,
"undefinedError" },
+ { ImmediateEnableResponse__immediateEnableResult_ok, "ok" },
+ {
ImmediateEnableResponse__immediateEnableResult_immediateEnableNotAvailable,
"immediateEnableNotAvailable" },
+ { ImmediateEnableResponse__immediateEnableResult_noSessionContext,
"noSessionContext" },
+ { ImmediateEnableResponse__immediateEnableResult_undefinedError,
"undefinedError" },
{ 0, NULL }
};
-static int dec_enable_using_dd_res(const struct ipa_buf *es10b_res)
+static int dec_immediate_enable_res(const struct ipa_buf *es10b_res)
{
- struct EnableUsingDDResponse *asn = NULL;
+ struct ImmediateEnableResponse *asn = NULL;
int rc;
- asn = ipa_es10x_res_dec(&asn_DEF_EnableUsingDDResponse, es10b_res,
"EnableUsingDD");
+ asn = ipa_es10x_res_dec(&asn_DEF_ImmediateEnableResponse, es10b_res,
"ImmediateEnable");
if (!asn)
return -EINVAL;
- rc = asn->enableUsingDDResult;
+ rc = asn->immediateEnableResult;
- if (rc == EnableUsingDDResponse__enableUsingDDResult_ok) {
- IPA_LOGP_ES10X("EnableUsingDD", LERROR, "function succeeded
with status code %d=%s!\n",
+ if (rc == ImmediateEnableResponse__immediateEnableResult_ok) {
+ IPA_LOGP_ES10X("ImmediateEnable", LERROR, "function succeeded
with status code %d=%s!\n",
rc, ipa_str_from_num(error_code_strings, rc,
"(unknown)"));
} else {
- IPA_LOGP_ES10X("EnableUsingDD", LERROR, "function failed with
error code %d=%s!\n",
+ IPA_LOGP_ES10X("ImmediateEnable", LERROR, "function failed with
error code %d=%s!\n",
rc, ipa_str_from_num(error_code_strings, rc,
"(unknown)"));
}
- ASN_STRUCT_FREE(asn_DEF_EnableUsingDDResponse, asn);
+ ASN_STRUCT_FREE(asn_DEF_ImmediateEnableResponse, asn);
return rc;
}
-int enable_using_dd(struct ipa_context *ctx)
+int immediate_enable(struct ipa_context *ctx)
{
struct ipa_buf *es10b_req = NULL;
struct ipa_buf *es10b_res = NULL;
- struct EnableUsingDDRequest enable_using_dd_req = { 0 };
+ struct ImmediateEnableRequest immediate_enable_req = { 0 };
int rc = -EINVAL;
- es10b_req = ipa_es10x_req_enc(&asn_DEF_EnableUsingDDRequest,
&enable_using_dd_req, "EnableUsingDD");
+ es10b_req = ipa_es10x_req_enc(&asn_DEF_ImmediateEnableRequest,
&immediate_enable_req, "ImmediateEnable");
if (!es10b_req) {
- IPA_LOGP_ES10X("EnableUsingDD", LERROR, "unable to encode ES10b
request\n");
+ IPA_LOGP_ES10X("ImmediateEnable", LERROR, "unable to encode
ES10b request\n");
goto error;
}
es10b_res = ipa_euicc_transceive_es10x(ctx, es10b_req);
if (!es10b_res) {
- IPA_LOGP_ES10X("EnableUsingDD", LERROR, "no ES10b response\n");
+ IPA_LOGP_ES10X("ImmediateEnable", LERROR, "no ES10b
response\n");
goto error;
}
- rc = dec_enable_using_dd_res(es10b_res);
+ rc = dec_immediate_enable_res(es10b_res);
if (rc < 0)
goto error;
@@ -86,36 +86,36 @@
return rc;
}
-int enable_using_dd_emu(struct ipa_context *ctx)
+int immediate_enable_emu(struct ipa_context *ctx)
{
struct ipa_es10c_enable_prfle_req enable_prfle_req = { 0 };
struct ipa_es10c_enable_prfle_res *enable_prfle_res = NULL;
- int rc = EnableUsingDDResponse__enableUsingDDResult_undefinedError;
+ int rc = ImmediateEnableResponse__immediateEnableResult_undefinedError;
/* Auto enable must be active */
if (ctx->nvstate.iot_euicc_emu.immediate_enable.flag == false) {
- rc =
EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable;
+ rc =
ImmediateEnableResponse__immediateEnableResult_immediateEnableNotAvailable;
goto error;
}
/* We also need either the smdp_oid or the smdp_address to verify
against */
if (ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_oid == NULL &&
ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_address == NULL) {
- rc =
EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable;
+ rc =
ImmediateEnableResponse__immediateEnableResult_immediateEnableNotAvailable;
goto error;
}
/* Ensure the session context is present and complete */
if (ctx->iot_euicc_emu.immediate_enable.smdp_address == NULL) {
- rc =
EnableUsingDDResponse__enableUsingDDResult_noSessionContext;
+ rc =
ImmediateEnableResponse__immediateEnableResult_noSessionContext;
goto error;
}
if (ctx->iot_euicc_emu.immediate_enable.smdp_oid == NULL) {
- rc =
EnableUsingDDResponse__enableUsingDDResult_noSessionContext;
+ rc =
ImmediateEnableResponse__immediateEnableResult_noSessionContext;
goto error;
}
if (ctx->iot_euicc_emu.immediate_enable.profile_aid == NULL) {
- rc =
EnableUsingDDResponse__enableUsingDDResult_noSessionContext;
+ rc =
ImmediateEnableResponse__immediateEnableResult_noSessionContext;
goto error;
}
@@ -123,13 +123,13 @@
if (ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_oid) {
if (ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_oid->len !=
ctx->iot_euicc_emu.immediate_enable.smdp_oid->len) {
- rc =
EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable;
+ rc =
ImmediateEnableResponse__immediateEnableResult_immediateEnableNotAvailable;
goto error;
}
if
(memcmp(ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_oid->data,
ctx->iot_euicc_emu.immediate_enable.smdp_oid->data,
ctx->iot_euicc_emu.immediate_enable.smdp_oid->len)) {
- rc =
EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable;
+ rc =
ImmediateEnableResponse__immediateEnableResult_immediateEnableNotAvailable;
goto error;
}
}
@@ -138,13 +138,13 @@
if (ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_address) {
if
(ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_address->len !=
ctx->iot_euicc_emu.immediate_enable.smdp_address->len) {
- rc =
EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable;
+ rc =
ImmediateEnableResponse__immediateEnableResult_immediateEnableNotAvailable;
goto error;
}
if
(memcmp(ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_address->data,
ctx->iot_euicc_emu.immediate_enable.smdp_address->data,
ctx->iot_euicc_emu.immediate_enable.smdp_address->len)) {
- rc =
EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable;
+ rc =
ImmediateEnableResponse__immediateEnableResult_immediateEnableNotAvailable;
goto error;
}
}
@@ -157,17 +157,17 @@
enable_prfle_res = ipa_es10c_enable_prfle(ctx, &enable_prfle_req);
if (enable_prfle_res && enable_prfle_res->res->enableResult ==
EnableProfileResponse__enableResult_ok)
- rc = EnableUsingDDResponse__enableUsingDDResult_ok;
+ rc = ImmediateEnableResponse__immediateEnableResult_ok;
else
- rc = EnableUsingDDResponse__enableUsingDDResult_undefinedError;
+ rc =
ImmediateEnableResponse__immediateEnableResult_undefinedError;
error:
- if (rc == EnableUsingDDResponse__enableUsingDDResult_ok) {
- IPA_LOGP_ES10X("EnableUsingDD", LERROR,
+ if (rc == ImmediateEnableResponse__immediateEnableResult_ok) {
+ IPA_LOGP_ES10X("ImmediateEnable", LERROR,
"IoT eUICC emulation active, function succeeded
with status code %d=%s!\n", rc,
ipa_str_from_num(error_code_strings, rc,
"(unknown)"));
} else {
- IPA_LOGP_ES10X("EnableUsingDD", LERROR,
+ IPA_LOGP_ES10X("ImmediateEnable", LERROR,
"IoT eUICC emulation active, function failed
with error code %d=%s!\n", rc,
ipa_str_from_num(error_code_strings, rc,
"(unknown)"));
}
@@ -184,13 +184,13 @@
return rc;
}
-/*! Function (ES10b): EnableUsingDD.
+/*! Function (ES10b): ImmediateEnable.
* \param[inout] ctx pointer to ipa_context.
* \returns positive status code on success, negative on error. */
-int ipa_es10b_enable_using_dd(struct ipa_context *ctx)
+int ipa_es10b_immediate_enable(struct ipa_context *ctx)
{
if (ctx->cfg->iot_euicc_emu_enabled)
- return enable_using_dd_emu(ctx);
+ return immediate_enable_emu(ctx);
else
- return enable_using_dd(ctx);
+ return immediate_enable(ctx);
}
diff --git a/src/ipa/libipa/es10b_enable_using_dd.h
b/src/ipa/libipa/es10b_immediate_enable.h
similarity index 74%
rename from src/ipa/libipa/es10b_enable_using_dd.h
rename to src/ipa/libipa/es10b_immediate_enable.h
index b73c541..7e3f0af 100644
--- a/src/ipa/libipa/es10b_enable_using_dd.h
+++ b/src/ipa/libipa/es10b_immediate_enable.h
@@ -8,4 +8,4 @@
struct ipa_context;
-int ipa_es10b_enable_using_dd(struct ipa_context *ctx);
+int ipa_es10b_immediate_enable(struct ipa_context *ctx);
diff --git a/src/ipa/libipa/es10b_load_bnd_prfle_pkg.c
b/src/ipa/libipa/es10b_load_bnd_prfle_pkg.c
index d11eb7d..946ccb2 100644
--- a/src/ipa/libipa/es10b_load_bnd_prfle_pkg.c
+++ b/src/ipa/libipa/es10b_load_bnd_prfle_pkg.c
@@ -95,7 +95,7 @@
goto error;
/* In case IoT eUICC emulation is active, collect immediate
enable data to support the emulation of
- * the ES10b function EnableUsingDD. */
+ * the ES10b function ImmediateEnable. */
if (ctx->cfg->iot_euicc_emu_enabled)
collect_immediate_enable_data_from_prfle_inst_rslt(ctx,
res->res);
}
diff --git a/src/ipa/libipa/proc_prfle_inst.c b/src/ipa/libipa/proc_prfle_inst.c
index 1d08910..264e095 100644
--- a/src/ipa/libipa/proc_prfle_inst.c
+++ b/src/ipa/libipa/proc_prfle_inst.c
@@ -21,7 +21,7 @@
#include "es10b_load_bnd_prfle_pkg.h"
#include "esipa_handle_notif.h"
#include "es10b_rm_notif_from_lst.h"
-#include "es10b_enable_using_dd.h"
+#include "es10b_immediate_enable.h"
#include "bpp_segments.h"
#include "proc_prfle_inst.h"
@@ -42,7 +42,7 @@
}
/* Instruct the eUICC to enable the newly installed profile (if
configured and granted) */
- ipa_es10b_enable_using_dd(ctx);
+ ipa_es10b_immediate_enable(ctx);
/* A response is present, this is either the normal ending of the
installation sequence or the eUICC has aborted
* the installation. In both situations we forward the
ProfileInstallationResult to the eIM. */
--
To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43025?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: Id750b2f5ca6c08a013aa30f876aa37e6291a30d5
Gerrit-Change-Number: 43025
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <[email protected]>
