/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_cons.c,v $
- * Revision 1.8 1995-03-15 11:18:04 quinn
+ * Revision 1.18 1997-05-14 06:53:58 adam
+ * C++ support.
+ *
+ * Revision 1.17 1996/10/23 12:31:24 adam
+ * Added 'static' modifier to dummy variable in odr_constructed_begin.
+ *
+ * Revision 1.16 1996/07/26 13:38:20 quinn
+ * Various smaller things. Gathered header-files.
+ *
+ * Revision 1.15 1995/09/29 17:12:23 quinn
+ * Smallish
+ *
+ * Revision 1.14 1995/09/27 15:02:58 quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.13 1995/08/15 11:16:39 quinn
+ * Fixed pretty-printers.
+ * CV:e ----------------------------------------------------------------------
+ * CV:e ----------------------------------------------------------------------
+ *
+ * Revision 1.12 1995/06/19 12:38:47 quinn
+ * Added BER dumper.
+ *
+ * Revision 1.11 1995/05/16 08:50:53 quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.10 1995/04/18 08:15:21 quinn
+ * Added dynamic memory allocation on encoding (whew). Code is now somewhat
+ * neater. We'll make the same change for decoding one day.
+ *
+ * Revision 1.9 1995/03/28 09:15:49 quinn
+ * Fixed bug in the printing mode
+ *
+ * Revision 1.8 1995/03/15 11:18:04 quinn
* Fixed serious bug in odr_cons
*
* Revision 1.7 1995/03/10 11:44:41 quinn
*/
#include <odr.h>
+#include <assert.h>
+
+void odr_setlenlen(ODR o, int len)
+{
+ o->lenlen = len;
+}
-int odr_constructed_begin(ODR o, void *p, int class, int tag)
+int odr_constructed_begin(ODR o, void *p, int zclass, int tag)
{
int res;
int cons = 1;
+ int lenlen = o->lenlen;
if (o->error)
return 0;
+ o->lenlen = 1; /* reset lenlen */
if (o->t_class < 0)
{
- o->t_class = class;
+ o->t_class = zclass;
o->t_tag = tag;
}
if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, 1)) < 0)
return 0;
}
o->stack[++(o->stackp)].lenb = o->bp;
+ o->stack[o->stackp].len_offset = odr_tell(o);
#ifdef ODR_DEBUG
fprintf(stderr, "[cons_begin(%d)]", o->stackp);
#endif
- if (o->direction == ODR_ENCODE || o->direction == ODR_PRINT)
+ if (o->direction == ODR_ENCODE)
{
- o->stack[o->stackp].lenlen = 1;
- o->bp++;
- o->left--;
+ static unsigned char dummy[sizeof(int)+1];
+
+ o->stack[o->stackp].lenlen = lenlen;
+
+ if (odr_write(o, dummy, lenlen) < 0) /* dummy */
+ return 0;
}
else if (o->direction == ODR_DECODE)
{
o->bp += res;
o->left -= res;
}
- else return 0;
-
+ else if (o->direction == ODR_PRINT)
+ {
+ fprintf(o->print, "%s{\n", odr_indent(o));
+ o->indent++;
+ }
+ else
+ {
+ o->error = OOTHER;
+ return 0;
+ }
o->stack[o->stackp].base = o->bp;
+ o->stack[o->stackp].base_offset = odr_tell(o);
return 1;
}
int odr_constructed_end(ODR o)
{
int res;
+ int pos;
if (o->error)
return 0;
else if (o->bp - o->stack[o->stackp].base !=
o->stack[o->stackp].len)
{
- o->error = OOTHER;
+ o->error = OCONLEN;
return 0;
}
o->stackp--;
return 1;
case ODR_ENCODE:
- if ((res = ber_enclen(o->stack[o->stackp].lenb,
- o->bp - o->stack[o->stackp].base,
+ pos = odr_tell(o);
+ odr_seek(o, ODR_S_SET, o->stack[o->stackp].len_offset);
+ if ((res = ber_enclen(o, pos - o->stack[o->stackp].base_offset,
o->stack[o->stackp].lenlen, 1)) < 0)
{
- o->error = OSPACE;
+ o->error = OLENOV;
return 0;
}
+ odr_seek(o, ODR_S_END, 0);
if (res == 0) /* indefinite encoding */
{
#ifdef ODR_DEBUG
fprintf(stderr, "[cons_end(%d): indefinite]", o->stackp);
#endif
- *(o->bp++) = 0;
- *(o->bp++) = 0;
- o->left -= 2;
+ if (odr_putc(o, 0) < 0 || odr_putc(o, 0) < 0)
+ return 0;
}
#ifdef ODR_DEBUG
else
#endif
o->stackp--;
return 1;
- case ODR_PRINT: return 1;
+ case ODR_PRINT:
+ assert(o->indent > 0);
+ o->stackp--;
+ o->indent--;
+ fprintf(o->print, "%s}\n", odr_indent(o));
+ return 1;
default:
o->error = OOTHER;
return 0;