X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fodr.h;h=7e86126b872d5aaeccc10f2f5785e510010dd0ed;hp=2f338eb218b3e3151e1f50cb2d46ac0361e0aa57;hb=88d26764ac94b4a2872c77e2deed58b15d2f6f02;hpb=54605527769927a70af506babc5d663a6caf7e64 diff --git a/include/odr.h b/include/odr.h index 2f338eb..7e86126 100644 --- a/include/odr.h +++ b/include/odr.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, Index Data. + * Copyright (c) 1995-1997, Index Data. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation, in whole or in part, for any purpose, is hereby granted, @@ -24,7 +24,59 @@ * OF THIS SOFTWARE. * * $Log: odr.h,v $ - * Revision 1.5 1995-05-22 11:31:24 quinn + * Revision 1.22 1997-07-21 12:44:30 adam + * Moved definitions of nmem_block and nmem_control. + * + * Revision 1.21 1997/05/14 06:53:41 adam + * C++ support. + * + * Revision 1.20 1997/04/30 08:52:08 quinn + * Null + * + * Revision 1.19 1996/10/08 12:58:08 adam + * New ODR function, odr_choice_enable_bias, to control behaviour of + * odr_choice_bias. + * + * Revision 1.18 1996/07/26 13:38:14 quinn + * Various smaller things. Gathered header-files. + * + * Revision 1.17 1995/11/08 17:41:27 quinn + * Smallish. + * + * Revision 1.16 1995/11/01 13:54:36 quinn + * Minor adjustments + * + * Revision 1.15 1995/10/18 16:12:36 quinn + * Better diagnostics. + * + * Revision 1.14 1995/09/29 17:12:04 quinn + * Smallish + * + * Revision 1.13 1995/09/29 17:01:49 quinn + * More Windows work + * + * Revision 1.12 1995/09/27 15:02:48 quinn + * Modified function heads & prototypes. + * + * Revision 1.11 1995/08/15 12:00:09 quinn + * Updated External + * + * Revision 1.10 1995/08/10 08:54:33 quinn + * Added Explain. + * + * Revision 1.9 1995/06/19 12:38:26 quinn + * Reorganized include-files. Added small features. + * + * Revision 1.8 1995/06/16 13:16:04 quinn + * Fixed Defaultdiagformat. + * + * Revision 1.7 1995/05/29 08:11:32 quinn + * Moved oid from odr/asn to util. + * + * Revision 1.6 1995/05/22 14:47:00 quinn + * ODR_NULLVAL --> void + * + * Revision 1.5 1995/05/22 11:31:24 quinn * Added PDUs * * Revision 1.4 1995/05/16 08:50:33 quinn @@ -93,6 +145,13 @@ #include #include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + #ifndef bool_t #define bool_t int #endif @@ -129,8 +188,10 @@ #define ODR_SET 17 #define ODR_NUMERICSTRING 18 #define ODR_PRINTABLESTRING 19 +#define ODR_GENERALIZEDTIME 24 #define ODR_GRAPHICSTRING 25 #define ODR_VISIBLESTRING 26 +#define ODR_GENERALSTRING 27 /* * odr stream directions @@ -146,7 +207,7 @@ typedef struct odr_oct int size; } Odr_oct; -typedef char Odr_null; +typedef void Odr_null; extern Odr_null *ODR_NULLVAL; typedef Odr_oct Odr_any; @@ -158,7 +219,6 @@ typedef struct odr_bitmask int top; } Odr_bitmask; -#define ODR_OID_SIZE 100 typedef int Odr_oid; /* terminate by -1 */ typedef struct odr_constack @@ -166,15 +226,12 @@ typedef struct odr_constack unsigned char *base; /* starting point of data */ int base_offset; int len; /* length of data, if known, else -1 - (decoding only) */ + (decoding only) */ unsigned char *lenb; /* where to encode length */ int len_offset; int lenlen; /* length of length-field */ } odr_constack; -struct odr_memblock; /* defined in odr_mem.c */ -typedef struct odr_memblock *ODR_MEM; - #define ODR_S_SET 0 #define ODR_S_CUR 1 #define ODR_S_END 2 @@ -204,10 +261,14 @@ typedef struct odr int t_class; /* implicit tagging (-1==default tag) */ int t_tag; + int enable_bias; /* force choice enable flag */ + int choice_bias; /* force choice */ + int lenlen; /* force length-of-lenght (odr_setlen()) */ + FILE *print; /* output file for direction print */ int indent; /* current indent level for printing */ - struct odr_memblock *mem; + NMEM mem; /* memory handle for decoding (primarily) */ /* stack for constructed types */ #define ODR_MAX_STACK 50 @@ -220,7 +281,7 @@ typedef int (*Odr_fun)(); typedef struct odr_arm { int tagmode; - int class; + int zclass; int tag; int which; Odr_fun fun; @@ -229,16 +290,18 @@ typedef struct odr_arm /* * Error control. */ -#define ONONE 0 -#define OMEMORY 1 -#define OSYSERR 2 -#define OSPACE 3 -#define OREQUIRED 4 -#define OUNEXPECTED 5 -#define OOTHER 6 -#define OPROTO 7 -#define ODATA 8 +#define ONONE 0 +#define OMEMORY 1 +#define OSYSERR 2 +#define OSPACE 3 +#define OREQUIRED 4 +#define OUNEXPECTED 5 +#define OOTHER 6 +#define OPROTO 7 +#define ODATA 8 #define OSTACK 9 +#define OCONLEN 10 +#define OLENOV 11 extern char *odr_errlist[]; @@ -251,16 +314,17 @@ void odr_destroy(ODR o); void odr_setbuf(ODR o, char *buf, int len, int can_grow); char *odr_getbuf(ODR o, int *len, int *size); void *odr_malloc(ODR o, int size); -ODR_MEM odr_extract_mem(ODR o); -void odr_release_mem(ODR_MEM p); +NMEM odr_extract_mem(ODR o); +#define odr_release_mem(m) nmem_destroy(m) +#define ODR_MEM NMEM #define odr_implicit(o, t, p, cl, tg, opt)\ - (odr_implicit_settag((o), cl, tg), t ((o), (p), opt) ) + (odr_implicit_settag((o), cl, tg), t ((o), (p), opt) ) #define odr_explicit(o, t, p, cl, tg, opt)\ - ((int) (odr_constructed_begin((o), (p), (cl), (tg)) ? \ - t ((o), (p), (opt)) &&\ - odr_constructed_end(o) : opt)) + ((int) (odr_constructed_begin((o), (p), (cl), (tg)) ? \ + t ((o), (p), (opt)) &&\ + odr_constructed_end(o) : opt)) #define ODR_MASK_ZERO(mask)\ ((void) (memset((mask)->bits, 0, ODR_BITMASK_SIZE),\ @@ -276,7 +340,7 @@ void odr_release_mem(ODR_MEM p); #define ODR_MASK_GET(mask, num) ( ((num) >> 3 <= (mask)->top) ? \ ((mask)->bits[(num) >> 3] & (0X80 >> ((num) & 0X07)) ? 1 : 0) : 0) -/* +/* Private macro. * write a single character at the current position - grow buffer if * necessary. * (no, we're not usually this anal about our macros, but this baby is @@ -285,40 +349,47 @@ void odr_release_mem(ODR_MEM p); #define odr_putc(o, c) \ ( \ ( \ - (o)->ecb.pos < (o)->ecb.size ? \ - ( \ - (o)->ecb.buf[(o)->ecb.pos++] = (c), \ - 0 \ - ) : \ - ( \ - odr_grow_block(&(o)->ecb, 1) == 0 ? \ - ( \ - (o)->ecb.buf[(o)->ecb.pos++] = (c), \ - 0 \ - ) : \ - ( \ - (o)->error = OSPACE, \ - -1 \ - ) \ - ) \ + (o)->ecb.pos < (o)->ecb.size ? \ + ( \ + (o)->ecb.buf[(o)->ecb.pos++] = (c), \ + 0 \ + ) : \ + ( \ + odr_grow_block(&(o)->ecb, 1) == 0 ? \ + ( \ + (o)->ecb.buf[(o)->ecb.pos++] = (c), \ + 0 \ + ) : \ + ( \ + (o)->error = OSPACE, \ + -1 \ + ) \ + ) \ ) == 0 ? \ ( \ - (o)->ecb.pos > (o)->ecb.top ? \ - ( \ - (o)->ecb.top = (o)->ecb.pos, \ - 0 \ - ) : \ - 0 \ + (o)->ecb.pos > (o)->ecb.top ? \ + ( \ + (o)->ecb.top = (o)->ecb.pos, \ + 0 \ + ) : \ + 0 \ ) : \ - -1 \ + -1 \ ) \ #define odr_tell(o) ((o)->ecb.pos) +#define odr_offset(o) ((o)->bp - (o)->buf) #define odr_ok(o) (!(o)->error) +#define odr_getmem(o) ((o)->mem) +#define odr_setmem(o, v) ((o)->mem = (v)) #define ODR_MAXNAME 256 +#ifdef __cplusplus +} +#endif + #include -#include +#include #endif