/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
+ * Copyright (c) 1995-2000, Index Data
+ * See the file LICENSE for details.
*
* $Log: ber_any.c,v $
- * Revision 1.2 1995-02-10 15:55:28 quinn
+ * Revision 1.18 2000-02-29 13:44:55 adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.17 2000/01/31 13:15:21 adam
+ * Removed uses of assert(3). Cleanup of ODR. CCL parser update so
+ * that some characters are not surrounded by spaces in resulting term.
+ * ILL-code updates.
+ *
+ * Revision 1.16 1999/11/30 13:47:11 adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.15 1999/01/08 11:23:20 adam
+ * Added const modifier to some of the BER/ODR encoding routines.
+ *
+ * Revision 1.14 1998/02/11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.13 1997/05/14 06:53:56 adam
+ * C++ support.
+ *
+ * Revision 1.12 1995/09/29 17:12:15 quinn
+ * Smallish
+ *
+ * Revision 1.11 1995/09/27 15:02:54 quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.10 1995/05/16 08:50:42 quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.9 1995/04/18 08:15:12 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.8 1995/04/17 09:37:42 quinn
+ * *** empty log message ***
+ *
+ * Revision 1.7 1995/03/17 10:17:39 quinn
+ * Added memory management.
+ *
+ * Revision 1.6 1995/03/08 12:12:02 quinn
+ * Added better error checking.
+ *
+ * Revision 1.5 1995/02/14 20:39:54 quinn
+ * Fixed bugs in completeBER and (serious one in) ber_oid.
+ *
+ * Revision 1.4 1995/02/14 11:54:33 quinn
+ * Adjustments.
+ *
+ * Revision 1.3 1995/02/10 18:57:24 quinn
+ * More in the way of error-checking.
+ *
+ * Revision 1.2 1995/02/10 15:55:28 quinn
* Bug fixes, mostly.
*
* Revision 1.1 1995/02/09 15:51:45 quinn
* Works better now.
*
*/
-
-#include <odr.h>
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <yaz/odr.h>
int ber_any(ODR o, Odr_any **p)
{
int res;
+ int left = o->size - (o->bp - o->buf);
switch (o->direction)
{
case ODR_DECODE:
- if ((res = completeBER(o->bp, 1000)) <= 0) /* FIX THIS */
+ if ((res = completeBER(o->bp, left)) <= 0) /* FIX THIS */
+ {
+ o->error = OPROTO;
return 0;
- (*p)->buf = nalloc(o, res);
+ }
+ (*p)->buf = (unsigned char *)odr_malloc(o, res);
memcpy((*p)->buf, o->bp, res);
(*p)->len = (*p)->size = res;
o->bp += res;
- o->left -= res;
return 1;
case ODR_ENCODE:
- if ((*p)->len > o->left)
+ if (odr_write(o, (*p)->buf, (*p)->len) < 0)
return 0;
- memcpy(o->bp , (*p)->buf, (*p)->len);
- o->bp += (*p)->len;
- o->left -= (*p)->len;
return 1;
- default: return 0;
+ default: o->error = OOTHER; return 0;
}
}
/*
- * Return length of BER-package or -1.
+ * Return length of BER-package or 0.
*/
-int completeBER(unsigned char *buf, int len)
+int completeBER(const unsigned char *buf, int len)
{
- int res, ll, class, tag, cons;
- unsigned char *b = buf;
+ int res, ll, zclass, tag, cons;
+ const unsigned char *b = buf;
+ if (!len)
+ return 0;
if (!buf[0] && !buf[1])
- return -1;
- if ((res = ber_dectag(b, &class, &tag, &cons)) <= 0)
+ return 0;
+ if ((res = ber_dectag(b, &zclass, &tag, &cons)) <= 0)
return 0;
if (res > len)
- return -1;
+ return 0;
b += res;
len -= res;
if ((res = ber_declen(b, &ll)) <= 0)
- return -1;
+ return 0;
if (res > len)
- return -1;
+ return 0;
b += res;
len -= res;
if (ll >= 0)
- return (len >= ll ? ll + (b-buf) : -1);
+ return (len >= ll ? ll + (b-buf) : 0);
if (!cons)
- return -1;
- while (1)
+ return 0;
+ /* constructed - cycle through children */
+ while (len >= 2)
{
- if ((res = completeBER(b, len)) < 0)
- return -1;
+ if (*b == 0 && *(b + 1) == 0)
+ break;
+ if (!(res = completeBER(b, len)))
+ return 0;
b += res;
len -= res;
- if (len < 2)
- return -1;
- if (*b == 0 && *(b + 1) == 0)
- return (b - buf) + 2;
}
+ if (len < 2)
+ return 0;
+ return (b - buf) + 2;
}