X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fprt-ext.c;h=9fd35c22949c584f992462af48dffdd4e494e4d3;hp=ccd2999eda6fbccffb55361a226850d32a63aa74;hb=f00caf7c3f8e70278f6ada47a1f5da79a8ba6858;hpb=a508158c2faf6e1bb96cd810d1d20f048eb01bae diff --git a/src/prt-ext.c b/src/prt-ext.c index ccd2999..9fd35c2 100644 --- a/src/prt-ext.c +++ b/src/prt-ext.c @@ -1,16 +1,19 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ - /** * \file prt-ext.c * \brief Implements handling of various Z39.50 Externals */ +#if HAVE_CONFIG_H +#include +#endif #include #include +#include "odr-priv.h" #define PRT_EXT_DEBUG 0 #if PRT_EXT_DEBUG @@ -20,7 +23,7 @@ /* * The table below should be moved to the ODR structure itself and * be an image of the association context: To help - * map indirect references when they show up. + * map indirect references when they show up. */ static Z_ext_typeent type_table[] = { @@ -83,7 +86,7 @@ Z_ext_typeent *z_ext_getentbyref(const Odr_oid *oid) encoding CHOICE { single-ASN1-type [0] ABSTRACT_SYNTAX.&Type, octet-aligned [1] IMPLICIT OCTET STRING, - arbitrary [2] IMPLICIT BIT STRING + arbitrary [2] IMPLICIT BIT STRING } } @@ -214,39 +217,39 @@ int z_External(ODR o, Z_External **p, int opt, const char *name) if (zclass == ODR_CONTEXT && tag == 1 && cons == 0) { /* we have an OCTET STRING. decode BER contents from it */ - const unsigned char *o_bp; - unsigned char *o_buf; + const char *o_bp; + char *o_buf; int o_size; char *voidp = 0; Odr_oct *oct; int r; if (!odr_implicit_tag(o, odr_octetstring, &oct, - ODR_CONTEXT, 1, 0, "octetaligned")) + ODR_CONTEXT, 1, 0, "octetaligned")) return 0; /* Save our decoding ODR members */ - o_bp = o->bp; - o_buf = o->buf; - o_size = o->size; + o_bp = o->op->bp; + o_buf = o->op->buf; + o_size = o->op->size; /* Set up the OCTET STRING buffer */ - o->bp = o->buf = oct->buf; - o->size = oct->len; + o->op->bp = o->op->buf = oct->buf; + o->op->size = oct->len; /* and decode that */ r = (*type->fun)(o, &voidp, 0, 0); (*p)->which = type->what; (*p)->u.single_ASN1_type = (Odr_any*) voidp; - + /* Restore our decoding ODR member */ - o->bp = o_bp; - o->buf = o_buf; - o->size = o_size; + o->op->bp = o_bp; + o->op->buf = o_buf; + o->op->size = o_size; return r && odr_sequence_end(o); } if (zclass == ODR_CONTEXT && tag == 0 && cons == 1) - { + { /* It's single ASN.1 type, bias the CHOICE. */ odr_choice_bias(o, type->what); } @@ -256,22 +259,17 @@ int z_External(ODR o, Z_External **p, int opt, const char *name) odr_sequence_end(o); } -Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid, const char *buf, int len) +Z_External *z_ext_record_oid_nmem(NMEM nmem, const Odr_oid *oid, + const char *buf, int len) { Z_External *thisext; - char oid_str_buf[OID_STR_MAX]; - const char *oid_str; - oid_class oclass; if (!oid) return 0; - thisext = (Z_External *) odr_malloc(o, sizeof(*thisext)); + thisext = (Z_External *) nmem_malloc(nmem, sizeof(*thisext)); thisext->descriptor = 0; thisext->indirect_reference = 0; - - oid_str = yaz_oid_to_string_buf(oid, &oclass, oid_str_buf); - - thisext->direct_reference = odr_oiddup(o, oid); + thisext->direct_reference = odr_oiddup_nmem(nmem, oid); if (len < 0) /* Structured data */ { @@ -312,59 +310,58 @@ Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid, const char *buf, int len return 0; } } - else if (!oid_oidcmp(oid, yaz_oid_recsyn_sutrs)) /* SUTRS is a single-ASN.1-type */ - { - Odr_oct *sutrs = (Odr_oct *)odr_malloc(o, sizeof(*sutrs)); - + else if (!oid_oidcmp(oid, yaz_oid_recsyn_sutrs)) + { /* SUTRS is a single-ASN.1-type */ + Odr_oct *sutrs = (Odr_oct *)nmem_malloc(nmem, sizeof(*sutrs)); + thisext->which = Z_External_sutrs; thisext->u.sutrs = sutrs; - sutrs->buf = (unsigned char *)odr_malloc(o, len); - sutrs->len = sutrs->size = len; + sutrs->buf = (char *)nmem_malloc(nmem, len); + sutrs->len = len; memcpy(sutrs->buf, buf, len); } else { thisext->which = Z_External_octet; if (!(thisext->u.octet_aligned = (Odr_oct *) - odr_malloc(o, sizeof(Odr_oct)))) + nmem_malloc(nmem, sizeof(Odr_oct)))) return 0; - if (!(thisext->u.octet_aligned->buf = (unsigned char *) - odr_malloc(o, len))) + if (!(thisext->u.octet_aligned->buf = (char *) + nmem_malloc(nmem, len))) return 0; memcpy(thisext->u.octet_aligned->buf, buf, len); - thisext->u.octet_aligned->len = thisext->u.octet_aligned->size = len; + thisext->u.octet_aligned->len = len; } return thisext; } +Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid, + const char *buf, int len) +{ + return z_ext_record_oid_nmem(o->mem, oid, buf, len); +} + Z_External *z_ext_record_oid_any(ODR o, const Odr_oid *oid, const char *buf, int len) { Z_External *thisext; - char oid_str_buf[OID_STR_MAX]; - const char *oid_str; - oid_class oclass; if (!oid) return 0; thisext = (Z_External *) odr_malloc(o, sizeof(*thisext)); thisext->descriptor = 0; thisext->indirect_reference = 0; - - oid_str = yaz_oid_to_string_buf(oid, &oclass, oid_str_buf); - thisext->direct_reference = odr_oiddup(o, oid); thisext->which = Z_External_single; thisext->u.single_ASN1_type = (Odr_any *) odr_malloc(o, sizeof(Odr_any)); if (!thisext->u.single_ASN1_type) return 0; - thisext->u.single_ASN1_type->buf = (unsigned char *) odr_malloc(o, len); + thisext->u.single_ASN1_type->buf = (char *) odr_malloc(o, len); if (!thisext->u.single_ASN1_type->buf) return 0; memcpy(thisext->u.single_ASN1_type->buf, buf, len); - thisext->u.single_ASN1_type->len = thisext->u.single_ASN1_type->size = len; - + thisext->u.single_ASN1_type->len = len; return thisext; }