XER support

1 files changed, 62 insertions, 23 deletions

diff --git a/skeletons/UniversalString.c b/skeletons/UniversalString.c
index 14988966..d56cd925 100644
--- a/skeletons/UniversalString.c
+++ b/skeletons/UniversalString.c
@@ -2,6 +2,7 @@
  * Copyright (c) 2003 Lev Walkin <vlm@lionet.info>. All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
+#include <asn_internal.h>
 #include <UniversalString.h>
 
 /*
@@ -13,11 +14,13 @@ static ber_tlv_tag_t asn1_DEF_UniversalString_tags[] = {
 };
 asn1_TYPE_descriptor_t asn1_DEF_UniversalString = {
 	"UniversalString",
+	OCTET_STRING_free,
+	UniversalString_print,      /* Convert into UTF8 and print */
 	asn_generic_no_constraint,
 	OCTET_STRING_decode_ber,    /* Implemented in terms of OCTET STRING */
 	OCTET_STRING_encode_der,    /* Implemented in terms of OCTET STRING */
-	UniversalString_print,      /* Convert into UTF8 and print */
-	OCTET_STRING_free,
+	0,				/* Not implemented yet */
+	UniversalString_encode_xer,	/* Conver into UTF8 */
 	0, /* Use generic outmost tag fetcher */
 	asn1_DEF_UniversalString_tags,
 	sizeof(asn1_DEF_UniversalString_tags)
@@ -31,29 +34,25 @@ asn1_TYPE_descriptor_t asn1_DEF_UniversalString = {
 };
 
 
-int
-UniversalString_print(asn1_TYPE_descriptor_t *td, const void *sptr, int ilevel,
-	asn_app_consume_bytes_f *cb, void *app_key) {
-	const UniversalString_t *st = (const UniversalString_t *)sptr;
-	uint32_t *wchar;
-	uint32_t *wend;
+static ssize_t
+UniversalString__dump(const UniversalString_t *st,
+		asn_app_consume_bytes_f *cb, void *app_key) {
 	char scratch[128];			/* Scratchpad buffer */
-	char *p;
-
-	(void)td;	/* Unused argument */
-	(void)ilevel;	/* Unused argument */
+	char *p = scratch;
+	ssize_t wrote = 0;
+	uint8_t *ch;
+	uint8_t *end;
 
-	if(!st || !st->buf) return cb("<absent>", 8, app_key);
-
-	wchar = (uint32_t *)st->buf;
-	wend = (uint32_t *)(st->buf + st->size);
-	for(p = scratch; wchar < wend; wchar++) {
-		uint32_t wc =    (((uint8_t *)wchar)[0] << 24)
-				| (((uint8_t *)wchar)[1] << 16)
-				| (((uint8_t *)wchar)[2] << 8)
-				|  ((uint8_t *)wchar)[3];	/* 4 bytes */
+	ch = st->buf;
+	end = (st->buf + st->size);
+	for(end -= 3; ch < end; ch += 4) {
+		uint32_t wc =     (ch[0] << 24)
+				| (ch[1] << 16)
+				| (ch[2] << 8)
+				|  ch[3];	/* 4 bytes */
 		if(sizeof(scratch) - (p - scratch) < 6) {
-			if(cb(scratch, p - scratch, app_key))
+			wrote += p - scratch;
+			if(cb(scratch, p - scratch, app_key) < 0)
 				return -1;
 			p = scratch;
 		}
@@ -87,5 +86,45 @@ UniversalString_print(asn1_TYPE_descriptor_t *td, const void *sptr, int ilevel,
 		}
 	}
 
-	return cb(scratch, p - scratch, app_key);
+	wrote += p - scratch;
+	if(cb(scratch, p - scratch, app_key) < 0)
+		return -1;
+
+	return wrote;
 }
+
+asn_enc_rval_t
+UniversalString_encode_xer(asn1_TYPE_descriptor_t *td, void *sptr,
+	int ilevel, enum xer_encoder_flags_e flags,
+		asn_app_consume_bytes_f *cb, void *app_key) {
+	const UniversalString_t *st = (const UniversalString_t *)sptr;
+	asn_enc_rval_t er;
+
+	(void)ilevel;
+	(void)flags;
+
+	if(!st || !st->buf)
+		_ASN_ENCODE_FAILED;
+
+	er.encoded = UniversalString__dump(st, cb, app_key);
+	if(er.encoded < 0) _ASN_ENCODE_FAILED;
+
+	return er;
+}
+
+int
+UniversalString_print(asn1_TYPE_descriptor_t *td, const void *sptr, int ilevel,
+	asn_app_consume_bytes_f *cb, void *app_key) {
+	const UniversalString_t *st = (const UniversalString_t *)sptr;
+
+	(void)td;	/* Unused argument */
+	(void)ilevel;	/* Unused argument */
+
+	if(!st || !st->buf) return cb("<absent>", 8, app_key);
+
+	if(UniversalString__dump(st, cb, app_key) < 0)
+		return -1;
+
+	return 0;
+}
+