/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
+ * Copyright (c) 1995-2000, Index Data
+ * See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_int.c,v $
- * Revision 1.5 1995-03-27 15:01:44 quinn
+ * Revision 1.19 2000-10-06 12:46:27 adam
+ * Including sys/types.h and netinet/in.h instead on arpa/inet.h on Unix.
+ *
+ * Revision 1.18 2000/02/29 13:44:55 adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.17 2000/02/28 11:20:06 adam
+ * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL.
+ *
+ * Revision 1.16 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.15 1999/11/30 13:47:11 adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.14 1999/05/26 07:49:35 adam
+ * C++ compilation.
+ *
+ * Revision 1.13 1999/01/08 11:23:22 adam
+ * Added const modifier to some of the BER/ODR encoding routines.
+ *
+ * Revision 1.12 1996/07/06 19:58:33 quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.11 1995/09/29 17:12:16 quinn
+ * Smallish
+ *
+ * Revision 1.10 1995/09/29 17:01:50 quinn
+ * More Windows work
+ *
+ * Revision 1.9 1995/09/28 10:12:39 quinn
+ * Windows-support changes
+ *
+ * Revision 1.8 1995/09/27 15:02:55 quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.7 1995/05/16 08:50:44 quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.6 1995/04/18 08:15:14 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.5 1995/03/27 15:01:44 quinn
* Added include of sys/types to further portability
*
* Revision 1.4 1995/03/08 12:12:07 quinn
* First kick.
*
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
-#include <odr.h>
-#include <sys/types.h>
-#include <netinet/in.h> /* for htons... */
#include <string.h>
-static int ber_encinteger(unsigned char *buf, int val, int maxlen);
-static int ber_decinteger(unsigned char *buf, int *val);
+#ifdef WIN32
+#include <winsock.h>
+#else
+#include <sys/types.h>
+#include <netinet/in.h>
+#endif
+
+#include <yaz/odr.h>
+
+static int ber_encinteger(ODR o, int val);
+static int ber_decinteger(const unsigned char *buf, int *val);
int ber_integer(ODR o, int *val)
{
switch (o->direction)
{
- case ODR_DECODE:
- if ((res = ber_decinteger(o->bp, val)) <= 0)
- {
- o->error = OPROTO;
- return 0;
- }
- o->bp += res;
- o->left -= res;
- return 1;
- case ODR_ENCODE:
- if ((res = ber_encinteger(o->bp, *val, o->left)) <= 0)
- {
- o->error = OSPACE;
- return 0;
- }
- o->bp += res;
- o->left -= res;
- return 1;
- case ODR_PRINT: return 1;
- default: o->error = OOTHER; return 0;
+ case ODR_DECODE:
+ if ((res = ber_decinteger(o->bp, val)) <= 0)
+ {
+ o->error = OPROTO;
+ return 0;
+ }
+ o->bp += res;
+ return 1;
+ case ODR_ENCODE:
+ if ((res = ber_encinteger(o, *val)) < 0)
+ return 0;
+ return 1;
+ case ODR_PRINT: return 1;
+ default: o->error = OOTHER; return 0;
}
}
/*
* Returns: number of bytes written or -1 for error (out of bounds).
*/
-int ber_encinteger(unsigned char *buf, int val, int maxlen)
+int ber_encinteger(ODR o, int val)
{
- unsigned char *b = buf, *lenpos;
+ int lenpos;
int a, len;
union { int i; unsigned char c[sizeof(int)]; } tmp;
- lenpos = b;
- maxlen--;
- b++;
-
+ lenpos = odr_tell(o);
+ if (odr_putc(o, 0) < 0) /* dummy */
+ return -1;
tmp.i = htonl(val); /* ensure that that we're big-endian */
- for (a = 0; a < sizeof(int) - 1; a++) /* skip superfluous octets */
- if (!((tmp.c[a] == 0 && !(tmp.c[a+1] & 0X80)) ||
- (tmp.c[a] == 0XFF && (tmp.c[a+1] & 0X80))))
- break;
- if ((len = sizeof(int) - a) > maxlen)
- return -1;
- memcpy(b, tmp.c + a, len);
- b += len;
- if (ber_enclen(lenpos, len, 1, 1) != 1)
- return -1;
+ for (a = 0; a < (int) sizeof(int) - 1; a++) /* skip superfluous octets */
+ if (!((tmp.c[a] == 0 && !(tmp.c[a+1] & 0X80)) ||
+ (tmp.c[a] == 0XFF && (tmp.c[a+1] & 0X80))))
+ break;
+ len = sizeof(int) - a;
+ if (odr_write(o, (unsigned char*) tmp.c + a, len) < 0)
+ return -1;
+ odr_seek(o, ODR_S_SET, lenpos);
+ if (ber_enclen(o, len, 1, 1) != 1)
+ return -1;
+ odr_seek(o, ODR_S_END, 0);
#ifdef ODR_DEBUG
fprintf(stderr, "[val=%d]", val);
#endif
- return b - buf;
+ return 0;
}
/*
* Returns: Number of bytes read or 0 if no match, -1 if error.
*/
-int ber_decinteger(unsigned char *buf, int *val)
+int ber_decinteger(const unsigned char *buf, int *val)
{
- unsigned char *b = buf, fill;
+ const unsigned char *b = buf;
+ unsigned char fill;
int res, len, remains;
union { int i; unsigned char c[sizeof(int)]; } tmp;
if ((res = ber_declen(b, &len)) < 0)
- return -1;
- if (len > sizeof(int)) /* let's be reasonable, here */
- return -1;
+ return -1;
+ if (len > (int) sizeof(int)) /* let's be reasonable, here */
+ return -1;
b+= res;
remains = sizeof(int) - len;
memcpy(tmp.c + remains, b, len);
if (*b & 0X80)
- fill = 0XFF;
+ fill = 0XFF;
else
- fill = 0X00;
+ fill = 0X00;
memset(tmp.c, fill, remains);
*val = ntohl(tmp.i);
projects / yaz-moved-to-github.git / blobdiff