XER support
git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@365 59561ff5-6e30-0410-9f3c-9617f08c8826
diff --git a/tests/46-redefine-OK.asn1.-PR b/tests/46-redefine-OK.asn1.-PR
index 9104df8..f89085e 100644
--- a/tests/46-redefine-OK.asn1.-PR
+++ b/tests/46-redefine-OK.asn1.-PR
@@ -11,11 +11,12 @@
/*** <<< FUNC-DECLS [PrimitiveType] >>> ***/
extern asn1_TYPE_descriptor_t asn1_DEF_PrimitiveType;
+asn_struct_free_f PrimitiveType_free;
+asn_struct_print_f PrimitiveType_print;
asn_constr_check_f PrimitiveType_constraint;
ber_type_decoder_f PrimitiveType_decode_ber;
der_type_encoder_f PrimitiveType_encode_der;
-asn_struct_print_f PrimitiveType_print;
-asn_struct_free_f PrimitiveType_free;
+xer_type_encoder_f PrimitiveType_encode_xer;
/*** <<< CODE [PrimitiveType] >>> ***/
@@ -35,29 +36,23 @@
*/
static void
PrimitiveType_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
- td->ber_decoder = asn1_DEF_OCTET_STRING.ber_decoder;
- td->der_encoder = asn1_DEF_OCTET_STRING.der_encoder;
td->free_struct = asn1_DEF_OCTET_STRING.free_struct;
td->print_struct = asn1_DEF_OCTET_STRING.print_struct;
+ td->ber_decoder = asn1_DEF_OCTET_STRING.ber_decoder;
+ td->der_encoder = asn1_DEF_OCTET_STRING.der_encoder;
+ td->xer_decoder = asn1_DEF_OCTET_STRING.xer_decoder;
+ td->xer_encoder = asn1_DEF_OCTET_STRING.xer_encoder;
td->last_tag_form = asn1_DEF_OCTET_STRING.last_tag_form;
td->elements = asn1_DEF_OCTET_STRING.elements;
td->elements_count = asn1_DEF_OCTET_STRING.elements_count;
td->specifics = asn1_DEF_OCTET_STRING.specifics;
}
-ber_dec_rval_t
-PrimitiveType_decode_ber(asn1_TYPE_descriptor_t *td,
- void **structure, void *bufptr, size_t size, int tag_mode) {
+void
+PrimitiveType_free(asn1_TYPE_descriptor_t *td,
+ void *struct_ptr, int contents_only) {
PrimitiveType_inherit_TYPE_descriptor(td);
- return td->ber_decoder(td, structure, bufptr, size, tag_mode);
-}
-
-der_enc_rval_t
-PrimitiveType_encode_der(asn1_TYPE_descriptor_t *td,
- void *structure, int tag_mode, ber_tlv_tag_t tag,
- asn_app_consume_bytes_f *cb, void *app_key) {
- PrimitiveType_inherit_TYPE_descriptor(td);
- return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
+ td->free_struct(td, struct_ptr, contents_only);
}
int
@@ -67,11 +62,27 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-void
-PrimitiveType_free(asn1_TYPE_descriptor_t *td,
- void *struct_ptr, int contents_only) {
+ber_dec_rval_t
+PrimitiveType_decode_ber(asn1_TYPE_descriptor_t *td,
+ void **structure, void *bufptr, size_t size, int tag_mode) {
PrimitiveType_inherit_TYPE_descriptor(td);
- td->free_struct(td, struct_ptr, contents_only);
+ return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+}
+
+asn_enc_rval_t
+PrimitiveType_encode_der(asn1_TYPE_descriptor_t *td,
+ void *structure, int tag_mode, ber_tlv_tag_t tag,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ PrimitiveType_inherit_TYPE_descriptor(td);
+ return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
+}
+
+asn_enc_rval_t
+PrimitiveType_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+ int ilevel, enum xer_encoder_flags_e flags,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ PrimitiveType_inherit_TYPE_descriptor(td);
+ return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
}
@@ -82,11 +93,13 @@
};
asn1_TYPE_descriptor_t asn1_DEF_PrimitiveType = {
"PrimitiveType",
+ PrimitiveType_free,
+ PrimitiveType_print,
PrimitiveType_constraint,
PrimitiveType_decode_ber,
PrimitiveType_encode_der,
- PrimitiveType_print,
- PrimitiveType_free,
+ 0, /* Not implemented yet */
+ PrimitiveType_encode_xer,
0, /* Use generic outmost tag fetcher */
asn1_DEF_PrimitiveType_tags,
sizeof(asn1_DEF_PrimitiveType_tags)
@@ -146,11 +159,13 @@
};
asn1_TYPE_descriptor_t asn1_DEF_ConstructedType = {
"ConstructedType",
+ SEQUENCE_free,
+ SEQUENCE_print,
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
- SEQUENCE_print,
- SEQUENCE_free,
+ 0, /* Not implemented yet */
+ SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn1_DEF_ConstructedType_tags,
sizeof(asn1_DEF_ConstructedType_tags)
@@ -177,11 +192,12 @@
/*** <<< FUNC-DECLS [T] >>> ***/
extern asn1_TYPE_descriptor_t asn1_DEF_T;
+asn_struct_free_f T_free;
+asn_struct_print_f T_print;
asn_constr_check_f T_constraint;
ber_type_decoder_f T_decode_ber;
der_type_encoder_f T_encode_der;
-asn_struct_print_f T_print;
-asn_struct_free_f T_free;
+xer_type_encoder_f T_encode_xer;
/*** <<< CODE [T] >>> ***/
@@ -201,29 +217,23 @@
*/
static void
T_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
- td->ber_decoder = asn1_DEF_ConstructedType.ber_decoder;
- td->der_encoder = asn1_DEF_ConstructedType.der_encoder;
td->free_struct = asn1_DEF_ConstructedType.free_struct;
td->print_struct = asn1_DEF_ConstructedType.print_struct;
+ td->ber_decoder = asn1_DEF_ConstructedType.ber_decoder;
+ td->der_encoder = asn1_DEF_ConstructedType.der_encoder;
+ td->xer_decoder = asn1_DEF_ConstructedType.xer_decoder;
+ td->xer_encoder = asn1_DEF_ConstructedType.xer_encoder;
td->last_tag_form = asn1_DEF_ConstructedType.last_tag_form;
td->elements = asn1_DEF_ConstructedType.elements;
td->elements_count = asn1_DEF_ConstructedType.elements_count;
td->specifics = asn1_DEF_ConstructedType.specifics;
}
-ber_dec_rval_t
-T_decode_ber(asn1_TYPE_descriptor_t *td,
- void **structure, void *bufptr, size_t size, int tag_mode) {
+void
+T_free(asn1_TYPE_descriptor_t *td,
+ void *struct_ptr, int contents_only) {
T_inherit_TYPE_descriptor(td);
- return td->ber_decoder(td, structure, bufptr, size, tag_mode);
-}
-
-der_enc_rval_t
-T_encode_der(asn1_TYPE_descriptor_t *td,
- void *structure, int tag_mode, ber_tlv_tag_t tag,
- asn_app_consume_bytes_f *cb, void *app_key) {
- T_inherit_TYPE_descriptor(td);
- return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
+ td->free_struct(td, struct_ptr, contents_only);
}
int
@@ -233,11 +243,27 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-void
-T_free(asn1_TYPE_descriptor_t *td,
- void *struct_ptr, int contents_only) {
+ber_dec_rval_t
+T_decode_ber(asn1_TYPE_descriptor_t *td,
+ void **structure, void *bufptr, size_t size, int tag_mode) {
T_inherit_TYPE_descriptor(td);
- td->free_struct(td, struct_ptr, contents_only);
+ return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+}
+
+asn_enc_rval_t
+T_encode_der(asn1_TYPE_descriptor_t *td,
+ void *structure, int tag_mode, ber_tlv_tag_t tag,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ T_inherit_TYPE_descriptor(td);
+ return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
+}
+
+asn_enc_rval_t
+T_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+ int ilevel, enum xer_encoder_flags_e flags,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ T_inherit_TYPE_descriptor(td);
+ return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
}
@@ -249,11 +275,13 @@
};
asn1_TYPE_descriptor_t asn1_DEF_T = {
"T",
+ T_free,
+ T_print,
T_constraint,
T_decode_ber,
T_encode_der,
- T_print,
- T_free,
+ 0, /* Not implemented yet */
+ T_encode_xer,
0, /* Use generic outmost tag fetcher */
asn1_DEF_T_tags,
sizeof(asn1_DEF_T_tags)