Fixed bug in inetd code. The server listened on tcp:@:9999 even

[yaz-moved-to-github.git] / odr / ber_any.c

diff --git a/odr/ber_any.c b/odr/ber_any.c
index 2e9a3ce..7b56f0f 100644 (file)
--- a/odr/ber_any.c
+++ b/odr/ber_any.c
@@ -1,10 +1,29 @@
 /*
- * 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: ber_any.c,v $
- * Revision 1.7  1995-03-17 10:17:39  quinn
+ * 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
@@ -48,14 +67,8 @@ int ber_any(ODR o, Odr_any **p)
            o->left -= res;
            return 1;
        case ODR_ENCODE:
-           if ((*p)->len > o->left)
-           {
-               o->error = OSPACE;
+           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: o->error = OOTHER; return 0;
     }
@@ -66,14 +79,14 @@ int ber_any(ODR o, Odr_any **p)
  */
 int completeBER(unsigned char *buf, int len)
 {
-    int res, ll, class, tag, cons;
+    int res, ll, zclass, tag, cons;
     unsigned char *b = buf;
     
     if (!len)
        return 0;
     if (!buf[0] && !buf[1])
        return 0;
-    if ((res = ber_dectag(b, &class, &tag, &cons)) <= 0)
+    if ((res = ber_dectag(b, &zclass, &tag, &cons)) <= 0)
        return 0;
     if (res > len)
        return 0;
@@ -99,5 +112,7 @@ int completeBER(unsigned char *buf, int len)
        b += res;
        len -= res;
     }
+    if (len < 2)
+       return 0;
     return (b - buf) + 2;
 }